Compare commits
6 Commits
93cf991779
...
ack-client
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f8f7a9d104 | ||
|
|
a210f5bac3 | ||
|
|
dc9f246841 | ||
|
|
74f26c72fd | ||
|
|
aae10819ca | ||
|
|
42549bb32a |
@@ -210,7 +210,7 @@ class ASEngineClient:
|
|||||||
|
|
||||||
# 发送数据
|
# 发送数据
|
||||||
self.sio.emit(route, data, namespace=self.namespace)
|
self.sio.emit(route, data, namespace=self.namespace)
|
||||||
print(f"Sent text to route '{route}': {text}")
|
print(f"Sent text to route '{route}': {text[:20]}")
|
||||||
|
|
||||||
# 如果不需要等待ACK,直接返回True
|
# 如果不需要等待ACK,直接返回True
|
||||||
if not wait_for_ack:
|
if not wait_for_ack:
|
||||||
@@ -380,6 +380,6 @@ class HSAEngineClient(ASEngineClient):
|
|||||||
super().__init__(server_url, namespace, id)
|
super().__init__(server_url, namespace, id)
|
||||||
self.chatmanager = chatmanager
|
self.chatmanager = chatmanager
|
||||||
def loadmarkdown(self, fmd, fmdp, fsp):
|
def loadmarkdown(self, fmd, fmdp, fsp):
|
||||||
self.send_text('markdown-in', fmd, self.id)
|
self.send_text('markdown-in', fmd, self.id, wait_for_ack=True)
|
||||||
self.send_text('markdown-prompt-in', fmdp, self.id)
|
self.send_text('markdown-prompt-in', fmdp, self.id, wait_for_ack=True)
|
||||||
self.send_text('score-prompt-in', fsp, self.id)
|
self.send_text('score-prompt-in', fsp, self.id, wait_for_ack=True)
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ def get_text_file(file_name):
|
|||||||
response = requests.get(file_name)
|
response = requests.get(file_name)
|
||||||
|
|
||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
print(file_name)
|
# print(file_name)
|
||||||
# print(f"get_text_file: {response.text}")
|
# print(f"get_text_file: {response.text}")
|
||||||
|
|
||||||
return response.text
|
return response.text
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ from ..services.markdown_service import load_full_markdown_file
|
|||||||
from ..services.course_service import save_learning_progress
|
from ..services.course_service import save_learning_progress
|
||||||
from ..extension_ase.ase_client import HSAEngineClient
|
from ..extension_ase.ase_client import HSAEngineClient
|
||||||
from ..services.user_service import get_or_load_current_user
|
from ..services.user_service import get_or_load_current_user
|
||||||
|
from ..services.course_service import load_learning_progress
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -76,7 +77,6 @@ class AgentNamespace(Namespace):
|
|||||||
chatmanager.function_manager.add_function(next_chapter, {'user_uuid': user_uuid})
|
chatmanager.function_manager.add_function(next_chapter, {'user_uuid': user_uuid})
|
||||||
|
|
||||||
# 尝试加载用户学习进度
|
# 尝试加载用户学习进度
|
||||||
from ..services.course_service import load_learning_progress
|
|
||||||
progress = load_learning_progress(user_uuid, course_id, chapter_name, lesson_name)
|
progress = load_learning_progress(user_uuid, course_id, chapter_name, lesson_name)
|
||||||
need_skip_chapters = 0
|
need_skip_chapters = 0
|
||||||
|
|
||||||
@@ -212,6 +212,7 @@ class AgentNamespace(Namespace):
|
|||||||
print(f"on_connect_to_ase {client_entry}, {namespace_entry}, {init_data}")
|
print(f"on_connect_to_ase {client_entry}, {namespace_entry}, {init_data}")
|
||||||
namespace_entry, ase_client = namespace_entry
|
namespace_entry, ase_client = namespace_entry
|
||||||
namespace_entry.emit('open-iframe',"", room=init_data['room'], namespace='/agent')
|
namespace_entry.emit('open-iframe',"", room=init_data['room'], namespace='/agent')
|
||||||
|
namespace_entry.emit('message', "Agents服务已连接, 加载教案中", room=init_data['room'], namespace='/agent')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
base_url = current_app.config['ASE_ENGINE_URL']
|
base_url = current_app.config['ASE_ENGINE_URL']
|
||||||
@@ -231,7 +232,8 @@ class AgentNamespace(Namespace):
|
|||||||
print(f"Error clearing user session: {e}")
|
print(f"Error clearing user session: {e}")
|
||||||
ase_client.chatmanager.load_next_chapter()
|
ase_client.chatmanager.load_next_chapter()
|
||||||
ase_client.send_text("chapter-start", "")
|
ase_client.send_text("chapter-start", "")
|
||||||
namespace_entry.emit('message', "Multi-Agents服务已连接", room=init_data['room'], namespace='/agent')
|
namespace_entry.emit('message', "教案加载完毕", room=init_data['room'], namespace='/agent')
|
||||||
|
|
||||||
|
|
||||||
#接受消息回来直接让message监听发送
|
#接受消息回来直接让message监听发送
|
||||||
def receive_ase_paste_detected(client_entry: HSAEngineClient, namespace_entry: Namespace, data, init_data):
|
def receive_ase_paste_detected(client_entry: HSAEngineClient, namespace_entry: Namespace, data, init_data):
|
||||||
|
|||||||
@@ -156,7 +156,6 @@ def load_chapters(markdown, markdown_prompt, score_prompt):
|
|||||||
|
|
||||||
chapter_chain = []
|
chapter_chain = []
|
||||||
No = 1
|
No = 1
|
||||||
print (chapter_dict)
|
|
||||||
for chapter_name in chapter_sequence:
|
for chapter_name in chapter_sequence:
|
||||||
chapter_chain.append(Chapter( No, CHAPTER_LATTER, chapter_name, chapter_dict[chapter_name]["markdown"], chapter_dict[chapter_name]["markdown_prompt"], chapter_dict[chapter_name]["score_prompt"],chapter_dict[chapter_name]["require_tools"]))
|
chapter_chain.append(Chapter( No, CHAPTER_LATTER, chapter_name, chapter_dict[chapter_name]["markdown"], chapter_dict[chapter_name]["markdown_prompt"], chapter_dict[chapter_name]["score_prompt"],chapter_dict[chapter_name]["require_tools"]))
|
||||||
No+=1
|
No+=1
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ api_key = sk-aMpnWklN2IbsK44d1kNpy6YOP9bk1pdPJjFeEmbb0a5ytEFf
|
|||||||
model=gpt-4.1-nano
|
model=gpt-4.1-nano
|
||||||
|
|
||||||
[VSCODE_WEB]
|
[VSCODE_WEB]
|
||||||
url = https://hsamooc.com
|
url = https://hsamooc.cn
|
||||||
[CODE_LIKE]
|
[CODE_LIKE]
|
||||||
url = https://hsamooc.com/vsc-like
|
url = /vsc-like
|
||||||
#http://asengine.net:8282
|
#http://asengine.net:8282
|
||||||
[VSCODE_WEB_PATH]
|
[VSCODE_WEB_PATH]
|
||||||
is_wsl = true
|
is_wsl = true
|
||||||
@@ -27,6 +27,6 @@ bucket = hsamooc-cdn-1374354408
|
|||||||
region = ap-guangzhou
|
region = ap-guangzhou
|
||||||
|
|
||||||
[ASE_ENGINE]
|
[ASE_ENGINE]
|
||||||
url = https://asengine.net
|
url = https://test.asengine.net
|
||||||
namespace = /socket.io/7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
namespace = /socket.io/7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
||||||
url_token = 7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
url_token = 7100eebf7a909e1ee3f4e06766f512f0358ecb6ac51d5434c17d31dd70890dc1
|
||||||
|
|||||||
Reference in New Issue
Block a user