jpmschweitzerandClaude
78066fab1b
Mechanical only, and separated from the judgment calls that follow so the reviewable changes are not buried in a 98-file whitespace diff. 227 automatic fixes: 60 blank lines carrying whitespace, 60 unsorted import blocks, 34 Optional[X] to X | None, 28 unused imports, 16 deprecated typing imports, 12 datetime.timezone.utc to datetime.UTC, and assorted smaller modernisations. Then `ruff format` over src and tests: 98 files reformatted, 35 already conforming. No file among the unused-import findings defines __all__ or is an __init__.py, so nothing here removes a re-export. `make test`: 658 passed, unchanged from HEAD. Two things observed while verifying, neither addressed here: `pytest tests/` cannot collect — tests/e2e/test_orchestration_e2e.py uses an `e2e` marker that is not registered, and the config is strict about markers. This fails identically at HEAD, so it predates this change; `make test` passes because it ignores tests/e2e, tests/integration and tests/contracts. test_tatlock_tool_call_logging_calculator is flaky. It failed once in a full run with these changes and passed on the next, passes in isolation with them, and fails in isolation at HEAD. It is order- or timing-dependent, not a regression from this commit — established by running the full suite both ways rather than by reasoning about which change could have caused it. Co-Authored-By: Claude <noreply@anthropic.com>
49 lines
903 B
Python
49 lines
903 B
Python
"""
|
|
Ollama API schemas.
|
|
Internal models for Ollama API communication.
|
|
"""
|
|
|
|
from typing import Any
|
|
|
|
from src.core.models import CustomBaseModel
|
|
|
|
|
|
class OllamaMessage(CustomBaseModel):
|
|
"""Message format for Ollama API."""
|
|
|
|
role: str
|
|
content: str
|
|
|
|
|
|
class OllamaChatRequest(CustomBaseModel):
|
|
"""Chat request to Ollama API."""
|
|
|
|
model: str
|
|
messages: list[OllamaMessage]
|
|
stream: bool = False
|
|
options: dict[str, Any] | None = None
|
|
|
|
|
|
class OllamaChatResponse(CustomBaseModel):
|
|
"""Chat response from Ollama API."""
|
|
|
|
model: str
|
|
created_at: str
|
|
message: OllamaMessage
|
|
done: bool
|
|
|
|
|
|
class OllamaModelInfo(CustomBaseModel):
|
|
"""Model information from Ollama."""
|
|
|
|
name: str
|
|
modified_at: str
|
|
size: int
|
|
digest: str
|
|
|
|
|
|
class OllamaModelsResponse(CustomBaseModel):
|
|
"""Response from Ollama models list endpoint."""
|
|
|
|
models: list[OllamaModelInfo]
|