agentenv-framework 0.9.1344__tar.gz → 0.9.1345__tar.gz

{agentenv_framework-0.9.1344 → agentenv_framework-0.9.1345}/.github/scripts/infra_build.py

@@ -7,7 +7,8 @@ images agent-env ships before it's built, pushed or recorded.
 ships, with its Dockerfile, context, repository and a source tag. ``exists REF`` exits 0 when the registry has REF, 1
 when it says it doesn't, and 2 when it can't tell. ``smoke NAME IMAGE`` checks that IMAGE, a local build of NAME, runs.
 ``verify-record PATH`` fails unless PATH records each image agent-env ships once, with the digest the registry serves
-under its tag now. ``retry COMMAND...`` runs COMMAND, again while a registry rate-limits it.
+under its tag now. ``retry COMMAND...`` runs COMMAND, again while a registry rate-limits it or PyPI doesn't serve
+yet the agentenv-framework-protocol an agent image's build installs.
 """
 
 from __future__ import annotations
@@ -41,8 +42,11 @@ _PRINTED_CHARS = 200  # of what docker printed in place of a manifest, in the er
 # What a registry answers when it rate-limits a request: ECR Public's 429, and the toomanyrequests error code GHCR and
 # Docker Hub send.
 _RATE_LIMITED = re.compile(r"429 Too Many Requests|toomanyrequests", re.IGNORECASE)
+# What pip in an agent image's build answers for the agentenv-framework-protocol its release published moments earlier,
+# until PyPI's index, which a CDN caches, lists it.
+_NOT_YET_SERVED = re.compile(r"No matching distribution found for agentenv-framework-protocol(\[[^\]]*\])?==")
 # How long to wait before each try again, so a burst of builds starting together spreads out.
-_RATE_LIMIT_WAITS_SECONDS = (30, 60, 120)
+_RETRY_WAITS_SECONDS = (30, 60, 120)
 
 # Each image's check, beyond its build: the gateway imports its server, Postgres turns healthy, the sidecars and the
 # browser answer their own commands, and Claude Code's agent runs its CLI and imports its server.
@@ -70,7 +74,7 @@ def main() -> int:
     commands.add_parser("retry").add_argument("argv", nargs=argparse.REMAINDER, metavar="COMMAND")
     args = parser.parse_args()
     if args.command == "retry":
-        return _until_not_rate_limited(lambda: _streamed(args.argv)).returncode
+        return _tried_again(lambda: _streamed(args.argv)).returncode
     if args.command == "exists":
         return _exists(args.ref)
     if args.command == "smoke":
@@ -100,19 +104,30 @@ def _check(entry: str) -> list[str]:
     return problems
 
 
-def _until_not_rate_limited(attempt: Callable[[], subprocess.CompletedProcess]) -> subprocess.CompletedProcess:
-    """``attempt()``, and again after each of ``_RATE_LIMIT_WAITS_SECONDS`` while what it printed says a registry
-    rate-limited it: public.ecr.aws allows one anonymous pull a second, which builds starting together pass."""
-    for wait in _RATE_LIMIT_WAITS_SECONDS:
+def _tried_again(attempt: Callable[[], subprocess.CompletedProcess]) -> subprocess.CompletedProcess:
+    """``attempt()``, and again after each of ``_RETRY_WAITS_SECONDS`` while what it printed says a later try can work
+    (``_why_again``)."""
+    for wait in _RETRY_WAITS_SECONDS:
         result = attempt()
-        if result.returncode == 0 or not _RATE_LIMITED.search(f"{result.stdout}{result.stderr}"):
+        if result.returncode == 0 or (why := _why_again(result)) is None:
             return result
-        print(f"::warning::a registry rate-limited `{' '.join(result.args)[:_PRINTED_CHARS]}`; trying again in {wait}s",
-              flush=True)
+        print(f"::warning::{why}; trying again in {wait}s", flush=True)
         time.sleep(wait)
     return attempt()
 
 
+def _why_again(result: subprocess.CompletedProcess) -> str | None:
+    """Why a failed run can work later, or None: a registry rate-limited it, as public.ecr.aws does past one anonymous
+    pull a second, which builds starting together pass; or a build's pip can't find the agentenv-framework-protocol its
+    release has just published, which PyPI's index lists a little after the upload."""
+    printed, command = f"{result.stdout}{result.stderr}", f"`{' '.join(result.args)[:_PRINTED_CHARS]}`"
+    if _RATE_LIMITED.search(printed):
+        return f"a registry rate-limited {command}"
+    if _NOT_YET_SERVED.search(printed):
+        return f"PyPI doesn't list yet the agentenv-framework-protocol {command} installs"
+    return None
+
+
 def _streamed(argv: list[str]) -> subprocess.CompletedProcess:
     """Run ``argv``, printing what it prints as it prints it, which is kept too, to look for a rate limit in. Each line is
     flushed, since the workflow's log is a pipe, which Python would otherwise fill before passing on."""
@@ -128,7 +143,7 @@ def _streamed(argv: list[str]) -> subprocess.CompletedProcess:
 def _served(ref: str) -> tuple[str | None, str]:
     """The digest the registry serves under ``ref``, or None, and what docker said when it serves none. The manifest as
     JSON, since buildx before 0.35 doesn't know the ``.Manifest.Digest`` template and prints the whole listing."""
-    result = _until_not_rate_limited(lambda: subprocess.run(
+    result = _tried_again(lambda: subprocess.run(
         ["docker", "buildx", "imagetools", "inspect", ref, "--format", "{{json .Manifest}}"],
         capture_output=True, text=True))
     if result.returncode != 0:

{agentenv_framework-0.9.1344 → agentenv_framework-0.9.1345}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: agentenv-framework
-Version: 0.9.1344
+Version: 0.9.1345
 Summary: SDK and CLI for building, deploying and running agent environments and the tasks that grade agents in them.
 Project-URL: Homepage, https://www.agentenvframework.com
 Project-URL: Documentation, https://www.agentenvframework.com/docs
@@ -29,7 +29,7 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Typing :: Typed
 Requires-Python: >=3.11.4
 Requires-Dist: a2a-sdk==0.3.26
-Requires-Dist: agentenv-framework-protocol==0.1.359
+Requires-Dist: agentenv-framework-protocol==0.1.360
 Requires-Dist: certifi>=2024.2.2
 Requires-Dist: click>=8.0.0
 Requires-Dist: cryptography>=42

{agentenv_framework-0.9.1344 → agentenv_framework-0.9.1345}/packages/agentenv-protocol/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentenv-framework-protocol"
-version = "0.1.359"
+version = "0.1.360"
 description = "Open data-plane protocol and server SDK for agent environments."
 readme = "README.md"
 license = "Apache-2.0"

{agentenv_framework-0.9.1344 → agentenv_framework-0.9.1345}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "agentenv-framework"
-version = "0.9.1344"
+version = "0.9.1345"
 description = "SDK and CLI for building, deploying and running agent environments and the tasks that grade agents in them."
 readme = "README.md"
 license = "Apache-2.0"
@@ -29,7 +29,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "agentenv-framework-protocol==0.1.359",
+    "agentenv-framework-protocol==0.1.360",
     "certifi>=2024.2.2",  # the public roots the local transfer CA's trust bundle carries
     "click>=8.0.0",
     "cryptography>=42",  # the local transfer CA

{agentenv_framework-0.9.1344 → agentenv_framework-0.9.1345}/src/agent_env/agents/agents/claude-code/requirements.txt

@@ -1,3 +1,3 @@
 # A release pins agentenv-framework-protocol to the version it was released with. The floor is the first that
 # serves peer-agents/v1's tools, which the agent advertises without handlers of its own.
-agentenv-framework-protocol[agent]==0.1.359
+agentenv-framework-protocol[agent]==0.1.360

agentenv_framework-0.9.1345/src/agent_env/agents/agents/pi/requirements.txt

@@ -0,0 +1 @@
+agentenv-framework-protocol[agent]==0.1.360

{agentenv_framework-0.9.1344 → agentenv_framework-0.9.1345}/src/agent_env/env/published_images.json

@@ -1 +1 @@
-{"images":[{"repository":"ghcr.io/scaleapi/agentenv-claude-code","tag":"src-07f0887418f8c42396e8dc60ffdd98c39c6c68181f5bac8af008deca567f0649","digest":"sha256:eb9bb035e391eb692c1b1e9a45c7b0f6ea41681d57e7de1b1826657cf6ee49dd"},{"repository":"ghcr.io/scaleapi/agentenv-db-mcp","tag":"src-8f8a64ea02549c388c26db342fc0798c7e809303f9ac42c7116eade52b96628b","digest":"sha256:44ded28ec1ee54e28561f167952dccfa08f5322bdb9db552a45dcb6233479e1e"},{"repository":"ghcr.io/scaleapi/agentenv-db-web","tag":"src-f993cd3a657cdfcc5d79f6935fb229422159853043908dc8db94306ea5660522","digest":"sha256:f0f8880cd5e69a775f2d3239d522a88d2a59664384d09f683aae46a0a97c6716"},{"repository":"ghcr.io/scaleapi/agentenv-gateway","tag":"src-1abdc284d7acd38e50727c40910955e6b69bc964adab9817153516856ba0280e","digest":"sha256:a6768791d4f5e366f66533d7731396216681e074c22eb2428dffd6be9dd8891a"},{"repository":"ghcr.io/scaleapi/agentenv-service-db","tag":"src-0915035efbb2dc62c3e9b6e387a1acde56bd3401569904eab9a9e659d5482dc9","digest":"sha256:d257f65cce5a5568d44a5d72632fecd5c3d2e9de66a5be8991dac317de423ebb"},{"repository":"ghcr.io/scaleapi/agentenv-website-browser","tag":"src-54f877bc28d8a6607e050050ab5b4d45e4bed292dcbd945c775b4ff297787c86","digest":"sha256:824f2644f32defbb9f92d3697f865dd9e1d58b1eb0a67bd2efca389ad478a935"}]}
+{"images":[{"repository":"ghcr.io/scaleapi/agentenv-claude-code","tag":"src-f757c14afea2ffcefbab31417147831bf1fb0603f715664cc7c5934fda86de2d","digest":"sha256:e85f3a370038730e6b8d9711c8ce63dedc06f7f769e12f3855fcf30ddaa3c903"},{"repository":"ghcr.io/scaleapi/agentenv-db-mcp","tag":"src-8f8a64ea02549c388c26db342fc0798c7e809303f9ac42c7116eade52b96628b","digest":"sha256:44ded28ec1ee54e28561f167952dccfa08f5322bdb9db552a45dcb6233479e1e"},{"repository":"ghcr.io/scaleapi/agentenv-db-web","tag":"src-f993cd3a657cdfcc5d79f6935fb229422159853043908dc8db94306ea5660522","digest":"sha256:f0f8880cd5e69a775f2d3239d522a88d2a59664384d09f683aae46a0a97c6716"},{"repository":"ghcr.io/scaleapi/agentenv-gateway","tag":"src-1abdc284d7acd38e50727c40910955e6b69bc964adab9817153516856ba0280e","digest":"sha256:a6768791d4f5e366f66533d7731396216681e074c22eb2428dffd6be9dd8891a"},{"repository":"ghcr.io/scaleapi/agentenv-service-db","tag":"src-0915035efbb2dc62c3e9b6e387a1acde56bd3401569904eab9a9e659d5482dc9","digest":"sha256:d257f65cce5a5568d44a5d72632fecd5c3d2e9de66a5be8991dac317de423ebb"},{"repository":"ghcr.io/scaleapi/agentenv-website-browser","tag":"src-54f877bc28d8a6607e050050ab5b4d45e4bed292dcbd945c775b4ff297787c86","digest":"sha256:824f2644f32defbb9f92d3697f865dd9e1d58b1eb0a67bd2efca389ad478a935"}]}

{agentenv_framework-0.9.1344 → agentenv_framework-0.9.1345}/src/agent_env/examples/echo-mcp/envs/echo/requirements.txt

@@ -1,3 +1,3 @@
 # A release pins agentenv-framework-protocol to the version it was released with.
-agentenv-framework-protocol==0.1.359
+agentenv-framework-protocol==0.1.360
 mcp>=1.25,<2

{agentenv_framework-0.9.1344 → agentenv_framework-0.9.1345}/tst/unit/test_infra_build_script.py

@@ -262,16 +262,37 @@ def test_retry_tries_again_while_a_registry_rate_limits_it(script, monkeypatch,
 
     assert _run(script, monkeypatch, "retry", "docker", "push", "img") == 0
 
-    assert len(runs) == 3 and waits == list(script._RATE_LIMIT_WAITS_SECONDS[:2])
+    assert len(runs) == 3 and waits == list(script._RETRY_WAITS_SECONDS[:2])
     assert capsys.readouterr().out.count("::warning::a registry rate-limited `docker push img`; trying again in") == 2
 
 
+def test_retry_tries_again_while_pypi_doesnt_list_the_protocol_a_build_installs(script, monkeypatch, capsys):
+    """An agent image's build installs the agentenv-framework-protocol its release published moments earlier."""
+    missing = ("#13 1.522 ERROR: No matching distribution found for agentenv-framework-protocol[agent]==0.1.359\n"
+               "ERROR: failed to solve: process \"/bin/sh -c pip install\" did not complete successfully: exit code: 1\n")
+    runs, waits = _attempts(script, monkeypatch, [(missing, 1), ("#13 DONE 4.1s\n", 0)])
+
+    assert _run(script, monkeypatch, "retry", "docker", "build", ".") == 0
+
+    assert len(runs) == 2 and waits == [script._RETRY_WAITS_SECONDS[0]]
+    assert ("::warning::PyPI doesn't list yet the agentenv-framework-protocol `docker build .` installs; trying again in"
+            in capsys.readouterr().out)
+
+
+def test_retry_doesnt_try_again_a_build_missing_another_package(script, monkeypatch, capsys):
+    runs, waits = _attempts(script, monkeypatch, [("ERROR: No matching distribution found for nonexistent-pkg==1.0\n", 1)])
+
+    assert _run(script, monkeypatch, "retry", "docker", "build", ".") == 1
+
+    assert len(runs) == 1 and waits == []
+
+
 def test_retry_gives_up_after_its_waits(script, monkeypatch, capsys):
-    runs, waits = _attempts(script, monkeypatch, [(_LIMITED, 1)] * (len(script._RATE_LIMIT_WAITS_SECONDS) + 1))
+    runs, waits = _attempts(script, monkeypatch, [(_LIMITED, 1)] * (len(script._RETRY_WAITS_SECONDS) + 1))
 
     assert _run(script, monkeypatch, "retry", "docker", "build", ".") == 1
 
-    assert len(runs) == len(script._RATE_LIMIT_WAITS_SECONDS) + 1 and waits == list(script._RATE_LIMIT_WAITS_SECONDS)
+    assert len(runs) == len(script._RETRY_WAITS_SECONDS) + 1 and waits == list(script._RETRY_WAITS_SECONDS)
 
 
 def test_retry_doesnt_try_again_a_command_that_fails_otherwise(script, monkeypatch, capsys):

agentenv_framework-0.9.1344/src/agent_env/agents/agents/pi/requirements.txt

@@ -1 +0,0 @@
-agentenv-framework-protocol[agent]==0.1.359