save_load_learned

Html/apps/sockets/namespaces.py

@@ -7,7 +7,7 @@ from flask_socketio import Namespace, join_room, leave_room, emit
 from ..function_tools import judge
 from ..function_tools import next_chapter
 from ..services.backboard_service import realtime_response
-from ..services.markdown_service import load_full_markdown_file
+from ..services.course_service import load_full_markdown_file, save_learning_progress
 from ..extension_ase.ase_client import HSAEngineClient
 from ..services.user_service import get_or_load_current_user
 
@@ -71,8 +71,32 @@ class AgentNamespace(Namespace):
         chatmanager = user_uuid2chatmanager[user_uuid]
         chatmanager.function_manager.add_function(judge, {'course_id': course_id, 'root_path': f'/home/{user_id}/{course_id}/{chapter_name}/{lesson_name}'})
         chatmanager.function_manager.add_function(next_chapter, {'user_uuid': user_uuid})
-        chatmanager.chat_historys = []
-        chatmanager.scores = []
+        
+        # 尝试加载用户学习进度
+        from ..services.course_service import load_learning_progress
+        progress = load_learning_progress(user_uuid, course_id, chapter_name, lesson_name)
+        need_skip_chapters = 0
+        
+        if progress:
+            # 恢复学习进度数据
+            if 'scores' in progress:
+                # 根据scores的数量确定需要跳过的章节数
+                need_skip_chapters = len(progress['scores'])
+                chatmanager.scores = progress['scores']
+                print(f"恢复用户学习进度: {user_uuid}, 已完成 {need_skip_chapters} 个章节")
+            
+            # 恢复聊天历史
+            if 'chat_historys' in progress:
+                chatmanager.chat_historys = progress['chat_historys']
+            else:
+                chatmanager.chat_historys = []
+            
+            # 恢复当前章节链
+            if 'chapter_chain_now' in progress:
+                chatmanager.chapter_chain_now = progress['chapter_chain_now']
+        else:
+            chatmanager.chat_historys = []
+            chatmanager.scores = []
 
         fmd,fmdp,fsp = load_full_markdown_file(course_id, chapter_name, lesson_name)
         user_uuid2ase_client[user_uuid] = HSAEngineClient(current_app.config["ASE_ENGINE_URL"], current_app.config["ASE_ENGINE_NAMESPACE"],id=user_id, chatmanager = chatmanager)
@@ -80,6 +104,10 @@ class AgentNamespace(Namespace):
         backboard_manager.add_backboard(user_uuid, user_id, course_id, lesson_name, root_path=f'/home/{user_id}/{course_id}/{chapter_name}/{lesson_name}')
         chatmanager.bb = backboard_manager.get_backboard(user_uuid)
         chatmanager.next_chapter()
+        
+        # 如果有保存的进度，需要跳过已经完成的章节
+        for _ in range(need_skip_chapters):
+            chatmanager.next_chapter()
         self.chatmanager = chatmanager
         self.ase_client = user_uuid2ase_client[user_uuid]
         user_uuid2ase_client[user_uuid].register_on_connect_entry(
@@ -221,7 +249,7 @@ class AgentNamespace(Namespace):
         if len(chatmanager.scores) >= chatmanager.chapter_chain_now:
             chatmanager.scores[chatmanager.chapter_chain_now - 1] = data.get('data', None)
         else: chatmanager.scores.append(data.get('data', None))
-        user.set_course_progress(chatmanager.chat_historys, chatmanager.scores, chatmanager.material_id, chatmanager.chapter_name, chatmanager.lesson_name)
+        user.set_course_progress(chatmanager.chat_historys, chatmanager.scores, chatmanager.course_id, chatmanager.chapter_name, chatmanager.lesson_name)
         chatmanager.load_next_chapter()
         time.sleep(0.5)
         chatmanager.ase_client.send_text("chapter-start", "")
@@ -241,10 +269,32 @@ class AgentNamespace(Namespace):
 
 
     def on_disconnect(self,data):
+        print(f'AgentNamespace client disconnected, session user_uuid: {session.get("user_uuid", "unknown")}')
         ex = current_app.extensions
         uuid = session.get('user_uuid')
-        user_uuid2chatmanager = ex["user_uuid2chatmanager"]
-        user_uuid2chatmanager[uuid].disconnect(uuid)
+        user_uuid2chatmanager = ex.get("user_uuid2chatmanager", {})
+        
+        # 保存学习进度到MongoDB
+        try:
+            # 获取用户ID
+            uuid2username = ex.get("uuid2username", {})
+            user_id = uuid2username.get(uuid, "unknown")
+            
+            # 调用保存学习进度功能
+            chatmanager = user_uuid2chatmanager.get(uuid)
+            if chatmanager:
+                save_result = save_learning_progress(uuid, chatmanager, user_id)
+                print(f"保存学习进度结果: {save_result}, user_uuid={uuid}")
+        except Exception as e:
+            print(f"保存学习进度时发生异常: {str(e)}")
+        
+        # 执行原有的断开连接逻辑
+        if uuid in user_uuid2chatmanager:
+            user_uuid2chatmanager[uuid].disconnect(uuid)
+        
+        # 离开房间
+        if uuid:
+            leave_room(uuid, namespace='/agent')
 
         print("VSCode client disconnected")
         print("Disconnect reason:"+str(data))