From 0e8fe405b1726e07f28bb95a2a2d9f8ef3c5df40 Mon Sep 17 00:00:00 2001
From: yhjun1026 <460342015@qq.com>
Date: Mon, 16 Oct 2023 12:00:46 +0800
Subject: [PATCH] feat(Agent): ChatAgent And AgentHub

1.Upgrade sqlalchemy to version 2.0
---
 pilot/base_modules/meta_data/meta_data.py | 4 +++-
 pilot/scene/chat_agent/chat.py            | 2 +-
 pilot/server/component_configs.py         | 4 +++-
 pilot/server/dbgpt_server.py              | 3 +--
 setup.py                                  | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pilot/base_modules/meta_data/meta_data.py b/pilot/base_modules/meta_data/meta_data.py
index 5db0ac464..46a5f44b0 100644
--- a/pilot/base_modules/meta_data/meta_data.py
+++ b/pilot/base_modules/meta_data/meta_data.py
@@ -72,7 +72,7 @@ else:
 Session = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 session = Session()
 
-Base = declarative_base(bind=engine)
+Base = declarative_base()
 
 # Base.metadata.create_all()
 
@@ -84,6 +84,8 @@ alembic_cfg = AlembicConfig(alembic_ini_path)
 alembic_cfg.set_main_option('sqlalchemy.url',  str(engine.url))
 
 os.makedirs(default_db_path + "/alembic", exist_ok=True)
+os.makedirs(default_db_path + "/alembic/versions", exist_ok=True)
+
 alembic_cfg.set_main_option('script_location',  default_db_path + "/alembic")
 
 # 将模型和会话传递给Alembic配置
diff --git a/pilot/scene/chat_agent/chat.py b/pilot/scene/chat_agent/chat.py
index 4f4b25eef..bb9872308 100644
--- a/pilot/scene/chat_agent/chat.py
+++ b/pilot/scene/chat_agent/chat.py
@@ -31,7 +31,7 @@ class ChatAgent(BaseChat):
         self.plugins_prompt_generator.command_registry = CFG.command_registry
 
         # load  select plugin
-        agent_module = CFG.SYSTEM_APP.get_componet(ComponentType.AGENT_HUB, ModuleAgent)
+        agent_module = CFG.SYSTEM_APP.get_component(ComponentType.AGENT_HUB, ModuleAgent)
         self.plugins_prompt_generator = agent_module.load_select_plugin(self.plugins_prompt_generator, self.select_plugins)
 
         self.api_call = ApiCall(plugin_generator=self.plugins_prompt_generator)
diff --git a/pilot/server/component_configs.py b/pilot/server/component_configs.py
index 91fb9de6e..06f2c4a16 100644
--- a/pilot/server/component_configs.py
+++ b/pilot/server/component_configs.py
@@ -26,9 +26,11 @@ def initialize_components(
 
     # Register global default executor factory first
     system_app.register(DefaultExecutorFactory)
-
     system_app.register_instance(controller)
 
+    from pilot.base_modules.agent.controller import module_agent
+    system_app.register_instance(module_agent)
+
     _initialize_embedding_model(
         param, system_app, embedding_model_name, embedding_model_path
     )
diff --git a/pilot/server/dbgpt_server.py b/pilot/server/dbgpt_server.py
index 12aac586e..ed170c50e 100644
--- a/pilot/server/dbgpt_server.py
+++ b/pilot/server/dbgpt_server.py
@@ -81,9 +81,8 @@ app.include_router(api_fb_v1, prefix="/api", tags=["FeedBack"])
 
 
 app.include_router(knowledge_router,  tags=["Knowledge"])
-
 app.include_router(prompt_router,  tags=["Prompt"])
-# app.include_router(api_editor_route_v1)
+
 
 @app.get("/openapi.json")
 async def get_openapi_endpoint():
diff --git a/setup.py b/setup.py
index f53b729a9..3785a277d 100644
--- a/setup.py
+++ b/setup.py
@@ -308,7 +308,7 @@ def core_requires():
         "auto-gpt-plugin-template",
         "gTTS==2.3.1",
         "langchain>=0.0.286",
-        "SQLAlchemy",
+        "SQLAlchemy==2.0.22",
         "pymysql",
         "duckdb==0.8.1",
         "duckdb-engine",