feat(Agent): ChatAgent And AgentHub

1.Upgrade sqlalchemy to version 2.0
glayyiyi · Oct 18, 2023 · ac4b809 · ac4b809
1 parent b06dbe3
commit ac4b809
Showing 34 changed files with 210 additions and 20 deletions.
diff --git a/pilot/base_modules/agent/db/my_plugin_db.py b/pilot/base_modules/agent/db/my_plugin_db.py
@@ -3,8 +3,6 @@
 from sqlalchemy import Column, Integer, String, Index, DateTime, func
 from sqlalchemy import UniqueConstraint
 
-from pilot.base_modules.meta_data.meta_data import Base
-
 from pilot.base_modules.meta_data.base_dao import BaseDao
 from pilot.base_modules.meta_data.meta_data import Base, engine, session
 

diff --git a/pilot/base_modules/agent/hub/agent_hub.py b/pilot/base_modules/agent/hub/agent_hub.py
@@ -180,7 +180,7 @@ async def upload_my_plugin(self, doc_file: UploadFile, user: Any = Default_User)
             os.remove(file_path)
         tmp_fd, tmp_path = tempfile.mkstemp(dir=os.path.join(self.plugin_dir))
         with os.fdopen(tmp_fd, "wb") as tmp:
-            tmp.write(await doc_file.read())
+            await tmp.write(await doc_file.read())
         shutil.move(
             tmp_path,
             os.path.join(self.plugin_dir, doc_file.filename),

diff --git a/pilot/base_modules/meta_data/meta_data/dbgpt.db b/pilot/base_modules/meta_data/meta_data/dbgpt.db
diff --git a/pilot/memory/chat_history/store_type/meta_db_history.py b/pilot/memory/chat_history/store_type/meta_db_history.py
@@ -84,7 +84,7 @@ def conv_info(self, conv_uid: str = None) -> None:
         return chat_history.__dict__
 
     def get_messages(self) -> List[OnceConversation]:
-        logger.info("get_messages:{}", self.chat_seesion_id)
+        # logger.info("get_messages:{}", self.chat_seesion_id)
         chat_history = self.chat_history_dao.get_by_uid(self.chat_seesion_id)
         if chat_history:
             context = chat_history.messages

diff --git a/pilot/meta_data/alembic/env.py b/pilot/meta_data/alembic/env.py
@@ -40,9 +40,9 @@ def run_migrations_offline() -> None:
     script output.
 
     """
-    url = str(engine.url)
+    url = config.get_main_option("sqlalchemy.url")
     context.configure(
-        url=url,
+        url="'mysql+pymysql://root:aa123456@127.0.0.1:3306/dbgpt'",
         target_metadata=target_metadata,
         literal_binds=True,
         dialect_opts={"paramstyle": "named"},
@@ -65,7 +65,7 @@ def run_migrations_online() -> None:
         poolclass=pool.NullPool,
     )
 
-    with connectable.connect() as connection:
+    with engine.connect() as connection:
         if engine.dialect.name == "sqlite":
             context.configure(
                 connection=engine.connect(),

diff --git a/pilot/server/base.py b/pilot/server/base.py
@@ -37,7 +37,7 @@ def server_init(args, system_app: SystemApp):
     cfg = Config()
     cfg.SYSTEM_APP = system_app
 
-    # ddl_init_and_upgrade()
+    ddl_init_and_upgrade()
 
     # load_native_plugins(cfg)
     signal.signal(signal.SIGINT, signal_handler)

diff --git a/pilot/server/static/404.html b/pilot/server/static/404.html
diff --git a/pilot/server/static/404/index.html b/pilot/server/static/404/index.html
diff --git a/pilot/server/static/_next/static/chunks/104-953a3907bb8d7bfd.js b/pilot/server/static/_next/static/chunks/104-953a3907bb8d7bfd.js
diff --git a/pilot/server/static/_next/static/chunks/747-5295584dfbb8b437.js b/pilot/server/static/_next/static/chunks/747-5295584dfbb8b437.js
diff --git a/pilot/server/static/_next/static/chunks/75fc9c18-a784766a129ec5fb.js b/pilot/server/static/_next/static/chunks/75fc9c18-a784766a129ec5fb.js
diff --git a/pilot/server/static/_next/static/chunks/pages/_app-fdf09e227ecb3ffc.js b/pilot/server/static/_next/static/chunks/pages/_app-fdf09e227ecb3ffc.js