2026-03-07 23:44:56 -05:00
|
|
|
"""Test that Ollama model is created with a generous timeout.
|
2026-03-07 23:21:30 -05:00
|
|
|
|
|
|
|
|
The default httpx timeout is too short for complex prompts (30-60s generation).
|
2026-03-07 23:44:56 -05:00
|
|
|
This caused socket read errors in production. The agno Ollama class uses
|
|
|
|
|
``timeout`` (not ``request_timeout``).
|
2026-03-07 23:21:30 -05:00
|
|
|
"""
|
|
|
|
|
|
2026-03-09 21:54:04 -04:00
|
|
|
import importlib
|
2026-03-08 12:50:44 -04:00
|
|
|
from unittest.mock import MagicMock, patch
|
2026-03-07 23:21:30 -05:00
|
|
|
|
|
|
|
|
|
2026-03-07 23:44:56 -05:00
|
|
|
def test_base_agent_sets_timeout():
|
|
|
|
|
"""BaseAgent creates Ollama with timeout=300."""
|
2026-03-09 21:54:04 -04:00
|
|
|
# Ensure module is loaded before patching — prevents xdist ordering issues
|
|
|
|
|
importlib.import_module("timmy.agents.base")
|
|
|
|
|
|
2026-03-08 12:50:44 -04:00
|
|
|
with patch("timmy.agents.base.Ollama") as mock_ollama, patch("timmy.agents.base.Agent"):
|
2026-03-07 23:21:30 -05:00
|
|
|
mock_ollama.return_value = MagicMock()
|
|
|
|
|
|
|
|
|
|
# Import after patching to get the patched version
|
|
|
|
|
from timmy.agents.base import BaseAgent
|
|
|
|
|
|
|
|
|
|
class ConcreteAgent(BaseAgent):
|
|
|
|
|
async def handle_message(self, message: str) -> str:
|
|
|
|
|
return ""
|
|
|
|
|
|
|
|
|
|
# Trigger Ollama construction
|
|
|
|
|
try:
|
|
|
|
|
ConcreteAgent(
|
|
|
|
|
agent_id="test",
|
|
|
|
|
name="Test",
|
|
|
|
|
role="tester",
|
|
|
|
|
system_prompt="You are a test agent.",
|
|
|
|
|
tools=[],
|
|
|
|
|
)
|
|
|
|
|
except Exception:
|
|
|
|
|
pass # MCP registry may not be available
|
|
|
|
|
|
2026-03-07 23:44:56 -05:00
|
|
|
# Verify Ollama was called with timeout
|
2026-03-07 23:21:30 -05:00
|
|
|
if mock_ollama.called:
|
|
|
|
|
_, kwargs = mock_ollama.call_args
|
ruff (#169)
* polish: streamline nav, extract inline styles, improve tablet UX
- Restructure desktop nav from 8+ flat links + overflow dropdown into
5 grouped dropdowns (Core, Agents, Intel, System, More) matching
the mobile menu structure to reduce decision fatigue
- Extract all inline styles from mission_control.html and base.html
notification elements into mission-control.css with semantic classes
- Replace JS-built innerHTML with secure DOM construction in
notification loader and chat history
- Add CONNECTING state to connection indicator (amber) instead of
showing OFFLINE before WebSocket connects
- Add tablet breakpoint (1024px) with larger touch targets for
Apple Pencil / stylus use and safe-area padding for iPad toolbar
- Add active-link highlighting in desktop dropdown menus
- Rename "Mission Control" page title to "System Overview" to
disambiguate from the chat home page
- Add "Home — Timmy Time" page title to index.html
https://claude.ai/code/session_015uPUoKyYa8M2UAcyk5Gt6h
* fix(security): move auth-gate credentials to environment variables
Hardcoded username, password, and HMAC secret in auth-gate.py replaced
with os.environ lookups. Startup now refuses to run if any variable is
unset. Added AUTH_GATE_SECRET/USER/PASS to .env.example.
https://claude.ai/code/session_015uPUoKyYa8M2UAcyk5Gt6h
* refactor(tooling): migrate from black+isort+bandit to ruff
Replace three separate linting/formatting tools with a single ruff
invocation. Updates tox.ini (lint, format, pre-push, pre-commit envs),
.pre-commit-config.yaml, and CI workflow. Fixes all ruff errors
including unused imports, missing raise-from, and undefined names.
Ruff config maps existing bandit skips to equivalent S-rules.
https://claude.ai/code/session_015uPUoKyYa8M2UAcyk5Gt6h
---------
Co-authored-by: Claude <noreply@anthropic.com>
2026-03-11 12:23:35 -04:00
|
|
|
assert kwargs.get("timeout") == 300, (
|
|
|
|
|
f"Expected timeout=300, got {kwargs.get('timeout')}"
|
|
|
|
|
)
|
2026-03-07 23:21:30 -05:00
|
|
|
|
|
|
|
|
|
2026-03-07 23:44:56 -05:00
|
|
|
def test_main_agent_sets_timeout():
|
|
|
|
|
"""create_timmy() creates Ollama with timeout=300."""
|
ruff (#169)
* polish: streamline nav, extract inline styles, improve tablet UX
- Restructure desktop nav from 8+ flat links + overflow dropdown into
5 grouped dropdowns (Core, Agents, Intel, System, More) matching
the mobile menu structure to reduce decision fatigue
- Extract all inline styles from mission_control.html and base.html
notification elements into mission-control.css with semantic classes
- Replace JS-built innerHTML with secure DOM construction in
notification loader and chat history
- Add CONNECTING state to connection indicator (amber) instead of
showing OFFLINE before WebSocket connects
- Add tablet breakpoint (1024px) with larger touch targets for
Apple Pencil / stylus use and safe-area padding for iPad toolbar
- Add active-link highlighting in desktop dropdown menus
- Rename "Mission Control" page title to "System Overview" to
disambiguate from the chat home page
- Add "Home — Timmy Time" page title to index.html
https://claude.ai/code/session_015uPUoKyYa8M2UAcyk5Gt6h
* fix(security): move auth-gate credentials to environment variables
Hardcoded username, password, and HMAC secret in auth-gate.py replaced
with os.environ lookups. Startup now refuses to run if any variable is
unset. Added AUTH_GATE_SECRET/USER/PASS to .env.example.
https://claude.ai/code/session_015uPUoKyYa8M2UAcyk5Gt6h
* refactor(tooling): migrate from black+isort+bandit to ruff
Replace three separate linting/formatting tools with a single ruff
invocation. Updates tox.ini (lint, format, pre-push, pre-commit envs),
.pre-commit-config.yaml, and CI workflow. Fixes all ruff errors
including unused imports, missing raise-from, and undefined names.
Ruff config maps existing bandit skips to equivalent S-rules.
https://claude.ai/code/session_015uPUoKyYa8M2UAcyk5Gt6h
---------
Co-authored-by: Claude <noreply@anthropic.com>
2026-03-11 12:23:35 -04:00
|
|
|
with (
|
|
|
|
|
patch("timmy.agent.Ollama") as mock_ollama,
|
|
|
|
|
patch("timmy.agent.SqliteDb"),
|
|
|
|
|
patch("timmy.agent.Agent"),
|
2026-03-15 08:20:00 -04:00
|
|
|
patch("timmy.agent._resolve_model_with_fallback", return_value=("llama3.2:3b", False)),
|
|
|
|
|
patch("timmy.agent._check_model_available", return_value=True),
|
2026-03-08 12:50:44 -04:00
|
|
|
):
|
2026-03-07 23:21:30 -05:00
|
|
|
mock_ollama.return_value = MagicMock()
|
|
|
|
|
|
|
|
|
|
from timmy.agent import create_timmy
|
2026-03-08 12:50:44 -04:00
|
|
|
|
2026-03-07 23:21:30 -05:00
|
|
|
try:
|
|
|
|
|
create_timmy()
|
|
|
|
|
except Exception:
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
if mock_ollama.called:
|
|
|
|
|
_, kwargs = mock_ollama.call_args
|
ruff (#169)
* polish: streamline nav, extract inline styles, improve tablet UX
- Restructure desktop nav from 8+ flat links + overflow dropdown into
5 grouped dropdowns (Core, Agents, Intel, System, More) matching
the mobile menu structure to reduce decision fatigue
- Extract all inline styles from mission_control.html and base.html
notification elements into mission-control.css with semantic classes
- Replace JS-built innerHTML with secure DOM construction in
notification loader and chat history
- Add CONNECTING state to connection indicator (amber) instead of
showing OFFLINE before WebSocket connects
- Add tablet breakpoint (1024px) with larger touch targets for
Apple Pencil / stylus use and safe-area padding for iPad toolbar
- Add active-link highlighting in desktop dropdown menus
- Rename "Mission Control" page title to "System Overview" to
disambiguate from the chat home page
- Add "Home — Timmy Time" page title to index.html
https://claude.ai/code/session_015uPUoKyYa8M2UAcyk5Gt6h
* fix(security): move auth-gate credentials to environment variables
Hardcoded username, password, and HMAC secret in auth-gate.py replaced
with os.environ lookups. Startup now refuses to run if any variable is
unset. Added AUTH_GATE_SECRET/USER/PASS to .env.example.
https://claude.ai/code/session_015uPUoKyYa8M2UAcyk5Gt6h
* refactor(tooling): migrate from black+isort+bandit to ruff
Replace three separate linting/formatting tools with a single ruff
invocation. Updates tox.ini (lint, format, pre-push, pre-commit envs),
.pre-commit-config.yaml, and CI workflow. Fixes all ruff errors
including unused imports, missing raise-from, and undefined names.
Ruff config maps existing bandit skips to equivalent S-rules.
https://claude.ai/code/session_015uPUoKyYa8M2UAcyk5Gt6h
---------
Co-authored-by: Claude <noreply@anthropic.com>
2026-03-11 12:23:35 -04:00
|
|
|
assert kwargs.get("timeout") == 300, (
|
|
|
|
|
f"Expected timeout=300, got {kwargs.get('timeout')}"
|
|
|
|
|
)
|