griptape_nodes 0.78.0__tar.gz → 0.78.2__tar.gz

{griptape_nodes-0.78.0 → griptape_nodes-0.78.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: griptape-nodes
-Version: 0.78.0
+Version: 0.78.2
 Summary: Add your description here
 Requires-Dist: griptape>=1.9.4
 Requires-Dist: pydantic>=2.10.6
@@ -29,6 +29,7 @@ Requires-Dist: asyncio-thread-runner>=1.0
 Requires-Dist: portalocker>=2.10.0
 Requires-Dist: pygit2>=1.19.0
 Requires-Dist: send2trash>=2.1.0
+Requires-Dist: tenacity>=9.0.0
 Requires-Dist: truststore>=0.10.1
 Requires-Dist: austin-dist>=3.7.0 ; extra == 'profiling'
 Requires-Python: >=3.12.0, <3.13

{griptape_nodes-0.78.0 → griptape_nodes-0.78.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "griptape-nodes"
-version = "0.78.0"
+version = "0.78.2"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12.0, <3.13"
@@ -33,6 +33,7 @@ dependencies = [
   "portalocker>=2.10.0",
   "pygit2>=1.19.0",
   "send2trash>=2.1.0",
+  "tenacity>=9.0.0",
   "truststore>=0.10.1",
 ]
 

{griptape_nodes-0.78.0 → griptape_nodes-0.78.2}/src/griptape_nodes/drivers/storage/griptape_cloud_storage_driver.py

@@ -11,6 +11,7 @@ from griptape_nodes.drivers.storage.base_storage_driver import BaseStorageDriver
 from griptape_nodes.files.path_utils import get_workspace_relative_path
 from griptape_nodes.retained_mode.events.os_events import ExistingFilePolicy
 from griptape_nodes.retained_mode.file_metadata.sidecar_metadata import SidecarContent
+from griptape_nodes.utils.http_utils import request_with_retry, retry_on_transient_error
 
 logger = logging.getLogger("griptape_nodes")
 
@@ -43,6 +44,15 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
         self.request_timeout = kwargs.get("request_timeout")
         self.bucket_id = bucket_id
 
+    @retry_on_transient_error
+    def _request(self, method: str, url: str, **kwargs) -> httpx.Response:
+        """Make an HTTP request with automatic retries on transient errors."""
+        kwargs.setdefault("headers", self.headers)
+        kwargs.setdefault("timeout", self.request_timeout)
+        response = httpx.request(method, url, **kwargs)
+        response.raise_for_status()
+        return response
+
     def create_signed_upload_url(
         self,
         path: Path,
@@ -64,8 +74,7 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
 
         url = urljoin(self.base_url, f"/api/buckets/{self.bucket_id}/asset-urls/{normalized_path.as_posix()}")
         try:
-            response = httpx.post(url, json={"operation": "PUT"}, headers=self.headers, timeout=self.request_timeout)
-            response.raise_for_status()
+            response = self._request("POST", url, json={"operation": "PUT"})
         except httpx.HTTPStatusError as e:
             msg = f"Failed to create presigned upload URL for file {normalized_path}: {e}"
             logger.error(msg)
@@ -144,8 +153,7 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
         normalized_path = get_workspace_relative_path(parsed_path, self.workspace_directory)
         url = urljoin(self.base_url, f"/api/buckets/{self.bucket_id}/asset-urls/{normalized_path.as_posix()}")
         try:
-            response = httpx.post(url, json={"method": "GET"}, headers=self.headers, timeout=self.request_timeout)
-            response.raise_for_status()
+            response = self._request("POST", url, json={"method": "GET"})
         except httpx.HTTPStatusError as e:
             msg = f"Failed to create presigned download URL for file {normalized_path}: {e}"
             logger.error(msg)
@@ -193,14 +201,12 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
 
         # Upload the file using the signed URL
         try:
-            response = httpx.request(
+            self._request(
                 upload_response["method"],
                 upload_response["url"],
                 content=file_content,
                 headers=upload_response["headers"],
-                timeout=self.request_timeout,
             )
-            response.raise_for_status()
         except httpx.HTTPStatusError as e:
             msg = f"Failed to upload file {normalized_path}: {e}"
             logger.error(msg)
@@ -212,13 +218,7 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
     def _create_asset(self, asset_name: str) -> str:
         url = urljoin(self.base_url, f"/api/buckets/{self.bucket_id}/assets")
         try:
-            response = httpx.put(
-                url=url,
-                json={"name": asset_name},
-                headers=self.headers,
-                timeout=self.request_timeout,
-            )
-            response.raise_for_status()
+            response = self._request("PUT", url, json={"name": asset_name})
         except httpx.HTTPStatusError as e:
             msg = str(e)
             logger.error(msg)
@@ -247,8 +247,7 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
         payload = {"name": bucket_name}
 
         try:
-            response = httpx.post(url, json=payload, headers=headers, timeout=timeout)
-            response.raise_for_status()
+            response = request_with_retry("POST", url, json=payload, headers=headers, timeout=timeout)
         except httpx.HTTPStatusError as e:
             msg = f"Failed to create bucket '{bucket_name}': {e}"
             logger.error(msg)
@@ -271,13 +270,7 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
         """
         url = urljoin(self.base_url, f"/api/buckets/{self.bucket_id}/assets")
         try:
-            response = httpx.get(
-                url,
-                headers=self.headers,
-                params={"prefix": self.workspace_directory.name or ""},
-                timeout=self.request_timeout,
-            )
-            response.raise_for_status()
+            response = self._request("GET", url, params={"prefix": self.workspace_directory.name or ""})
         except httpx.HTTPStatusError as e:
             msg = f"Failed to list files in bucket {self.bucket_id}: {e}"
             logger.error(msg)
@@ -328,8 +321,7 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
         url = urljoin(base_url, "/api/buckets")
 
         try:
-            response = httpx.get(url, headers=headers, timeout=timeout)
-            response.raise_for_status()
+            response = request_with_retry("GET", url, headers=headers, timeout=timeout)
         except httpx.HTTPStatusError as e:
             msg = f"Failed to list buckets: {e}"
             logger.error(msg)
@@ -347,8 +339,7 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
         url = urljoin(self.base_url, f"/api/buckets/{self.bucket_id}/assets/{normalized_path.as_posix()}")
 
         try:
-            response = httpx.delete(url, headers=self.headers, timeout=self.request_timeout)
-            response.raise_for_status()
+            self._request("DELETE", url)
         except httpx.HTTPStatusError as e:
             msg = f"Failed to delete file {normalized_path}: {e}"
             logger.error(msg)
@@ -439,8 +430,7 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
 
         # Make API request to get signed URL
         try:
-            response = httpx.post(api_url, json={"method": "GET"}, headers=self.headers, timeout=self.request_timeout)
-            response.raise_for_status()
+            response = self._request("POST", api_url, json={"method": "GET"})
 
             response_data = response.json()
             signed_url = response_data["url"]
@@ -625,20 +615,13 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
         # Make API request to get signed URL
         try:
             headers = {"Authorization": f"Bearer {api_key}"}
-            response = httpx_request_func("POST", api_url, json={"method": "GET"}, headers=headers)
-            response.raise_for_status()
-
-            response_data = response.json()
-            signed_url = response_data["url"]
-
-            logger.info("Converted cloud asset URL to signed URL: %s", asset_url)
+            response = request_with_retry(
+                "POST", api_url, httpx_request_func=httpx_request_func, json={"method": "GET"}, headers=headers
+            )
         except Exception as e:
-            if isinstance(e, httpx.HTTPStatusError):
-                logger.warning(
-                    "Failed to create signed download URL for %s: HTTP %s", asset_url, e.response.status_code
-                )
-            else:
-                logger.warning("Failed to create signed download URL for %s: %s", asset_url, e)
+            logger.warning("Failed to create signed download URL for %s: %s", asset_url, e)
             return None
-        else:
-            return signed_url
+
+        signed_url = response.json()["url"]
+        logger.info("Converted cloud asset URL to signed URL: %s", asset_url)
+        return signed_url

{griptape_nodes-0.78.0 → griptape_nodes-0.78.2}/src/griptape_nodes/exe_types/param_components/project_file_parameter.py

@@ -40,7 +40,7 @@ class ProjectFileParameter:
 
     DEFAULT_SITUATION = "save_node_output"
 
-    def __init__(
+    def __init__(  # noqa: PLR0913
         self,
         node: BaseNode,
         name: str,
@@ -48,6 +48,7 @@ class ProjectFileParameter:
         default_filename: str,
         situation: str = DEFAULT_SITUATION,
         allowed_modes: set[ParameterMode] | None = None,
+        ui_options: dict | None = None,
     ) -> None:
         """Initialize with situation context.
 
@@ -57,12 +58,14 @@ class ProjectFileParameter:
             default_filename: Default filename if parameter is empty
             situation: Situation name (default: "save_node_output")
             allowed_modes: Set of allowed parameter modes (default: INPUT, PROPERTY)
+            ui_options: Optional UI options to pass to the generated parameter
         """
         self._node = node
         self._name = name
         self._situation_name = situation
         self._default_filename = default_filename
         self._allowed_modes = allowed_modes or {ParameterMode.INPUT, ParameterMode.PROPERTY}
+        self._ui_options = ui_options
 
     def add_parameter(self) -> None:
         """Create and add the file path parameter to the node."""
@@ -96,6 +99,7 @@ class ProjectFileParameter:
             input_types=["str"],
             output_type="str",
             traits=traits,
+            ui_options=self._ui_options,
         )
         parameter.on_incoming_connection_removed.append(self._reset_to_default)
 

{griptape_nodes-0.78.0 → griptape_nodes-0.78.2}/src/griptape_nodes/retained_mode/managers/static_files_manager.py

@@ -203,9 +203,9 @@ class StaticFilesManager:
         Returns:
             A result object indicating success or failure.
         """
-        resolved = self._resolve_static_file_path(request.file_name)
+        resolved = self._resolve_static_file_path(request.file_name, COPY_EXTERNAL_FILE_SITUATION)
         if resolved is None:
-            msg = f"Attempted to create download URL for '{request.file_name}'. Failed because the project template is missing the '{SAVE_STATIC_FILE_SITUATION}' situation."
+            msg = f"Attempted to create download URL for '{request.file_name}'. Failed because the project template is missing the '{COPY_EXTERNAL_FILE_SITUATION}' situation."
             return CreateStaticFileDownloadUrlResultFailure(error=msg, result_details=msg)
 
         try:

griptape_nodes-0.78.2/src/griptape_nodes/utils/http_utils.py

@@ -0,0 +1,90 @@
+import logging
+from collections.abc import Callable
+from http import HTTPStatus
+from typing import Any
+
+import httpx
+from tenacity import before_sleep_log, retry, retry_if_exception, stop_after_attempt, wait_exponential
+from tenacity.wait import WaitBaseT
+
+logger = logging.getLogger("griptape_nodes")
+
+RETRY_MAX_ATTEMPTS = 3
+RETRY_WAIT_MULTIPLIER = 1
+RETRY_WAIT_MIN_SECONDS = 1
+RETRY_WAIT_MAX_SECONDS = 10
+
+
+def is_retryable_httpx_error(exc: BaseException) -> bool:
+    """Return True for transient httpx errors that warrant a retry.
+
+    Retries on:
+    - Connection errors (httpx.ConnectError)
+    - Timeouts (httpx.TimeoutException)
+    - Server errors (HTTP 5xx)
+
+    Does not retry on client errors (HTTP 4xx) or other exceptions.
+    """
+    if isinstance(exc, (httpx.ConnectError, httpx.TimeoutException)):
+        return True
+    if isinstance(exc, httpx.HTTPStatusError):
+        return exc.response.status_code >= HTTPStatus.INTERNAL_SERVER_ERROR
+    return False
+
+
+retry_on_transient_error = retry(
+    retry=retry_if_exception(is_retryable_httpx_error),
+    wait=wait_exponential(multiplier=RETRY_WAIT_MULTIPLIER, min=RETRY_WAIT_MIN_SECONDS, max=RETRY_WAIT_MAX_SECONDS),
+    stop=stop_after_attempt(RETRY_MAX_ATTEMPTS),
+    before_sleep=before_sleep_log(logger, logging.WARNING),
+    reraise=True,
+)
+
+
+DEFAULT_RETRY_WAIT: WaitBaseT = wait_exponential(
+    multiplier=RETRY_WAIT_MULTIPLIER, min=RETRY_WAIT_MIN_SECONDS, max=RETRY_WAIT_MAX_SECONDS
+)
+
+
+def request_with_retry(
+    method: str,
+    url: str,
+    *,
+    max_attempts: int = RETRY_MAX_ATTEMPTS,
+    wait: WaitBaseT = DEFAULT_RETRY_WAIT,
+    httpx_request_func: Callable[..., httpx.Response] | None = None,
+    **kwargs: Any,
+) -> httpx.Response:
+    """Make an HTTP request with automatic retries on transient errors.
+
+    Convenience wrapper for standalone/static-method use where a decorated
+    closure would otherwise be needed.
+
+    Args:
+        method: HTTP method (GET, POST, PUT, DELETE, etc.).
+        url: The URL to request.
+        max_attempts: Maximum number of retry attempts.
+        wait: Tenacity wait strategy for backoff between retries.
+        httpx_request_func: Optional httpx request callable. Use this to pass
+            the original (unpatched) httpx.request when calling from within
+            monkey-patched code to avoid infinite recursion.
+        **kwargs: Passed through to the request function.
+
+    Returns:
+        The httpx.Response (already checked via raise_for_status).
+    """
+    func = httpx_request_func or httpx.request
+
+    @retry(
+        retry=retry_if_exception(is_retryable_httpx_error),
+        wait=wait,
+        stop=stop_after_attempt(max_attempts),
+        before_sleep=before_sleep_log(logger, logging.WARNING),
+        reraise=True,
+    )
+    def _do_request() -> httpx.Response:
+        response = func(method, url, **kwargs)
+        response.raise_for_status()
+        return response
+
+    return _do_request()