mirror of
https://github.com/Xe138/AI-Trader.git
synced 2026-04-02 09:37:23 -04:00
Compare commits
8 Commits
v0.4.2-alp
...
v0.4.2-alp
| Author | SHA1 | Date | |
|---|---|---|---|
| f1f76b9a99 | |||
| 277714f664 | |||
| db1341e204 | |||
| e5b83839ad | |||
| 4629bb1522 | |||
| f175139863 | |||
| 75a76bbb48 | |||
| fbe383772a |
28
CLAUDE.md
28
CLAUDE.md
@@ -202,6 +202,34 @@ bash main.sh
|
||||
- Search results: News filtered by publication date
|
||||
- All tools enforce temporal boundaries via `TODAY_DATE` from `runtime_env.json`
|
||||
|
||||
### Duplicate Simulation Prevention
|
||||
|
||||
**Automatic Skip Logic:**
|
||||
- `JobManager.create_job()` checks database for already-completed model-day pairs
|
||||
- Skips completed simulations automatically
|
||||
- Returns warnings list with skipped pairs
|
||||
- Raises `ValueError` if all requested simulations are already completed
|
||||
|
||||
**Example:**
|
||||
```python
|
||||
result = job_manager.create_job(
|
||||
config_path="config.json",
|
||||
date_range=["2025-10-15", "2025-10-16"],
|
||||
models=["model-a"],
|
||||
model_day_filter=[("model-a", "2025-10-15")] # Already completed
|
||||
)
|
||||
|
||||
# result = {
|
||||
# "job_id": "new-job-uuid",
|
||||
# "warnings": ["Skipped model-a/2025-10-15 - already completed"]
|
||||
# }
|
||||
```
|
||||
|
||||
**Cross-Job Portfolio Continuity:**
|
||||
- `get_current_position_from_db()` queries across ALL jobs for a given model
|
||||
- Enables portfolio continuity even when new jobs are created with overlapping dates
|
||||
- Starting position = most recent trading_day.ending_cash + holdings where date < current_date
|
||||
|
||||
## Configuration File Format
|
||||
|
||||
```json
|
||||
|
||||
@@ -88,9 +88,28 @@ class ContextInjector:
|
||||
|
||||
# Update position state after successful trade
|
||||
if request.name in ["buy", "sell"]:
|
||||
# Check if result is a valid position dict (not an error)
|
||||
if isinstance(result, dict) and "error" not in result and "CASH" in result:
|
||||
# Debug: Log result type and structure
|
||||
print(f"[DEBUG ContextInjector] Trade result type: {type(result)}")
|
||||
print(f"[DEBUG ContextInjector] Trade result: {result}")
|
||||
|
||||
# Extract position dict from MCP result
|
||||
# MCP tools return CallToolResult objects with structuredContent field
|
||||
position_dict = None
|
||||
if hasattr(result, 'structuredContent') and result.structuredContent:
|
||||
position_dict = result.structuredContent
|
||||
print(f"[DEBUG ContextInjector] Extracted from structuredContent: {position_dict}")
|
||||
elif isinstance(result, dict):
|
||||
position_dict = result
|
||||
print(f"[DEBUG ContextInjector] Using result as dict: {position_dict}")
|
||||
|
||||
# Check if position dict is valid (not an error) and update state
|
||||
if position_dict and "error" not in position_dict and "CASH" in position_dict:
|
||||
# Update our tracked position with the new state
|
||||
self._current_position = result.copy()
|
||||
self._current_position = position_dict.copy()
|
||||
print(f"[DEBUG ContextInjector] Updated _current_position: {self._current_position}")
|
||||
else:
|
||||
print(f"[DEBUG ContextInjector] Did NOT update _current_position - check failed")
|
||||
print(f"[DEBUG ContextInjector] position_dict: {position_dict}")
|
||||
print(f"[DEBUG ContextInjector] _current_position remains: {self._current_position}")
|
||||
|
||||
return result
|
||||
|
||||
@@ -34,8 +34,11 @@ def get_current_position_from_db(
|
||||
Returns ending holdings and cash from that previous day, which becomes the
|
||||
starting position for the current day.
|
||||
|
||||
NOTE: Searches across ALL jobs for the given model, enabling portfolio continuity
|
||||
even when new jobs are created with overlapping date ranges.
|
||||
|
||||
Args:
|
||||
job_id: Job UUID
|
||||
job_id: Job UUID (kept for compatibility but not used in query)
|
||||
model: Model signature
|
||||
date: Current trading date (will query for date < this)
|
||||
initial_cash: Initial cash if no prior data (first trading day)
|
||||
@@ -51,13 +54,14 @@ def get_current_position_from_db(
|
||||
|
||||
try:
|
||||
# Query most recent trading_day BEFORE current date (previous day's ending position)
|
||||
# NOTE: Removed job_id filter to enable cross-job continuity
|
||||
cursor.execute("""
|
||||
SELECT id, ending_cash
|
||||
FROM trading_days
|
||||
WHERE job_id = ? AND model = ? AND date < ?
|
||||
WHERE model = ? AND date < ?
|
||||
ORDER BY date DESC
|
||||
LIMIT 1
|
||||
""", (job_id, model, date))
|
||||
""", (model, date))
|
||||
|
||||
row = cursor.fetchone()
|
||||
|
||||
@@ -128,11 +132,14 @@ def _buy_impl(symbol: str, amount: int, signature: str = None, today_date: str =
|
||||
# Step 1: Get current position
|
||||
# Use injected position if available (for intra-day tracking),
|
||||
# otherwise query database for starting position
|
||||
print(f"[DEBUG buy] _current_position received: {_current_position}")
|
||||
if _current_position is not None:
|
||||
current_position = _current_position
|
||||
next_action_id = 0 # Not used in new schema
|
||||
print(f"[DEBUG buy] Using injected position: {current_position}")
|
||||
else:
|
||||
current_position, next_action_id = get_current_position_from_db(job_id, signature, today_date)
|
||||
print(f"[DEBUG buy] Queried position from DB: {current_position}")
|
||||
|
||||
# Step 2: Get stock price
|
||||
try:
|
||||
@@ -185,6 +192,8 @@ def _buy_impl(symbol: str, amount: int, signature: str = None, today_date: str =
|
||||
|
||||
conn.commit()
|
||||
print(f"[buy] {signature} bought {amount} shares of {symbol} at ${this_symbol_price}")
|
||||
print(f"[DEBUG buy] Returning new_position: {new_position}")
|
||||
print(f"[DEBUG buy] new_position keys: {list(new_position.keys())}")
|
||||
return new_position
|
||||
|
||||
except Exception as e:
|
||||
|
||||
@@ -55,8 +55,9 @@ class JobManager:
|
||||
config_path: str,
|
||||
date_range: List[str],
|
||||
models: List[str],
|
||||
model_day_filter: Optional[List[tuple]] = None
|
||||
) -> str:
|
||||
model_day_filter: Optional[List[tuple]] = None,
|
||||
skip_completed: bool = True
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
Create new simulation job.
|
||||
|
||||
@@ -66,12 +67,16 @@ class JobManager:
|
||||
models: List of model signatures to execute
|
||||
model_day_filter: Optional list of (model, date) tuples to limit job_details.
|
||||
If None, creates job_details for all model-date combinations.
|
||||
skip_completed: If True (default), skips already-completed simulations.
|
||||
If False, includes all requested simulations regardless of completion status.
|
||||
|
||||
Returns:
|
||||
job_id: UUID of created job
|
||||
Dict with:
|
||||
- job_id: UUID of created job
|
||||
- warnings: List of warning messages for skipped simulations
|
||||
|
||||
Raises:
|
||||
ValueError: If another job is already running/pending
|
||||
ValueError: If another job is already running/pending or if all simulations are already completed (when skip_completed=True)
|
||||
"""
|
||||
if not self.can_start_new_job():
|
||||
raise ValueError("Another simulation job is already running or pending")
|
||||
@@ -83,6 +88,49 @@ class JobManager:
|
||||
cursor = conn.cursor()
|
||||
|
||||
try:
|
||||
# Determine which model-day pairs to check
|
||||
if model_day_filter is not None:
|
||||
pairs_to_check = model_day_filter
|
||||
else:
|
||||
pairs_to_check = [(model, date) for date in date_range for model in models]
|
||||
|
||||
# Check for already-completed simulations (only if skip_completed=True)
|
||||
skipped_pairs = []
|
||||
pending_pairs = []
|
||||
|
||||
if skip_completed:
|
||||
# Perform duplicate checking
|
||||
for model, date in pairs_to_check:
|
||||
cursor.execute("""
|
||||
SELECT COUNT(*)
|
||||
FROM job_details
|
||||
WHERE model = ? AND date = ? AND status = 'completed'
|
||||
""", (model, date))
|
||||
|
||||
count = cursor.fetchone()[0]
|
||||
|
||||
if count > 0:
|
||||
skipped_pairs.append((model, date))
|
||||
logger.info(f"Skipping {model}/{date} - already completed in previous job")
|
||||
else:
|
||||
pending_pairs.append((model, date))
|
||||
|
||||
# If all simulations are already completed, raise error
|
||||
if len(pending_pairs) == 0:
|
||||
warnings = [
|
||||
f"Skipped {model}/{date} - already completed"
|
||||
for model, date in skipped_pairs
|
||||
]
|
||||
raise ValueError(
|
||||
f"All requested simulations are already completed. "
|
||||
f"Skipped {len(skipped_pairs)} model-day pair(s). "
|
||||
f"Details: {warnings}"
|
||||
)
|
||||
else:
|
||||
# skip_completed=False: include ALL pairs (no duplicate checking)
|
||||
pending_pairs = pairs_to_check
|
||||
logger.info(f"Including all {len(pending_pairs)} model-day pairs (skip_completed=False)")
|
||||
|
||||
# Insert job
|
||||
cursor.execute("""
|
||||
INSERT INTO jobs (
|
||||
@@ -98,34 +146,32 @@ class JobManager:
|
||||
created_at
|
||||
))
|
||||
|
||||
# Create job_details based on filter
|
||||
if model_day_filter is not None:
|
||||
# Only create job_details for specified model-day pairs
|
||||
for model, date in model_day_filter:
|
||||
cursor.execute("""
|
||||
INSERT INTO job_details (
|
||||
job_id, date, model, status
|
||||
)
|
||||
VALUES (?, ?, ?, ?)
|
||||
""", (job_id, date, model, "pending"))
|
||||
# Create job_details only for pending pairs
|
||||
for model, date in pending_pairs:
|
||||
cursor.execute("""
|
||||
INSERT INTO job_details (
|
||||
job_id, date, model, status
|
||||
)
|
||||
VALUES (?, ?, ?, ?)
|
||||
""", (job_id, date, model, "pending"))
|
||||
|
||||
logger.info(f"Created job {job_id} with {len(model_day_filter)} model-day tasks (filtered)")
|
||||
else:
|
||||
# Create job_details for all model-day combinations
|
||||
for date in date_range:
|
||||
for model in models:
|
||||
cursor.execute("""
|
||||
INSERT INTO job_details (
|
||||
job_id, date, model, status
|
||||
)
|
||||
VALUES (?, ?, ?, ?)
|
||||
""", (job_id, date, model, "pending"))
|
||||
logger.info(f"Created job {job_id} with {len(pending_pairs)} model-day tasks")
|
||||
|
||||
logger.info(f"Created job {job_id} with {len(date_range)} dates and {len(models)} models")
|
||||
if skipped_pairs:
|
||||
logger.info(f"Skipped {len(skipped_pairs)} already-completed simulations")
|
||||
|
||||
conn.commit()
|
||||
|
||||
return job_id
|
||||
# Prepare warnings
|
||||
warnings = [
|
||||
f"Skipped {model}/{date} - already completed"
|
||||
for model, date in skipped_pairs
|
||||
]
|
||||
|
||||
return {
|
||||
"job_id": job_id,
|
||||
"warnings": warnings
|
||||
}
|
||||
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
12
api/main.py
12
api/main.py
@@ -280,12 +280,19 @@ def create_app(
|
||||
|
||||
# Create job immediately with all requested dates
|
||||
# Worker will handle data download and filtering
|
||||
job_id = job_manager.create_job(
|
||||
result = job_manager.create_job(
|
||||
config_path=config_path,
|
||||
date_range=all_dates,
|
||||
models=models_to_run,
|
||||
model_day_filter=None # Worker will filter based on available data
|
||||
model_day_filter=None, # Worker will filter based on available data
|
||||
skip_completed=(not request.replace_existing) # Skip if replace_existing=False
|
||||
)
|
||||
job_id = result["job_id"]
|
||||
warnings = result.get("warnings", [])
|
||||
|
||||
# Log warnings if any simulations were skipped
|
||||
if warnings:
|
||||
logger.warning(f"Job {job_id} created with {len(warnings)} skipped simulations: {warnings}")
|
||||
|
||||
# Start worker in background thread (only if not in test mode)
|
||||
if not getattr(app.state, "test_mode", False):
|
||||
@@ -312,6 +319,7 @@ def create_app(
|
||||
status="pending",
|
||||
total_model_days=len(all_dates) * len(models_to_run),
|
||||
message=message,
|
||||
warnings=warnings if warnings else None,
|
||||
**deployment_info
|
||||
)
|
||||
|
||||
|
||||
@@ -66,3 +66,28 @@ See README.md for architecture diagram.
|
||||
- Search results filtered by publication date
|
||||
|
||||
See [CLAUDE.md](../../CLAUDE.md) for implementation details.
|
||||
|
||||
---
|
||||
|
||||
## Position Tracking Across Jobs
|
||||
|
||||
**Design:** Portfolio state is tracked per-model across all jobs, not per-job.
|
||||
|
||||
**Query Logic:**
|
||||
```python
|
||||
# Get starting position for current trading day
|
||||
SELECT id, ending_cash FROM trading_days
|
||||
WHERE model = ? AND date < ? # No job_id filter
|
||||
ORDER BY date DESC
|
||||
LIMIT 1
|
||||
```
|
||||
|
||||
**Benefits:**
|
||||
- Portfolio continuity when creating new jobs with overlapping dates
|
||||
- Prevents accidental portfolio resets
|
||||
- Enables flexible job scheduling (resume, rerun, backfill)
|
||||
|
||||
**Example:**
|
||||
- Job 1: Runs 2025-10-13 to 2025-10-15 for model-a
|
||||
- Job 2: Runs 2025-10-16 to 2025-10-20 for model-a
|
||||
- Job 2 starts with Job 1's ending position from 2025-10-15
|
||||
|
||||
1172
docs/plans/2025-11-07-fix-duplicate-simulation-bugs.md
Normal file
1172
docs/plans/2025-11-07-fix-duplicate-simulation-bugs.md
Normal file
File diff suppressed because it is too large
Load Diff
@@ -405,11 +405,12 @@ class TestAsyncDownload:
|
||||
db_path = api_client.db_path
|
||||
job_manager = JobManager(db_path=db_path)
|
||||
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="config.json",
|
||||
date_range=["2025-10-01"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Add warnings
|
||||
warnings = ["Rate limited", "Skipped 1 date"]
|
||||
|
||||
@@ -12,11 +12,12 @@ def test_worker_prepares_data_before_execution(tmp_path):
|
||||
job_manager = JobManager(db_path=db_path)
|
||||
|
||||
# Create job
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="configs/default_config.json",
|
||||
date_range=["2025-10-01"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=db_path)
|
||||
|
||||
@@ -46,11 +47,12 @@ def test_worker_handles_no_available_dates(tmp_path):
|
||||
initialize_database(db_path)
|
||||
job_manager = JobManager(db_path=db_path)
|
||||
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="configs/default_config.json",
|
||||
date_range=["2025-10-01"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=db_path)
|
||||
|
||||
@@ -74,11 +76,12 @@ def test_worker_stores_warnings(tmp_path):
|
||||
initialize_database(db_path)
|
||||
job_manager = JobManager(db_path=db_path)
|
||||
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="configs/default_config.json",
|
||||
date_range=["2025-10-01"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=db_path)
|
||||
|
||||
|
||||
278
tests/integration/test_duplicate_simulation_prevention.py
Normal file
278
tests/integration/test_duplicate_simulation_prevention.py
Normal file
@@ -0,0 +1,278 @@
|
||||
"""Integration test for duplicate simulation prevention."""
|
||||
import pytest
|
||||
import tempfile
|
||||
import os
|
||||
import json
|
||||
from pathlib import Path
|
||||
from api.job_manager import JobManager
|
||||
from api.model_day_executor import ModelDayExecutor
|
||||
from api.database import get_db_connection
|
||||
|
||||
|
||||
pytestmark = pytest.mark.integration
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def temp_env(tmp_path):
|
||||
"""Create temporary environment with db and config."""
|
||||
# Create temp database
|
||||
db_path = str(tmp_path / "test_jobs.db")
|
||||
|
||||
# Initialize database
|
||||
conn = get_db_connection(db_path)
|
||||
cursor = conn.cursor()
|
||||
|
||||
# Create schema
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS jobs (
|
||||
job_id TEXT PRIMARY KEY,
|
||||
config_path TEXT NOT NULL,
|
||||
status TEXT NOT NULL,
|
||||
date_range TEXT NOT NULL,
|
||||
models TEXT NOT NULL,
|
||||
created_at TEXT NOT NULL,
|
||||
started_at TEXT,
|
||||
updated_at TEXT,
|
||||
completed_at TEXT,
|
||||
total_duration_seconds REAL,
|
||||
error TEXT,
|
||||
warnings TEXT
|
||||
)
|
||||
""")
|
||||
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS job_details (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
job_id TEXT NOT NULL,
|
||||
date TEXT NOT NULL,
|
||||
model TEXT NOT NULL,
|
||||
status TEXT NOT NULL,
|
||||
started_at TEXT,
|
||||
completed_at TEXT,
|
||||
duration_seconds REAL,
|
||||
error TEXT,
|
||||
FOREIGN KEY (job_id) REFERENCES jobs(job_id) ON DELETE CASCADE,
|
||||
UNIQUE(job_id, date, model)
|
||||
)
|
||||
""")
|
||||
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS trading_days (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
job_id TEXT NOT NULL,
|
||||
model TEXT NOT NULL,
|
||||
date TEXT NOT NULL,
|
||||
starting_cash REAL NOT NULL,
|
||||
ending_cash REAL NOT NULL,
|
||||
profit REAL NOT NULL,
|
||||
return_pct REAL NOT NULL,
|
||||
portfolio_value REAL NOT NULL,
|
||||
reasoning_summary TEXT,
|
||||
reasoning_full TEXT,
|
||||
completed_at TEXT,
|
||||
session_duration_seconds REAL,
|
||||
UNIQUE(job_id, model, date)
|
||||
)
|
||||
""")
|
||||
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS holdings (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
trading_day_id INTEGER NOT NULL,
|
||||
symbol TEXT NOT NULL,
|
||||
quantity INTEGER NOT NULL,
|
||||
FOREIGN KEY (trading_day_id) REFERENCES trading_days(id) ON DELETE CASCADE
|
||||
)
|
||||
""")
|
||||
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS actions (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
trading_day_id INTEGER NOT NULL,
|
||||
action_type TEXT NOT NULL,
|
||||
symbol TEXT NOT NULL,
|
||||
quantity INTEGER NOT NULL,
|
||||
price REAL NOT NULL,
|
||||
created_at TEXT NOT NULL,
|
||||
FOREIGN KEY (trading_day_id) REFERENCES trading_days(id) ON DELETE CASCADE
|
||||
)
|
||||
""")
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
|
||||
# Create mock config
|
||||
config_path = str(tmp_path / "test_config.json")
|
||||
config = {
|
||||
"models": [
|
||||
{
|
||||
"signature": "test-model",
|
||||
"basemodel": "mock/model",
|
||||
"enabled": True
|
||||
}
|
||||
],
|
||||
"agent_config": {
|
||||
"max_steps": 10,
|
||||
"initial_cash": 10000.0
|
||||
},
|
||||
"log_config": {
|
||||
"log_path": str(tmp_path / "logs")
|
||||
},
|
||||
"date_range": {
|
||||
"init_date": "2025-10-13"
|
||||
}
|
||||
}
|
||||
|
||||
with open(config_path, 'w') as f:
|
||||
json.dump(config, f)
|
||||
|
||||
yield {
|
||||
"db_path": db_path,
|
||||
"config_path": config_path,
|
||||
"data_dir": str(tmp_path)
|
||||
}
|
||||
|
||||
|
||||
def test_duplicate_simulation_is_skipped(temp_env):
|
||||
"""Test that overlapping job skips already-completed simulation."""
|
||||
manager = JobManager(db_path=temp_env["db_path"])
|
||||
|
||||
# Create first job
|
||||
result_1 = manager.create_job(
|
||||
config_path=temp_env["config_path"],
|
||||
date_range=["2025-10-15"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id_1 = result_1["job_id"]
|
||||
|
||||
# Simulate completion by manually inserting trading_day record
|
||||
conn = get_db_connection(temp_env["db_path"])
|
||||
cursor = conn.cursor()
|
||||
|
||||
cursor.execute("""
|
||||
INSERT INTO trading_days (
|
||||
job_id, model, date, starting_cash, ending_cash,
|
||||
profit, return_pct, portfolio_value, completed_at
|
||||
)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
""", (
|
||||
job_id_1,
|
||||
"test-model",
|
||||
"2025-10-15",
|
||||
10000.0,
|
||||
9500.0,
|
||||
-500.0,
|
||||
-5.0,
|
||||
9500.0,
|
||||
"2025-11-07T01:00:00Z"
|
||||
))
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
|
||||
# Mark job_detail as completed
|
||||
manager.update_job_detail_status(
|
||||
job_id_1,
|
||||
"2025-10-15",
|
||||
"test-model",
|
||||
"completed"
|
||||
)
|
||||
|
||||
# Try to create second job with same model-day
|
||||
result_2 = manager.create_job(
|
||||
config_path=temp_env["config_path"],
|
||||
date_range=["2025-10-15", "2025-10-16"],
|
||||
models=["test-model"]
|
||||
)
|
||||
|
||||
# Should have warnings about skipped simulation
|
||||
assert len(result_2["warnings"]) == 1
|
||||
assert "2025-10-15" in result_2["warnings"][0]
|
||||
|
||||
# Should only create job_detail for 2025-10-16
|
||||
details = manager.get_job_details(result_2["job_id"])
|
||||
assert len(details) == 1
|
||||
assert details[0]["date"] == "2025-10-16"
|
||||
|
||||
|
||||
def test_portfolio_continues_from_previous_job(temp_env):
|
||||
"""Test that new job continues portfolio from previous job's last day."""
|
||||
manager = JobManager(db_path=temp_env["db_path"])
|
||||
|
||||
# Create and complete first job
|
||||
result_1 = manager.create_job(
|
||||
config_path=temp_env["config_path"],
|
||||
date_range=["2025-10-13"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id_1 = result_1["job_id"]
|
||||
|
||||
# Insert completed trading_day with holdings
|
||||
conn = get_db_connection(temp_env["db_path"])
|
||||
cursor = conn.cursor()
|
||||
|
||||
cursor.execute("""
|
||||
INSERT INTO trading_days (
|
||||
job_id, model, date, starting_cash, ending_cash,
|
||||
profit, return_pct, portfolio_value, completed_at
|
||||
)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
""", (
|
||||
job_id_1,
|
||||
"test-model",
|
||||
"2025-10-13",
|
||||
10000.0,
|
||||
5000.0,
|
||||
0.0,
|
||||
0.0,
|
||||
15000.0,
|
||||
"2025-11-07T01:00:00Z"
|
||||
))
|
||||
|
||||
trading_day_id = cursor.lastrowid
|
||||
|
||||
cursor.execute("""
|
||||
INSERT INTO holdings (trading_day_id, symbol, quantity)
|
||||
VALUES (?, ?, ?)
|
||||
""", (trading_day_id, "AAPL", 10))
|
||||
|
||||
conn.commit()
|
||||
|
||||
# Mark as completed
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-13", "test-model", "completed")
|
||||
manager.update_job_status(job_id_1, "completed")
|
||||
|
||||
# Create second job for next day
|
||||
result_2 = manager.create_job(
|
||||
config_path=temp_env["config_path"],
|
||||
date_range=["2025-10-14"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id_2 = result_2["job_id"]
|
||||
|
||||
# Get starting position for 2025-10-14
|
||||
from agent_tools.tool_trade import get_current_position_from_db
|
||||
import agent_tools.tool_trade as trade_module
|
||||
original_get_db_connection = trade_module.get_db_connection
|
||||
|
||||
def mock_get_db_connection(path):
|
||||
return get_db_connection(temp_env["db_path"])
|
||||
|
||||
trade_module.get_db_connection = mock_get_db_connection
|
||||
|
||||
try:
|
||||
position, _ = get_current_position_from_db(
|
||||
job_id=job_id_2,
|
||||
model="test-model",
|
||||
date="2025-10-14",
|
||||
initial_cash=10000.0
|
||||
)
|
||||
|
||||
# Should continue from job 1's ending position
|
||||
assert position["CASH"] == 5000.0
|
||||
assert position["AAPL"] == 10
|
||||
finally:
|
||||
# Restore original function
|
||||
trade_module.get_db_connection = original_get_db_connection
|
||||
|
||||
conn.close()
|
||||
229
tests/unit/test_cross_job_position_continuity.py
Normal file
229
tests/unit/test_cross_job_position_continuity.py
Normal file
@@ -0,0 +1,229 @@
|
||||
"""Test portfolio continuity across multiple jobs."""
|
||||
import pytest
|
||||
import tempfile
|
||||
import os
|
||||
from agent_tools.tool_trade import get_current_position_from_db
|
||||
from api.database import get_db_connection
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def temp_db():
|
||||
"""Create temporary database with schema."""
|
||||
fd, path = tempfile.mkstemp(suffix='.db')
|
||||
os.close(fd)
|
||||
|
||||
conn = get_db_connection(path)
|
||||
cursor = conn.cursor()
|
||||
|
||||
# Create trading_days table
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS trading_days (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
job_id TEXT NOT NULL,
|
||||
model TEXT NOT NULL,
|
||||
date TEXT NOT NULL,
|
||||
starting_cash REAL NOT NULL,
|
||||
ending_cash REAL NOT NULL,
|
||||
profit REAL NOT NULL,
|
||||
return_pct REAL NOT NULL,
|
||||
portfolio_value REAL NOT NULL,
|
||||
reasoning_summary TEXT,
|
||||
reasoning_full TEXT,
|
||||
completed_at TEXT,
|
||||
session_duration_seconds REAL,
|
||||
UNIQUE(job_id, model, date)
|
||||
)
|
||||
""")
|
||||
|
||||
# Create holdings table
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS holdings (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
trading_day_id INTEGER NOT NULL,
|
||||
symbol TEXT NOT NULL,
|
||||
quantity INTEGER NOT NULL,
|
||||
FOREIGN KEY (trading_day_id) REFERENCES trading_days(id) ON DELETE CASCADE
|
||||
)
|
||||
""")
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
|
||||
yield path
|
||||
|
||||
if os.path.exists(path):
|
||||
os.remove(path)
|
||||
|
||||
|
||||
def test_position_continuity_across_jobs(temp_db):
|
||||
"""Test that position queries see history from previous jobs."""
|
||||
# Insert trading_day from job 1
|
||||
conn = get_db_connection(temp_db)
|
||||
cursor = conn.cursor()
|
||||
|
||||
cursor.execute("""
|
||||
INSERT INTO trading_days (
|
||||
job_id, model, date, starting_cash, ending_cash,
|
||||
profit, return_pct, portfolio_value, completed_at
|
||||
)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
""", (
|
||||
"job-1-uuid",
|
||||
"deepseek-chat-v3.1",
|
||||
"2025-10-14",
|
||||
10000.0,
|
||||
5121.52, # Negative cash from buying
|
||||
0.0,
|
||||
0.0,
|
||||
14993.945,
|
||||
"2025-11-07T01:52:53Z"
|
||||
))
|
||||
|
||||
trading_day_id = cursor.lastrowid
|
||||
|
||||
# Insert holdings from job 1
|
||||
holdings = [
|
||||
("ADBE", 5),
|
||||
("AVGO", 5),
|
||||
("CRWD", 5),
|
||||
("GOOGL", 20),
|
||||
("META", 5),
|
||||
("MSFT", 5),
|
||||
("NVDA", 10)
|
||||
]
|
||||
|
||||
for symbol, quantity in holdings:
|
||||
cursor.execute("""
|
||||
INSERT INTO holdings (trading_day_id, symbol, quantity)
|
||||
VALUES (?, ?, ?)
|
||||
""", (trading_day_id, symbol, quantity))
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
|
||||
# Mock get_db_connection to return our test db
|
||||
import agent_tools.tool_trade as trade_module
|
||||
original_get_db_connection = trade_module.get_db_connection
|
||||
|
||||
def mock_get_db_connection(path):
|
||||
return get_db_connection(temp_db)
|
||||
|
||||
trade_module.get_db_connection = mock_get_db_connection
|
||||
|
||||
try:
|
||||
# Now query position for job 2 on next trading day
|
||||
position, _ = get_current_position_from_db(
|
||||
job_id="job-2-uuid", # Different job
|
||||
model="deepseek-chat-v3.1",
|
||||
date="2025-10-15",
|
||||
initial_cash=10000.0
|
||||
)
|
||||
|
||||
# Should see job 1's ending position, NOT initial $10k
|
||||
assert position["CASH"] == 5121.52
|
||||
assert position["ADBE"] == 5
|
||||
assert position["AVGO"] == 5
|
||||
assert position["CRWD"] == 5
|
||||
assert position["GOOGL"] == 20
|
||||
assert position["META"] == 5
|
||||
assert position["MSFT"] == 5
|
||||
assert position["NVDA"] == 10
|
||||
finally:
|
||||
# Restore original function
|
||||
trade_module.get_db_connection = original_get_db_connection
|
||||
|
||||
|
||||
def test_position_returns_initial_state_for_first_day(temp_db):
|
||||
"""Test that first trading day returns initial cash."""
|
||||
# Mock get_db_connection to return our test db
|
||||
import agent_tools.tool_trade as trade_module
|
||||
original_get_db_connection = trade_module.get_db_connection
|
||||
|
||||
def mock_get_db_connection(path):
|
||||
return get_db_connection(temp_db)
|
||||
|
||||
trade_module.get_db_connection = mock_get_db_connection
|
||||
|
||||
try:
|
||||
# No previous trading days exist
|
||||
position, _ = get_current_position_from_db(
|
||||
job_id="new-job-uuid",
|
||||
model="new-model",
|
||||
date="2025-10-13",
|
||||
initial_cash=10000.0
|
||||
)
|
||||
|
||||
# Should return initial position
|
||||
assert position == {"CASH": 10000.0}
|
||||
finally:
|
||||
# Restore original function
|
||||
trade_module.get_db_connection = original_get_db_connection
|
||||
|
||||
|
||||
def test_position_uses_most_recent_prior_date(temp_db):
|
||||
"""Test that position query uses the most recent date before current."""
|
||||
conn = get_db_connection(temp_db)
|
||||
cursor = conn.cursor()
|
||||
|
||||
# Insert two trading days
|
||||
cursor.execute("""
|
||||
INSERT INTO trading_days (
|
||||
job_id, model, date, starting_cash, ending_cash,
|
||||
profit, return_pct, portfolio_value, completed_at
|
||||
)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
""", (
|
||||
"job-1",
|
||||
"model-a",
|
||||
"2025-10-13",
|
||||
10000.0,
|
||||
9500.0,
|
||||
-500.0,
|
||||
-5.0,
|
||||
9500.0,
|
||||
"2025-11-07T01:00:00Z"
|
||||
))
|
||||
|
||||
cursor.execute("""
|
||||
INSERT INTO trading_days (
|
||||
job_id, model, date, starting_cash, ending_cash,
|
||||
profit, return_pct, portfolio_value, completed_at
|
||||
)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
""", (
|
||||
"job-2",
|
||||
"model-a",
|
||||
"2025-10-14",
|
||||
9500.0,
|
||||
12000.0,
|
||||
2500.0,
|
||||
26.3,
|
||||
12000.0,
|
||||
"2025-11-07T02:00:00Z"
|
||||
))
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
|
||||
# Mock get_db_connection to return our test db
|
||||
import agent_tools.tool_trade as trade_module
|
||||
original_get_db_connection = trade_module.get_db_connection
|
||||
|
||||
def mock_get_db_connection(path):
|
||||
return get_db_connection(temp_db)
|
||||
|
||||
trade_module.get_db_connection = mock_get_db_connection
|
||||
|
||||
try:
|
||||
# Query for 2025-10-15 should use 2025-10-14's ending position
|
||||
position, _ = get_current_position_from_db(
|
||||
job_id="job-3",
|
||||
model="model-a",
|
||||
date="2025-10-15",
|
||||
initial_cash=10000.0
|
||||
)
|
||||
|
||||
assert position["CASH"] == 12000.0 # From 2025-10-14, not 2025-10-13
|
||||
finally:
|
||||
# Restore original function
|
||||
trade_module.get_db_connection = original_get_db_connection
|
||||
@@ -26,11 +26,12 @@ class TestJobCreation:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16", "2025-01-17"],
|
||||
models=["gpt-5", "claude-3.7-sonnet"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
assert job_id is not None
|
||||
job = manager.get_job(job_id)
|
||||
@@ -44,11 +45,12 @@ class TestJobCreation:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16", "2025-01-17"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
progress = manager.get_job_progress(job_id)
|
||||
assert progress["total_model_days"] == 2 # 2 dates × 1 model
|
||||
@@ -60,11 +62,12 @@ class TestJobCreation:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job1_id = manager.create_job(
|
||||
job1_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-16"],
|
||||
["gpt-5"]
|
||||
)
|
||||
job1_id = job1_result["job_id"]
|
||||
|
||||
with pytest.raises(ValueError, match="Another simulation job is already running"):
|
||||
manager.create_job(
|
||||
@@ -78,20 +81,22 @@ class TestJobCreation:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job1_id = manager.create_job(
|
||||
job1_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-16"],
|
||||
["gpt-5"]
|
||||
)
|
||||
job1_id = job1_result["job_id"]
|
||||
|
||||
manager.update_job_status(job1_id, "completed")
|
||||
|
||||
# Now second job should be allowed
|
||||
job2_id = manager.create_job(
|
||||
job2_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-17"],
|
||||
["gpt-5"]
|
||||
)
|
||||
job2_id = job2_result["job_id"]
|
||||
assert job2_id is not None
|
||||
|
||||
|
||||
@@ -104,11 +109,12 @@ class TestJobStatusTransitions:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-16"],
|
||||
["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Update detail to running
|
||||
manager.update_job_detail_status(job_id, "2025-01-16", "gpt-5", "running")
|
||||
@@ -122,11 +128,12 @@ class TestJobStatusTransitions:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-16"],
|
||||
["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
manager.update_job_detail_status(job_id, "2025-01-16", "gpt-5", "running")
|
||||
manager.update_job_detail_status(job_id, "2025-01-16", "gpt-5", "completed")
|
||||
@@ -141,11 +148,12 @@ class TestJobStatusTransitions:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-16"],
|
||||
["gpt-5", "claude-3.7-sonnet"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# First model succeeds
|
||||
manager.update_job_detail_status(job_id, "2025-01-16", "gpt-5", "running")
|
||||
@@ -183,10 +191,12 @@ class TestJobRetrieval:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job1_id = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job1_result = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job1_id = job1_result["job_id"]
|
||||
manager.update_job_status(job1_id, "completed")
|
||||
|
||||
job2_id = manager.create_job("configs/test.json", ["2025-01-17"], ["gpt-5"])
|
||||
job2_result = manager.create_job("configs/test.json", ["2025-01-17"], ["gpt-5"])
|
||||
job2_id = job2_result["job_id"]
|
||||
|
||||
current = manager.get_current_job()
|
||||
assert current["job_id"] == job2_id
|
||||
@@ -204,11 +214,12 @@ class TestJobRetrieval:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-16", "2025-01-17"],
|
||||
["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
found = manager.find_job_by_date_range(["2025-01-16", "2025-01-17"])
|
||||
assert found["job_id"] == job_id
|
||||
@@ -237,11 +248,12 @@ class TestJobProgress:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-16", "2025-01-17"],
|
||||
["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
progress = manager.get_job_progress(job_id)
|
||||
assert progress["total_model_days"] == 2
|
||||
@@ -254,11 +266,12 @@ class TestJobProgress:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-16"],
|
||||
["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
manager.update_job_detail_status(job_id, "2025-01-16", "gpt-5", "running")
|
||||
|
||||
@@ -270,11 +283,12 @@ class TestJobProgress:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
"configs/test.json",
|
||||
["2025-01-16"],
|
||||
["gpt-5", "claude-3.7-sonnet"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
manager.update_job_detail_status(job_id, "2025-01-16", "gpt-5", "completed")
|
||||
|
||||
@@ -311,7 +325,8 @@ class TestConcurrencyControl:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job_result = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job_id = job_result["job_id"]
|
||||
manager.update_job_status(job_id, "running")
|
||||
|
||||
assert manager.can_start_new_job() is False
|
||||
@@ -321,7 +336,8 @@ class TestConcurrencyControl:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job_result = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job_id = job_result["job_id"]
|
||||
manager.update_job_status(job_id, "completed")
|
||||
|
||||
assert manager.can_start_new_job() is True
|
||||
@@ -331,13 +347,15 @@ class TestConcurrencyControl:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job1_id = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job1_result = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job1_id = job1_result["job_id"]
|
||||
|
||||
# Complete first job
|
||||
manager.update_job_status(job1_id, "completed")
|
||||
|
||||
# Create second job
|
||||
job2_id = manager.create_job("configs/test.json", ["2025-01-17"], ["gpt-5"])
|
||||
job2_result = manager.create_job("configs/test.json", ["2025-01-17"], ["gpt-5"])
|
||||
job2_id = job2_result["job_id"]
|
||||
|
||||
running = manager.get_running_jobs()
|
||||
assert len(running) == 1
|
||||
@@ -368,12 +386,13 @@ class TestJobCleanup:
|
||||
conn.close()
|
||||
|
||||
# Create recent job
|
||||
recent_id = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
recent_result = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
recent_id = recent_result["job_id"]
|
||||
|
||||
# Cleanup jobs older than 30 days
|
||||
result = manager.cleanup_old_jobs(days=30)
|
||||
cleanup_result = manager.cleanup_old_jobs(days=30)
|
||||
|
||||
assert result["jobs_deleted"] == 1
|
||||
assert cleanup_result["jobs_deleted"] == 1
|
||||
assert manager.get_job("old-job") is None
|
||||
assert manager.get_job(recent_id) is not None
|
||||
|
||||
@@ -387,7 +406,8 @@ class TestJobUpdateOperations:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job_result = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
manager.update_job_status(job_id, "failed", error="MCP service unavailable")
|
||||
|
||||
@@ -401,7 +421,8 @@ class TestJobUpdateOperations:
|
||||
import time
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job_result = manager.create_job("configs/test.json", ["2025-01-16"], ["gpt-5"])
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Start
|
||||
manager.update_job_detail_status(job_id, "2025-01-16", "gpt-5", "running")
|
||||
@@ -432,11 +453,12 @@ class TestJobWarnings:
|
||||
job_manager = JobManager(db_path=clean_db)
|
||||
|
||||
# Create a job
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="config.json",
|
||||
date_range=["2025-10-01"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Add warnings
|
||||
warnings = ["Rate limit reached", "Skipped 2 dates"]
|
||||
@@ -457,11 +479,12 @@ class TestStaleJobCleanup:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16", "2025-01-17"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Job is pending - simulate container restart
|
||||
result = manager.cleanup_stale_jobs()
|
||||
@@ -478,11 +501,12 @@ class TestStaleJobCleanup:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16", "2025-01-17"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mark job as running and complete one model-day
|
||||
manager.update_job_status(job_id, "running")
|
||||
@@ -502,11 +526,12 @@ class TestStaleJobCleanup:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mark as downloading data
|
||||
manager.update_job_status(job_id, "downloading_data")
|
||||
@@ -524,11 +549,12 @@ class TestStaleJobCleanup:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16", "2025-01-17"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mark job as running, one detail running, one pending
|
||||
manager.update_job_status(job_id, "running")
|
||||
@@ -552,11 +578,12 @@ class TestStaleJobCleanup:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Complete the job
|
||||
manager.update_job_detail_status(job_id, "2025-01-16", "gpt-5", "completed")
|
||||
@@ -575,28 +602,31 @@ class TestStaleJobCleanup:
|
||||
manager = JobManager(db_path=clean_db)
|
||||
|
||||
# Create first job
|
||||
job1_id = manager.create_job(
|
||||
job1_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job1_id = job1_result["job_id"]
|
||||
manager.update_job_status(job1_id, "running")
|
||||
manager.update_job_status(job1_id, "completed")
|
||||
|
||||
# Create second job (pending)
|
||||
job2_id = manager.create_job(
|
||||
job2_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-17"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job2_id = job2_result["job_id"]
|
||||
|
||||
# Create third job (running)
|
||||
manager.update_job_status(job2_id, "completed")
|
||||
job3_id = manager.create_job(
|
||||
job3_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-18"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job3_id = job3_result["job_id"]
|
||||
manager.update_job_status(job3_id, "running")
|
||||
|
||||
# Simulate container restart
|
||||
|
||||
256
tests/unit/test_job_manager_duplicate_detection.py
Normal file
256
tests/unit/test_job_manager_duplicate_detection.py
Normal file
@@ -0,0 +1,256 @@
|
||||
"""Test duplicate detection in job creation."""
|
||||
import pytest
|
||||
import tempfile
|
||||
import os
|
||||
from pathlib import Path
|
||||
from api.job_manager import JobManager
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def temp_db():
|
||||
"""Create temporary database for testing."""
|
||||
fd, path = tempfile.mkstemp(suffix='.db')
|
||||
os.close(fd)
|
||||
|
||||
# Initialize schema
|
||||
from api.database import get_db_connection
|
||||
conn = get_db_connection(path)
|
||||
cursor = conn.cursor()
|
||||
|
||||
# Create jobs table
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS jobs (
|
||||
job_id TEXT PRIMARY KEY,
|
||||
config_path TEXT NOT NULL,
|
||||
status TEXT NOT NULL,
|
||||
date_range TEXT NOT NULL,
|
||||
models TEXT NOT NULL,
|
||||
created_at TEXT NOT NULL,
|
||||
started_at TEXT,
|
||||
updated_at TEXT,
|
||||
completed_at TEXT,
|
||||
total_duration_seconds REAL,
|
||||
error TEXT,
|
||||
warnings TEXT
|
||||
)
|
||||
""")
|
||||
|
||||
# Create job_details table
|
||||
cursor.execute("""
|
||||
CREATE TABLE IF NOT EXISTS job_details (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
job_id TEXT NOT NULL,
|
||||
date TEXT NOT NULL,
|
||||
model TEXT NOT NULL,
|
||||
status TEXT NOT NULL,
|
||||
started_at TEXT,
|
||||
completed_at TEXT,
|
||||
duration_seconds REAL,
|
||||
error TEXT,
|
||||
FOREIGN KEY (job_id) REFERENCES jobs(job_id) ON DELETE CASCADE,
|
||||
UNIQUE(job_id, date, model)
|
||||
)
|
||||
""")
|
||||
|
||||
conn.commit()
|
||||
conn.close()
|
||||
|
||||
yield path
|
||||
|
||||
# Cleanup
|
||||
if os.path.exists(path):
|
||||
os.remove(path)
|
||||
|
||||
|
||||
def test_create_job_with_filter_skips_completed_simulations(temp_db):
|
||||
"""Test that job creation with model_day_filter skips already-completed pairs."""
|
||||
manager = JobManager(db_path=temp_db)
|
||||
|
||||
# Create first job and mark model-day as completed
|
||||
result_1 = manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15", "2025-10-16"],
|
||||
models=["deepseek-chat-v3.1"],
|
||||
model_day_filter=[("deepseek-chat-v3.1", "2025-10-15")]
|
||||
)
|
||||
job_id_1 = result_1["job_id"]
|
||||
|
||||
# Mark as completed
|
||||
manager.update_job_detail_status(
|
||||
job_id_1,
|
||||
"2025-10-15",
|
||||
"deepseek-chat-v3.1",
|
||||
"completed"
|
||||
)
|
||||
|
||||
# Try to create second job with overlapping date
|
||||
model_day_filter = [
|
||||
("deepseek-chat-v3.1", "2025-10-15"), # Already completed
|
||||
("deepseek-chat-v3.1", "2025-10-16") # Not yet completed
|
||||
]
|
||||
|
||||
result_2 = manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15", "2025-10-16"],
|
||||
models=["deepseek-chat-v3.1"],
|
||||
model_day_filter=model_day_filter
|
||||
)
|
||||
job_id_2 = result_2["job_id"]
|
||||
|
||||
# Get job details for second job
|
||||
details = manager.get_job_details(job_id_2)
|
||||
|
||||
# Should only have 2025-10-16 (2025-10-15 was skipped as already completed)
|
||||
assert len(details) == 1
|
||||
assert details[0]["date"] == "2025-10-16"
|
||||
assert details[0]["model"] == "deepseek-chat-v3.1"
|
||||
|
||||
|
||||
def test_create_job_without_filter_skips_all_completed_simulations(temp_db):
|
||||
"""Test that job creation without filter skips all completed model-day pairs."""
|
||||
manager = JobManager(db_path=temp_db)
|
||||
|
||||
# Create first job and complete some model-days
|
||||
result_1 = manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15"],
|
||||
models=["model-a", "model-b"]
|
||||
)
|
||||
job_id_1 = result_1["job_id"]
|
||||
|
||||
# Mark model-a/2025-10-15 as completed
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-15", "model-a", "completed")
|
||||
# Mark model-b/2025-10-15 as failed to complete the job
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-15", "model-b", "failed")
|
||||
|
||||
# Create second job with same date range and models
|
||||
result_2 = manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15", "2025-10-16"],
|
||||
models=["model-a", "model-b"]
|
||||
)
|
||||
job_id_2 = result_2["job_id"]
|
||||
|
||||
# Get job details for second job
|
||||
details = manager.get_job_details(job_id_2)
|
||||
|
||||
# Should have 3 entries (skip only completed model-a/2025-10-15):
|
||||
# - model-b/2025-10-15 (failed in job 1, so not skipped - retry)
|
||||
# - model-a/2025-10-16 (new date)
|
||||
# - model-b/2025-10-16 (new date)
|
||||
assert len(details) == 3
|
||||
|
||||
dates_models = [(d["date"], d["model"]) for d in details]
|
||||
assert ("2025-10-15", "model-a") not in dates_models # Skipped (completed)
|
||||
assert ("2025-10-15", "model-b") in dates_models # NOT skipped (failed, not completed)
|
||||
assert ("2025-10-16", "model-a") in dates_models
|
||||
assert ("2025-10-16", "model-b") in dates_models
|
||||
|
||||
|
||||
def test_create_job_returns_warnings_for_skipped_simulations(temp_db):
|
||||
"""Test that skipped simulations are returned as warnings."""
|
||||
manager = JobManager(db_path=temp_db)
|
||||
|
||||
# Create and complete first simulation
|
||||
result_1 = manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15"],
|
||||
models=["model-a"]
|
||||
)
|
||||
job_id_1 = result_1["job_id"]
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-15", "model-a", "completed")
|
||||
|
||||
# Try to create job with overlapping date (one completed, one new)
|
||||
result = manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15", "2025-10-16"], # Add new date
|
||||
models=["model-a"]
|
||||
)
|
||||
|
||||
# Result should be a dict with job_id and warnings
|
||||
assert isinstance(result, dict)
|
||||
assert "job_id" in result
|
||||
assert "warnings" in result
|
||||
assert len(result["warnings"]) == 1
|
||||
assert "model-a" in result["warnings"][0]
|
||||
assert "2025-10-15" in result["warnings"][0]
|
||||
|
||||
# Verify job_details only has the new date
|
||||
details = manager.get_job_details(result["job_id"])
|
||||
assert len(details) == 1
|
||||
assert details[0]["date"] == "2025-10-16"
|
||||
|
||||
|
||||
def test_create_job_raises_error_when_all_simulations_completed(temp_db):
|
||||
"""Test that ValueError is raised when ALL requested simulations are already completed."""
|
||||
manager = JobManager(db_path=temp_db)
|
||||
|
||||
# Create and complete first simulation
|
||||
result_1 = manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15", "2025-10-16"],
|
||||
models=["model-a", "model-b"]
|
||||
)
|
||||
job_id_1 = result_1["job_id"]
|
||||
|
||||
# Mark all model-days as completed
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-15", "model-a", "completed")
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-15", "model-b", "completed")
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-16", "model-a", "completed")
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-16", "model-b", "completed")
|
||||
|
||||
# Try to create job with same date range and models (all already completed)
|
||||
with pytest.raises(ValueError) as exc_info:
|
||||
manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15", "2025-10-16"],
|
||||
models=["model-a", "model-b"]
|
||||
)
|
||||
|
||||
# Verify error message contains expected text
|
||||
error_message = str(exc_info.value)
|
||||
assert "All requested simulations are already completed" in error_message
|
||||
assert "Skipped 4 model-day pair(s)" in error_message
|
||||
|
||||
|
||||
def test_create_job_with_skip_completed_false_includes_all_simulations(temp_db):
|
||||
"""Test that skip_completed=False includes ALL simulations, even already-completed ones."""
|
||||
manager = JobManager(db_path=temp_db)
|
||||
|
||||
# Create first job and complete some model-days
|
||||
result_1 = manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15", "2025-10-16"],
|
||||
models=["model-a", "model-b"]
|
||||
)
|
||||
job_id_1 = result_1["job_id"]
|
||||
|
||||
# Mark all model-days as completed
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-15", "model-a", "completed")
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-15", "model-b", "completed")
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-16", "model-a", "completed")
|
||||
manager.update_job_detail_status(job_id_1, "2025-10-16", "model-b", "completed")
|
||||
|
||||
# Create second job with skip_completed=False
|
||||
result_2 = manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-15", "2025-10-16"],
|
||||
models=["model-a", "model-b"],
|
||||
skip_completed=False
|
||||
)
|
||||
job_id_2 = result_2["job_id"]
|
||||
|
||||
# Get job details for second job
|
||||
details = manager.get_job_details(job_id_2)
|
||||
|
||||
# Should have ALL 4 model-day pairs (no skipping)
|
||||
assert len(details) == 4
|
||||
|
||||
dates_models = [(d["date"], d["model"]) for d in details]
|
||||
assert ("2025-10-15", "model-a") in dates_models
|
||||
assert ("2025-10-15", "model-b") in dates_models
|
||||
assert ("2025-10-16", "model-a") in dates_models
|
||||
assert ("2025-10-16", "model-b") in dates_models
|
||||
|
||||
# Verify no warnings were returned
|
||||
assert result_2.get("warnings") == []
|
||||
@@ -41,11 +41,12 @@ class TestSkipStatusDatabase:
|
||||
def test_skipped_status_allowed_in_job_details(self, job_manager):
|
||||
"""Test job_details accepts 'skipped' status without constraint violation."""
|
||||
# Create job
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01", "2025-10-02"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mark a detail as skipped - should not raise constraint violation
|
||||
job_manager.update_job_detail_status(
|
||||
@@ -70,11 +71,12 @@ class TestJobCompletionWithSkipped:
|
||||
def test_job_completes_with_all_dates_skipped(self, job_manager):
|
||||
"""Test job transitions to completed when all dates are skipped."""
|
||||
# Create job with 3 dates
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01", "2025-10-02", "2025-10-03"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mark all as skipped
|
||||
for date in ["2025-10-01", "2025-10-02", "2025-10-03"]:
|
||||
@@ -93,11 +95,12 @@ class TestJobCompletionWithSkipped:
|
||||
|
||||
def test_job_completes_with_mixed_completed_and_skipped(self, job_manager):
|
||||
"""Test job completes when some dates completed, some skipped."""
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01", "2025-10-02", "2025-10-03"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mark some completed, some skipped
|
||||
job_manager.update_job_detail_status(
|
||||
@@ -119,11 +122,12 @@ class TestJobCompletionWithSkipped:
|
||||
|
||||
def test_job_partial_with_mixed_completed_failed_skipped(self, job_manager):
|
||||
"""Test job status 'partial' when some failed, some completed, some skipped."""
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01", "2025-10-02", "2025-10-03"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mix of statuses
|
||||
job_manager.update_job_detail_status(
|
||||
@@ -145,11 +149,12 @@ class TestJobCompletionWithSkipped:
|
||||
|
||||
def test_job_remains_running_with_pending_dates(self, job_manager):
|
||||
"""Test job stays running when some dates are still pending."""
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01", "2025-10-02", "2025-10-03"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Only mark some as terminal states
|
||||
job_manager.update_job_detail_status(
|
||||
@@ -173,11 +178,12 @@ class TestProgressTrackingWithSkipped:
|
||||
|
||||
def test_progress_includes_skipped_count(self, job_manager):
|
||||
"""Test get_job_progress returns skipped count."""
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01", "2025-10-02", "2025-10-03", "2025-10-04"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Set various statuses
|
||||
job_manager.update_job_detail_status(
|
||||
@@ -205,11 +211,12 @@ class TestProgressTrackingWithSkipped:
|
||||
|
||||
def test_progress_all_skipped(self, job_manager):
|
||||
"""Test progress when all dates are skipped."""
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01", "2025-10-02"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mark all as skipped
|
||||
for date in ["2025-10-01", "2025-10-02"]:
|
||||
@@ -231,11 +238,12 @@ class TestMultiModelSkipHandling:
|
||||
|
||||
def test_different_models_different_skip_states(self, job_manager):
|
||||
"""Test that different models can have different skip states for same date."""
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01", "2025-10-02"],
|
||||
models=["model-a", "model-b"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Model A: 10/1 skipped (already completed), 10/2 completed
|
||||
job_manager.update_job_detail_status(
|
||||
@@ -276,11 +284,12 @@ class TestMultiModelSkipHandling:
|
||||
|
||||
def test_job_completes_with_per_model_skips(self, job_manager):
|
||||
"""Test job completes when different models have different skip patterns."""
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01", "2025-10-02"],
|
||||
models=["model-a", "model-b"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Model A: one skipped, one completed
|
||||
job_manager.update_job_detail_status(
|
||||
@@ -318,11 +327,12 @@ class TestSkipReasons:
|
||||
|
||||
def test_skip_reason_already_completed(self, job_manager):
|
||||
"""Test 'Already completed' skip reason is stored."""
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-01"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
job_manager.update_job_detail_status(
|
||||
job_id=job_id, date="2025-10-01", model="test-model",
|
||||
@@ -334,11 +344,12 @@ class TestSkipReasons:
|
||||
|
||||
def test_skip_reason_incomplete_price_data(self, job_manager):
|
||||
"""Test 'Incomplete price data' skip reason is stored."""
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="test_config.json",
|
||||
date_range=["2025-10-04"],
|
||||
models=["test-model"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
job_manager.update_job_detail_status(
|
||||
job_id=job_id, date="2025-10-04", model="test-model",
|
||||
|
||||
@@ -112,11 +112,12 @@ class TestModelDayExecutorExecution:
|
||||
|
||||
# Create job and job_detail
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path=str(config_path),
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mock agent execution
|
||||
mock_agent = create_mock_agent(
|
||||
@@ -156,11 +157,12 @@ class TestModelDayExecutorExecution:
|
||||
|
||||
# Create job
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mock agent to raise error
|
||||
with patch("api.model_day_executor.RuntimeConfigManager") as mock_runtime:
|
||||
@@ -212,11 +214,12 @@ class TestModelDayExecutorDataPersistence:
|
||||
|
||||
# Create job
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path=str(config_path),
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mock successful execution (no trades)
|
||||
mock_agent = create_mock_agent(
|
||||
@@ -269,11 +272,12 @@ class TestModelDayExecutorDataPersistence:
|
||||
|
||||
# Create job
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
# Mock execution with reasoning
|
||||
mock_agent = create_mock_agent(
|
||||
@@ -320,11 +324,12 @@ class TestModelDayExecutorCleanup:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
mock_agent = create_mock_agent(
|
||||
session_result={"success": True}
|
||||
@@ -355,11 +360,12 @@ class TestModelDayExecutorCleanup:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
with patch("api.model_day_executor.RuntimeConfigManager") as mock_runtime:
|
||||
mock_instance = Mock()
|
||||
|
||||
@@ -41,11 +41,12 @@ class TestSimulationWorkerExecution:
|
||||
|
||||
# Create job with 2 dates and 2 models = 4 model-days
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16", "2025-01-17"],
|
||||
models=["gpt-5", "claude-3.7-sonnet"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=clean_db)
|
||||
|
||||
@@ -73,11 +74,12 @@ class TestSimulationWorkerExecution:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16", "2025-01-17"],
|
||||
models=["gpt-5", "claude-3.7-sonnet"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=clean_db)
|
||||
|
||||
@@ -118,11 +120,12 @@ class TestSimulationWorkerExecution:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=clean_db)
|
||||
|
||||
@@ -159,11 +162,12 @@ class TestSimulationWorkerExecution:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5", "claude-3.7-sonnet"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=clean_db)
|
||||
|
||||
@@ -214,11 +218,12 @@ class TestSimulationWorkerErrorHandling:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5", "claude-3.7-sonnet", "gemini"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=clean_db)
|
||||
|
||||
@@ -259,11 +264,12 @@ class TestSimulationWorkerErrorHandling:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=clean_db)
|
||||
|
||||
@@ -289,11 +295,12 @@ class TestSimulationWorkerConcurrency:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16"],
|
||||
models=["gpt-5", "claude-3.7-sonnet"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=clean_db)
|
||||
|
||||
@@ -335,11 +342,12 @@ class TestSimulationWorkerJobRetrieval:
|
||||
from api.job_manager import JobManager
|
||||
|
||||
manager = JobManager(db_path=clean_db)
|
||||
job_id = manager.create_job(
|
||||
job_result = manager.create_job(
|
||||
config_path="configs/test.json",
|
||||
date_range=["2025-01-16", "2025-01-17"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=clean_db)
|
||||
job_info = worker.get_job_info()
|
||||
@@ -469,11 +477,12 @@ class TestSimulationWorkerHelperMethods:
|
||||
job_manager = JobManager(db_path=db_path)
|
||||
|
||||
# Create job
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="config.json",
|
||||
date_range=["2025-10-01"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=db_path)
|
||||
|
||||
@@ -498,11 +507,12 @@ class TestSimulationWorkerHelperMethods:
|
||||
job_manager = JobManager(db_path=db_path)
|
||||
|
||||
# Create job
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="config.json",
|
||||
date_range=["2025-10-01"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=db_path)
|
||||
|
||||
@@ -545,11 +555,12 @@ class TestSimulationWorkerHelperMethods:
|
||||
initialize_database(db_path)
|
||||
job_manager = JobManager(db_path=db_path)
|
||||
|
||||
job_id = job_manager.create_job(
|
||||
job_result = job_manager.create_job(
|
||||
config_path="config.json",
|
||||
date_range=["2025-10-01"],
|
||||
models=["gpt-5"]
|
||||
)
|
||||
job_id = job_result["job_id"]
|
||||
|
||||
worker = SimulationWorker(job_id=job_id, db_path=db_path)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user