vision-agent 0.2.86__tar.gz → 0.2.87__tar.gz

{vision_agent-0.2.86 → vision_agent-0.2.87}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vision-agent
-Version: 0.2.86
+Version: 0.2.87
 Summary: Toolset for Vision Agent
 Author: Landing AI
 Author-email: dev@landing.ai

{vision_agent-0.2.86 → vision_agent-0.2.87}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "vision-agent"
-version = "0.2.86"
+version = "0.2.87"
 description = "Toolset for Vision Agent"
 authors = ["Landing AI <dev@landing.ai>"]
 readme = "README.md"

vision_agent-0.2.87/vision_agent/tools/tool_utils.py

@@ -0,0 +1,95 @@
+import logging
+import os
+from typing import Any, Dict, MutableMapping, Optional
+
+from IPython.display import display
+from pydantic import BaseModel
+from requests import Session
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
+
+from vision_agent.utils.exceptions import RemoteToolCallFailed
+from vision_agent.utils.execute import Error, MimeType
+from vision_agent.utils.type_defs import LandingaiAPIKey
+
+_LOGGER = logging.getLogger(__name__)
+_LND_API_KEY = LandingaiAPIKey().api_key
+_LND_API_URL = "https://api.staging.landing.ai/v1/agent"
+
+
+class ToolCallTrace(BaseModel):
+    endpoint_url: str
+    request: MutableMapping[str, Any]
+    response: MutableMapping[str, Any]
+    error: Optional[Error]
+
+
+def send_inference_request(
+    payload: Dict[str, Any], endpoint_name: str
+) -> Dict[str, Any]:
+    try:
+        if runtime_tag := os.environ.get("RUNTIME_TAG", ""):
+            payload["runtime_tag"] = runtime_tag
+
+        url = f"{_LND_API_URL}/model/{endpoint_name}"
+        if "TOOL_ENDPOINT_URL" in os.environ:
+            url = os.environ["TOOL_ENDPOINT_URL"]
+
+        tool_call_trace = ToolCallTrace(
+            endpoint_url=url,
+            request=payload,
+            response={},
+            error=None,
+        )
+        headers = {"Content-Type": "application/json", "apikey": _LND_API_KEY}
+        if "TOOL_ENDPOINT_AUTH" in os.environ:
+            headers["Authorization"] = os.environ["TOOL_ENDPOINT_AUTH"]
+            headers.pop("apikey")
+
+        session = _create_requests_session(
+            url=url,
+            num_retry=3,
+            headers=headers,
+        )
+        res = session.post(url, json=payload)
+        if res.status_code != 200:
+            tool_call_trace.error = Error(
+                name="RemoteToolCallFailed",
+                value=f"{res.status_code} - {res.text}",
+                traceback_raw=[],
+            )
+            _LOGGER.error(f"Request failed: {res.status_code} {res.text}")
+            raise RemoteToolCallFailed(payload["tool"], res.status_code, res.text)
+
+        resp = res.json()
+        tool_call_trace.response = resp
+        # TODO: consider making the response schema the same between below two sources
+        return resp if "TOOL_ENDPOINT_AUTH" in os.environ else resp["data"]  # type: ignore
+    finally:
+        trace = tool_call_trace.model_dump()
+        trace["type"] = "tool_call"
+        display({MimeType.APPLICATION_JSON: trace}, raw=True)
+
+
+def _create_requests_session(
+    url: str, num_retry: int, headers: Dict[str, str]
+) -> Session:
+    """Create a requests session with retry"""
+    session = Session()
+    retries = Retry(
+        total=num_retry,
+        backoff_factor=2,
+        raise_on_redirect=True,
+        raise_on_status=False,
+        allowed_methods=["GET", "POST", "PUT"],
+        status_forcelist=[
+            408,  # Request Timeout
+            429,  # Too Many Requests (ie. rate limiter).
+            502,  # Bad Gateway
+            503,  # Service Unavailable (include cloud circuit breaker)
+            504,  # Gateway Timeout
+        ],
+    )
+    session.mount(url, HTTPAdapter(max_retries=retries if num_retry > 0 else 0))
+    session.headers.update(headers)
+    return session

{vision_agent-0.2.86 → vision_agent-0.2.87}/vision_agent/utils/exceptions.py

@@ -13,6 +13,15 @@ For more information, see https://landing-ai.github.io/landingai-python/landinga
         return self.message
 
 
+class RemoteToolCallFailed(Exception):
+    """Exception raised when an error occurs during a tool call."""
+
+    def __init__(self, tool_name: str, status_code: int, message: str):
+        self.message = (
+            f"""Tool call ({tool_name}) failed due to {status_code} - {message}"""
+        )
+
+
 class RemoteSandboxError(Exception):
     """Exception related to remote sandbox."""
 

{vision_agent-0.2.86 → vision_agent-0.2.87}/vision_agent/utils/execute.py

@@ -277,6 +277,17 @@ class Error(BaseModel):
         text = "\n".join(self.traceback_raw)
         return _remove_escape_and_color_codes(text) if return_clean_text else text
 
+    @staticmethod
+    def from_exception(e: Exception) -> "Error":
+        """
+        Creates an Error object from an exception.
+        """
+        return Error(
+            name=e.__class__.__name__,
+            value=str(e),
+            traceback_raw=traceback.format_exception(type(e), e, e.__traceback__),
+        )
+
 
 class Execution(BaseModel):
     """

vision_agent-0.2.86/vision_agent/tools/tool_utils.py

@@ -1,67 +0,0 @@
-import logging
-import os
-from typing import Any, Dict
-
-from requests import Session
-from requests.adapters import HTTPAdapter
-from urllib3.util.retry import Retry
-
-from vision_agent.utils.type_defs import LandingaiAPIKey
-
-_LOGGER = logging.getLogger(__name__)
-_LND_API_KEY = LandingaiAPIKey().api_key
-_LND_API_URL = "https://api.staging.landing.ai/v1/agent"
-
-
-def send_inference_request(
-    payload: Dict[str, Any], endpoint_name: str
-) -> Dict[str, Any]:
-    if runtime_tag := os.environ.get("RUNTIME_TAG", ""):
-        payload["runtime_tag"] = runtime_tag
-
-    url = f"{_LND_API_URL}/model/{endpoint_name}"
-    if "TOOL_ENDPOINT_URL" in os.environ:
-        url = os.environ["TOOL_ENDPOINT_URL"]
-
-    headers = {"Content-Type": "application/json", "apikey": _LND_API_KEY}
-    if "TOOL_ENDPOINT_AUTH" in os.environ:
-        headers["Authorization"] = os.environ["TOOL_ENDPOINT_AUTH"]
-        headers.pop("apikey")
-
-    session = _create_requests_session(
-        url=url,
-        num_retry=3,
-        headers=headers,
-    )
-    res = session.post(url, json=payload)
-    if res.status_code != 200:
-        _LOGGER.error(f"Request failed: {res.status_code} {res.text}")
-        raise ValueError(f"Request failed: {res.status_code} {res.text}")
-
-    resp = res.json()
-    # TODO: consider making the response schema the same between below two sources
-    return resp if "TOOL_ENDPOINT_AUTH" in os.environ else resp["data"]  # type: ignore
-
-
-def _create_requests_session(
-    url: str, num_retry: int, headers: Dict[str, str]
-) -> Session:
-    """Create a requests session with retry"""
-    session = Session()
-    retries = Retry(
-        total=num_retry,
-        backoff_factor=2,
-        raise_on_redirect=True,
-        raise_on_status=False,
-        allowed_methods=["GET", "POST", "PUT"],
-        status_forcelist=[
-            408,  # Request Timeout
-            429,  # Too Many Requests (ie. rate limiter).
-            502,  # Bad Gateway
-            503,  # Service Unavailable (include cloud circuit breaker)
-            504,  # Gateway Timeout
-        ],
-    )
-    session.mount(url, HTTPAdapter(max_retries=retries if num_retry > 0 else 0))
-    session.headers.update(headers)
-    return session