diff --git a/pilot/openapi/api_v1/api_v1.py b/pilot/openapi/api_v1/api_v1.py index 7f6f66953..3838c8dbe 100644 --- a/pilot/openapi/api_v1/api_v1.py +++ b/pilot/openapi/api_v1/api_v1.py @@ -26,8 +26,8 @@ from pilot.openapi.api_v1.api_view_model import ( ChatSceneVo, ) from pilot.configs.config import Config -from pilot.openapi.knowledge.knowledge_service import KnowledgeService -from pilot.openapi.knowledge.request.knowledge_request import KnowledgeSpaceRequest +from pilot.server.knowledge.service import KnowledgeService +from pilot.server.knowledge.request.request import KnowledgeSpaceRequest from pilot.scene.base_chat import BaseChat from pilot.scene.base import ChatScene diff --git a/pilot/server/dbgpt_server.py b/pilot/server/dbgpt_server.py index f72f04dd7..4996e7c4a 100644 --- a/pilot/server/dbgpt_server.py +++ b/pilot/server/dbgpt_server.py @@ -23,7 +23,7 @@ from fastapi import FastAPI, applications from fastapi.openapi.docs import get_swagger_ui_html from fastapi.exceptions import RequestValidationError from fastapi.middleware.cors import CORSMiddleware -from pilot.openapi.knowledge.knowledge_controller import router as knowledge_router +from pilot.server.knowledge.api import router as knowledge_router from pilot.openapi.api_v1.api_v1 import router as api_v1, validation_exception_handler diff --git a/pilot/openapi/knowledge/__init__.py b/pilot/server/knowledge/__init__.py similarity index 100% rename from pilot/openapi/knowledge/__init__.py rename to pilot/server/knowledge/__init__.py diff --git a/pilot/openapi/knowledge/knowledge_controller.py b/pilot/server/knowledge/api.py similarity index 94% rename from pilot/openapi/knowledge/knowledge_controller.py rename to pilot/server/knowledge/api.py index 26e79609f..887bbadb2 100644 --- a/pilot/openapi/knowledge/knowledge_controller.py +++ b/pilot/server/knowledge/api.py @@ -2,7 +2,7 @@ import os import shutil from tempfile import NamedTemporaryFile -from fastapi import APIRouter, File, UploadFile, Request, Form +from fastapi import APIRouter, File, UploadFile, Form from langchain.embeddings import HuggingFaceEmbeddings @@ -12,8 +12,8 @@ from pilot.configs.model_config import LLM_MODEL_CONFIG, KNOWLEDGE_UPLOAD_ROOT_P from pilot.openapi.api_v1.api_view_model import Result from pilot.embedding_engine.knowledge_embedding import KnowledgeEmbedding -from pilot.openapi.knowledge.knowledge_service import KnowledgeService -from pilot.openapi.knowledge.request.knowledge_request import ( +from pilot.server.knowledge.service import KnowledgeService +from pilot.server.knowledge.request.request import ( KnowledgeQueryRequest, KnowledgeQueryResponse, KnowledgeDocumentRequest, @@ -22,7 +22,7 @@ from pilot.openapi.knowledge.request.knowledge_request import ( DocumentQueryRequest, ) -from pilot.openapi.knowledge.request.knowledge_request import KnowledgeSpaceRequest +from pilot.server.knowledge.request.request import KnowledgeSpaceRequest CFG = Config() router = APIRouter() diff --git a/pilot/openapi/knowledge/document_chunk_dao.py b/pilot/server/knowledge/chunk_dao.py similarity index 100% rename from pilot/openapi/knowledge/document_chunk_dao.py rename to pilot/server/knowledge/chunk_dao.py diff --git a/pilot/openapi/knowledge/knowledge_document_dao.py b/pilot/server/knowledge/document_dao.py similarity index 100% rename from pilot/openapi/knowledge/knowledge_document_dao.py rename to pilot/server/knowledge/document_dao.py diff --git a/pilot/openapi/knowledge/request/__init__.py b/pilot/server/knowledge/request/__init__.py similarity index 100% rename from pilot/openapi/knowledge/request/__init__.py rename to pilot/server/knowledge/request/__init__.py diff --git a/pilot/openapi/knowledge/request/knowledge_request.py b/pilot/server/knowledge/request/request.py similarity index 100% rename from pilot/openapi/knowledge/request/knowledge_request.py rename to pilot/server/knowledge/request/request.py diff --git a/pilot/openapi/knowledge/request/knowledge_response.py b/pilot/server/knowledge/request/response.py similarity index 100% rename from pilot/openapi/knowledge/request/knowledge_response.py rename to pilot/server/knowledge/request/response.py diff --git a/pilot/openapi/knowledge/knowledge_service.py b/pilot/server/knowledge/service.py similarity index 95% rename from pilot/openapi/knowledge/knowledge_service.py rename to pilot/server/knowledge/service.py index b6308a81a..35f644ffb 100644 --- a/pilot/openapi/knowledge/knowledge_service.py +++ b/pilot/server/knowledge/service.py @@ -5,19 +5,19 @@ from pilot.configs.config import Config from pilot.configs.model_config import LLM_MODEL_CONFIG from pilot.embedding_engine.knowledge_embedding import KnowledgeEmbedding from pilot.logs import logger -from pilot.openapi.knowledge.document_chunk_dao import ( +from pilot.server.knowledge.chunk_dao import ( DocumentChunkEntity, DocumentChunkDao, ) -from pilot.openapi.knowledge.knowledge_document_dao import ( +from pilot.server.knowledge.document_dao import ( KnowledgeDocumentDao, KnowledgeDocumentEntity, ) -from pilot.openapi.knowledge.knowledge_space_dao import ( +from pilot.server.knowledge.space_dao import ( KnowledgeSpaceDao, KnowledgeSpaceEntity, ) -from pilot.openapi.knowledge.request.knowledge_request import ( +from pilot.server.knowledge.request.request import ( KnowledgeSpaceRequest, KnowledgeDocumentRequest, DocumentQueryRequest, @@ -25,7 +25,7 @@ from pilot.openapi.knowledge.request.knowledge_request import ( ) from enum import Enum -from pilot.openapi.knowledge.request.knowledge_response import ( +from pilot.server.knowledge.request.response import ( ChunkQueryResponse, DocumentQueryResponse, ) diff --git a/pilot/openapi/knowledge/knowledge_space_dao.py b/pilot/server/knowledge/space_dao.py similarity index 97% rename from pilot/openapi/knowledge/knowledge_space_dao.py rename to pilot/server/knowledge/space_dao.py index 16def1e99..d4f6fbba6 100644 --- a/pilot/openapi/knowledge/knowledge_space_dao.py +++ b/pilot/server/knowledge/space_dao.py @@ -5,7 +5,7 @@ from sqlalchemy.ext.declarative import declarative_base from pilot.configs.config import Config -from pilot.openapi.knowledge.request.knowledge_request import KnowledgeSpaceRequest +from pilot.server.knowledge.request.request import KnowledgeSpaceRequest from sqlalchemy.orm import sessionmaker CFG = Config()