agent-framework-lib 0.8.8.post6__tar.gz → 0.8.8.post7__tar.gz

{agent_framework_lib-0.8.8.post6/agent_framework_lib.egg-info → agent_framework_lib-0.8.8.post7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-framework-lib
-Version: 0.8.8.post6
+Version: 0.8.8.post7
 Summary: A comprehensive Python framework for building and serving conversational AI agents with FastAPI
 Author-email: Sebastian Pavel <sebastian@cinco.ai>, Elliott Girard <elliott.girard@icloud.com>
 Maintainer-email: Sebastian Pavel <sebastian@cinco.ai>

{agent_framework_lib-0.8.8.post6 → agent_framework_lib-0.8.8.post7}/agent_framework/skills/builtin/scripts/create_and_register.py

@@ -117,7 +117,14 @@ def _verify_file(filepath: str) -> None:
 
 
 def _upload_file(filepath: str) -> dict:
-    """Upload the file to the Storage API and return the response dict."""
+    """Upload the file to the Storage API. NEVER fatal.
+
+    Returns the server response dict on success, or {} on ANY failure — the
+    parent ShellTool finalizer then delivers the file from AGENT_OUTPUT_DIR
+    (collect_out). A failed upload must not exit non-zero: that derailed the
+    agent into improvising its own (wrong) delivery, which was worse than just
+    letting the finalizer do its job.
+    """
     user_id = os.environ.get("AGENT_USER_ID", "default_user")
     session_id = os.environ.get("AGENT_SESSION_ID", "")
     host = os.environ.get("AGENT_HOST", "localhost")
@@ -141,12 +148,13 @@ def _upload_file(filepath: str) -> dict:
     try:
         with urllib.request.urlopen(req, timeout=30) as resp:
             return json.loads(resp.read().decode("utf-8"))
-    except urllib.error.HTTPError as e:
-        err = e.read().decode("utf-8", errors="replace")
-        _emit_error(f"Server {e.code}: {err}")
-    except urllib.error.URLError as e:
-        _emit_error(f"Cannot connect to server at http://{host}:{port}: {e.reason}")
-    return {}  # unreachable, but satisfies type checker
+    except Exception as e:  # noqa: BLE001 — soft-fail: finalizer delivers instead
+        print(
+            f"[create_and_register] direct upload failed ({e}); "
+            "falling back to automatic delivery by the framework",
+            file=sys.stderr,
+        )
+        return {}
 
 
 def _cleanup(filepath: str) -> bool:
@@ -183,11 +191,13 @@ def main() -> None:
 
     _verify_file(filepath)
 
-    # Delivery is the ShellTool parent finalizer's job (it has network + creds; the
-    # sandbox does not). The in-shell HTTP upload is OFF by default and never runs
-    # in the sandbox: it derails the agent (401 on an unreachable target) and a
-    # printed file_id makes the finalizer skip the file. Opt in explicitly with
-    # AGENT_SKILL_HTTP_UPLOAD=1 for legacy/local non-finalizer flows only.
+    # Delivery is belt-and-braces. PRIMARY: a direct upload to the agent's
+    # callback endpoint when AGENT_SKILL_HTTP_UPLOAD is set (the framework sets
+    # it in the sandbox when the callback port is published) — on success the
+    # download link is immediate. FALLBACK: the upload soft-fails (returns {})
+    # and the parent ShellTool finalizer delivers the file from AGENT_OUTPUT_DIR.
+    # Either way this script exits 0 with a clear success — the agent must never
+    # be tempted to improvise its own delivery.
     do_upload = os.environ.get("AGENT_SKILL_HTTP_UPLOAD", "").lower() in ("1", "true", "yes")
     upload_result = _upload_file(filepath) if do_upload else {}
 
@@ -213,9 +223,9 @@ def main() -> None:
         "filename": os.path.basename(filepath),
         "mime_type": mime,
         "local_cleaned": local_cleaned,
-        # The file is created; the framework delivers it to storage automatically
-        # and appends the download link to this command's result. The agent must
-        # NOT try to upload or authenticate.
+        # Whether the direct upload succeeded or the parent finalizer delivers,
+        # the file ALWAYS reaches storage. The agent must NOT try to upload or
+        # authenticate anything itself.
         "delivery": "automatic",
         "message": (
             f"File '{os.path.basename(filepath)}' created successfully and is being "
@@ -223,11 +233,16 @@ def main() -> None:
             "command's result. Do not upload or authenticate."
         ),
     }
-    # Surface storage fields ONLY when an explicit upload actually happened.
-    if upload_result:
+    # Direct upload succeeded → surface the storage fields right away (the
+    # finalizer sees the file_id in stdout and will not re-register the file).
+    if upload_result.get("file_id"):
         output["file_id"] = upload_result.get("file_id", "")
         output["download_url"] = upload_result.get("download_url", "")
         output["size_bytes"] = upload_result.get("size_bytes", 0)
+        output["message"] = (
+            f"File '{os.path.basename(filepath)}' created and stored — "
+            f"download link: {output['download_url']}"
+        )
     print(json.dumps(output))
 
 

{agent_framework_lib-0.8.8.post6 → agent_framework_lib-0.8.8.post7}/agent_framework/tools/shell_tool.py

@@ -768,6 +768,13 @@ class ShellTool(AgentTool):
         )
         env["AGENT_HOST"] = callback_host
         env["AGENT_PORT"] = str(callback_port)
+        # Belt-and-braces delivery: enable the skill's DIRECT upload to the
+        # callback endpoint (PRIMARY — immediate download link; requires the
+        # callback port to be published, see AGENT_SANDBOX_CALLBACK_PORT). The
+        # upload soft-fails: on any error the file stays in AGENT_OUTPUT_DIR and
+        # the parent finalizer delivers it via collect_out (FALLBACK). Set
+        # AGENT_SKILL_HTTP_UPLOAD=0 in the host env to force finalizer-only.
+        env["AGENT_SKILL_HTTP_UPLOAD"] = os.environ.get("AGENT_SKILL_HTTP_UPLOAD", "1")
         # Tell upload scripts whether to authenticate.
         env["REQUIRE_AUTH"] = os.environ.get("REQUIRE_AUTH", "false")
         # Scoped, short-lived session token (HMAC, user/session) so the sandbox

{agent_framework_lib-0.8.8.post6 → agent_framework_lib-0.8.8.post7/agent_framework_lib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-framework-lib
-Version: 0.8.8.post6
+Version: 0.8.8.post7
 Summary: A comprehensive Python framework for building and serving conversational AI agents with FastAPI
 Author-email: Sebastian Pavel <sebastian@cinco.ai>, Elliott Girard <elliott.girard@icloud.com>
 Maintainer-email: Sebastian Pavel <sebastian@cinco.ai>

{agent_framework_lib-0.8.8.post6 → agent_framework_lib-0.8.8.post7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "agent-framework-lib"
-version = "0.8.8post6"
+version = "0.8.8post7"
 description = "A comprehensive Python framework for building and serving conversational AI agents with FastAPI"
 readme = {file = "README.md", content-type = "text/markdown"}
 license = {text = "MIT"}