diff --git a/Html/apps/extensions.py b/Html/apps/extensions.py index 5303f4d..8ae87fc 100644 --- a/Html/apps/extensions.py +++ b/Html/apps/extensions.py @@ -26,7 +26,7 @@ users_list = UserList() uuid2username = {} # 你的映射，或换成数据库访问层 username2uuid = {} course_list = CourseList() -user_id2UserClass = {} +user_uuid2UserClass = {} from AlgoriAgent.projects.algoriAgent.agent_manager import AgentManager agent_manager = AgentManager() @@ -52,7 +52,7 @@ def init_extensions(app): app.extensions["uuid2username"] = uuid2username app.extensions["username2uuid"] = username2uuid app.extensions["userid_recorder"] = userid_recorder - app.extensions["user_id2UserClass"] = user_id2UserClass + app.extensions["user_uuid2UserClass"] = user_uuid2UserClass app.extensions["agent_manager"] = agent_manager app.extensions["my_function"] = MyFunction() diff --git a/Html/apps/services/memory_service.py b/Html/apps/services/memory_service.py index 7a652ed..37d59c8 100644 --- a/Html/apps/services/memory_service.py +++ b/Html/apps/services/memory_service.py @@ -13,7 +13,7 @@ def save_chapter_memory_by_uuid( is_rebuttal: bool, ): uuid2username = current_app.extensions["uuid2username"] - user_map = current_app.extensions["user_id2UserClass"] # 可复用缓存 + user_map = current_app.extensions["user_uuid2UserClass"] # 可复用缓存 user_data_dir = current_app.config["USER_DATA_DIR"] username = uuid2username[user_uuid] diff --git a/Html/apps/services/user_service.py b/Html/apps/services/user_service.py index 736e8e2..b67395e 100644 --- a/Html/apps/services/user_service.py +++ b/Html/apps/services/user_service.py @@ -8,7 +8,7 @@ from db.user import load_user_from_json def _username_from_session() -> str: """通过 session['user_id'] -> username""" - user_uuid = session.get("user_id") + user_uuid = session.get("user_uuid") if not user_uuid: return None uuid2username = current_app.extensions["uuid2username"] @@ -16,9 +16,9 @@ def _username_from_session() -> str: def get_or_load_current_user(): """ - 返回当前用户对象（如 user_id2UserClass 中没有则从 JSON 载入并缓存） + 返回当前用户对象（如 user_uuid2UserClass 中没有则从 JSON 载入并缓存） """ - user_uuid = session.get("user_id") + user_uuid = session.get("user_uuid") if not user_uuid: return None @@ -26,7 +26,7 @@ def get_or_load_current_user(): if not username: return None - user_map = current_app.extensions["user_id2UserClass"] + user_map = current_app.extensions["user_uuid2UserClass"] if user_uuid not in user_map: user_map[user_uuid] = load_user_from_json( username, user_data_dir=current_app.config["USER_DATA_DIR"] diff --git a/Html/apps/sockets/namespaces.py b/Html/apps/sockets/namespaces.py index f1d27fa..8d7de7f 100644 --- a/Html/apps/sockets/namespaces.py +++ b/Html/apps/sockets/namespaces.py @@ -7,20 +7,19 @@ from ..services.backboard_service import realtime_response class VSCodeNamespace(Namespace): def on_login(self,data): ex = current_app.extensions - username2uuid = ex["username2uuid"] + uuid2username = ex["uuid2username"] backboard_manager = ex["backboard_manager"] print("VSCode client connected") print(data) dataconfig = data['config'] - user_id = dataconfig.get('user_id') + user_uuid = dataconfig.get('user_uuid') path = dataconfig.get('path') course_id = dataconfig.get('course_id') lesson_id = dataconfig.get('chapter_id') - print(f"User {user_id} connected with path: {path}") - useruuid = username2uuid[user_id] - join_room(useruuid, namespace='/vscode') - if backboard_manager.get_backboard(useruuid) == None: - backboard_manager.add_backboard(useruuid,user_id, course_id, lesson_id, path) + print(f"User {user_uuid} connected with path: {path}") + join_room(user_uuid, namespace='/vscode') + if backboard_manager.get_backboard(user_uuid) == None: + backboard_manager.add_backboard(user_uuid,uuid2username[user_uuid], course_id, lesson_id, path) def on_message(self, data): @@ -36,16 +35,16 @@ class VSCodeNamespace(Namespace): class AgentNamespace(Namespace): def on_login(self, data): ex = current_app.extensions - username2uuid = ex["username2uuid"] + uuid2username = ex["uuid2username"] backboard_manager = ex["backboard_manager"] agent_manager = ex["agent_manager"] data = json.loads(data) - user = data['username'] + user_uuid = data['user_uuid'] course_id = data['course_id'] chapter_id = data['chapter_id'] - user_uuid = username2uuid[user] - session['user_id'] = user_uuid - print(f'User connected with session user_id: {user_uuid}') + user_id = uuid2username[user_uuid] + session['user_uuid'] = user_uuid + print(f'User connected with session user_uuid: {user_uuid}') # 从markdown、markdown_prompts、score_prompts中各读取数据folder.md并进行new_agent with open(f'books/markdown/{course_id}/{chapter_id}.md','r',encoding='UTF-8') as fmd,\ open(f'books/markdown_prompts/{course_id}/{chapter_id}.md','r',encoding='UTF-8')as fmdp,\ @@ -54,44 +53,48 @@ class AgentNamespace(Namespace): markdown_prompts = fmdp.read() score_prompts = fsp.read() user_uuid, agent = agent_manager.new_agent(course_id, chapter_id, markdown, markdown_prompts, score_prompts, id=user_uuid, - root_path=f'../../study/{user}/{course_id}/{chapter_id}') + root_path=f'../../study/{user_id}/{course_id}/{chapter_id}') print(user_uuid) join_room(user_uuid, namespace='/agent') # 将该用户加入以user_id为名的room - backboard_manager.add_backboard(user_uuid, user, course_id, chapter_id, root_path=f'../../study/{user}/{course_id}/{chapter_id}') + backboard_manager.add_backboard(user_uuid, user_id, course_id, chapter_id, root_path=f'../../study/{user_id}/{course_id}/{chapter_id}') def on_language(self, language): ex = current_app.extensions agent_manager = ex["agent_manager"] - id = session.get('user_id') - agent_manager.change_language(id, language) + uuid2username = ex["uuid2username"] + uuid = session.get('user_uuid') + user_id = uuid2username[uuid] + agent_manager.change_language(uuid, language) def on_message(self, data): print(f"Message from client: {data}") ex = current_app.extensions agent_manager = ex["agent_manager"] backboard_manager = ex["backboard_manager"] - id = session.get('user_id') + uuid = session.get('user_uuid') + uuid2username = ex["uuid2username"] + user_id = uuid2username[uuid] if (type(data)==str): data = json.loads(data) - print(id) if data['type'] == 'text': - res = agent_manager.invoke(id, data['data'], backboard_manager.get_backboard(id).get_info_prompt()) + res = agent_manager.invoke(uuid, data['data'], backboard_manager.get_backboard(user_id).get_info_prompt()) print('=*='*20) print(res.content) reply = f"{res.content['speak']}" with current_app.app_context(): - emit('message',reply, room=id, namespace='/agent') - emit('request_function',res.content['function'], room=id, namespace='/agent') + emit('message',reply, room=uuid, namespace='/agent') + emit('request_function',res.content['function'], room=uuid, namespace='/agent') if data['type'] == 'function': - agent_manager.function_call(id, data['data']) + agent_manager.function_call(uuid, data['data']) def on_initiative(self,data): print("User active function call") ex = current_app.extensions agent_manager = ex["agent_manager"] backboard_manager = ex["backboard_manager"] - user_id = session['user_id'] + uuid2username = ex["uuid2username"] + user_id = uuid2username[session['user_uuid']] if data['name'] == 'sample_judge': agent_manager.sample_judge(user_id, backboard_manager.get_backboard(user_id)) if data['name'] == 'judge': diff --git a/Html/apps/static/js/chatbox.js b/Html/apps/static/js/chatbox.js index 5da49a5..49115a3 100644 --- a/Html/apps/static/js/chatbox.js +++ b/Html/apps/static/js/chatbox.js @@ -6,7 +6,7 @@ document.addEventListener('DOMContentLoaded', function() { console.log(data); socket = io('ws://localhost:5551/agent',{ query:{ - username:data.username, + user_uuid:data.user_uuid, folder:data.folder } }); diff --git a/Html/apps/templates/desktop.html b/Html/apps/templates/desktop.html index 8633354..2d01fc5 100644 --- a/Html/apps/templates/desktop.html +++ b/Html/apps/templates/desktop.html @@ -64,7 +64,7 @@