Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8aa567cdf2 | ||
|
|
a3b3018de7 | ||
|
|
761095d61d | ||
| 643c16fdf7 | |||
| 5082436289 | |||
| 7193b9a000 | |||
| 042f6ee99e | |||
|
|
8fd88b0088 | ||
|
|
319b111485 | ||
|
|
f060a17f6a | ||
|
|
ecdc2e320f | ||
|
|
aa9f39ca18 | ||
|
|
f444e86136 | ||
|
|
22d9fb39f1 | ||
|
|
cb435ecade | ||
|
|
c8942cedac | ||
|
|
1f6e75f006 | ||
|
|
5438dc99ba | ||
|
|
f65b5bf32a | ||
|
|
da93289799 | ||
|
|
1554c85616 | ||
|
|
70410d2c4b | ||
|
|
496c5be90a |
@@ -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'):
|
||||
|
||||
@@ -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')
|
||||
|
||||
@@ -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',
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,41 +1,53 @@
|
||||
function show_books(courses_data, user_selected_courses){
|
||||
function show_books(courses_data, user_selected_courses) {
|
||||
console.log(courses_data)
|
||||
console.log(user_selected_courses)
|
||||
}
|
||||
function show_course_details(course_id){
|
||||
function show_course_details(course_id) {
|
||||
window.location.href = '/course/' + course_id
|
||||
}
|
||||
|
||||
function on_click_select_course(event){
|
||||
function on_click_select_course(event) {
|
||||
event.stopPropagation(); // 阻止事件冒泡
|
||||
const courseId = event.currentTarget.getAttribute('data-course-id');
|
||||
if (event.currentTarget.classList.contains("selected-button")) {alert('课程已选择'); return;}
|
||||
const button = event.currentTarget;
|
||||
const courseId = button.getAttribute('data-course-id');
|
||||
if (!courseId) { alert('缺少课程ID'); return; }
|
||||
if (button.classList.contains("selected-button")) { alert('课程已选择'); return; }
|
||||
if (button.disabled) { return; }
|
||||
button.disabled = true;
|
||||
fetch(`/select_course`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'X-CSRFToken': '{{ csrf_token() }}' // 如果使用 CSRF 保护
|
||||
},
|
||||
body: JSON.stringify({ course_id: courseId })
|
||||
})
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.success) {
|
||||
// 更新按钮样式或显示消息
|
||||
this.classList.remove('select-button');
|
||||
this.classList.add('selected-button');
|
||||
this.textContent = '已选择';
|
||||
.then(async (response) => {
|
||||
let data = null;
|
||||
try {
|
||||
data = await response.json();
|
||||
} catch (_) {
|
||||
}
|
||||
if (!response.ok) {
|
||||
throw new Error(data?.message || `请求失败(${response.status})`);
|
||||
}
|
||||
return data;
|
||||
})
|
||||
.then((data) => {
|
||||
if (!data?.success) {
|
||||
throw new Error(data?.message || '选择课程失败');
|
||||
}
|
||||
button.classList.remove('select-button');
|
||||
button.classList.add('selected-button');
|
||||
button.textContent = '已选课';
|
||||
alert('选择课程成功');
|
||||
} else {
|
||||
alert('选择课程失败');
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
alert('选择课程失败');
|
||||
});
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
alert(error?.message || '选择课程失败');
|
||||
button.disabled = false;
|
||||
});
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
document.addEventListener('DOMContentLoaded', function () {
|
||||
|
||||
});
|
||||
File diff suppressed because it is too large
Load Diff
@@ -4,6 +4,7 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>华实学伴 - 专业的在线学习平台</title>
|
||||
<script src="/static/cdnback/jquery.min.js"></script>
|
||||
<link href="/static/cdnback/bootstrap.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" href="/static/cdnback/all.min.css">
|
||||
<link rel="stylesheet" href="/static/css/dashboard.css">
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>课程选择主页</title>
|
||||
<meta charset="UTF-8">
|
||||
<title>课程选择主页</title>
|
||||
<script src="/static/cdnback/jquery.min.js"></script>
|
||||
|
||||
<link href="/static/cdnback/bootstrap.min.css" rel="stylesheet">
|
||||
@@ -12,6 +13,7 @@
|
||||
<script src="/static/cdnback/js/bootstrap.bundle.min.js"></script>
|
||||
<link rel="stylesheet" href="/static/css/index.css">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
{% include 'navbar.html' %}
|
||||
|
||||
@@ -38,7 +40,7 @@
|
||||
<h2>课程列表</h2>
|
||||
<div class="course-cards" id="course-cards">
|
||||
{% for course in courses_data %}
|
||||
<!-- <div class="course-card" onclick="show_course_details('{{ course._id }}')">
|
||||
<!-- <div class="course-card" onclick="show_course_details('{{ course._id }}')">
|
||||
<img src="{{ course.image_url }}" alt="{{ course.course_name }}">
|
||||
<h3>{{ course.name }}</h3>
|
||||
<p>{{ course.description }}</p>
|
||||
@@ -49,10 +51,9 @@
|
||||
{% endif %}
|
||||
</div> -->
|
||||
|
||||
<div class="col-md-6 col-lg-4">
|
||||
<div class="col-md-6 col-lg-4">
|
||||
<div class="course-card card h-100" onclick="openCourseProgress('{{course._id}}')">
|
||||
<img src="{{course.image_url}}"
|
||||
class="course-img" alt="课程封面">
|
||||
<img src="{{course.image_url}}" class="course-img" alt="课程封面">
|
||||
<div class="card-body d-flex flex-column">
|
||||
<span class="course-category">算法设计</span>
|
||||
<h5 class="course-title">{{course.name}}</h5>
|
||||
@@ -62,11 +63,15 @@
|
||||
<span class="course-rating"><i class="fas fa-star"></i> 4.7</span>
|
||||
</div>
|
||||
<div class="mt-auto d-grid gap-2 d-md-flex">
|
||||
<button class="btn btn-view flex-fill" onclick="btn_view(event,'{{course._id}}')"><i class="far fa-eye me-1"></i> 课程</button>
|
||||
<button class="btn btn-view flex-fill" onclick="btn_view(event,'{{course._id}}')"><i
|
||||
class="far fa-eye me-1"></i> 课程</button>
|
||||
{% if course._id in selected_courses %}
|
||||
<button class="btn btn-process flex-fill selected-button" data-course-id="{{course._id}}">已选课</button>
|
||||
<button class="btn btn-process flex-fill selected-button"
|
||||
data-course-id="{{course._id}}">已选课</button>
|
||||
{% else %}
|
||||
<button class="btn btn-process flex-fill select-button" onclick="on_click_select_course(event)" data-course-id="{{course._id}}">选择课程</button>
|
||||
<button class="btn btn-process flex-fill select-button"
|
||||
onclick="on_click_select_course(event)"
|
||||
data-course-id="{{course._id}}">选择课程</button>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
@@ -80,7 +85,7 @@
|
||||
</main>
|
||||
|
||||
|
||||
{% include 'footer-brief.html' %}
|
||||
{% include 'footer-brief.html' %}
|
||||
</body>
|
||||
<script>
|
||||
window.appData = {
|
||||
@@ -88,5 +93,6 @@
|
||||
}
|
||||
</script>
|
||||
<script src="/static/js/index.js"></script>
|
||||
</html>
|
||||
<script src="/static/js/dashboard.js"></script>
|
||||
|
||||
</html>
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ api_key = sk-aMpnWklN2IbsK44d1kNpy6YOP9bk1pdPJjFeEmbb0a5ytEFf
|
||||
model=gpt-4.1-nano
|
||||
|
||||
[VSCODE_WEB]
|
||||
url = https://hsamooc.cn
|
||||
url = https://hsamooc.com
|
||||
[CODE_LIKE]
|
||||
url = /vsc-like
|
||||
#http://asengine.net:8282
|
||||
@@ -27,6 +27,6 @@ bucket = hsamooc-cdn-1374354408
|
||||
region = ap-guangzhou
|
||||
|
||||
[ASE_ENGINE]
|
||||
url = https://test.asengine.net
|
||||
namespace = /socket.io/7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
||||
url_token = 7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
||||
url = https://asengine.net
|
||||
namespace = /socket.io/afe58a9e4c03e10fae6fae5985e8adde23a49635
|
||||
url_token = afe58a9e4c03e10fae6fae5985e8adde23a49635
|
||||
|
||||
1
Html/db/data/user/_10235101560.json
Normal file
1
Html/db/data/user/_10235101560.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "_10235101560"}
|
||||
1
Html/db/data/user/shanks.json
Normal file
1
Html/db/data/user/shanks.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "shanks"}
|
||||
1
Html/db/data/user/ts88.json
Normal file
1
Html/db/data/user/ts88.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "ts88"}
|
||||
1
Html/db/data/user/xuans.json
Normal file
1
Html/db/data/user/xuans.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "xuans"}
|
||||
1
Html/db/data/user/xuans_.json
Normal file
1
Html/db/data/user/xuans_.json
Normal file
@@ -0,0 +1 @@
|
||||
{"username": "xuans_"}
|
||||
@@ -1,5 +1,32 @@
|
||||
import eventlet
|
||||
eventlet.monkey_patch() # 进行猴子补丁操作
|
||||
import logging
|
||||
|
||||
# 配置 eventlet 日志,抑制 IOClosed 等错误日志
|
||||
logging.getLogger('eventlet.hubs').setLevel(logging.CRITICAL)
|
||||
logging.getLogger('eventlet.greenio').setLevel(logging.CRITICAL)
|
||||
|
||||
# 进行猴子补丁操作
|
||||
eventlet.monkey_patch()
|
||||
|
||||
# 配置 eventlet hub 以更优雅地处理 IOClosed 错误
|
||||
try:
|
||||
from eventlet.hubs import hub
|
||||
# 保存原始的 handle_error 方法
|
||||
original_handle_error = hub.Hub.handle_error
|
||||
|
||||
def custom_handle_error(self, context, type, value, tb):
|
||||
# 忽略 IOClosed 错误
|
||||
if type.__name__ == 'IOClosed' and 'Operation on closed file' in str(value):
|
||||
return
|
||||
# 其他错误调用原始方法
|
||||
original_handle_error(self, context, type, value, tb)
|
||||
|
||||
# 替换原始方法
|
||||
hub.Hub.handle_error = custom_handle_error
|
||||
except Exception as e:
|
||||
# 如果修改失败,忽略错误
|
||||
pass
|
||||
|
||||
from flask import Flask
|
||||
from .views.routes import main_bp
|
||||
from .views.file import file_bp
|
||||
|
||||
@@ -13,4 +13,5 @@ class Config:
|
||||
|
||||
# 自定义其他全局配置
|
||||
ROOT_WORKSPACE_PATH = GLOBAL_CONFIG['Global']['ROOT_WORKSPACE_PATH']
|
||||
DEBUG = GLOBAL_CONFIG['Global'].getboolean('DEBUG', False)
|
||||
|
||||
|
||||
@@ -29,8 +29,12 @@ terminal_bp = Blueprint('terminal', __name__, url_prefix='/vsc-like')
|
||||
|
||||
|
||||
def set_winsize(fd, row, col, xpix=0, ypix=0):
|
||||
winsize = struct.pack("HHHH", row, col, xpix, ypix)
|
||||
fcntl.ioctl(fd, termios.TIOCSWINSZ, winsize)
|
||||
try:
|
||||
winsize = struct.pack("HHHH", row, col, xpix, ypix)
|
||||
fcntl.ioctl(fd, termios.TIOCSWINSZ, winsize)
|
||||
except (OSError, IOError):
|
||||
# File descriptor closed or invalid, do nothing
|
||||
pass
|
||||
|
||||
|
||||
def read_and_forward_pty_output(fd=None, pid=None, room_id=None,namespace=None):
|
||||
@@ -39,35 +43,70 @@ 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
|
||||
try:
|
||||
# Check if file descriptor is still valid by trying to select on it
|
||||
(data_ready, _, _) = select.select([fd], [], [], timeout_sec)
|
||||
if data_ready:
|
||||
timeout=0.1
|
||||
try:
|
||||
output = os.read(fd, max_read_bytes).decode()
|
||||
except (OSError, IOError, EOFError) as err:
|
||||
# File descriptor closed or other IO error, exit gracefully
|
||||
return
|
||||
except UnicodeDecodeError as err:
|
||||
output = """
|
||||
***AQUI WEB TERM ERR***
|
||||
Unicode decode error: {}
|
||||
***********************
|
||||
""".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!
|
||||
try:
|
||||
namespace.emit("pty_output", {"output": output}, room=room_id)
|
||||
except Exception:
|
||||
# If emit fails, the client is probably disconnected, exit
|
||||
return
|
||||
except (OSError, IOError) as err:
|
||||
# File descriptor closed or invalid, exit gracefully
|
||||
return
|
||||
except Exception as e:
|
||||
# Catch any other unexpected exceptions to prevent server crash
|
||||
pass
|
||||
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):
|
||||
@@ -137,7 +176,13 @@ class VSCLikeNameSpace(Namespace):
|
||||
if fd:
|
||||
# print("writing to ptd: %s" % data["input"])
|
||||
# os.write(fd, data["input"].encode('ascii'))
|
||||
os.write(fd, data["input"].encode())
|
||||
try:
|
||||
os.write(fd, data["input"].encode())
|
||||
except (OSError, IOError):
|
||||
# File descriptor closed or invalid, clean up
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
return
|
||||
|
||||
|
||||
def on_resize(self, data):
|
||||
@@ -153,18 +198,55 @@ class VSCLikeNameSpace(Namespace):
|
||||
return
|
||||
fd = session.get('terminal_config').get('fd')
|
||||
if fd:
|
||||
set_winsize(fd, data["rows"], data["cols"])
|
||||
# 检查文件描述符是否有效
|
||||
try:
|
||||
# 尝试一个简单的操作来检查文件描述符是否有效
|
||||
os.fstat(fd)
|
||||
set_winsize(fd, data["rows"], data["cols"])
|
||||
except (OSError, IOError):
|
||||
# 文件描述符无效,清理资源
|
||||
disconnect()
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
return
|
||||
|
||||
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')
|
||||
terminal_config = session.get('terminal_config', {})
|
||||
child_pid = terminal_config.get('child_pid')
|
||||
fd = terminal_config.get('fd')
|
||||
|
||||
# 先关闭文件描述符,避免其他操作尝试使用无效的文件描述符
|
||||
if fd:
|
||||
try:
|
||||
os.close(fd)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
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
|
||||
try:
|
||||
child_process.kill()
|
||||
child_process.wait(timeout=1)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception as err:
|
||||
current_app.logger.error(f'Error terminating process: {err}')
|
||||
|
||||
# Reset session config
|
||||
session['terminal_config'] = TERM_INIT_CONFIG
|
||||
current_app.logger.debug('Client disconnected')
|
||||
@@ -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}")
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
[Global]
|
||||
SECRET_KEY = cakebaker
|
||||
ROOT_WORKSPACE_PATH = /home
|
||||
DEBUG = False
|
||||
|
||||
@@ -1,12 +1,32 @@
|
||||
from app import create_app
|
||||
from app.extensions import socketio
|
||||
import logging
|
||||
|
||||
# 配置日志,减少eventlet的调试日志
|
||||
logging.getLogger('eventlet').setLevel(logging.ERROR)
|
||||
logging.getLogger('socketio').setLevel(logging.ERROR)
|
||||
logging.getLogger('werkzeug').setLevel(logging.ERROR)
|
||||
|
||||
app = create_app()
|
||||
|
||||
if __name__ == '__main__':
|
||||
socketio.run(
|
||||
app,
|
||||
host="0.0.0.0",
|
||||
port=5200,
|
||||
debug=False, # 开发期打开
|
||||
allow_unsafe_werkzeug=True, # 避免 dev server 的安全限制提示
|
||||
try:
|
||||
socketio.run(
|
||||
app,
|
||||
host="0.0.0.0",
|
||||
port=5200,
|
||||
debug=False, # 开发期打开
|
||||
allow_unsafe_werkzeug=True, # 避免 dev server 的安全限制提示
|
||||
log_output=False # 禁用详细输出
|
||||
)
|
||||
except KeyboardInterrupt:
|
||||
print("Server stopped by user")
|
||||
except Exception as e:
|
||||
# 捕获所有异常,包括 eventlet 内部的 IOClosed 错误
|
||||
if "IOClosed" in str(type(e).__name__) or "Operation on closed file" in str(e):
|
||||
# 优雅处理 eventlet 关闭文件的错误
|
||||
print("Eventlet IOClosed error handled gracefully")
|
||||
else:
|
||||
# 其他异常仍然打印
|
||||
import traceback
|
||||
traceback.print_exc()
|
||||
|
||||
@@ -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>
|
||||
|
||||
69
et --hard HEAD@{1}
Normal file
69
et --hard HEAD@{1}
Normal file
@@ -0,0 +1,69 @@
|
||||
[33m68493d6a[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mmain[m[33m, [m[1;31morigin/main[m[33m)[m HEAD@{0}: pull origin main: Fast-forward
|
||||
[33m0852e121[m HEAD@{1}: reset: moving to HEAD
|
||||
[33m0852e121[m HEAD@{2}: commit: cdn fix more
|
||||
[33m7dc4714a[m HEAD@{3}: commit: index style
|
||||
[33m9dc81b14[m[33m ([m[1;31morigin/feature/paste_detecte_new[m[33m, [m[1;32mfeature/paste_detecte_new[m[33m)[m HEAD@{4}: merge feature/paste_detecte_new: Fast-forward
|
||||
[33m7862647b[m HEAD@{5}: checkout: moving from feature/paste_detecte_new to main
|
||||
[33m9dc81b14[m[33m ([m[1;31morigin/feature/paste_detecte_new[m[33m, [m[1;32mfeature/paste_detecte_new[m[33m)[m HEAD@{6}: commit (merge): Merge branch 'main' into feature/paste_detecte_new
|
||||
[33m0cf1896b[m HEAD@{7}: checkout: moving from main to feature/paste_detecte_new
|
||||
[33m7862647b[m HEAD@{8}: commit: style fix
|
||||
[33m6b9c8e9e[m HEAD@{9}: commit: cdn change to local and use markdown and style change
|
||||
[33m33844786[m HEAD@{10}: commit: use markdown to edit
|
||||
[33mce88ae64[m HEAD@{11}: commit: use queue to allow send vscode_ws when it is none
|
||||
[33m6c38e906[m HEAD@{12}: pull: Fast-forward
|
||||
[33m9759c93a[m HEAD@{13}: commit: fix funciton response
|
||||
[33mecf19f49[m HEAD@{14}: commit: fix function double promlem
|
||||
[33mf5d50772[m HEAD@{15}: commit: function call can be expire
|
||||
[33m4a390adb[m HEAD@{16}: commit: fix style bug
|
||||
[33m960d1f1d[m HEAD@{17}: commit: style fix
|
||||
[33mc73ea447[m HEAD@{18}: commit: fix index
|
||||
[33m33bf569f[m HEAD@{19}: commit: fix nextchapter bug
|
||||
[33mb921bda4[m HEAD@{20}: commit: auto get domain
|
||||
[33m9921848d[m HEAD@{21}: commit: remove prefix of http url
|
||||
[33m4d81aef8[m HEAD@{22}: commit (merge): Merge branch 'feature/paste_deteced'
|
||||
[33m8fe5ee16[m HEAD@{23}: checkout: moving from feature/paste_deteced to main
|
||||
[33m9ce212e9[m[33m ([m[1;31morigin/feature/paste_deteced[m[33m, [m[1;32mfeature/paste_deteced[m[33m)[m HEAD@{24}: checkout: moving from main to feature/paste_deteced
|
||||
[33m8fe5ee16[m HEAD@{25}: commit (merge): 准备合并main
|
||||
[33m908d5915[m HEAD@{26}: checkout: moving from syt to main
|
||||
[33m57d8ac32[m[33m ([m[1;31morigin/syt[m[33m, [m[1;32msyt[m[33m)[m HEAD@{27}: checkout: moving from main to syt
|
||||
[33m908d5915[m HEAD@{28}: commit: ready
|
||||
[33m02b12791[m HEAD@{29}: checkout: moving from syt to main
|
||||
[33m57d8ac32[m[33m ([m[1;31morigin/syt[m[33m, [m[1;32msyt[m[33m)[m HEAD@{30}: checkout: moving from main to syt
|
||||
[33m02b12791[m HEAD@{31}: pull: Fast-forward
|
||||
[33m7d861e34[m[33m ([m[1;31morigin/zrz[m[33m)[m HEAD@{32}: checkout: moving from syt to main
|
||||
[33m57d8ac32[m[33m ([m[1;31morigin/syt[m[33m, [m[1;32msyt[m[33m)[m HEAD@{33}: commit: first
|
||||
[33m0196f37e[m HEAD@{34}: pull: Merge made by the 'ort' strategy.
|
||||
[33m57eb1197[m HEAD@{35}: commit: ok
|
||||
[33m382f2006[m HEAD@{36}: checkout: moving from main to syt
|
||||
[33m7d861e34[m[33m ([m[1;31morigin/zrz[m[33m)[m HEAD@{37}: commit (merge): Merge branch 'main' of https://gitee.com/CakeCN/code-agent
|
||||
[33m5f8f6c94[m HEAD@{38}: commit: many ok
|
||||
[33me24aa12e[m HEAD@{39}: commit: ready to process
|
||||
[33m6766ca85[m HEAD@{40}: commit (merge): Merge branch 'feature/voice_send'
|
||||
[33m3c9c7553[m HEAD@{41}: checkout: moving from feature/voice_send to main
|
||||
[33m58a95e9f[m[33m ([m[1;31morigin/feature/voice_send[m[33m, [m[1;32mfeature/voice_send[m[33m)[m HEAD@{42}: commit: ready merge to main
|
||||
[33m79125ffc[m HEAD@{43}: commit: change .cn to .com
|
||||
[33m2f9bc7df[m HEAD@{44}: checkout: moving from main to feature/voice_send
|
||||
[33m3c9c7553[m HEAD@{45}: reset: moving to HEAD
|
||||
[33m3c9c7553[m HEAD@{46}: checkout: moving from feature/voice_send to main
|
||||
[33m2f9bc7df[m HEAD@{47}: pull: Fast-forward
|
||||
[33m504c5cae[m[33m ([m[1;32m0v[m[33m)[m HEAD@{48}: checkout: moving from main to feature/voice_send
|
||||
[33m3c9c7553[m HEAD@{49}: commit: cn/com allow all
|
||||
[33m7122c3be[m HEAD@{50}: commit (merge): fix url
|
||||
[33me07c41fb[m HEAD@{51}: commit: fix code-server reboot problem(close debug)
|
||||
[33m821e20c9[m HEAD@{52}: commit: clear double iframe more safe
|
||||
[33m053584a7[m HEAD@{53}: checkout: moving from feature/voice_send to main
|
||||
[33m504c5cae[m[33m ([m[1;32m0v[m[33m)[m HEAD@{54}: checkout: moving from main to feature/voice_send
|
||||
[33m053584a7[m HEAD@{55}: commit: clear iframe double
|
||||
[33m10481b0b[m HEAD@{56}: commit: fix permisson bug
|
||||
[33mdc0eeaa9[m HEAD@{57}: commit: add hint
|
||||
[33ma24df620[m HEAD@{58}: commit: fix some bug
|
||||
[33m3ad36c29[m HEAD@{59}: commit: 25/09/24 10:00~11:30 停机维护
|
||||
[33m07cf2363[m HEAD@{60}: commit: fix many bug
|
||||
[33m6aac4200[m HEAD@{61}: commit: try hello message
|
||||
[33m271672c9[m HEAD@{62}: commit: check to code-server-like
|
||||
[33m252c426c[m HEAD@{63}: pull: Merge made by the 'ort' strategy.
|
||||
[33m588fc3b6[m HEAD@{64}: commit: ready to code-like
|
||||
[33mb1f832a2[m[33m ([m[1;31morigin/code-like-autosave[m[33m, [m[1;32mcode-like-autosave[m[33m)[m HEAD@{65}: merge code-like-autosave: Fast-forward
|
||||
[33m24f191d5[m HEAD@{66}: checkout: moving from code-like-autosave to main
|
||||
[33mb1f832a2[m[33m ([m[1;31morigin/code-like-autosave[m[33m, [m[1;32mcode-like-autosave[m[33m)[m HEAD@{67}: checkout: moving from main to code-like-autosave
|
||||
[33m24f191d5[m HEAD@{68}: clone: from https://gitee.com/CakeCN/code-agent.git
|
||||
Reference in New Issue
Block a user