diff --git a/pilot/scene/dbgpt_chat/chat.py b/pilot/scene/dbgpt_chat/chat.py index 37c17cae0..2c3d9c54e 100644 --- a/pilot/scene/dbgpt_chat/chat.py +++ b/pilot/scene/dbgpt_chat/chat.py @@ -7,6 +7,7 @@ from pilot.scene.base import ChatScene from pilot.scene.base_chat import BaseChat from pilot.server.knowledge.api import knowledge_space_service from pilot.server.knowledge.request.request import KnowledgeSpaceRequest +from .prompt import prompt CFG = Config() diff --git a/pilot/user/user_db.py b/pilot/user/user_db.py index 743c11bc7..93411739d 100644 --- a/pilot/user/user_db.py +++ b/pilot/user/user_db.py @@ -1,13 +1,14 @@ -from pilot.base_modules.meta_data.base_dao import BaseDao -from pilot.base_modules.meta_data.meta_data import Base, engine, session from pilot.configs.config import Config +from sqlalchemy.ext.declarative import declarative_base from datetime import datetime -from sqlalchemy import Column, String, DateTime +from sqlalchemy import Column, Integer, String, DateTime +from pilot.connections.rdbms.base_dao import BaseDao from pilot.user.user_request import UserRequest import uuid CFG = Config() +Base = declarative_base() DB_AUTH = "auth" TABLE_USER = "user" @@ -35,14 +36,14 @@ class UserDao(BaseDao): create database `auth` firstly. """ super().__init__( - database=DB_AUTH, orm_base=Base, db_engine=engine, session=session + database=DB_AUTH, orm_base=Base, create_not_exist_table=False ) def get_by_user_id(self, user_id: str): """ get user info by user_id """ - session = self.get_session() + session = self.Session() user_query = session.query(UserEntity).filter(UserEntity.user_id == user_id) result = user_query.all() session.close() @@ -55,7 +56,7 @@ class UserDao(BaseDao): """ query user by user_no """ - session = self.get_session() + session = self.Session() user_query = session.query(UserEntity).filter( UserEntity.user_no == user_no ).filter( @@ -77,7 +78,7 @@ class UserDao(BaseDao): if user_req.user_no is not None and user_req.user_channel is not None: result = self.get_by_user_no_and_channel(user_req.user_no, user_req.user_channel) if len(result) == 0: - session = self.get_session() + session = self.Session() user = UserEntity( user_id=uuid.uuid4().hex, nick_name=user_req.nick_name, @@ -99,7 +100,7 @@ class UserDao(BaseDao): """ query user by user_no """ - session = self.get_session() + session = self.Session() user_query = session.query(UserEntity).order_by( UserEntity.gmt_created.desc() ) @@ -108,14 +109,14 @@ class UserDao(BaseDao): return result def update_user(self, user: UserEntity): - session = self.get_session() + session = self.Session() session.merge(user) session.commit() session.close() return True def delete_user(self, user: UserEntity): - session = self.get_session() + session = self.Session() if user: session.delete(user) session.commit()