griptape-nodes 0.48.0__py3-none-any.whl → 0.49.0__py3-none-any.whl

griptape_nodes/__init__.py

@@ -32,7 +32,13 @@ with console.status("Loading Griptape Nodes...") as status:
     from griptape_nodes.retained_mode.managers.os_manager import OSManager
     from griptape_nodes.retained_mode.managers.secrets_manager import SecretsManager
     from griptape_nodes.utils.uv_utils import find_uv_bin
-    from griptape_nodes.utils.version_utils import get_complete_version_string, get_current_version, get_install_source
+    from griptape_nodes.utils.version_utils import (
+        get_complete_version_string,
+        get_current_version,
+        get_install_source,
+        get_latest_version_git,
+        get_latest_version_pypi,
+    )
 
 CONFIG_DIR = xdg_config_home() / "griptape_nodes"
 DATA_DIR = xdg_data_home() / "griptape_nodes"
@@ -642,38 +648,11 @@ def _get_latest_version(package: str, install_source: str) -> str:
         str: Latest release tag (e.g., "v0.31.4")
     """
     if install_source == "pypi":
-        update_url = PYPI_UPDATE_URL.format(package=package)
-
-        with httpx.Client() as client:
-            response = client.get(update_url)
-            try:
-                response.raise_for_status()
-                data = response.json()
-                return f"v{data['info']['version']}"
-            except httpx.HTTPStatusError as e:
-                console.print(f"[red]Error fetching latest version: {e}[/red]")
-                return get_current_version()
-    elif install_source == "git":
-        # We only install auto updating from the 'latest' tag
-        revision = LATEST_TAG
-        update_url = GITHUB_UPDATE_URL.format(package=package, revision=revision)
-
-        with httpx.Client() as client:
-            response = client.get(update_url)
-            try:
-                response.raise_for_status()
-                # Get the latest commit SHA for the tag, this effectively the latest version of the package
-                data = response.json()
-                if "object" in data and "sha" in data["object"]:
-                    return data["object"]["sha"][:7]
-                # Should not happen, but if it does, return the current version
-                return get_current_version()
-            except httpx.HTTPStatusError as e:
-                console.print(f"[red]Error fetching latest version: {e}[/red]")
-                return get_current_version()
-    else:
-        # If the package is installed from a file, just return the current version since the user is likely managing it manually
-        return get_current_version()
+        return get_latest_version_pypi(package, PYPI_UPDATE_URL)
+    if install_source == "git":
+        return get_latest_version_git(package, GITHUB_UPDATE_URL, LATEST_TAG)
+    # If the package is installed from a file, just return the current version since the user is likely managing it manually
+    return get_current_version()
 
 
 def _auto_update_self() -> None:

griptape_nodes/app/app.py

@@ -92,7 +92,6 @@ def start_app() -> None:
     Starts the event loop and listens for events from the Nodes API.
     """
     _init_event_listeners()
-
     # Listen for any signals to exit the app
     for sig in (signal.SIGINT, signal.SIGTERM):
         signal.signal(sig, lambda *_: sys.exit(0))
@@ -100,11 +99,9 @@ def start_app() -> None:
     api_key = _ensure_api_key()
     threading.Thread(target=mcp_server, args=(api_key,), daemon=True).start()
     threading.Thread(target=_listen_for_api_events, args=(api_key,), daemon=True).start()
-
     if STATIC_SERVER_ENABLED:
         static_dir = _build_static_dir()
         threading.Thread(target=start_api, args=(static_dir, event_queue), daemon=True).start()
-
     _process_event_queue()
 
 
@@ -263,8 +260,12 @@ def _process_event_queue() -> None:
     Event queue will be populated by background threads listening for events from the Nodes API.
     """
     # Wait for WebSocket connection to be established before processing events
-    ws_ready_event.wait()
-
+    timed_out = ws_ready_event.wait(timeout=15)
+    if not timed_out:
+        console.print(
+            "[red] The connection to the websocket timed out. Please check your internet connection or the status of Griptape Nodes API.[/red]"
+        )
+        sys.exit(1)
     while True:
         event = event_queue.get(block=True)
         if isinstance(event, EventRequest):

griptape_nodes/bootstrap/workflow_executors/local_workflow_executor.py

@@ -92,7 +92,7 @@ class LocalWorkflowExecutor(WorkflowExecutor):
             node_name = result_event.payload.node_name
             flow_name = GriptapeNodes.NodeManager().get_node_parent_flow_by_name(node_name)
             event_request = EventRequest(request=SingleExecutionStepRequest(flow_name=flow_name))
-            GriptapeNodes.handle_request(event_request.request)
+            self.queue.put(event_request)
 
         elif type(result_event.payload).__name__ == "NodeFinishProcessEvent":
             event_log = f"NodeFinishProcessEvent: {result_event.payload}"
@@ -196,7 +196,13 @@ class LocalWorkflowExecutor(WorkflowExecutor):
             try:
                 event = self.queue.get(block=True)
 
-                if isinstance(event, ExecutionGriptapeNodeEvent):
+                if isinstance(event, EventRequest):
+                    # Handle EventRequest objects by processing them through GriptapeNodes
+                    request_payload = event.request
+                    GriptapeNodes.handle_request(
+                        request_payload, response_topic=event.response_topic, request_id=event.request_id
+                    )
+                elif isinstance(event, ExecutionGriptapeNodeEvent):
                     result_event = event.wrapped_event
 
                     if type(result_event.payload).__name__ == "ControlFlowResolvedEvent":
@@ -208,6 +214,8 @@ class LocalWorkflowExecutor(WorkflowExecutor):
                         is_flow_finished = True
                         logger.error(msg)
                         error = LocalExecutorError(msg)
+                else:
+                    logger.info("Unknown event type encountered: %s", type(event))
 
                 self.queue.task_done()
 

griptape_nodes/utils/version_utils.py

@@ -6,6 +6,11 @@ import importlib.metadata
 import json
 from typing import Literal
 
+import httpx
+from rich.console import Console
+
+console = Console()
+
 engine_version = importlib.metadata.version("griptape_nodes")
 
 
@@ -49,3 +54,73 @@ def get_complete_version_string() -> str:
     if commit_id is None:
         return f"{version} ({source})"
     return f"{version} ({source} - {commit_id})"
+
+
+def get_latest_version_pypi(package: str, pypi_url: str) -> str:
+    """Gets the latest version from PyPI.
+
+    Args:
+        package: The name of the package to fetch the latest version for.
+        pypi_url: The PyPI URL template to use.
+
+    Returns:
+        str: Latest release tag (e.g., "v0.31.4") or current version if fetch fails.
+    """
+    version = get_current_version()
+    update_url = pypi_url.format(package=package)
+
+    with httpx.Client(timeout=30.0) as client:
+        try:
+            response = client.get(update_url)
+        except httpx.RequestError as e:
+            console.print(f"[red]Error fetching latest version due to error: [/red][cyan]{e}[/cyan]")
+            console.print(
+                f"[red]Please check your internet connection or if you can access the following update url: [/red] [cyan]{update_url}[/cyan]"
+            )
+            return version
+
+        try:
+            response.raise_for_status()
+            data = response.json()
+            if "info" in data and "version" in data["info"]:
+                version = f"v{data['info']['version']}"
+        except httpx.HTTPStatusError as e:
+            console.print(f"[red]Error fetching latest version: {e}[/red]")
+
+    return version
+
+
+def get_latest_version_git(package: str, github_url: str, latest_tag: str) -> str:
+    """Gets the latest version from Git.
+
+    Args:
+        package: The name of the package to fetch the latest version for.
+        github_url: The GitHub URL template to use.
+        latest_tag: The tag to fetch (usually 'latest').
+
+    Returns:
+        str: Latest commit SHA (first 7 characters) or current version if fetch fails.
+    """
+    version = get_current_version()
+    revision = latest_tag
+    update_url = github_url.format(package=package, revision=revision)
+
+    with httpx.Client(timeout=30.0) as client:
+        try:
+            response = client.get(update_url)
+        except httpx.RequestError as e:
+            console.print(f"[red]Error fetching latest version due to error: [/red][cyan]{e}[/cyan]")
+            console.print(
+                f"[red]Please check your internet connection or if you can access the following update url: [/red] [cyan]{update_url}[/cyan]"
+            )
+            return version
+
+        try:
+            response.raise_for_status()
+            data = response.json()
+            if "object" in data and "sha" in data["object"]:
+                version = data["object"]["sha"][:7]
+        except httpx.HTTPStatusError as e:
+            console.print(f"[red]Error fetching latest version: {e}[/red]")
+
+    return version

{griptape_nodes-0.48.0.dist-info → griptape_nodes-0.49.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: griptape-nodes
-Version: 0.48.0
+Version: 0.49.0
 Summary: Add your description here
 Requires-Dist: griptape>=1.8.0
 Requires-Dist: pydantic>=2.10.6

{griptape_nodes-0.48.0.dist-info → griptape_nodes-0.49.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-griptape_nodes/__init__.py,sha256=086f45e6ae694a24d828e6a1823376b75b6e64bf05ae95bb7e159bee199bd18e,38501
+griptape_nodes/__init__.py,sha256=ca4ec8ef95679e0a98c8e75a539ee1a6eb00c8bf2d1d88bf0e44edb9b778e192,37367
 griptape_nodes/app/.python-version,sha256=7b55f8e67b5623c4bef3fa691288da9437d79d3aba156de48d481db32ac7d16d,5
 griptape_nodes/app/__init__.py,sha256=0c1f834ec81c3676e6102957128bb0cc686b9a8de01c10965c1f4190f1a97502,90
 griptape_nodes/app/api.py,sha256=46a36af068a4784b0317daede79befd59198320c3934ee1b84c74b297108774f,6925
-griptape_nodes/app/app.py,sha256=764f9ef01e11bd5649bc0b0b3e72c4a7e113b5c94eb2236770152cfd81a0eafa,17747
+griptape_nodes/app/app.py,sha256=4d494cb0e1ba87c288b19a76c01015629c104fdf7a8668b6abf42e6e8baeaade,17984
 griptape_nodes/app/watch.py,sha256=413353c7811b54440276277250d766b3be30edf8eb8c128069dbb52d40e9e962,2064
 griptape_nodes/bootstrap/__init__.py,sha256=10dbf7488cd0f53b6546b835cb87b80a7a01a49685a454a43694c5055f17e4bb,25
 griptape_nodes/bootstrap/workflow_executors/__init__.py,sha256=a728cdf35f9e2ed8f21021582d73ad3028b18a223da818b9c9a95df3a88cec49,34
-griptape_nodes/bootstrap/workflow_executors/local_workflow_executor.py,sha256=c3711f000d42b3ea63558b574d327073fe8645f460337bd45cf1190a6a4113ba,8816
+griptape_nodes/bootstrap/workflow_executors/local_workflow_executor.py,sha256=f09128692368e073d18cc602bcc0c81af8317eb4bfff486b30154262eb45f578,9274
 griptape_nodes/bootstrap/workflow_executors/subprocess_workflow_executor.py,sha256=b610be5ba3b459d1f0f0ee6a01fa104bed225d6081ae1db42626de8c7bc6c90c,3347
 griptape_nodes/bootstrap/workflow_executors/workflow_executor.py,sha256=945000fb96d6cabd8a7f53324b9d2f5f549e1bb976ce66d2adbe7f932c8822ba,417
 griptape_nodes/drivers/__init__.py,sha256=b479a21509fab89c855610b63eba87811507ddddf20eca8c4295aa45ab266aa0,42
@@ -113,7 +113,7 @@ griptape_nodes/utils/dict_utils.py,sha256=932962e4c39fcd2a2bd1af259977d80554bf35
 griptape_nodes/utils/image_preview.py,sha256=361608aa885117dbdb16958812f64774f2cb3cafc975406f0b846f340b126b5c,4480
 griptape_nodes/utils/metaclasses.py,sha256=4522b202f669a47fe16ccba0994988afc42a3a0d6c618e2e44d7d0c9b0f83bc4,287
 griptape_nodes/utils/uv_utils.py,sha256=64adfb2e669c29fc4c54a91c20ec89df91ce5e057ab05584f42ce028f99a454d,519
-griptape_nodes/utils/version_utils.py,sha256=f601cb158cd089036bec69ed7466d74e524e3dfdeaf1f6692024c7a38b001646,1649
+griptape_nodes/utils/version_utils.py,sha256=63e1c97c95ba271bb3fe33a71f1322cbea6631ab8746763eec13b76a51a6c3e4,4318
 griptape_nodes/version_compatibility/__init__.py,sha256=24ccf5b01ed9b23ea94b54b9b1db0f474927f3db35034b01d24148bf280961fa,74
 griptape_nodes/version_compatibility/versions/__init__.py,sha256=3d64b1336f0b3d47417513c0f7c8f84545afb99e0da9f5f575acb6554e92a8fc,74
 griptape_nodes/version_compatibility/versions/v0_39_0/__init__.py,sha256=db588a945a6c9815b85ac01ec520f458c0099ec62632adac21b0de602f37d5f7,62
@@ -121,7 +121,7 @@ griptape_nodes/version_compatibility/versions/v0_39_0/modified_parameters_set_re
 griptape_nodes/version_compatibility/workflow_versions/__init__.py,sha256=cf95c38248b3a0d072097a72a37e217ec24a16c5a53876c3ea18337d81fdb9b7,52
 griptape_nodes/version_compatibility/workflow_versions/v0_7_0/__init__.py,sha256=2333cf9862bcea1dacc1f1864ce1f255c04894e9e0e928e0590ce56dfde7826a,51
 griptape_nodes/version_compatibility/workflow_versions/v0_7_0/local_executor_argument_addition.py,sha256=f4f725029fcc9b920fb5de728f95d24b9fb1ed062689fbe14e5cb6d02801666a,2018
-griptape_nodes-0.48.0.dist-info/WHEEL,sha256=a51d7af6bb8356f1000fb3d205aba975eca53e14c9e011c620094d822eb4863c,79
-griptape_nodes-0.48.0.dist-info/entry_points.txt,sha256=aaf7afa9ddc155b015e5371a9ed9c09b4a2ea9aa982a1b113b7a641729962d63,82
-griptape_nodes-0.48.0.dist-info/METADATA,sha256=62b03f4479b27f2548ff0dbbb1daf21749fca32f9aad00092d7968b1b24aebc1,4980
-griptape_nodes-0.48.0.dist-info/RECORD,,
+griptape_nodes-0.49.0.dist-info/WHEEL,sha256=0f7d664a881437bddec71c703c3c2f01fd13581519f95130abcc96e296ef0426,79
+griptape_nodes-0.49.0.dist-info/entry_points.txt,sha256=aaf7afa9ddc155b015e5371a9ed9c09b4a2ea9aa982a1b113b7a641729962d63,82
+griptape_nodes-0.49.0.dist-info/METADATA,sha256=300c28a67c7d0fdcb6bcc173a4131b3b14818dfc55af1dcd53d5db3b7b7fdae1,4980
+griptape_nodes-0.49.0.dist-info/RECORD,,

{griptape_nodes-0.48.0.dist-info → griptape_nodes-0.49.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.8.10
+Generator: uv 0.8.11
 Root-Is-Purelib: true
 Tag: py3-none-any