Merge branch 'feat/dev-0.6' of https://github.com/eosphoros-ai/DB-GPT …

…into dev_0.6
eosphoros-ai · Aug 21, 2024 · 2382661 · 2382661
2 parents fde8805 + b0adabb
commit 2382661
Show file tree

Hide file tree

Showing 69 changed files with 117 additions and 124 deletions.
diff --git a/dbgpt/app/knowledge/api.py b/dbgpt/app/knowledge/api.py
@@ -11,6 +11,7 @@
     ChunkEditRequest,
     ChunkQueryRequest,
     DocumentQueryRequest,
+    DocumentRecallTestRequest,
     DocumentSummaryRequest,
     DocumentSyncRequest,
     EntityExtractRequest,
@@ -19,8 +20,6 @@
     KnowledgeQueryRequest,
     KnowledgeSpaceRequest,
     SpaceArgumentRequest,
-    ChunkEditRequest,
-    DocumentRecallTestRequest,
 )
 from dbgpt.app.knowledge.request.response import (
     ChunkQueryResponse,
@@ -157,9 +156,7 @@ def recursively_find_subclasses(cls):
             except Exception as e:
                 logger.error(f"Error calling name method on {retriever_cls}: {e}")
 
-        return Result.succ(
-            list(retriever_names.keys())
-        )
+        return Result.succ(list(retriever_names.keys()))
     except Exception as e:
         return Result.failed(
             code="E000X", msg=f"{space_id} get_recall_retrievers error {e}"

diff --git a/dbgpt/app/knowledge/service.py b/dbgpt/app/knowledge/service.py
@@ -11,17 +11,15 @@
     KnowledgeDocumentDao,
     KnowledgeDocumentEntity,
 )
-from dbgpt.rag.retriever.rerank import RerankEmbeddingsRanker
-
 from dbgpt.app.knowledge.request.request import (
+    ChunkEditRequest,
     ChunkQueryRequest,
     DocumentQueryRequest,
+    DocumentRecallTestRequest,
     DocumentSummaryRequest,
     KnowledgeDocumentRequest,
     KnowledgeSpaceRequest,
     SpaceArgumentRequest,
-    ChunkEditRequest,
-    DocumentRecallTestRequest,
 )
 from dbgpt.app.knowledge.request.response import (
     ChunkQueryResponse,
@@ -40,6 +38,7 @@
 from dbgpt.rag.embedding.embedding_factory import EmbeddingFactory
 from dbgpt.rag.knowledge.base import KnowledgeType
 from dbgpt.rag.knowledge.factory import KnowledgeFactory
+from dbgpt.rag.retriever.rerank import RerankEmbeddingsRanker
 from dbgpt.serve.rag.connector import VectorStoreConnector
 from dbgpt.serve.rag.models.models import KnowledgeSpaceDao, KnowledgeSpaceEntity
 from dbgpt.serve.rag.retriever.knowledge_space import KnowledgeSpaceRetriever
@@ -310,11 +309,12 @@ def get_knowledge_space_by_ids(self, ids):
         """
         return knowledge_space_dao.get_knowledge_space_by_ids(ids)
 
-    def recall_test(self, space_name, doc_recall_test_request: DocumentRecallTestRequest):
+    def recall_test(
+        self, space_name, doc_recall_test_request: DocumentRecallTestRequest
+    ):
         logger.info(f"recall_test {space_name}, {doc_recall_test_request}")
-        from dbgpt.rag.embedding.embedding_factory import (
-            RerankEmbeddingFactory,
-        )
+        from dbgpt.rag.embedding.embedding_factory import RerankEmbeddingFactory
+
         try:
             start_time = timeit.default_timer()
             question = doc_recall_test_request.question
@@ -353,8 +353,7 @@ def recall_test(self, space_name, doc_recall_test_request: DocumentRecallTestReq
                 rerank_embeddings = RerankEmbeddingFactory.get_instance(
                     CFG.SYSTEM_APP
                 ).create()
-                reranker = RerankEmbeddingsRanker(rerank_embeddings,
-                                                  topk=recall_top_k)
+                reranker = RerankEmbeddingsRanker(rerank_embeddings, topk=recall_top_k)
                 chunks = reranker.rank(candidates_with_scores=chunks, query=question)
 
             recall_score_threshold = doc_recall_test_request.recall_score_threshold

diff --git a/dbgpt/app/scene/chat_knowledge/v1/chat.py b/dbgpt/app/scene/chat_knowledge/v1/chat.py
@@ -40,9 +40,7 @@ def __init__(self, chat_param: Dict):
             - model_name:(str) llm model name
             - select_param:(str) space name
         """
-        from dbgpt.rag.embedding.embedding_factory import (
-            RerankEmbeddingFactory,
-        )
+        from dbgpt.rag.embedding.embedding_factory import RerankEmbeddingFactory
 
         self.knowledge_space = chat_param["select_param"]
         chat_param["chat_mode"] = ChatScene.ChatKnowledge

diff --git a/dbgpt/app/static/web/404.html b/dbgpt/app/static/web/404.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:site_name" content="df.alipay.com"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="Ant-DB-GPT"/><link rel="preload" href="/_next/static/css/303847e6112d00ae.css" as="style"/><link rel="stylesheet" href="/_next/static/css/303847e6112d00ae.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-0a2338c2b59bc7b5.js" defer=""></script><script src="/_next/static/chunks/framework-f701683ca87c9d36.js" defer=""></script><script src="/_next/static/chunks/main-8c6ee2635a9b3afc.js" defer=""></script><script src="/_next/static/chunks/pages/_app-53ef7d9cabe0adea.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/SffxRojMO5idwjHbCoDQW/_buildManifest.js" defer=""></script><script src="/_next/static/SffxRojMO5idwjHbCoDQW/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"SffxRojMO5idwjHbCoDQW","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="DB-GPT"/><link rel="preload" href="/_next/static/css/303847e6112d00ae.css" as="style"/><link rel="stylesheet" href="/_next/static/css/303847e6112d00ae.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-3d1fc9d1ad5b769f.js" defer=""></script><script src="/_next/static/chunks/framework-f701683ca87c9d36.js" defer=""></script><script src="/_next/static/chunks/main-8c6ee2635a9b3afc.js" defer=""></script><script src="/_next/static/chunks/pages/_app-3080d061c6f415ba.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/T0TLOiMXd67QJRfok8C-J/_buildManifest.js" defer=""></script><script src="/_next/static/T0TLOiMXd67QJRfok8C-J/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"T0TLOiMXd67QJRfok8C-J","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
diff --git a/dbgpt/app/static/web/404/index.html b/dbgpt/app/static/web/404/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:site_name" content="df.alipay.com"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="Ant-DB-GPT"/><link rel="preload" href="/_next/static/css/303847e6112d00ae.css" as="style"/><link rel="stylesheet" href="/_next/static/css/303847e6112d00ae.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-0a2338c2b59bc7b5.js" defer=""></script><script src="/_next/static/chunks/framework-f701683ca87c9d36.js" defer=""></script><script src="/_next/static/chunks/main-8c6ee2635a9b3afc.js" defer=""></script><script src="/_next/static/chunks/pages/_app-53ef7d9cabe0adea.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/SffxRojMO5idwjHbCoDQW/_buildManifest.js" defer=""></script><script src="/_next/static/SffxRojMO5idwjHbCoDQW/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"SffxRojMO5idwjHbCoDQW","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="DB-GPT"/><link rel="preload" href="/_next/static/css/303847e6112d00ae.css" as="style"/><link rel="stylesheet" href="/_next/static/css/303847e6112d00ae.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-3d1fc9d1ad5b769f.js" defer=""></script><script src="/_next/static/chunks/framework-f701683ca87c9d36.js" defer=""></script><script src="/_next/static/chunks/main-8c6ee2635a9b3afc.js" defer=""></script><script src="/_next/static/chunks/pages/_app-3080d061c6f415ba.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/T0TLOiMXd67QJRfok8C-J/_buildManifest.js" defer=""></script><script src="/_next/static/T0TLOiMXd67QJRfok8C-J/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"T0TLOiMXd67QJRfok8C-J","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
diff --git a/...jMO5idwjHbCoDQW/construct/prompt/add.json → ...MXd67QJRfok8C-J/construct/prompt/add.json b/...jMO5idwjHbCoDQW/construct/prompt/add.json → ...MXd67QJRfok8C-J/construct/prompt/add.json
diff --git a/...MO5idwjHbCoDQW/construct/prompt/edit.json → ...Xd67QJRfok8C-J/construct/prompt/edit.json b/...MO5idwjHbCoDQW/construct/prompt/edit.json → ...Xd67QJRfok8C-J/construct/prompt/edit.json
diff --git a/...c/SffxRojMO5idwjHbCoDQW/_buildManifest.js → ...c/T0TLOiMXd67QJRfok8C-J/_buildManifest.js b/...c/SffxRojMO5idwjHbCoDQW/_buildManifest.js → ...c/T0TLOiMXd67QJRfok8C-J/_buildManifest.js
diff --git a/...tic/SffxRojMO5idwjHbCoDQW/_ssgManifest.js → ...tic/T0TLOiMXd67QJRfok8C-J/_ssgManifest.js b/...tic/SffxRojMO5idwjHbCoDQW/_ssgManifest.js → ...tic/T0TLOiMXd67QJRfok8C-J/_ssgManifest.js
diff --git a/dbgpt/app/static/web/_next/static/chunks/342-5b24b376765bdef8.js b/dbgpt/app/static/web/_next/static/chunks/342-5b24b376765bdef8.js
diff --git a/dbgpt/app/static/web/_next/static/chunks/342-71966afd6f9426f3.js b/dbgpt/app/static/web/_next/static/chunks/342-71966afd6f9426f3.js
diff --git a/...xt/static/chunks/8336.e7d702ed64679ad8.js → ...xt/static/chunks/8336.aa5dde5efe593365.js b/...xt/static/chunks/8336.e7d702ed64679ad8.js → ...xt/static/chunks/8336.aa5dde5efe593365.js
diff --git a/...xt/static/chunks/9071-b0c98ca80d466c11.js → ...xt/static/chunks/9071-4f435a7a74d5a7a9.js b/...xt/static/chunks/9071-b0c98ca80d466c11.js → ...xt/static/chunks/9071-4f435a7a74d5a7a9.js
diff --git a/...tic/chunks/pages/_app-53ef7d9cabe0adea.js → ...tic/chunks/pages/_app-3080d061c6f415ba.js b/...tic/chunks/pages/_app-53ef7d9cabe0adea.js → ...tic/chunks/pages/_app-3080d061c6f415ba.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:site_name" content="df.alipay.com"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="Ant-DB-GPT"/><link rel="preload" href="/_next/static/css/303847e6112d00ae.css" as="style"/><link rel="stylesheet" href="/_next/static/css/303847e6112d00ae.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-0a2338c2b59bc7b5.js" defer=""></script><script src="/_next/static/chunks/framework-f701683ca87c9d36.js" defer=""></script><script src="/_next/static/chunks/main-8c6ee2635a9b3afc.js" defer=""></script><script src="/_next/static/chunks/pages/_app-53ef7d9cabe0adea.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/SffxRojMO5idwjHbCoDQW/_buildManifest.js" defer=""></script><script src="/_next/static/SffxRojMO5idwjHbCoDQW/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"SffxRojMO5idwjHbCoDQW","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
		<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="icon" href="/favicon.ico"/><meta name="description" content="Revolutionizing Database Interactions with Private LLM Technology"/><meta property="og:description" content="eosphoros-ai"/><meta property="og:title" content="DB-GPT"/><link rel="preload" href="/_next/static/css/303847e6112d00ae.css" as="style"/><link rel="stylesheet" href="/_next/static/css/303847e6112d00ae.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="/_next/static/chunks/polyfills-78c92fac7aa8fdd8.js"></script><script src="/_next/static/chunks/webpack-3d1fc9d1ad5b769f.js" defer=""></script><script src="/_next/static/chunks/framework-f701683ca87c9d36.js" defer=""></script><script src="/_next/static/chunks/main-8c6ee2635a9b3afc.js" defer=""></script><script src="/_next/static/chunks/pages/_app-3080d061c6f415ba.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/T0TLOiMXd67QJRfok8C-J/_buildManifest.js" defer=""></script><script src="/_next/static/T0TLOiMXd67QJRfok8C-J/_ssgManifest.js" defer=""></script><link rel="stylesheet" href="/_next/static/css/antd-output/antd.min.7d5365b5.css"/></head><body><div id="__next"><div></div></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"T0TLOiMXd67QJRfok8C-J","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>