Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 087ad77f39 | |||
| 92d3e76d44 | |||
| 8069fc2f8a | |||
| af361d7fc7 |
@@ -34,12 +34,21 @@ def set_input_file(path: str) -> None:
|
||||
global INPUT_JSON
|
||||
INPUT_JSON = path
|
||||
|
||||
# Secrets file (shared with workspace-document-analyzer)
|
||||
# .openclaw/workspace/skills/ir_generation_new_skill -> .openclaw/workspace-document-analyzer
|
||||
OPENCLAW_HOME = os.path.dirname(os.path.dirname(WORKSPACE_DIR))
|
||||
SECRETS_YAML = os.path.join(
|
||||
OPENCLAW_HOME, "workspace-document-analyzer", "config", "secrets.yaml",
|
||||
)
|
||||
# Secrets file — searched in order of priority:
|
||||
# 1. IR_SECRETS_PATH env var
|
||||
# 2. ~/.openclaw/config/secrets.yaml
|
||||
# 3. ~/.openclaw/workspace-document-analyzer/config/secrets.yaml
|
||||
_SECRETS_CANDIDATES = [
|
||||
os.path.join(os.path.expanduser("~"), ".openclaw", "config", "secrets.yaml"),
|
||||
os.path.join(os.path.expanduser("~"), ".openclaw", "workspace-document-analyzer",
|
||||
"config", "secrets.yaml"),
|
||||
]
|
||||
|
||||
_SECRETS_PATH = os.environ.get("IR_SECRETS_PATH", "")
|
||||
if _SECRETS_PATH:
|
||||
_SECRETS_CANDIDATES.insert(0, _SECRETS_PATH)
|
||||
|
||||
SECRETS_YAML = _SECRETS_CANDIDATES[0] # primary path (backward compat)
|
||||
|
||||
# Intermediate outputs (all under PROJECT_OUTPUT/ir/)
|
||||
SEMANTIC_INDEX_R1_JSON = os.path.join(IR_OUTPUT, "semantic_index_r1.json")
|
||||
@@ -84,11 +93,15 @@ ENSEMBLE_TEMPERATURES = [
|
||||
def _load_secrets() -> dict[str, dict[str, str]]:
|
||||
"""Load provider credentials from secrets.yaml.
|
||||
|
||||
Tries paths in order: IR_SECRETS_PATH env var → ~/.openclaw/config/ →
|
||||
~/.openclaw/workspace-document-analyzer/config/.
|
||||
|
||||
Returns a dict like: {"deepseek": {"apiKey": "...", "baseUrl": "..."}, ...}
|
||||
"""
|
||||
if os.path.isfile(SECRETS_YAML):
|
||||
with open(SECRETS_YAML, "r", encoding="utf-8") as f:
|
||||
return yaml.safe_load(f) or {}
|
||||
for p in _SECRETS_CANDIDATES:
|
||||
if os.path.isfile(p):
|
||||
with open(p, "r", encoding="utf-8") as f:
|
||||
return yaml.safe_load(f) or {}
|
||||
return {}
|
||||
|
||||
|
||||
@@ -108,9 +121,11 @@ def _get_provider_config(provider: str) -> dict[str, str]:
|
||||
)
|
||||
|
||||
if not api_key:
|
||||
tried_paths = "\n ".join(_SECRETS_CANDIDATES)
|
||||
raise RuntimeError(
|
||||
f"No API key found for provider '{provider}'. "
|
||||
f"Check {SECRETS_YAML} or set {env_prefix}_API_KEY."
|
||||
f"No API key found for provider '{provider}'.\n"
|
||||
f"Tried secrets.yaml paths:\n {tried_paths}\n"
|
||||
f"Or set {env_prefix}_API_KEY environment variable."
|
||||
)
|
||||
return {"apiKey": api_key, "baseUrl": base_url}
|
||||
|
||||
|
||||
@@ -548,11 +548,20 @@ def call_llm(prompt: str, max_retries: int = 2,
|
||||
Args:
|
||||
temperature: Override config.TEMPERATURE. If None, uses config default.
|
||||
"""
|
||||
client = config.llm_client()
|
||||
import sys as _sys
|
||||
|
||||
try:
|
||||
client = config.llm_client()
|
||||
except Exception as e:
|
||||
print(f" LLM 客户端初始化失败: {e}", file=_sys.stderr)
|
||||
print(f" 请检查: IR_PROVIDER={config.LLM_PROVIDER}, secrets.yaml 或环境变量", file=_sys.stderr)
|
||||
raise
|
||||
|
||||
temp = temperature if temperature is not None else config.TEMPERATURE
|
||||
|
||||
for attempt in range(max_retries + 1):
|
||||
print(f" LLM 调用 T={temp} (尝试 {attempt + 1}/{max_retries + 1})...", flush=True)
|
||||
print(f" LLM 调用 model={config.MODEL_NAME} T={temp} "
|
||||
f"(尝试 {attempt + 1}/{max_retries + 1})...", flush=True)
|
||||
try:
|
||||
resp = client.chat.completions.create(
|
||||
model=config.MODEL_NAME,
|
||||
@@ -568,17 +577,31 @@ def call_llm(prompt: str, max_retries: int = 2,
|
||||
)
|
||||
content = resp.choices[0].message.content
|
||||
if content is None:
|
||||
raise RuntimeError("LLM returned empty response")
|
||||
raise RuntimeError(
|
||||
"LLM 返回空响应 (content=None)。可能是 API 配额不足或模型不可用。"
|
||||
)
|
||||
|
||||
# Log response length and first characters for diagnostics
|
||||
print(f" 响应长度: {len(content)} 字符", flush=True)
|
||||
|
||||
json_str = extract_json_from_response(content)
|
||||
return json.loads(json_str)
|
||||
result = json.loads(json_str)
|
||||
n_units = len(result.get("function_units", []))
|
||||
n_concepts = len(result.get("concepts", []))
|
||||
print(f" 提取: {n_concepts} 概念, {n_units} 功能单元", flush=True)
|
||||
return result
|
||||
|
||||
except (json.JSONDecodeError, ValueError) as e:
|
||||
print(f" JSON 解析失败: {e}")
|
||||
print(f" JSON 解析失败: {e}", file=_sys.stderr)
|
||||
# Show a snippet of what the LLM returned for diagnosis
|
||||
print(f" LLM 返回内容前 500 字符: {content[:500] if content else '(None)'}", file=_sys.stderr)
|
||||
if attempt < max_retries:
|
||||
time.sleep(2)
|
||||
|
||||
raise RuntimeError("无法从 LLM 响应中解析 JSON")
|
||||
raise RuntimeError(
|
||||
f"无法从 LLM 响应中解析 JSON({max_retries + 1} 次尝试均失败)。"
|
||||
f"最后返回内容前 500 字符: {content[:500] if content else '(None)'}"
|
||||
)
|
||||
|
||||
|
||||
# ---- Ensemble Orchestration ----
|
||||
@@ -632,6 +655,18 @@ def run_ensemble_semantic_index(doc: dict) -> dict:
|
||||
if not raw_results:
|
||||
raise RuntimeError("所有集成的 LLM 调用均失败")
|
||||
|
||||
# Check that at least some raw results have function_units
|
||||
all_empty = all(
|
||||
len(r[2].get("function_units", [])) == 0 for r in raw_results
|
||||
)
|
||||
if all_empty:
|
||||
raise RuntimeError(
|
||||
"所有集成的 LLM 调用返回了空的 function_units。请检查:\n"
|
||||
" 1. API Key 是否配置正确 (secrets.yaml 或环境变量)\n"
|
||||
" 2. 输入文档格式是否与 Prompt 兼容\n"
|
||||
" 3. LLM 服务是否可访问"
|
||||
)
|
||||
|
||||
# Sort by temperature for determinism
|
||||
raw_results.sort(key=lambda x: x[1])
|
||||
semantic_indices = [r[2] for r in raw_results]
|
||||
@@ -709,6 +744,17 @@ def main():
|
||||
n_concepts = cs.get("total_concepts", len(merged_index.get("concepts", [])))
|
||||
n_units = cs.get("total_units", len(merged_index.get("function_units", [])))
|
||||
n_versions = merged_index.get("ensemble_versions", len(config.ENSEMBLE_TEMPERATURES))
|
||||
|
||||
if not merged_index.get("validation_passed", True):
|
||||
print(f"\n错误: 语义索引验证未通过!")
|
||||
gaps = merged_index.get("validation_gaps", {})
|
||||
for category, issues in gaps.items():
|
||||
for issue in issues:
|
||||
print(f" [{category}] {issue}")
|
||||
print(f"\n流水线中止: {n_units} 个功能单元不满足最低覆盖率要求。")
|
||||
print("请检查 LLM 配置、输入文档格式和 Prompt 兼容性。")
|
||||
sys.exit(1)
|
||||
|
||||
print(f"\n完成! {n_versions} 版本集成, {n_concepts} 个概念, {n_units} 个功能单元.")
|
||||
print(f"输出: {config.SEMANTIC_INDEX_JSON}")
|
||||
|
||||
|
||||
@@ -487,6 +487,12 @@ def main():
|
||||
n_units = len(semantic_index.get("function_units", []))
|
||||
print(f" 语义索引: {n_units} 个功能单元")
|
||||
|
||||
if n_units == 0:
|
||||
print("错误: 语义索引中无功能单元 (function_units 为空)。")
|
||||
print(" 请检查 step1_semantic_index 是否正确运行。")
|
||||
print(" 可能原因: LLM API Key 未配置、Prompt 不兼容、或输入文档格式异常。")
|
||||
sys.exit(1)
|
||||
|
||||
# 2. Extract rules
|
||||
print(f"\n[2/3] 逐单元提取 IR 规则...")
|
||||
fragments = extract_all_rules(semantic_index, doc)
|
||||
|
||||
@@ -987,10 +987,17 @@ def main():
|
||||
semantic_index = load_semantic_index()
|
||||
path_enum = load_path_enumeration()
|
||||
|
||||
total_fragments = len(fragments)
|
||||
if total_fragments == 0 and not autocomplete_fragments:
|
||||
print("错误: 无 IR 片段可合并 (fragments 和 autocomplete_fragments 均为空)。")
|
||||
print(" 请检查 step2_ir_extraction 是否正确运行。")
|
||||
print(" 可能原因: step1 未生成 function_units,或 step2 提取失败。")
|
||||
sys.exit(1)
|
||||
|
||||
feature_name = semantic_index.get("feature_name", "行车娱乐限制")
|
||||
feature_id = "DRL-001"
|
||||
print(f" 功能: {feature_name} ({feature_id})")
|
||||
print(f" 主片段: {len(fragments)}")
|
||||
print(f" 主片段: {total_fragments}")
|
||||
if autocomplete_fragments:
|
||||
print(f" 自动补全片段: {len(autocomplete_fragments)}")
|
||||
|
||||
|
||||
@@ -376,10 +376,13 @@ def _load_si_and_doc():
|
||||
"""Try to load semantic_index.json and the input document. Returns (si, doc) or (None, None)."""
|
||||
try:
|
||||
si = config.load_json(config.SEMANTIC_INDEX_JSON)
|
||||
doc = config.load_input_document()
|
||||
return si, doc
|
||||
except FileNotFoundError:
|
||||
return None, None
|
||||
try:
|
||||
doc = config.load_input_document()
|
||||
except (FileNotFoundError, SystemExit):
|
||||
return None, None
|
||||
return si, doc
|
||||
|
||||
|
||||
def test_step1_unit_ids():
|
||||
|
||||
@@ -160,6 +160,8 @@ def test_step2_5_path_enumeration():
|
||||
path_data = config.load_json(config.PATH_ENUM_JSON)
|
||||
except FileNotFoundError:
|
||||
pytest.skip("path_enumeration.json not found — run step2_5_branch_coverage.py first")
|
||||
if path_data.get("total_paths", 0) == 0:
|
||||
pytest.skip("path_enumeration.json has 0 paths — pipeline may have failed upstream")
|
||||
errors = check_path_enumeration(path_data)
|
||||
assert not errors, f"path enumeration errors: {errors}"
|
||||
|
||||
|
||||
@@ -235,11 +235,14 @@ import pytest # noqa: E402
|
||||
|
||||
|
||||
def _load_ir_final_or_skip():
|
||||
"""Load ir_final.json or return None."""
|
||||
"""Load ir_final.json. Returns None if file missing or rules empty (failed pipeline)."""
|
||||
try:
|
||||
return config.load_json(config.IR_FINAL_JSON)
|
||||
data = config.load_json(config.IR_FINAL_JSON)
|
||||
except FileNotFoundError:
|
||||
return None
|
||||
if not data.get("rules"):
|
||||
return None # Skip: pipeline produced empty results
|
||||
return data
|
||||
|
||||
|
||||
def _load_audit_report_or_skip():
|
||||
|
||||
Reference in New Issue
Block a user