Official Codebase of 3DCodeVerse
Python
agy: a bare model id was unusable -- agy requires an effort for every gemini model
gaoypengd8426a82e7d2
diff --git a/harness/codeverse/agents/antigravity.py b/harness/codeverse/agents/antigravity.pyindex 6717cc05..e240fe9e 100644--- a/harness/codeverse/agents/antigravity.py+++ b/harness/codeverse/agents/antigravity.py@@ -19,6 +19,9 @@ accepted when the JSON envelope is missing.from __future__ import annotationsimport json+import logging+from functools import lru_cache+from pathlib import Pathfrom typing import Anyfrom codeverse.agents.cli_common import (@@ -35,9 +38,63 @@ from codeverse.agents.watchdog import run_with_watchdogfrom codeverse.config import get_settingsfrom codeverse.contracts.agent import AgentJob, AgentResultfrom codeverse.contracts.common import Usage+from codeverse.proc import run_subprocess++log = logging.getLogger(__name__)IDLE_GRACE_S = 300.0+#: reasoning efforts agy exposes for the models that have them+EFFORTS = ("low", "medium", "high")+#: what a bare id is resolved to when agy offers only effort-suffixed spellings+DEFAULT_EFFORT = "medium"+_EFFORT_SUFFIXES = tuple(f"-{e}" for e in EFFORTS)+++@lru_cache(maxsize=4)+def available_models(binary: str) -> tuple[str, ...]:+ """The model ids ``agy models`` offers, or ``()`` when it cannot be reached.++ Cached: one lookup per binary per process, and only for an id that needs it.+ """+ try:+ r = run_subprocess([binary, "models"], cwd=Path.cwd(), timeout_s=30.0)+ except OSError as e: # pragma: no cover - defensive+ log.debug("agy models unavailable: %s", e)+ return ()+ if r.returncode != 0:+ return ()+ ids = []+ for line in r.stdout.splitlines():+ head = line.split("\t", 1)[0].strip()+ if head and " " not in head:+ ids.append(head)+ return tuple(ids)+++def resolve_model(model: str, binary: str) -> str:+ """Map a bare model id onto the effort-suffixed one agy actually accepts.++ agy 1.1.19 rejects ``--model gemini-3.7-flash`` outright ("requires --effort+ (available: low, medium, high)") and equally rejects ``--effort`` for a model that+ has none ("--effort is not supported for model claude-sonnet-4-6"), so the effort+ cannot be a blanket flag — it belongs in the MODEL ID, which is the only spelling+ ``agy models`` lists (gemini-3.7-flash-low/-medium/-high).++ A bare id agy DOES offer (claude-sonnet-4-6) is passed through untouched, and so is+ anything we cannot check, so this can only turn a guaranteed failure into a run.+ """+ if not model or model.endswith(_EFFORT_SUFFIXES):+ return model+ offered = available_models(binary)+ if not offered or model in offered:+ return model+ for effort in (DEFAULT_EFFORT, *EFFORTS):+ if f"{model}-{effort}" in offered:+ log.info("agy has no bare %r; using the %s-effort id %r", model, effort, f"{model}-{effort}")+ return f"{model}-{effort}"+ return model+def parse_agy_json(stdout: str) -> dict[str, Any] | None:s = stdout.strip()@@ -77,6 +134,10 @@ class AntigravityAgent:def id(self) -> str:return f"{self.kind}:{self.model}"+ def served_model(self) -> str:+ """The id actually sent to agy (a bare one gains its effort suffix)."""+ return resolve_model(self.model, self.binary)+def available(self) -> tuple[bool, str]:if not exists_on_path(self.binary):return False, f"agy CLI not found: {self.binary!r}"@@ -88,7 +149,7 @@ class AntigravityAgent:"--print-timeout", f"{minutes}m", "--output-format", "json","--add-dir", str(s.ws.root), "--disable-slash-commands"]if self.model:- argv += ["--model", self.model]+ argv += ["--model", self.served_model()]return argvdef build_env(self, s: Session) -> dict[str, str]:@@ -110,7 +171,8 @@ class AntigravityAgent:s.traj.write_text("stdout.json", proc.stdout)s.traj.write_text("stderr.log", proc.stderr)env = parse_agy_json(proc.stdout)- usage = usage_from_agy(env, self.model) if env else Usage(backend=self.kind, model=self.model)+ served = self.served_model()+ usage = usage_from_agy(env, served) if env else Usage(backend=self.kind, model=served)usage.latency_ms = usage.latency_ms or int(proc.duration_s * 1000)text = str(env.get("response", "")) if env else proc.stdout.strip()errors: list[str] = []diff --git a/harness/tests/agents/test_antigravity.py b/harness/tests/agents/test_antigravity.pyindex ade4a154..cacec06a 100644--- a/harness/tests/agents/test_antigravity.py+++ b/harness/tests/agents/test_antigravity.py@@ -7,7 +7,13 @@ import shutilimport pytest-from codeverse.agents.antigravity import AntigravityAgent, parse_agy_json, usage_from_agy+from codeverse.agents.antigravity import (+ AntigravityAgent,+ available_models,+ parse_agy_json,+ resolve_model,+ usage_from_agy,+)from codeverse.agents.cli_common import begin_sessionfrom codeverse.contracts.agent import AgentJobfrom codeverse.workspace import Workspace@@ -30,6 +36,30 @@ else:'''+#: `agy models` output, as agy 1.1.19 prints it: a model with reasoning efforts is+#: listed ONLY in its effort-suffixed spellings, one that has none is listed bare.+FAKE_AGY_MODELS = r"""+args = sys.argv[1:]+if args[:1] == ["models"]:+ print("Fetching available models...")+ print("gemini-3.7-flash-high\tGemini 3.7 Flash (High)")+ print("gemini-3.7-flash-medium\tGemini 3.7 Flash (Medium)")+ print("gemini-3.7-flash-low\tGemini 3.7 Flash (Low)")+ print("claude-sonnet-4-6\tClaude Sonnet 4.6 (Thinking)")+ sys.exit(0)+# agy 1.1.19 refuses a bare id that has efforts, and refuses --effort for one that has none+model = args[args.index("--model") + 1] if "--model" in args else ""+if model in ("gemini-3.7-flash",):+ print(json.dumps({"conversation_id": "", "status": "ERROR", "response": "",+ "error": 'invalid model selection (--model "%s" --effort ""): '+ "--model %s requires --effort (available: low, medium, high)" % (model, model)}))+ sys.exit(0)+os.makedirs("src", exist_ok=True)+open("src/hello.txt", "w").write("hi")+print(""" + repr(json.dumps(ENVELOPE)) + r""")+"""++def test_parse_and_usage():env = parse_agy_json(json.dumps(ENVELOPE))assert env["status"] == "SUCCESS"@@ -67,3 +97,50 @@ def test_live_agy_tiny(tmp_ws: Workspace):timeout_s=300, label="live", spatial_tools=False))assert res.ok, res.errorsassert (tmp_ws.src / "hello.txt").read_text().strip() == "hi"+++# --------------------------------------------------------------------------- SMOKE3+def test_a_bare_model_id_gains_the_effort_agy_requires(tmp_ws: Workspace, fake_bin):+ """SMOKE3: build_argv appended --model but never an effort, so `agy:gemini-3.7-flash`+ died with rc=1 'invalid model selection ... requires --effort'. The effort cannot be+ a blanket --effort flag: agy rejects that outright for a model that has none, so it+ has to go into the model ID — the only spelling `agy models` lists."""+ available_models.cache_clear()+ a = AntigravityAgent("gemini-3.7-flash", binary=fake_bin("agy", FAKE_AGY_MODELS))+ s = begin_session(AgentJob(workspace=str(tmp_ws.root), prompt="p", timeout_s=60), "agy")++ argv = a.build_argv(s, "p")++ assert argv[argv.index("--model") + 1] == "gemini-3.7-flash-medium"+ assert "--effort" not in argv+++def test_an_effort_suffixed_or_effortless_id_is_left_alone(tmp_ws: Workspace, fake_bin):+ """Both forms already worked and must not be touched: a suffixed id is passed+ through without a lookup, and claude-sonnet-4-6 has no effort at all."""+ available_models.cache_clear()+ binary = fake_bin("agy", FAKE_AGY_MODELS)+ assert resolve_model("gemini-3.7-flash-low", binary) == "gemini-3.7-flash-low"+ assert resolve_model("claude-sonnet-4-6", binary) == "claude-sonnet-4-6"+ assert resolve_model("", binary) == ""+++def test_an_unknown_model_and_an_unreachable_agy_are_passed_through(tmp_ws: Workspace, fake_bin):+ """Resolution can only turn a guaranteed failure into a run, never the reverse."""+ available_models.cache_clear()+ binary = fake_bin("agy", FAKE_AGY_MODELS)+ assert resolve_model("some-future-model", binary) == "some-future-model"+ available_models.cache_clear()+ assert resolve_model("gemini-3.7-flash", "/nonexistent/agy") == "gemini-3.7-flash"+++def test_the_run_uses_and_records_the_resolved_id(tmp_ws: Workspace, fake_bin):+ """The fake refuses the bare id exactly as agy 1.1.19 does, so a green run here+ means the resolved id really was the one sent."""+ available_models.cache_clear()+ a = AntigravityAgent("gemini-3.7-flash", binary=fake_bin("agy", FAKE_AGY_MODELS))++ res = a.run(AgentJob(workspace=str(tmp_ws.root), prompt="hello", label="a", timeout_s=60))++ assert res.ok and res.text.strip() == "DONE", res.errors+ assert res.usage.model == "gemini-3.7-flash-medium"