bugfix
This commit is contained in:
parent
801467e3c4
commit
b9fdf32231
@ -67,21 +67,21 @@ async def run_subprocess(command, cwd, env, timeout=30.0):
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
class IndustrialSkillEngine:
|
class IndustrialSkillEngine:
|
||||||
def __init__(self, request, llmid: str, apikey: str=None):
|
def __init__(self, request, llmid: str, apikey: str=None):
|
||||||
config = getConfig()
|
config = getConfig()
|
||||||
skills_dir = config.skills_dir
|
skills_dir = config.skills_dir
|
||||||
self.root = Path(skills_dir).resolve()
|
self.root = Path(skills_dir).resolve()
|
||||||
self.llm = LLMHandler(request, llmid, apikey=apikey)
|
self.llm = LLMHandler(request, llmid, apikey=apikey)
|
||||||
self.registry = {}
|
self.registry = {}
|
||||||
self.task_queue = asyncio.Queue(maxsize=20)
|
self.task_queue = asyncio.Queue(maxsize=20)
|
||||||
# 状态机：记录当前任务执行到的步骤
|
# 状态机：记录当前任务执行到的步骤
|
||||||
self.state = {"current_skill": None, "history": [], "pending_params": []}
|
self.state = {"current_skill": None, "history": [], "pending_params": []}
|
||||||
|
|
||||||
async def write_output(self, data=None):
|
async def write_output(self, data=None):
|
||||||
await self.task_queue.put(data)
|
await self.task_queue.put(data)
|
||||||
|
|
||||||
# --- 1. 工业级初始化：依赖检查与索引 ---
|
# --- 1. 工业级初始化：依赖检查与索引 ---
|
||||||
def boot(self, refresh=False):
|
def boot(self, refresh=False):
|
||||||
env = self.request._run_ns
|
env = self.request._run_ns
|
||||||
userid = await env.get_user()
|
userid = await env.get_user()
|
||||||
key = f'skillregister_{userid}'
|
key = f'skillregister_{userid}'
|
||||||
@ -90,95 +90,95 @@ class IndustrialSkillEngine:
|
|||||||
self.self.registry = skills
|
self.self.registry = skills
|
||||||
return
|
return
|
||||||
|
|
||||||
for skill_md in self.root.glob("**/SKILL.md"):
|
for skill_md in self.root.glob("**/SKILL.md"):
|
||||||
with open(skill_md, 'r', encoding='utf-8') as f:
|
with open(skill_md, 'r', encoding='utf-8') as f:
|
||||||
content = f.read()
|
content = f.read()
|
||||||
meta = yaml.safe_load(re.search(r'^---(.*?)---', content, re.DOTALL).group(1))
|
meta = yaml.safe_load(re.search(r'^---(.*?)---', content, re.DOTALL).group(1))
|
||||||
name = meta.get('name')
|
name = meta.get('name')
|
||||||
|
|
||||||
# 检查依赖 (Pre-flight check)
|
# 检查依赖 (Pre-flight check)
|
||||||
req_file = skill_md.parent / "requirements.txt"
|
req_file = skill_md.parent / "requirements.txt"
|
||||||
has_deps = req_file.exists()
|
has_deps = req_file.exists()
|
||||||
|
|
||||||
self.registry[name] = {
|
self.registry[name] = {
|
||||||
"root": skill_md.parent,
|
"root": skill_md.parent,
|
||||||
"meta": meta,
|
"meta": meta,
|
||||||
"content": content,
|
"content": content,
|
||||||
"has_deps": has_deps
|
"has_deps": has_deps
|
||||||
}
|
}
|
||||||
await session_setvalue(key, self.registry)
|
await session_setvalue(key, self.registry)
|
||||||
|
|
||||||
# --- 2. 自动化依赖环境隔离 (venv 思想) ---
|
# --- 2. 自动化依赖环境隔离 (venv 思想) ---
|
||||||
async def _ensure_dependencies(self, skill_name: str):
|
async def _ensure_dependencies(self, skill_name: str):
|
||||||
skill = self.registry[skill_name]
|
skill = self.registry[skill_name]
|
||||||
if skill["has_deps"]:
|
if skill["has_deps"]:
|
||||||
# 工业级引擎通常会检查一个隐藏的 .installed 标识
|
# 工业级引擎通常会检查一个隐藏的 .installed 标识
|
||||||
if not (skill["root"] / ".deps_installed").exists():
|
if not (skill["root"] / ".deps_installed").exists():
|
||||||
print(f"📦 正在为技能 {skill_name} 安装必要依赖...")
|
print(f"📦 正在为技能 {skill_name} 安装必要依赖...")
|
||||||
await run_subprocess(["pip", "install", "-r", "requirements.txt"], cwd=skill["root"])
|
await run_subprocess(["pip", "install", "-r", "requirements.txt"], cwd=skill["root"])
|
||||||
(skill["root"] / ".deps_installed").touch()
|
(skill["root"] / ".deps_installed").touch()
|
||||||
|
|
||||||
# --- 3. 增强版安全执行器：带重试逻辑与审计 ---
|
# --- 3. 增强版安全执行器：带重试逻辑与审计 ---
|
||||||
async def _execute_with_retry(self, command: str, skill_name: str, retry_count=1) -> str:
|
async def _execute_with_retry(self, command: str, skill_name: str, retry_count=1) -> str:
|
||||||
await self._ensure_dependencies(skill_name)
|
await self._ensure_dependencies(skill_name)
|
||||||
|
|
||||||
# 安全预检：禁止敏感命令
|
# 安全预检：禁止敏感命令
|
||||||
forbidden = ["rm ", "> /dev/", "chmod", "sudo"]
|
forbidden = ["rm ", "> /dev/", "chmod", "sudo"]
|
||||||
if any(f in command for f in forbidden):
|
if any(f in command for f in forbidden):
|
||||||
return "🚫 安全风险：检测到非法指令，执行被拦截。"
|
return "🚫 安全风险：检测到非法指令，执行被拦截。"
|
||||||
|
|
||||||
info(f"Executing: {command} in {skill_name}")
|
info(f"Executing: {command} in {skill_name}")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
env = os.environ.copy()
|
env = os.environ.copy()
|
||||||
env["SKILL_CONTEXT"] = skill_name
|
env["SKILL_CONTEXT"] = skill_name
|
||||||
|
|
||||||
res = await run_subprocess(command, cwd=self.registry[skill_name]["root"], env=env, timeout=30)
|
res = await run_subprocess(command, cwd=self.registry[skill_name]["root"], env=env, timeout=30)
|
||||||
|
|
||||||
if res.return_code != 0:
|
if res.return_code != 0:
|
||||||
# 工业级特性：自动将错误回传给 LLM 进行自愈 (Self-healing)
|
# 工业级特性：自动将错误回传给 LLM 进行自愈 (Self-healing)
|
||||||
error(f"Command failed: {res.stderr}")
|
error(f"Command failed: {res.stderr}")
|
||||||
if retry_count > 0:
|
if retry_count > 0:
|
||||||
print(f"⚠️ 执行失败，尝试让 AI 自愈修复参数...")
|
print(f"⚠️ 执行失败，尝试让 AI 自愈修复参数...")
|
||||||
new_prompt = f"命令 '{command}' 失败，错误信息: {res.stderr}。请根据错误重新生成正确的命令，或提示用户补全参数。"
|
new_prompt = f"命令 '{command}' 失败，错误信息: {res.stderr}。请根据错误重新生成正确的命令，或提示用户补全参数。"
|
||||||
# 这里会递归调用逻辑进行修复
|
# 这里会递归调用逻辑进行修复
|
||||||
return await self.run(new_prompt, is_retry=True)
|
return await self.run(new_prompt, is_retry=True)
|
||||||
|
|
||||||
await self.write_output({
|
await self.write_output({
|
||||||
"status": "FAILED",
|
"status": "FAILED",
|
||||||
"error": f"Error: {res.stderr}"
|
"error": f"Error: {res.stderr}"
|
||||||
})
|
})
|
||||||
raise Exception(f"Error: {res.stderr}")
|
raise Exception(f"Error: {res.stderr}")
|
||||||
|
|
||||||
return res.stdout
|
return res.stdout
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return str(e)
|
return str(e)
|
||||||
|
|
||||||
# --- 4. 递归文档注入与意图路由 ---
|
# --- 4. 递归文档注入与意图路由 ---
|
||||||
async def _get_expanded_context(self, skill_name: str, user_prompt: str, context=None):
|
async def _get_expanded_context(self, skill_name: str, user_prompt: str, context=None):
|
||||||
skill = self.registry[skill_name]
|
skill = self.registry[skill_name]
|
||||||
base_content = skill["content"]
|
base_content = skill["content"]
|
||||||
|
|
||||||
# 扫描目录下的辅助文件夹
|
# 扫描目录下的辅助文件夹
|
||||||
sub_dirs = ["reference", "examples"]
|
sub_dirs = ["reference", "examples"]
|
||||||
found_docs = []
|
found_docs = []
|
||||||
for d in sub_dirs:
|
for d in sub_dirs:
|
||||||
path = skill["root"] / d
|
path = skill["root"] / d
|
||||||
if path.exists():
|
if path.exists():
|
||||||
found_docs.extend([f"{d}/{f.name}" for f in path.glob("*.md")])
|
found_docs.extend([f"{d}/{f.name}" for f in path.glob("*.md")])
|
||||||
|
|
||||||
if found_docs:
|
if found_docs:
|
||||||
# 仅在模型认为有必要时，“点餐式”加载
|
# 仅在模型认为有必要时，“点餐式”加载
|
||||||
choice = await self.llm(f"上下文：{context or ''}\n用户问题: {user_prompt}\n可选深入文档: {found_docs}\n需要读取哪个？(仅返回路径，不需则返回 None)")
|
choice = await self.llm(f"上下文：{context or ''}\n用户问题: {user_prompt}\n可选深入文档: {found_docs}\n需要读取哪个？(仅返回路径，不需则返回 None)")
|
||||||
if choice != "None" and any(choice in doc for doc in found_docs):
|
if choice != "None" and any(choice in doc for doc in found_docs):
|
||||||
with open(skill["root"] / choice, 'r') as f:
|
with open(skill["root"] / choice, 'r') as f:
|
||||||
await self.write_output({
|
await self.write_output({
|
||||||
"status": "PROCESSING",
|
"status": "PROCESSING",
|
||||||
"hint": f"📂 深度加载: {choice}"
|
"hint": f"📂 深度加载: {choice}"
|
||||||
})
|
})
|
||||||
base_content += f"\n\n--- 深度参考 ({choice}) ---\n{f.read()}"
|
base_content += f"\n\n--- 深度参考 ({choice}) ---\n{f.read()}"
|
||||||
|
|
||||||
return base_content
|
return base_content
|
||||||
|
|
||||||
async def reference(self, user_prompt:str, context: str=None, is_retry: boolean=False):
|
async def reference(self, user_prompt:str, context: str=None, is_retry: boolean=False):
|
||||||
f = partial(self.run, user_prompt, context=context, is_retry=is_retry)
|
f = partial(self.run, user_prompt, context=context, is_retry=is_retry)
|
||||||
@ -191,36 +191,36 @@ class IndustrialSkillEngine:
|
|||||||
asyncio.sleep(0.1)
|
asyncio.sleep(0.1)
|
||||||
|
|
||||||
|
|
||||||
# --- 5. 主运行接口 ---
|
# --- 5. 主运行接口 ---
|
||||||
async def run(self, user_prompt: str, context=None, is_retry=False):
|
async def run(self, user_prompt: str, context=None, is_retry=False):
|
||||||
# 如果是重试，跳过技能选择
|
# 如果是重试，跳过技能选择
|
||||||
self.boot()
|
self.boot()
|
||||||
if not is_retry:
|
if not is_retry:
|
||||||
await self.write_output({
|
await self.write_output({
|
||||||
"status": "PROCESSING",
|
"status": "PROCESSING",
|
||||||
"hint": "寻找合适的skill"
|
"hint": "寻找合适的skill"
|
||||||
})
|
})
|
||||||
skill_map = {n: v["description"] for n, v in self.registry.items()}
|
skill_map = {n: v["description"] for n, v in self.registry.items()}
|
||||||
target = await self.llm(f"用户意图: {user_prompt}\n可选技能清单: {skill_map}\n请返回匹配的技能名:")
|
target = await self.llm(f"用户意图: {user_prompt}\n可选技能清单: {skill_map}\n请返回匹配的技能名:")
|
||||||
self.state["current_skill"] = target
|
self.state["current_skill"] = target
|
||||||
await self.write_output({
|
await self.write_output({
|
||||||
"status":"PROCESSING",
|
"status":"PROCESSING",
|
||||||
"hint": f"找到skill={target}"
|
"hint": f"找到skill={target}"
|
||||||
})
|
})
|
||||||
|
|
||||||
skill_name = self.state["current_skill"]
|
skill_name = self.state["current_skill"]
|
||||||
if skill_name not in self.registry:
|
if skill_name not in self.registry:
|
||||||
await self.write_output({
|
await self.write_output({
|
||||||
"status": "FAILED",
|
"status": "FAILED",
|
||||||
"error": f"技能名{skill_name}未注册"
|
"error": f"技能名{skill_name}未注册"
|
||||||
})
|
})
|
||||||
raise Exception("Skill not found.")
|
raise Exception("Skill not found.")
|
||||||
|
|
||||||
# 获取递归上下文
|
# 获取递归上下文
|
||||||
context = await self._get_expanded_context(skill_name, user_prompt, context=context)
|
context = await self._get_expanded_context(skill_name, user_prompt, context=context)
|
||||||
|
|
||||||
# 决策：是直接回答还是执行脚本
|
# 决策：是直接回答还是执行脚本
|
||||||
decision = await self.llm(f"上下文: {context}\n问题: {user_prompt}\n决定动作：EXEC: <command> 或 ANSWER: <text> 或 REPLY: <question>")
|
decision = await self.llm(f"上下文: {context}\n问题: {user_prompt}\n决定动作：EXEC: <command> 或 ANSWER: <text> 或 REPLY: <question>")
|
||||||
|
|
||||||
if "REPLY" in decision:
|
if "REPLY" in decision:
|
||||||
sessionkey = getID()
|
sessionkey = getID()
|
||||||
@ -238,12 +238,12 @@ class IndustrialSkillEngine:
|
|||||||
user_reply = await env.session_getvalue(sessionkey)
|
user_reply = await env.session_getvalue(sessionkey)
|
||||||
prompt = f"{user_prompt}\n补充输入：{user_reply}"
|
prompt = f"{user_prompt}\n补充输入：{user_reply}"
|
||||||
await self.run(prompt, context=context, is_retry=True)
|
await self.run(prompt, context=context, is_retry=True)
|
||||||
return
|
return
|
||||||
if "EXEC:" in decision:
|
if "EXEC:" in decision:
|
||||||
cmd = decision.split("EXEC:")[1].strip()
|
cmd = decision.split("EXEC:")[1].strip()
|
||||||
output = await self._execute_with_retry(cmd, skill_name)
|
output = await self._execute_with_retry(cmd, skill_name)
|
||||||
await self.write_output(output)
|
await self.write_output(output)
|
||||||
return
|
return
|
||||||
if "ANSWER:" in decision
|
if "ANSWER:" in decision
|
||||||
output = decision.replace("ANSWER:", "").strip()
|
output = decision.replace("ANSWER:", "").strip()
|
||||||
await self.write_output(output)
|
await self.write_output(output)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user