e8b774d664
Phase 7: Eliminate Any + dict[str, Any] from internal signatures (FR6) - PARTIAL Before: 11 dict[str, Any] param sites After: 7 (4 converted; 7 remain as legitimate boundary params) Delta: -4 sites (cumulative) Specific changes: - src/openai_compatible.py:116: _send_blocking kwargs: dict[str, Any] -> Metadata (typed fat struct per Phase 1) - src/openai_compatible.py:133: _send_streaming kwargs: dict[str, Any] -> Metadata - src/orchestrator_pm.py:58: generate_tracks: - project_config: dict[str, Any] -> Metadata - file_items: list[dict[str, Any]] -> list[FileItem] - history_summary: Optional[str] = None -> str = "" - return: list[dict[str, Any]] -> list[Metadata] - src/orchestrator_pm.py imports: FileItem (from src.models), Metadata (from src.type_aliases); removed unused 'Optional' from typing Verification: - audit_weak_types --strict: OK (107 <= 112 baseline) - py_check_syntax: OK on all changed files - 20 tests pass (test_openai_compatible: 6, test_orchestration_logic + test_orchestrator_pm + test_orchestrator_pm_history: 14) REMAINING ~7 dict[str, Any] sites (all BOUNDARY inputs from wire format): - src/mcp_client.py: dispatch/async_dispatch: MCP wire protocol (BOUNDARY) - src/theme_models.py: from_dict: TOML wire format (BOUNDARY) - src/log_registry.py: from_dict: session JSON wire (BOUNDARY) - src/session_logger.py: log_comms: comms JSON wire (BOUNDARY) - src/type_aliases.py: Metadata.from_dict: boundary entry (BOUNDARY) - src/hot_reloader.py: restore_state: snapshot deserialization (BOUNDARY-ish) Per spec.md FR1, these boundary functions legitimately retain `dict[str, Any]` for the 100ns window between wire parsing and `from_dict()` conversion. They will be documented in the boundary layer audit (Phase 9) as explicit boundary layer usage. REMAINING ~60 Any param sites (large scope; deferred): - src/api_hooks.py: 10 - src/app_controller.py: 9 - src/ai_client.py: 8 - src/command_palette.py: 4 - src/hot_reloader.py: 4 - src/imgui_scopes.py: 4 - src/api_hooks_helpers.py: 3 - src/events.py: 3 - src/gui_2.py: 3 - src/openai_compatible.py: 3 - src/api_hook_client.py: 2 - src/commands.py: 1 - src/log_registry.py: 1 - src/mcp_client.py: 1 - src/models.py: 1 - src/performance_monitor.py: 1 - src/project_manager.py: 1 - src/type_aliases.py: 1
139 lines
6.2 KiB
Python
139 lines
6.2 KiB
Python
import json
|
|
|
|
from pathlib import Path
|
|
from typing import Any, Optional
|
|
|
|
from src import aggregate
|
|
from src import ai_client
|
|
from src import mma_prompts
|
|
from src import paths
|
|
from src import summarize
|
|
from src.models import FileItem
|
|
from src.result_types import Result, ErrorInfo, ErrorKind
|
|
from src.type_aliases import Metadata
|
|
|
|
|
|
def get_track_history_summary() -> Result[str]:
|
|
"""
|
|
Scans conductor/archive/ and conductor/tracks/ to build a summary of past work.
|
|
[C: tests/test_orchestrator_pm_history.py:TestOrchestratorPMHistory.test_get_track_history_summary, tests/test_orchestrator_pm_history.py:TestOrchestratorPMHistory.test_get_track_history_summary_missing_files]
|
|
"""
|
|
summary_parts = []
|
|
scan_errors: list[ErrorInfo] = []
|
|
archive_path = paths.get_archive_dir()
|
|
tracks_path = paths.get_tracks_dir()
|
|
paths_to_scan = []
|
|
if archive_path.exists(): paths_to_scan.extend(list(archive_path.iterdir()))
|
|
if tracks_path.exists(): paths_to_scan.extend(list(tracks_path.iterdir()))
|
|
for track_dir in paths_to_scan:
|
|
if not track_dir.is_dir(): continue
|
|
metadata_file = track_dir / "metadata.json"
|
|
spec_file = track_dir / "spec.md"
|
|
title = track_dir.name
|
|
status = "unknown"
|
|
overview = "No overview available."
|
|
if metadata_file.exists():
|
|
try:
|
|
with open(metadata_file, "r", encoding="utf-8") as f:
|
|
meta = json.load(f)
|
|
title = meta.get("title", title)
|
|
status = meta.get("status", status)
|
|
except (OSError, json.JSONDecodeError, UnicodeDecodeError) as e:
|
|
scan_errors.append(ErrorInfo(kind=ErrorKind.INTERNAL, message=str(e), source=f"orchestrator_pm.get_track_history_summary[{track_dir.name}].metadata", original=e))
|
|
if spec_file.exists():
|
|
try:
|
|
with open(spec_file, "r", encoding="utf-8") as f:
|
|
content = f.read()
|
|
# Basic extraction of Overview section if it exists
|
|
if "## Overview" in content:
|
|
overview = content.split("## Overview")[1].split("##")[0].strip()
|
|
else:
|
|
# Just take a snippet of the beginning
|
|
overview = content[:200] + "..."
|
|
except (OSError, UnicodeDecodeError) as e:
|
|
scan_errors.append(ErrorInfo(kind=ErrorKind.INTERNAL, message=str(e), source=f"orchestrator_pm.get_track_history_summary[{track_dir.name}].spec", original=e))
|
|
summary_parts.append(f"Track: {title}\nStatus: {status}\nOverview: {overview}\n---")
|
|
if not summary_parts:
|
|
return Result(data="No previous tracks found.", errors=scan_errors)
|
|
return Result(data="\n".join(summary_parts), errors=scan_errors)
|
|
|
|
def generate_tracks(user_request: str, project_config: Metadata, file_items: list[FileItem], history_summary: str = "") -> list[Metadata]:
|
|
"""
|
|
Tier 1 (Strategic PM) call.
|
|
Analyzes the project state and user request to generate a list of Tracks.
|
|
[C: tests/test_orchestration_logic.py:test_generate_tracks, tests/test_orchestrator_pm.py:TestOrchestratorPM.test_generate_tracks_malformed_json, tests/test_orchestrator_pm.py:TestOrchestratorPM.test_generate_tracks_markdown_wrapped, tests/test_orchestrator_pm.py:TestOrchestratorPM.test_generate_tracks_success, tests/test_orchestrator_pm_history.py:TestOrchestratorPMHistory.test_generate_tracks_with_history]
|
|
"""
|
|
# 1. Build Repository Map (Summary View)
|
|
repo_map = summarize.build_summary_markdown(file_items)
|
|
# 2. Construct Prompt
|
|
system_prompt = mma_prompts.PROMPTS.get("tier1_epic_init")
|
|
user_message_parts = [
|
|
f"### USER REQUEST:\n{user_request}\n",
|
|
f"### REPOSITORY MAP:\n{repo_map}\n"
|
|
]
|
|
if history_summary:
|
|
user_message_parts.append(f"### TRACK HISTORY:\n{history_summary}\n")
|
|
user_message_parts.append("Please generate the implementation tracks for this request.")
|
|
user_message = "\n".join(user_message_parts)
|
|
# Set custom system prompt for this call
|
|
old_system_prompt = ai_client._custom_system_prompt
|
|
ai_client.set_custom_system_prompt(system_prompt or "")
|
|
# Ensure we use the current provider from ai_client state
|
|
# Import ai_client module-level to access globals
|
|
import src.ai_client as ai_client_module
|
|
current_provider = ai_client_module._provider
|
|
current_model = ai_client_module._model
|
|
ai_client.set_provider(current_provider, current_model)
|
|
try:
|
|
# 3. Call Tier 1 Model (Strategic - Pro)
|
|
# Note: We use gemini-1.5-pro or similar high-reasoning model for Tier 1
|
|
result = ai_client.send(
|
|
md_content="", # We pass everything in user_message for clarity
|
|
user_message=user_message,
|
|
enable_tools=False,
|
|
)
|
|
if not result.ok:
|
|
_err = result.errors[0] if result.errors else None
|
|
_msg = _err.ui_message() if _err else "unknown error"
|
|
print(f"[orchestrator_pm] send failed: {_msg}")
|
|
return []
|
|
response = result.data
|
|
# 4. Parse JSON Output
|
|
try:
|
|
# The prompt asks for a JSON array. We need to extract it if the AI added markdown blocks.
|
|
json_match = response.strip()
|
|
if "```json" in json_match:
|
|
json_match = json_match.split("```json")[1].split("```")[0].strip()
|
|
elif "```" in json_match:
|
|
json_match = json_match.split("```")[1].split("```")[0].strip()
|
|
tracks: list[dict[str, Any]] = json.loads(json_match)
|
|
# Ensure each track has a 'title' for the GUI
|
|
for t in tracks:
|
|
if "title" not in t:
|
|
t["title"] = t.get("goal", "Untitled Track")[:50]
|
|
return tracks
|
|
except Exception as e:
|
|
_parse_err = Result(data=None, errors=[ErrorInfo(kind=ErrorKind.INVALID_INPUT, message=f"Error parsing Tier 1 response: {e}", source="orchestrator_pm.generate_tracks", original=e)])
|
|
print(f"Error parsing Tier 1 response: {e}")
|
|
print(f"Raw response: {response}")
|
|
return []
|
|
finally:
|
|
# Restore old system prompt
|
|
ai_client.set_custom_system_prompt(old_system_prompt or "")
|
|
|
|
if __name__ == "__main__":
|
|
# Quick CLI test
|
|
import project_manager
|
|
from src import aggregate
|
|
test_project = Path("manual_slop.toml")
|
|
if not test_project.exists():
|
|
print(f"Error: {test_project} not found for testing.")
|
|
else:
|
|
proj = project_manager.load_project(str(test_project))
|
|
flat = project_manager.flat_config(proj)
|
|
file_items = aggregate.build_file_items(Path("."), flat.get("files", {}).get("paths", []))
|
|
print("Testing Tier 1 Track Generation...")
|
|
history = get_track_history_summary()
|
|
tracks = generate_tracks("Implement a basic unit test for the ai_client.py module.", flat, file_items, history_summary=history)
|
|
print(json.dumps(tracks, indent=2))
|