griptape-nodes 0.48.0__tar.gz → 0.49.0__tar.gz

{griptape_nodes-0.48.0 → griptape_nodes-0.49.0}/PKG-INFO

@@ -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 → griptape_nodes-0.49.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "griptape-nodes"
-version = "0.48.0"
+version = "0.49.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12.0, <3.13"

{griptape_nodes-0.48.0 → griptape_nodes-0.49.0}/src/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-0.48.0 → griptape_nodes-0.49.0}/src/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-0.48.0 → griptape_nodes-0.49.0}/src/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-0.49.0/src/griptape_nodes/utils/version_utils.py

@@ -0,0 +1,126 @@
+"""Version utilities for Griptape Nodes."""
+
+from __future__ import annotations
+
+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")
+
+
+def get_current_version() -> str:
+    """Returns the current version of the Griptape Nodes package."""
+    return f"v{engine_version}"
+
+
+def get_install_source() -> tuple[Literal["git", "file", "pypi"], str | None]:
+    """Determines the install source of the Griptape Nodes package.
+
+    Returns:
+        tuple: A tuple containing the install source and commit ID (if applicable).
+    """
+    dist = importlib.metadata.distribution("griptape_nodes")
+    direct_url_text = dist.read_text("direct_url.json")
+    # installing from pypi doesn't have a direct_url.json file
+    if direct_url_text is None:
+        return "pypi", None
+
+    direct_url_info = json.loads(direct_url_text)
+    url = direct_url_info.get("url")
+    if url and url.startswith("file://"):
+        return "file", None
+    if "vcs_info" in direct_url_info:
+        return "git", direct_url_info["vcs_info"].get("commit_id")[:7]
+    # Fall back to pypi if no other source is found
+    return "pypi", None
+
+
+def get_complete_version_string() -> str:
+    """Returns the complete version string including install source and commit ID.
+
+    Format: v1.2.3 (source) or v1.2.3 (source - commit_id)
+
+    Returns:
+        Complete version string with source and commit info.
+    """
+    version = get_current_version()
+    source, commit_id = get_install_source()
+    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/src/griptape_nodes/utils/version_utils.py

@@ -1,51 +0,0 @@
-"""Version utilities for Griptape Nodes."""
-
-from __future__ import annotations
-
-import importlib.metadata
-import json
-from typing import Literal
-
-engine_version = importlib.metadata.version("griptape_nodes")
-
-
-def get_current_version() -> str:
-    """Returns the current version of the Griptape Nodes package."""
-    return f"v{engine_version}"
-
-
-def get_install_source() -> tuple[Literal["git", "file", "pypi"], str | None]:
-    """Determines the install source of the Griptape Nodes package.
-
-    Returns:
-        tuple: A tuple containing the install source and commit ID (if applicable).
-    """
-    dist = importlib.metadata.distribution("griptape_nodes")
-    direct_url_text = dist.read_text("direct_url.json")
-    # installing from pypi doesn't have a direct_url.json file
-    if direct_url_text is None:
-        return "pypi", None
-
-    direct_url_info = json.loads(direct_url_text)
-    url = direct_url_info.get("url")
-    if url and url.startswith("file://"):
-        return "file", None
-    if "vcs_info" in direct_url_info:
-        return "git", direct_url_info["vcs_info"].get("commit_id")[:7]
-    # Fall back to pypi if no other source is found
-    return "pypi", None
-
-
-def get_complete_version_string() -> str:
-    """Returns the complete version string including install source and commit ID.
-
-    Format: v1.2.3 (source) or v1.2.3 (source - commit_id)
-
-    Returns:
-        Complete version string with source and commit info.
-    """
-    version = get_current_version()
-    source, commit_id = get_install_source()
-    if commit_id is None:
-        return f"{version} ({source})"
-    return f"{version} ({source} - {commit_id})"