Merge branch 'main' of https://hsamooc.com/git/CakeCN/hsa

Merge branch 'test'

Html/apps/extension_ase/ase_client/manager.py

@@ -35,7 +35,6 @@ class ChatManager:
     _lock = threading.RLock()
     def __init__(self, restart=False):
         self.restart = restart
-        self.chapter_chain_now = -1
         self.ase_client = None
         self.app = None
         self.socketio = None
@@ -70,6 +69,9 @@ class ChatManager:
         self.chapter_chain = load_chapters(raw_markdown, raw_markdown_prompts, raw_score_prompts)
         self.bb = None 
         self.chat_historys = []
+        self.chapter_chain_now = 0
+        self.scores = []
+
 
 
     def send_to_vscode(self, event: str, data: dict, room: str = None, namespace: str = '/vscode'):

Html/apps/services/asectrl_service.py

@@ -33,10 +33,15 @@ def on_connect_to_ase(client, entry, init_data, **kwargs):
     namespace_entry.emit('message', "Agents服务已连接, 加载教案中", room=init_data['room'], namespace='/agent')
         
     restart = init_data.get("restart", False)
-    if restart: # 重启时，从-1章进入 0章
-        ase_client.chatmanager.next_chapter()
+    # 不再需要手动next_chapter，因为已经在on_login中根据mongo进度恢复了正确的章节
+    # if restart: # 重启时，从-1章进入 0章
+    #     ase_client.chatmanager.next_chapter()
+    
+    # 根据restart决定是否重新加载代码
     ase_client.chatmanager.load_now_chapter(load_code=restart)
     print("load_now_chapter with restart:", restart)
+    
+    # 只有当需要restart时才发送chapter-start
     if restart: 
         ase_client.send_text("chapter-start", "")
     namespace_entry.emit('message', "教案加载完毕", room=init_data['room'], namespace='/agent')

Html/apps/sockets/namespaces.py

@@ -72,38 +72,39 @@ class AgentNamespace(Namespace):
             course_id: 课程ID
             chapter_name: 章节名称
             lesson_name: 课时名称
-            continue_learn: 是否继续学习
+            continue_learn: 是否继续学习（现在总是为True，保持兼容性）
             
         Returns:
             int: 需要跳过的章节数
         """
-        need_skip_chapters = 0
+        # 总是从mongo加载学习进度
+        progress_result = load_learning_progress(user_id, course_id, chapter_name, lesson_name)
         
-        if continue_learn:  # 尝试加载用户学习进度
-            progress_result = load_learning_progress(user_id, course_id, chapter_name, lesson_name)
+        if progress_result['exists']:
+            progress = progress_result['data']
+            # 恢复学习进度数据
+            if 'scores' in progress:
+                chatmanager.scores = progress['scores']
             
-            if progress_result['exists']:
-                progress = progress_result['data']
-                # 恢复学习进度数据
-                if 'scores' in progress:
-                    # 根据scores的数量确定需要跳过的章节数
-                    need_skip_chapters = len(progress['scores'])
-                    chatmanager.scores = progress['scores']
-                
-                # 恢复聊天历史
-                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']
-                upload_learning_progress_to_cloud(progress)
+            # 恢复聊天历史
+            if 'chat_historys' in progress:
+                chatmanager.chat_historys = progress['chat_historys']
             else:
-                # 使用默认值，确保有完整的结构
-                chatmanager.chat_historys = progress_result['data']['chat_historys']
-                chatmanager.scores = progress_result['data']['scores']
+                chatmanager.chat_historys = []
+            
+            # 恢复当前章节链
+            if 'chapter_chain_now' in progress:
+                chatmanager.chapter_chain_now = progress['chapter_chain_now']
+            upload_learning_progress_to_cloud(progress)
+            
+            # 计算需要跳过的章节数：从初始的-1到当前的chapter_chain_now
+            need_skip_chapters = chatmanager.chapter_chain_now 
+        else:
+            # 使用默认值，确保有完整的结构
+            chatmanager.chat_historys = progress_result['data']['chat_historys']
+            chatmanager.scores = progress_result['data']['scores']
+            chatmanager.chapter_chain_now = 0
+            need_skip_chapters = 0
         
         return need_skip_chapters
     
@@ -131,8 +132,9 @@ class AgentNamespace(Namespace):
         chatmanager.function_manager.add_function(next_chapter, {'user_uuid': user_uuid})
 
         clear_user_session(current_app.config["ASE_ENGINE_URL"], current_app.config["ASE_ENGINE_URL_TOKEN"], user_id)
-        continue_learn = not chatmanager.restart
-        need_skip_chapters = self._load_learning_progress(chatmanager, user_id, course_id, chapter_name, lesson_name, continue_learn)
+        
+        # 总是从mongo加载进度，不管restart状态
+        need_skip_chapters = self._load_learning_progress(chatmanager, user_id, course_id, chapter_name, lesson_name, True)
 
         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)
@@ -141,21 +143,26 @@ 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)
-        # 如果有保存的进度，需要跳过已经完成的章节、无需清空代码、对话历史恢复
-        if continue_learn:
-            for _ in range(need_skip_chapters):
-                chatmanager.next_chapter()
-                emit('next_chapter', room=user_uuid, namespace='/agent')
-            # 恢复对话历史到前端 - 使用批量发送消息列表
-            if chatmanager.chat_historys:
-                emit('messages', chatmanager.chat_historys, room=user_uuid, namespace='/agent')
+        
+        # 总是根据进度跳过章节，恢复对话历史
+        for _ in range(need_skip_chapters):
+            chatmanager.next_chapter()
+            emit('next_chapter', room=user_uuid, namespace='/agent')
+        # 恢复对话历史到前端 - 使用批量发送消息列表
+        if chatmanager.chat_historys:
+            emit('messages', chatmanager.chat_historys, room=user_uuid, namespace='/agent')
         
         self.chatmanager = chatmanager
         self.ase_client = user_uuid2ase_client[user_uuid]
+        
+        # 将restart设置为False，避免后续重复处理
+        restart = chatmanager.restart
+        chatmanager.restart = False
+        
         user_uuid2ase_client[user_uuid].register_on_connect_entry(
             callback=on_connect_to_ase,
             entry=(self, user_uuid2ase_client[user_uuid]),
-            init_data={'room':user_uuid, 'restart':chatmanager.restart}
+            init_data={'room':user_uuid, 'restart':restart}
         )
         user_uuid2ase_client[user_uuid].register_route_with_entry(
                                             route='dialog',

Html/apps/views/vscode.py

@@ -69,8 +69,23 @@ def desktop(user_uuid, course_id, chapter_name, lesson_name):
 
 
 
-    chatmanager = ChatManager(restart=not load_history)
+    restart = not load_history
+    chatmanager = ChatManager(restart=restart)
     current_app.extensions["user_uuid2chatmanager"][user_uuid] = chatmanager
+    
+    # 如果restart为True，删除mongo中的学习进度
+    if restart:
+        try:
+            mongo = current_app.extensions["mongo"]
+            mongo.db.learning_progress.delete_one({
+                "user_id": user_id,
+                "material_id": course_id,
+                "chapter_name": chapter_name,
+                "lesson_name": lesson_name
+            })
+            current_app.logger.info(f"删除学习进度成功: user_id={user_id}, course_id={course_id}, chapter={chapter_name}, lesson={lesson_name}")
+        except Exception as e:
+            current_app.logger.error(f"删除学习进度失败: {str(e)}")
     code_server_port = 10000 + int(uuid.uuid4().int % 10000)
     # chatmanager.start_code_server(user_uuid, user_id, path_dir, code_server_port)
     

Html/config.ini

@@ -28,5 +28,5 @@ region = ap-guangzhou
 
 [ASE_ENGINE]
 url = https://test.asengine.net
-namespace = /socket.io/7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
-url_token = 7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
+namespace = /socket.io/afe58a9e4c03e10fae6fae5985e8adde23a49635
+url_token = afe58a9e4c03e10fae6fae5985e8adde23a49635

code-server-like/app/config.py

@@ -13,4 +13,5 @@ class Config:
 
     # 自定义其他全局配置
     ROOT_WORKSPACE_PATH = GLOBAL_CONFIG['Global']['ROOT_WORKSPACE_PATH']
+    DEBUG = GLOBAL_CONFIG['Global'].getboolean('DEBUG', False)
 

code-server-like/app/sockets/terminal_service.py

@@ -39,35 +39,56 @@ def read_and_forward_pty_output(fd=None, pid=None, room_id=None,namespace=None):
     """
     max_read_bytes = 1024 * 20
     timeout=0.1
-    while True:
-        socketio.sleep(timeout)
-        timeout=min(timeout*2, 0.4)
-        # using flask default web server, or uwsgi production web server
-        # when the child process is terminated, it will not disappear from linux process list
-        # and keep staying as a zombie process until the parent exits.
-        try:
-            child_process = psutil.Process(pid)
-        except psutil.NoSuchProcess as err:
-            return
-        if child_process.status() not in ('running', 'sleeping'):
-            return
-        if fd:
-            timeout_sec = 0
-            (data_ready, _, _) = select.select([fd], [], [], timeout_sec)
-            if data_ready:
-                # output = os.read(fd, max_read_bytes).decode('ascii')
-                timeout=0.1
+    try:
+        while True:
+            socketio.sleep(timeout)
+            timeout=min(timeout*2, 0.4)
+            # using flask default web server, or uwsgi production web server
+            # when the child process is terminated, it will not disappear from linux process list
+            # and keep staying as a zombie process until the parent exits.
+            try:
+                child_process = psutil.Process(pid)
+            except psutil.NoSuchProcess as err:
+                # Process already terminated, clean up any zombie
                 try:
-                    output = os.read(fd, max_read_bytes).decode()
-                except Exception as err:
-                    output = """
-                    ***AQUI WEB TERM ERR***
-                    {}
-                    ***********************
-                    """.format(err)
-                # the key for different visitor to get different terminal (instead of mixing up)
-                # is to let the background task push pty response to each one's own (default) ROOM!
-                namespace.emit("pty_output", {"output": output}, room=room_id)
+                    os.waitpid(pid, os.WNOHANG)
+                except Exception:
+                    pass
+                return
+            if child_process.status() not in ('running', 'sleeping'):
+                # Process is terminated or in other state, clean up
+                try:
+                    child_process.wait(timeout=1)
+                except Exception:
+                    try:
+                        os.waitpid(pid, os.WNOHANG)
+                    except Exception:
+                        pass
+                return
+            if fd:
+                timeout_sec = 0
+                (data_ready, _, _) = select.select([fd], [], [], timeout_sec)
+                if data_ready:
+                    # output = os.read(fd, max_read_bytes).decode('ascii')
+                    timeout=0.1
+                    try:
+                        output = os.read(fd, max_read_bytes).decode()
+                    except Exception as err:
+                        output = """
+                        ***AQUI WEB TERM ERR***
+                        {}
+                        ***********************
+                        """.format(err)
+                    # the key for different visitor to get different terminal (instead of mixing up)
+                    # is to let the background task push pty response to each one's own (default) ROOM!
+                    namespace.emit("pty_output", {"output": output}, room=room_id)
+    finally:
+        # Clean up file descriptor if it's open
+        if fd:
+            try:
+                os.close(fd)
+            except Exception:
+                pass
 
 class VSCLikeNameSpace(Namespace):
     def on_connect(self):
@@ -156,15 +177,40 @@ class VSCLikeNameSpace(Namespace):
             set_winsize(fd, data["rows"], data["cols"])
 
     def on_disconnect(self):
-        try:
-            child_process = psutil.Process(session.get('terminal_config', {}).get('child_pid'))
-        except psutil.NoSuchProcess as err:
-            disconnect()
-            session['terminal_config'] = TERM_INIT_CONFIG
-            return
-        if child_process.status() in ('running', 'sleeping'):
-            # if visitor just close the browser tab then left alone the pty here
-            # it should be terminated by the parent process after
-            child_process.terminate()
-            current_app.logger.debug('user left the pty alone, terminated')
+        child_pid = session.get('terminal_config', {}).get('child_pid')
+        if child_pid:
+            try:
+                child_process = psutil.Process(child_pid)
+                if child_process.status() in ('running', 'sleeping'):
+                    # if visitor just close the browser tab then left alone the pty here
+                    # it should be terminated by the parent process after
+                    child_process.terminate()
+                    # Wait for the process to terminate and collect its exit status
+                    child_process.wait(timeout=2)
+                    current_app.logger.debug('user left the pty alone, terminated and waited')
+            except psutil.NoSuchProcess as err:
+                # Process already terminated, try to wait anyway to clean up any zombie
+                try:
+                    os.waitpid(child_pid, os.WNOHANG)
+                except Exception:
+                    pass
+            except psutil.TimeoutExpired:
+                # If process didn't terminate in time, kill it forcefully
+                child_process.kill()
+                try:
+                    child_process.wait(timeout=1)
+                except Exception:
+                    pass
+            except Exception as err:
+                current_app.logger.error(f'Error terminating process: {err}')
+            finally:
+                # Close the file descriptor if it's open
+                fd = session.get('terminal_config', {}).get('fd')
+                if fd:
+                    try:
+                        os.close(fd)
+                    except Exception:
+                        pass
+                # Reset session config
+                session['terminal_config'] = TERM_INIT_CONFIG
         current_app.logger.debug('Client disconnected')

code-server-like/app/views/routes.py

@@ -1,5 +1,5 @@
 import os
-import subprocess
+from eventlet.green import subprocess
 from flask import Blueprint, request, jsonify, current_app, render_template, session
 from ..services.file_service import get_file_tree, load_config
 
@@ -42,32 +42,34 @@ def vsc_like(user_uuid, user_id, course_id, chapter_name, lesson_name, port):
         subprocess.run(["sudo", "chown", "-R", user_id, user_root])  # 设置目录权限为新用户
         
     except subprocess.CalledProcessError as e:
-        print(f"Error creating user {user_id}: {e}")
+        # 用户可能已经存在，这是正常情况，继续执行
+        print(f"Useradd command returned non-zero exit status, this is expected if user already exists: {e}")
     try:
         # 使用 sudo 执行 mkdir 命令来创建目录
-        subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", path], check=True)
-        subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", f'{user_root}/.ssh'], check=True)
+        subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", path], check=current_app.config['DEBUG'])
+        subprocess.run(["sudo", "-u", user_id, "mkdir", "-p", f'{user_root}/.ssh'], check=current_app.config['DEBUG'])
         flask_pub_key = "/home/flask/.ssh/id_ed25519.pub"
-        subprocess.run(["sudo", "cp", flask_pub_key, f"{user_root}/.ssh/authorized_keys"], check=True)
-        subprocess.run(["sudo", "chmod", "700", f"{user_root}/.ssh"], check=True)
-        subprocess.run(["sudo", "chmod", "600", f"{user_root}/.ssh/authorized_keys"], check=True)
+        subprocess.run(["sudo", "cp", flask_pub_key, f"{user_root}/.ssh/authorized_keys"], check=current_app.config['DEBUG'])
+        subprocess.run(["sudo", "chmod", "700", f"{user_root}/.ssh"], check=current_app.config['DEBUG'])
+        subprocess.run(["sudo", "chmod", "600", f"{user_root}/.ssh/authorized_keys"], check=current_app.config['DEBUG'])
         print(f"Directory {path} created successfully for user {user_id}")
     except subprocess.CalledProcessError as e:
         print(f"Error creating directory {path} details {str(e)}")
     try:#使用sudo创建shared_group
-        subprocess.run(["sudo", "groupadd", f"shared_group_{user_id}"], check=True)
+        subprocess.run(["sudo", "groupadd", f"shared_group_{user_id}"], check=current_app.config['DEBUG'])
     except subprocess.CalledProcessError as e:
-        print(f"Error creating shared_group: {e}")
+        # 组可能已经存在，这是正常情况，继续执行
+        print(f"Groupadd command returned non-zero exit status, this is expected if group already exists: {e}")
     try:#使用sudo将user_id加入shared_group
-        subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", user_id], check=True)
+        subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", user_id], check=current_app.config['DEBUG'])
         # 自己也加入
-        subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", 'flask'], check=True)
+        subprocess.run(["sudo", "usermod", "-a", "-G", f"shared_group_{user_id}", 'flask'], check=current_app.config['DEBUG'])
     except subprocess.CalledProcessError as e:
         print(f"Error adding user {user_id} to shared_group: {e}")
     try:
-        subprocess.run(["sudo", "chown", "-R", f"flask:shared_group_{user_id}", path], check=True)
-        subprocess.run(["sudo", "chmod", "-R", "755", user_root], check=True)
-        subprocess.run(["sudo", "chmod", "-R", "775", path], check=True)
+        subprocess.run(["sudo", "chown", "-R", f"flask:shared_group_{user_id}", path], check=current_app.config['DEBUG'])
+        subprocess.run(["sudo", "chmod", "-R", "755", user_root], check=current_app.config['DEBUG'])
+        subprocess.run(["sudo", "chmod", "-R", "775", path], check=current_app.config['DEBUG'])
     except subprocess.CalledProcessError as e:
         print(f"Error changing directory {path} to shared_group_{user_id}: {e}")
 

code-server-like/config.ini

@@ -1,3 +1,4 @@
 [Global]
 SECRET_KEY = cakebaker
 ROOT_WORKSPACE_PATH = /home
+DEBUG = False

code-server-like/templates/index.html

@@ -4,17 +4,17 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Cloud IDE</title>
-    <link rel="stylesheet" href="static/cdnback/css/editor/editor.main.css">
-    <script src="static/cdnback/socket.io.min.js"></script>
-    <link rel="stylesheet" href="static/cdnback/all.min.css">
-    <link rel="stylesheet" href="static/cdnback/css/xterm.css" />
+    <link rel="stylesheet" href="/static/cdnback/css/editor/editor.main.css">
+    <script src="/static/cdnback/socket.io.min.js"></script>
+    <link rel="stylesheet" href="/static/cdnback/all.min.css">
+    <link rel="stylesheet" href="/static/cdnback/css/xterm.css" />
     <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/xterm/5.5.0/xterm.js"></script> -->
-    <script src="static/cdnback/js/xterm.js"></script>
-    <script src="static/cdnback/js/addons/fit/fit.js"></script>
-    <script src="static/cdnback/js/addons/webLinks/webLinks.js"></script>
-    <script src="static/cdnback/js/addons/fullscreen/fullscreen.js"></script>
-    <script src="static/cdnback/js/addons/search/search.js"></script>
-    <link rel="stylesheet" href="static/cdnback/all.min.css">
+    <script src="/static/cdnback/js/xterm.js"></script>
+    <script src="/static/cdnback/js/addons/fit/fit.js"></script>
+    <script src="/static/cdnback/js/addons/webLinks/webLinks.js"></script>
+    <script src="/static/cdnback/js/addons/fullscreen/fullscreen.js"></script>
+    <script src="/static/cdnback/js/addons/search/search.js"></script>
+    <link rel="stylesheet" href="/static/cdnback/all.min.css">
 
     <link rel="stylesheet" href="/vsc-like/static/css/index.css">
     <link rel="stylesheet" href="/vsc-like/static/css/notification.css">
@@ -61,7 +61,7 @@
     </div>
     <div id="notificationsContainer"></div>
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/loader.js"></script>
+    <script src="/static/cdnback/js/monaco-editor/0.34.0/min/vs/loader.js"></script>
     <script src="/vsc-like/static/js/code-like-extension.js"></script>
     <script src="/vsc-like/static/js/file.js"></script>
     <script src="/vsc-like/static/js/terminal.js"></script>