Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 29925de52d | |||
| 80b18940c3 |
@@ -72,6 +72,12 @@ def cron_list(show_all: bool = False):
|
|||||||
deliver = [deliver]
|
deliver = [deliver]
|
||||||
deliver_str = ", ".join(deliver)
|
deliver_str = ", ".join(deliver)
|
||||||
|
|
||||||
|
model = job.get("model")
|
||||||
|
provider = job.get("provider")
|
||||||
|
model_str = ""
|
||||||
|
if model:
|
||||||
|
model_str = f" @ {provider}/{model}" if provider else f" @ {model}"
|
||||||
|
|
||||||
skills = job.get("skills") or ([job["skill"]] if job.get("skill") else [])
|
skills = job.get("skills") or ([job["skill"]] if job.get("skill") else [])
|
||||||
if state == "paused":
|
if state == "paused":
|
||||||
status = color("[paused]", Colors.YELLOW)
|
status = color("[paused]", Colors.YELLOW)
|
||||||
@@ -168,6 +174,8 @@ def cron_create(args):
|
|||||||
skill=getattr(args, "skill", None),
|
skill=getattr(args, "skill", None),
|
||||||
skills=_normalize_skills(getattr(args, "skill", None), getattr(args, "skills", None)),
|
skills=_normalize_skills(getattr(args, "skill", None), getattr(args, "skills", None)),
|
||||||
script=getattr(args, "script", None),
|
script=getattr(args, "script", None),
|
||||||
|
model=getattr(args, "model", None),
|
||||||
|
provider=getattr(args, "provider", None),
|
||||||
)
|
)
|
||||||
if not result.get("success"):
|
if not result.get("success"):
|
||||||
print(color(f"Failed to create job: {result.get('error', 'unknown error')}", Colors.RED))
|
print(color(f"Failed to create job: {result.get('error', 'unknown error')}", Colors.RED))
|
||||||
@@ -180,6 +188,10 @@ def cron_create(args):
|
|||||||
job_data = result.get("job", {})
|
job_data = result.get("job", {})
|
||||||
if job_data.get("script"):
|
if job_data.get("script"):
|
||||||
print(f" Script: {job_data['script']}")
|
print(f" Script: {job_data['script']}")
|
||||||
|
if job_data.get("model"):
|
||||||
|
provider = job_data.get("provider", "")
|
||||||
|
model_str = f"{provider}/{job_data['model']}" if provider else job_data["model"]
|
||||||
|
print(f" Model: {model_str}")
|
||||||
print(f" Next run: {result['next_run_at']}")
|
print(f" Next run: {result['next_run_at']}")
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
@@ -217,6 +229,8 @@ def cron_edit(args):
|
|||||||
deliver=getattr(args, "deliver", None),
|
deliver=getattr(args, "deliver", None),
|
||||||
repeat=getattr(args, "repeat", None),
|
repeat=getattr(args, "repeat", None),
|
||||||
skills=final_skills,
|
skills=final_skills,
|
||||||
|
model=getattr(args, "model", None),
|
||||||
|
provider=getattr(args, "provider", None),
|
||||||
script=getattr(args, "script", None),
|
script=getattr(args, "script", None),
|
||||||
)
|
)
|
||||||
if not result.get("success"):
|
if not result.get("success"):
|
||||||
|
|||||||
73
tests/test_cron_model_preservation.py
Normal file
73
tests/test_cron_model_preservation.py
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
"""Tests for cron model/provider config preservation (#222)."""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import pytest
|
||||||
|
from unittest.mock import patch, MagicMock
|
||||||
|
|
||||||
|
|
||||||
|
def test_create_job_preserves_model_and_provider():
|
||||||
|
"""create_job should store model and provider in the job dict."""
|
||||||
|
from cron.jobs import create_job, load_jobs, save_jobs
|
||||||
|
import tempfile, os
|
||||||
|
|
||||||
|
with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
|
||||||
|
json.dump([], f)
|
||||||
|
tmp_path = f.name
|
||||||
|
|
||||||
|
try:
|
||||||
|
with patch("cron.jobs._JOBS_FILE", tmp_path):
|
||||||
|
job = create_job(
|
||||||
|
schedule="0 * * * *",
|
||||||
|
prompt="test prompt",
|
||||||
|
model="xiaomi/mimo-v2-pro",
|
||||||
|
provider="nous",
|
||||||
|
)
|
||||||
|
assert job["model"] == "xiaomi/mimo-v2-pro"
|
||||||
|
assert job["provider"] == "nous"
|
||||||
|
|
||||||
|
# Verify persisted
|
||||||
|
jobs = load_jobs()
|
||||||
|
assert jobs[0]["model"] == "xiaomi/mimo-v2-pro"
|
||||||
|
assert jobs[0]["provider"] == "nous"
|
||||||
|
finally:
|
||||||
|
os.unlink(tmp_path)
|
||||||
|
|
||||||
|
|
||||||
|
def test_update_job_preserves_model():
|
||||||
|
"""update_job should preserve model/provider when updating other fields."""
|
||||||
|
from cron.jobs import create_job, update_job
|
||||||
|
|
||||||
|
with patch("cron.jobs._JOBS_FILE", "/tmp/test_cron_jobs.json"):
|
||||||
|
import os
|
||||||
|
if os.path.exists("/tmp/test_cron_jobs.json"):
|
||||||
|
os.unlink("/tmp/test_cron_jobs.json")
|
||||||
|
|
||||||
|
job = create_job(
|
||||||
|
schedule="0 * * * *",
|
||||||
|
prompt="test",
|
||||||
|
model="xiaomi/mimo-v2-pro",
|
||||||
|
provider="nous",
|
||||||
|
)
|
||||||
|
# Update prompt — model should be preserved
|
||||||
|
updated = update_job(job["id"], {"prompt": "new prompt"})
|
||||||
|
assert updated["model"] == "xiaomi/mimo-v2-pro"
|
||||||
|
assert updated["provider"] == "nous"
|
||||||
|
assert updated["prompt"] == "new prompt"
|
||||||
|
|
||||||
|
os.unlink("/tmp/test_cron_jobs.json")
|
||||||
|
|
||||||
|
|
||||||
|
def test_create_job_without_model_is_none():
|
||||||
|
"""create_job without model/provider should store None."""
|
||||||
|
from cron.jobs import create_job
|
||||||
|
|
||||||
|
with patch("cron.jobs._JOBS_FILE", "/tmp/test_cron_none.json"):
|
||||||
|
import os
|
||||||
|
if os.path.exists("/tmp/test_cron_none.json"):
|
||||||
|
os.unlink("/tmp/test_cron_none.json")
|
||||||
|
|
||||||
|
job = create_job(schedule="0 * * * *", prompt="test")
|
||||||
|
assert job["model"] is None
|
||||||
|
assert job["provider"] is None
|
||||||
|
|
||||||
|
os.unlink("/tmp/test_cron_none.json")
|
||||||
Reference in New Issue
Block a user