Merge branch 'main' into chore/merge-main

eosphoros-ai · Aug 30, 2024 · 968c067 · 968c067
2 parents b984439 + f866580
commit 968c067
Show file tree

Hide file tree

Showing 382 changed files with 1,736 additions and 1,570 deletions.
diff --git a/.env.template b/.env.template
@@ -97,6 +97,14 @@ KNOWLEDGE_SEARCH_REWRITE=False
 ## qwen embedding model, See dbgpt/model/parameter.py
 # EMBEDDING_MODEL=proxy_tongyi
 # proxy_tongyi_proxy_backend=text-embedding-v1
+# proxy_tongyi_proxy_api_key={your-api-key}
+
+## qianfan embedding model, See dbgpt/model/parameter.py
+#EMBEDDING_MODEL=proxy_qianfan
+#proxy_qianfan_proxy_backend=bge-large-zh
+#proxy_qianfan_proxy_api_key={your-api-key}
+#proxy_qianfan_proxy_api_secret={your-secret-key}
+
 
 ## Common HTTP embedding model
 # EMBEDDING_MODEL=proxy_http_openapi
@@ -309,4 +317,4 @@ DBGPT_LOG_LEVEL=INFO
 #*******************************************************************#
 #**                     FINANCIAL CHAT Config                     **#
 #*******************************************************************#
-# FIN_REPORT_MODEL=/app/models/bge-large-zh
+# FIN_REPORT_MODEL=/app/models/bge-large-zh
diff --git a/.mypy.ini b/.mypy.ini
@@ -122,3 +122,6 @@ ignore_missing_imports = True
 
 [mypy-pypdf.*]
 ignore_missing_imports = True
+
+[mypy-qianfan.*]
+ignore_missing_imports = True
diff --git a/dbgpt/agent/core/base_agent.py b/dbgpt/agent/core/base_agent.py
@@ -341,6 +341,9 @@ async def generate_reply(
                         received_message=received_message,
                         rely_messages=rely_messages,
                     )
+
+                    retry_message.rounds = reply_message.rounds + 1
+
                     retry_message.content = fail_reason
                     retry_message.current_goal = received_message.current_goal
 
@@ -351,6 +354,7 @@ async def generate_reply(
                     await sender.send(
                         retry_message, self, reviewer, request_reply=False
                     )
+                    reply_message.rounds = retry_message.rounds + 1
 
                 # In manual retry mode, load all messages of the last speaker as dependent messages # noqa
                 logger.info(

diff --git a/dbgpt/agent/core/plan/team_auto_plan.py b/dbgpt/agent/core/plan/team_auto_plan.py
@@ -168,6 +168,7 @@ async def act(
             )
         speaker: Agent = sender
         final_message = message.content
+        rounds = message.rounds
         for i in range(self.max_round):
             if not self.memory:
                 return ActionOutput(
@@ -196,11 +197,12 @@ async def act(
 
                 plan_message = await planner.generate_reply(
                     received_message=AgentMessage.from_llm_message(
-                        {"content": message.content}
+                        {"content": message.content, "rounds": rounds}
                     ),
                     sender=self,
                     reviewer=reviewer,
                 )
+                rounds = plan_message.rounds
                 await planner.send(
                     message=plan_message, recipient=self, request_reply=False
                 )
@@ -228,6 +230,7 @@ async def act(
                                 "plan_task": now_plan.sub_task_content,
                                 "plan_task_num": now_plan.sub_task_num,
                             },
+                            rounds=rounds + 1,
                         )
                         # select the next speaker
                         speaker, model = await self.select_speaker(
@@ -264,6 +267,7 @@ async def act(
                         await speaker.send(
                             agent_reply_message, self, reviewer, request_reply=False
                         )
+                        rounds = agent_reply_message.rounds
 
                         plan_result = ""
                         final_message = reply_message["content"]

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:description" content="eosphoros-ai"/><meta property="og:title" content="DB-GPT"/><link rel="preload" href="/_next/static/css/f8eb45c952dd19e2.css" as="style"/><link rel="stylesheet" href="/_next/static/css/f8eb45c952dd19e2.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-aae1f4a1a3b156bd.js" defer=""></script><script src="/_next/static/chunks/framework-e41fd17eac0ca504.js" defer=""></script><script src="/_next/static/chunks/main-05be4496aadb43c7.js" defer=""></script><script src="/_next/static/chunks/pages/_app-72304f997d4f174e.js" defer=""></script><script src="/_next/static/chunks/pages/_error-4fa9991a75118e6f.js" defer=""></script><script src="/_next/static/-L9Od0w1XElCNcbCi4hJV/_buildManifest.js" defer=""></script><script src="/_next/static/-L9Od0w1XElCNcbCi4hJV/_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":"-L9Od0w1XElCNcbCi4hJV","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/f8eb45c952dd19e2.css" as="style"/><link rel="stylesheet" href="/_next/static/css/f8eb45c952dd19e2.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-f159616fcd1bda6b.js" defer=""></script><script src="/_next/static/chunks/framework-bf941633d42c5f92.js" defer=""></script><script src="/_next/static/chunks/main-28c79a921c889131.js" defer=""></script><script src="/_next/static/chunks/pages/_app-690c49bd776698cb.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/_LUlP8fg3TFDUAFikQDdn/_buildManifest.js" defer=""></script><script src="/_next/static/_LUlP8fg3TFDUAFikQDdn/_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":"_LUlP8fg3TFDUAFikQDdn","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:description" content="eosphoros-ai"/><meta property="og:title" content="DB-GPT"/><link rel="preload" href="/_next/static/css/f8eb45c952dd19e2.css" as="style"/><link rel="stylesheet" href="/_next/static/css/f8eb45c952dd19e2.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-aae1f4a1a3b156bd.js" defer=""></script><script src="/_next/static/chunks/framework-e41fd17eac0ca504.js" defer=""></script><script src="/_next/static/chunks/main-05be4496aadb43c7.js" defer=""></script><script src="/_next/static/chunks/pages/_app-72304f997d4f174e.js" defer=""></script><script src="/_next/static/chunks/pages/_error-4fa9991a75118e6f.js" defer=""></script><script src="/_next/static/-L9Od0w1XElCNcbCi4hJV/_buildManifest.js" defer=""></script><script src="/_next/static/-L9Od0w1XElCNcbCi4hJV/_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":"-L9Od0w1XElCNcbCi4hJV","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/f8eb45c952dd19e2.css" as="style"/><link rel="stylesheet" href="/_next/static/css/f8eb45c952dd19e2.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-f159616fcd1bda6b.js" defer=""></script><script src="/_next/static/chunks/framework-bf941633d42c5f92.js" defer=""></script><script src="/_next/static/chunks/main-28c79a921c889131.js" defer=""></script><script src="/_next/static/chunks/pages/_app-690c49bd776698cb.js" defer=""></script><script src="/_next/static/chunks/pages/_error-8095ba9e1bf12f30.js" defer=""></script><script src="/_next/static/_LUlP8fg3TFDUAFikQDdn/_buildManifest.js" defer=""></script><script src="/_next/static/_LUlP8fg3TFDUAFikQDdn/_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":"_LUlP8fg3TFDUAFikQDdn","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
diff --git a/...w1XElCNcbCi4hJV/construct/prompt/add.json → ...fg3TFDUAFikQDdn/construct/prompt/add.json b/...w1XElCNcbCi4hJV/construct/prompt/add.json → ...fg3TFDUAFikQDdn/construct/prompt/add.json
diff --git a/...1XElCNcbCi4hJV/construct/prompt/edit.json → ...g3TFDUAFikQDdn/construct/prompt/edit.json b/...1XElCNcbCi4hJV/construct/prompt/edit.json → ...g3TFDUAFikQDdn/construct/prompt/edit.json
diff --git a/dbgpt/app/static/web/_next/static/-L9Od0w1XElCNcbCi4hJV/_buildManifest.js b/dbgpt/app/static/web/_next/static/-L9Od0w1XElCNcbCi4hJV/_buildManifest.js