feat: per-task model/effort/approval + relay models endpoint (#59)
Co-authored-by: host <host@test.local>
This commit is contained in:
openqjandhost authored and GitHub committed
1 parent
cff152c5a2
commit
8b2f3968dc
9 files changed
+521
-16
No files matched your search
@@ -0,0 +1,81 @@
|
||||
"""中转模型列表（cloud/relay.py）单测：只用注入的取数函数，不联网、
|
||||
不碰真 key。"""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from unittest import mock
|
||||
|
||||
try:
|
||||
from cloud.relay import RelayError, get_relay_models
|
||||
from cloud.relay import _reset_cache_for_tests
|
||||
except ImportError:
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
|
||||
from cloud.relay import RelayError, get_relay_models
|
||||
from cloud.relay import _reset_cache_for_tests
|
||||
|
||||
|
||||
class RelayTestCase(unittest.TestCase):
|
||||
def setUp(self):
|
||||
_reset_cache_for_tests()
|
||||
self.env = mock.patch.dict(os.environ, {}, clear=False)
|
||||
self.env.start()
|
||||
os.environ.pop("XCM_API_KEY", None)
|
||||
|
||||
def tearDown(self):
|
||||
self.env.stop()
|
||||
_reset_cache_for_tests()
|
||||
|
||||
def test_parses_ids_and_dedups(self):
|
||||
calls = []
|
||||
|
||||
def fetcher(url, headers, timeout):
|
||||
calls.append((url, headers))
|
||||
return {"data": [{"id": "gpt-6.1-sol"}, {"id": "gpt-6-sol"},
|
||||
{"id": "gpt-6.1-sol"}, {"nope": 1}]}
|
||||
models, cached, _ = get_relay_models(fetcher=fetcher)
|
||||
self.assertEqual(models, ["gpt-6.1-sol", "gpt-6-sol"])
|
||||
self.assertFalse(cached)
|
||||
self.assertTrue(calls[0][0].endswith("/models"))
|
||||
# 注入路径不带 key：响应与请求头里都不应出现密钥字样。
|
||||
self.assertNotIn("Authorization", calls[0][1])
|
||||
self.assertEqual(len(calls), 1)
|
||||
|
||||
def test_cache_hit_skips_second_fetch(self):
|
||||
calls = []
|
||||
|
||||
def fetcher(url, headers, timeout):
|
||||
calls.append(url)
|
||||
return {"data": [{"id": "m1"}]}
|
||||
models1, cached1, _ = get_relay_models(fetcher=fetcher)
|
||||
models2, cached2, _ = get_relay_models(fetcher=fetcher)
|
||||
self.assertEqual(models1, models2)
|
||||
self.assertFalse(cached1)
|
||||
self.assertTrue(cached2)
|
||||
self.assertEqual(len(calls), 1)
|
||||
|
||||
def test_cache_expires_after_ttl(self):
|
||||
calls = []
|
||||
|
||||
def fetcher(url, headers, timeout):
|
||||
calls.append(url)
|
||||
return {"data": [{"id": "m1"}]}
|
||||
get_relay_models(fetcher=fetcher, now=1000.0)
|
||||
_, cached, _ = get_relay_models(fetcher=fetcher, now=1000.0 + 3601)
|
||||
self.assertFalse(cached)
|
||||
self.assertEqual(len(calls), 2)
|
||||
|
||||
def test_missing_key_without_fetcher_raises(self):
|
||||
with self.assertRaises(RelayError):
|
||||
get_relay_models()
|
||||
|
||||
def test_bad_response_raises(self):
|
||||
with self.assertRaises(RelayError):
|
||||
get_relay_models(fetcher=lambda u, h, t: {"nope": []})
|
||||
with self.assertRaises(RelayError):
|
||||
get_relay_models(fetcher=lambda u, h, t: {"data": "x"})
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,196 @@
|
||||
"""任务级选项（model/effort/approval）端到端单测。
|
||||
|
||||
覆盖：POST /tasks 校验与落库回读、GET /relay/models（注入取数，
|
||||
不联网不碰真 key）、LocalExecutor/DockerExecutor 命令行里
|
||||
的 --model/--effort/--approval-policy/--sandbox 位置与映射。
|
||||
不跑真实模型，不启动 worker。
|
||||
"""
|
||||
|
||||
import http.client
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
import threading
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from types import SimpleNamespace
|
||||
|
||||
try:
|
||||
from cloud.auth import AuthStore
|
||||
from cloud.relay import _reset_cache_for_tests
|
||||
from cloud.sandbox import DockerExecutor, LocalExecutor
|
||||
from cloud.sandbox import _approval_cli_args
|
||||
from cloud.server import create_server
|
||||
except ImportError:
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[2]))
|
||||
from cloud.auth import AuthStore
|
||||
from cloud.relay import _reset_cache_for_tests
|
||||
from cloud.sandbox import DockerExecutor, LocalExecutor
|
||||
from cloud.sandbox import _approval_cli_args
|
||||
from cloud.server import create_server
|
||||
|
||||
|
||||
class TaskOptionsTestCase(unittest.TestCase):
|
||||
def setUp(self):
|
||||
_reset_cache_for_tests()
|
||||
self.tmp = tempfile.TemporaryDirectory()
|
||||
self.db_path = os.path.join(self.tmp.name, "control.db")
|
||||
self.auth = AuthStore(self.db_path)
|
||||
self.owner_id, self.owner_key = self.auth.create_user("owner")
|
||||
self.server = create_server(self.db_path, "127.0.0.1", 0)
|
||||
self.server.relay_fetcher = lambda u, h, t: {
|
||||
"data": [{"id": "gpt-6.1-sol"}, {"id": "gpt-6-astra"}]}
|
||||
self.port = self.server.server_address[1]
|
||||
self.thread = threading.Thread(
|
||||
target=self.server.serve_forever, daemon=True)
|
||||
self.thread.start()
|
||||
status, self.project = self._req(
|
||||
"POST", "/projects", {"name": "demo"}, self.owner_key)
|
||||
self.assertEqual(status, 201)
|
||||
|
||||
def tearDown(self):
|
||||
self.server.shutdown()
|
||||
self.server.server_close()
|
||||
self.thread.join(timeout=5)
|
||||
try:
|
||||
self.auth.conn.close()
|
||||
except Exception:
|
||||
pass
|
||||
self.tmp.cleanup()
|
||||
_reset_cache_for_tests()
|
||||
|
||||
def _req(self, method, path, body=None, key=None):
|
||||
conn = http.client.HTTPConnection("127.0.0.1", self.port, timeout=10)
|
||||
headers = {"Content-Type": "application/json"}
|
||||
if key:
|
||||
headers["X-API-Key"] = key
|
||||
conn.request(method, path,
|
||||
json.dumps(body) if body is not None else None, headers)
|
||||
resp = conn.getresponse()
|
||||
raw = resp.read()
|
||||
conn.close()
|
||||
try:
|
||||
data = json.loads(raw)
|
||||
except ValueError:
|
||||
data = None
|
||||
return resp.status, data
|
||||
|
||||
def test_create_task_with_options_roundtrip(self):
|
||||
status, task = self._req("POST", "/tasks", {
|
||||
"project_id": self.project["id"], "prompt": "hi",
|
||||
"model": "gpt-6-astra", "effort": "high",
|
||||
"approval": "full"}, self.owner_key)
|
||||
self.assertEqual(status, 201)
|
||||
self.assertEqual(task["model"], "gpt-6-astra")
|
||||
self.assertEqual(task["effort"], "high")
|
||||
self.assertEqual(task["approval"], "full")
|
||||
status, tasks = self._req(
|
||||
"GET", "/tasks?project_id=" + self.project["id"],
|
||||
key=self.owner_key)
|
||||
self.assertEqual(status, 200)
|
||||
self.assertEqual(tasks["tasks"][0]["model"], "gpt-6-astra")
|
||||
|
||||
def test_create_task_defaults_are_null(self):
|
||||
status, task = self._req("POST", "/tasks", {
|
||||
"project_id": self.project["id"], "prompt": "hi"},
|
||||
self.owner_key)
|
||||
self.assertEqual(status, 201)
|
||||
self.assertIsNone(task["model"])
|
||||
self.assertIsNone(task["effort"])
|
||||
self.assertIsNone(task["approval"])
|
||||
|
||||
def test_create_task_invalid_options_rejected(self):
|
||||
for body in ({"effort": "ultra"}, {"approval": "yes"},
|
||||
{"model": ""}, {"model": 42}):
|
||||
payload = {"project_id": self.project["id"], "prompt": "hi"}
|
||||
payload.update(body)
|
||||
status, data = self._req("POST", "/tasks", payload,
|
||||
self.owner_key)
|
||||
self.assertEqual(status, 400, body)
|
||||
|
||||
def test_relay_models_endpoint(self):
|
||||
status, data = self._req("GET", "/relay/models", key=self.owner_key)
|
||||
self.assertEqual(status, 200)
|
||||
self.assertEqual(data["models"], ["gpt-6.1-sol", "gpt-6-astra"])
|
||||
# 响应里只有模型 id，绝无密钥字样。
|
||||
self.assertNotIn("Bearer", json.dumps(data))
|
||||
self.assertNotIn("XCM_API_KEY", json.dumps(data))
|
||||
|
||||
def test_relay_models_requires_auth(self):
|
||||
status, _ = self._req("GET", "/relay/models")
|
||||
self.assertEqual(status, 401)
|
||||
|
||||
def test_relay_models_failure_is_502(self):
|
||||
from cloud.relay import RelayError
|
||||
self.server.relay_fetcher = lambda u, h, t: (_ for _ in ()).throw(
|
||||
RelayError("relay down"))
|
||||
_reset_cache_for_tests()
|
||||
status, data = self._req("GET", "/relay/models", key=self.owner_key)
|
||||
self.assertEqual(status, 502)
|
||||
self.assertIn("relay down", data["error"])
|
||||
|
||||
def test_approval_mapping(self):
|
||||
self.assertEqual(_approval_cli_args("ask"),
|
||||
["--approval-policy", "untrusted"])
|
||||
self.assertEqual(_approval_cli_args("auto"),
|
||||
["--approval-policy", "never"])
|
||||
self.assertEqual(_approval_cli_args("full"),
|
||||
["--approval-policy", "never",
|
||||
"--sandbox", "danger-full-access"])
|
||||
self.assertEqual(_approval_cli_args(None), [])
|
||||
self.assertEqual(_approval_cli_args("bogus"), [])
|
||||
|
||||
def test_local_dispatch_command_carries_options(self):
|
||||
seen = []
|
||||
|
||||
def fake_runner(cmd):
|
||||
seen.append(cmd)
|
||||
return SimpleNamespace(returncode=0, stdout="{}")
|
||||
|
||||
ex = LocalExecutor("/fake/host.py", config_path="/fake/cfg.json",
|
||||
runner=fake_runner)
|
||||
ex.dispatch_task({"id": "t1", "prompt": "hi",
|
||||
"model": "gpt-6-astra", "effort": "max",
|
||||
"approval": "full"})
|
||||
cmd = seen[0]
|
||||
# 顶层全局参数必须在子命令之前。
|
||||
self.assertLess(cmd.index("--model"), cmd.index("dispatch"))
|
||||
self.assertLess(cmd.index("--effort"), cmd.index("dispatch"))
|
||||
self.assertLess(cmd.index("--approval-policy"),
|
||||
cmd.index("dispatch"))
|
||||
self.assertLess(cmd.index("--sandbox"), cmd.index("dispatch"))
|
||||
self.assertEqual(cmd[cmd.index("--model") + 1], "gpt-6-astra")
|
||||
self.assertEqual(cmd[cmd.index("--effort") + 1], "max")
|
||||
self.assertEqual(cmd[cmd.index("--approval-policy") + 1], "never")
|
||||
self.assertEqual(cmd[cmd.index("--sandbox") + 1],
|
||||
"danger-full-access")
|
||||
|
||||
def test_local_dispatch_without_options_passes_nothing(self):
|
||||
seen = []
|
||||
|
||||
def fake_runner(cmd):
|
||||
seen.append(cmd)
|
||||
return SimpleNamespace(returncode=0, stdout="{}")
|
||||
|
||||
ex = LocalExecutor("/fake/host.py", runner=fake_runner)
|
||||
ex.dispatch_task({"id": "t1", "prompt": "hi"})
|
||||
cmd = seen[0]
|
||||
self.assertNotIn("--effort", cmd)
|
||||
self.assertNotIn("--approval-policy", cmd)
|
||||
self.assertNotIn("--sandbox", cmd)
|
||||
|
||||
def test_docker_inner_command_carries_options(self):
|
||||
ex = DockerExecutor(config_path="/fake/cfg.json")
|
||||
cmd = ex._inner_host_command(
|
||||
"dispatch", "--name", "x", "--task", "hi",
|
||||
model="gpt-6-astra", effort="high", approval="ask")
|
||||
self.assertLess(cmd.index("--model"), cmd.index("dispatch"))
|
||||
self.assertLess(cmd.index("--effort"), cmd.index("dispatch"))
|
||||
self.assertEqual(cmd[cmd.index("--approval-policy") + 1],
|
||||
"untrusted")
|
||||
self.assertNotIn("--sandbox", cmd)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user