ed
c12d5b6d82
Phase 6: Eliminate Optional[T] returns (FR5) - BATCH 1 of 7
Before: 8 Optional[T] return types across 4 files
After: 0 (replaced with default-zero return values)
Delta: -8 sites
Per conductor/code_styleguides/error_handling.md "Optional[X] ban":
- "Use Result[T] for any function that can fail at runtime."
- "Use nil-sentinel dataclasses for 'no result'."
For accessor-style returns (lookup or zero-default), convert to:
- Optional[str] -> str with default "" (empty string sentinel)
- Optional[float] -> float with default 0.0
- Optional[int] -> int with default 0
- Optional[Path] -> Path with default Path("") or project_root
Specific changes:
- src/models.py:765-789: Persona.provider/model/temperature/top_p/max_output_tokens
(Optional[str]/[float]/[int] -> str/float/int with default zero values)
- src/paths.py:255: _get_project_conductor_dir_from_toml returns project_root
when no [conductor].dir override is configured (was Optional[Path] returning None)
- src/presets.py:21: project_path property returns Path("") when no project_root
(was Optional[Path] returning None)
- src/summary_cache.py:57: get_summary returns "" when hash mismatch (was
Optional[str] returning None)
Test updates:
- tests/test_persona_models.py:64-69: test_persona_defaults now expects
"" / 0.0 instead of None
- tests/test_summary_cache.py:25, 32, 58: get_summary assertions now
expect "" instead of None
Verification:
- audit_weak_types --strict: OK (107 <= 112 baseline)
- 13 tests pass (test_summary_cache, test_paths, test_presets,
test_persona_models)
- py_check_syntax: OK on all changed files
REMAINING: ~22 Optional[T] returns in:
- src/command_palette.py (1)
- src/diff_viewer.py (2)
- src/external_editor.py (3)
- src/file_cache.py (7)
- src/fuzzy_anchor.py (1)
- src/models.py (1)
- src/multi_agent_conductor.py (1)
- src/patch_modal.py (1)
- src/project_manager.py (1)
- src/session_logger.py (1)
- src/app_controller.py (3)
81 lines
2.8 KiB
Python
81 lines
2.8 KiB
Python
import pytest
|
|
from src.models import Persona
|
|
|
|
def test_persona_serialization():
|
|
persona = Persona(
|
|
name="SecuritySpecialist",
|
|
preferred_models=[
|
|
{"provider": "anthropic", "model": "claude-3-7-sonnet-20250219", "temperature": 0.2, "top_p": 0.9, "max_output_tokens": 4000},
|
|
"claude-3-5-sonnet-20241022"
|
|
],
|
|
system_prompt="You are a security expert.",
|
|
tool_preset="SecurityTools",
|
|
bias_profile="Execution-Focused"
|
|
)
|
|
|
|
assert persona.provider == "anthropic"
|
|
assert persona.model == "claude-3-7-sonnet-20250219"
|
|
assert persona.temperature == 0.2
|
|
assert persona.top_p == 0.9
|
|
assert persona.max_output_tokens == 4000
|
|
|
|
data = persona.to_dict()
|
|
|
|
# data should NOT have top-level provider/model anymore, it's in preferred_models
|
|
assert "provider" not in data
|
|
assert "model" not in data
|
|
assert data["preferred_models"][0]["provider"] == "anthropic"
|
|
assert data["preferred_models"][0]["model"] == "claude-3-7-sonnet-20250219"
|
|
assert data["preferred_models"][1] == {"model": "claude-3-5-sonnet-20241022"}
|
|
assert data["system_prompt"] == "You are a security expert."
|
|
assert data["preferred_models"][0]["temperature"] == 0.2
|
|
assert data["preferred_models"][0]["top_p"] == 0.9
|
|
assert data["preferred_models"][0]["max_output_tokens"] == 4000
|
|
assert data["tool_preset"] == "SecurityTools"
|
|
assert data["bias_profile"] == "Execution-Focused"
|
|
|
|
def test_persona_deserialization():
|
|
# Old config format (legacy)
|
|
data = {
|
|
"provider": "gemini",
|
|
"model": "gemini-2.5-flash",
|
|
"preferred_models": ["gemini-2.5-flash"],
|
|
"system_prompt": "You are a helpful assistant.",
|
|
"temperature": 0.5,
|
|
"top_p": 1.0,
|
|
"max_output_tokens": 8192,
|
|
"tool_preset": "Default",
|
|
"bias_profile": "Balanced"
|
|
}
|
|
|
|
persona = Persona.from_dict("Assistant", data)
|
|
|
|
assert persona.name == "Assistant"
|
|
assert persona.provider == "gemini"
|
|
assert persona.model == "gemini-2.5-flash"
|
|
# Migration logic should have put legacy fields into preferred_models since it only had a string
|
|
assert persona.preferred_models[0]["provider"] == "gemini"
|
|
assert persona.preferred_models[0]["model"] == "gemini-2.5-flash"
|
|
assert persona.system_prompt == "You are a helpful assistant."
|
|
assert persona.temperature == 0.5
|
|
assert persona.top_p == 1.0
|
|
assert persona.max_output_tokens == 8192
|
|
assert persona.tool_preset == "Default"
|
|
assert persona.bias_profile == "Balanced"
|
|
|
|
def test_persona_defaults():
|
|
persona = Persona(name="Minimal", system_prompt="Just the basics")
|
|
assert persona.provider == ""
|
|
assert persona.model == ""
|
|
assert persona.preferred_models == []
|
|
assert persona.temperature == 0.0
|
|
assert persona.tool_preset is None
|
|
|
|
data = persona.to_dict()
|
|
assert "provider" not in data
|
|
assert "preferred_models" not in data
|
|
assert "temperature" not in data
|
|
|
|
loaded = Persona.from_dict("Minimal", data)
|
|
assert loaded.preferred_models == []
|