CakeCN/hsa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了User无法登录的bug

Browse Source
This commit is contained in:
CakeCN
2025-09-03 17:17:14 +08:00
parent fd6e12528c
commit a0dd8cd234
9 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Html/apps/extensions.py
View File

@@ -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()

2
Html/apps/services/memory_service.py
View File

@@ -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]

8
Html/apps/services/user_service.py
View File

@@ -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"]

49
Html/apps/sockets/namespaces.py
View File

@@ -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':

2
Html/apps/static/js/chatbox.js
View File

@@ -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
}
});

2
Html/apps/templates/desktop.html
View File

@@ -64,7 +64,7 @@
<script type="text/javascript">
window.appData = {
username:"{{user_id}}",
user_uuid:"{{user_uuid}}",
course_id:"{{course_id}}",
chapter_id:"{{chapter_id}}",
folder:"{{workspace_path}}"

34
Html/apps/views/vscode.py
View File

@@ -5,22 +5,21 @@ from ..services.backboard_service import realtime_response
bp = Blueprint("vscode", __name__)
@bp.route("/desktop/<user_id>/<course_id>/<chapter_id>")
def desktop(user_id, course_id, chapter_id):
# session 中放 uuid（访客也能进则给一个）
if "user_id" not in session:
session["user_id"] = "user_" + str(uuid.uuid4())
current_app.logger.debug("user %s uuid is %s", user_id, session["user_id"])
# 全局映射
@bp.route("/desktop/<user_uuid>/<course_id>/<chapter_id>")
def desktop(user_uuid, course_id, chapter_id):
username2uuid = current_app.extensions["username2uuid"]
uuid2username = current_app.extensions["uuid2username"]
userid_recorder = current_app.extensions["userid_recorder"]
# session 中放 uuid（访客也能进则给一个）
if "user_uuid" not in session:
user_uuid = "user_" + str(uuid.uuid4())
session["user_uuid"] = user_uuid
uuid2username[user_uuid] = "guest"+str(uuid.uuid4())
username2uuid[uuid2username[user_uuid]] = user_uuid
username2uuid[user_id] = session["user_id"]
uuid2username[session["user_id"]] = user_id
userid_recorder[f"{user_id}&{course_id}"] = session["user_id"]
# 全局映射
user_id = uuid2username[user_uuid]
userid_recorder[f"{user_id}&{course_id}"] = session["user_uuid"]
# 按课程/章节创建工作目录
base_root = current_app.config["STUDENT_WORKSPACE_ROOT"]
@@ -36,7 +35,7 @@ def desktop(user_id, course_id, chapter_id):
config_path = os.path.join(path_dir, ".config")
tmpd = {
"user_id": user_id,
"user_uuid": session["user_uuid"],
"course_id": course_id,
"chapter_id": chapter_id,
"path": path_for_vscode
@@ -49,17 +48,16 @@ def desktop(user_id, course_id, chapter_id):
return render_template(
"desktop.html",
vscode_web_url=current_app.config["VSCODE_WEB_URL"],
user_id=user_id, course_id=course_id, chapter_id=chapter_id,
user_uuid=session["user_uuid"], course_id=course_id, chapter_id=chapter_id,
workspace_path=path_for_vscode
)
@bp.route("/desktop_nouser/<course_id>/<chapter_id>")
def desktop_nouser(course_id, chapter_id):
if "user_id" not in session:
if "user_uuid" not in session:
return redirect(url_for("auth.login")) # 如果你有 auth 蓝图
user_uuid = session["user_id"]
username = current_app.extensions["uuid2username"].get(user_uuid)
return redirect(url_for("vscode.desktop", user_id=username, course_id=course_id, chapter_id=chapter_id))
user_uuid = session["user_uuid"]
return redirect(url_for("vscode.desktop", user_uuid=user_uuid, course_id=course_id, chapter_id=chapter_id))
@bp.route("/vscode_data", methods=["POST"])
def vscode_data():