griptape-nodes 0.43.1__tar.gz → 0.45.0__tar.gz

{griptape_nodes-0.43.1 → griptape_nodes-0.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: griptape-nodes
-Version: 0.43.1
+Version: 0.45.0
 Summary: Add your description here
 Requires-Dist: griptape>=1.8.0
 Requires-Dist: pydantic>=2.10.6
@@ -19,6 +19,7 @@ Requires-Dist: imageio-ffmpeg>=0.6.0
 Requires-Dist: mcp[ws]>=1.10.1
 Requires-Dist: binaryornot>=0.4.4
 Requires-Dist: pillow>=11.3.0
+Requires-Dist: watchfiles>=1.1.0
 Requires-Dist: austin-dist>=3.7.0 ; extra == 'profiling'
 Requires-Python: >=3.12.0, <3.13
 Provides-Extra: profiling

{griptape_nodes-0.43.1 → griptape_nodes-0.45.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "griptape-nodes"
-version = "0.43.1"
+version = "0.45.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12.0, <3.13"
@@ -23,6 +23,7 @@ dependencies = [
   "mcp[ws]>=1.10.1",
   "binaryornot>=0.4.4",
   "pillow>=11.3.0",
+  "watchfiles>=1.1.0",
 ]
 
 [project.optional-dependencies]

{griptape_nodes-0.43.1 → griptape_nodes-0.45.0}/src/griptape_nodes/__init__.py

@@ -6,7 +6,6 @@ console = Console()
 
 with console.status("Loading Griptape Nodes...") as status:
     import argparse
-    import importlib.metadata
     import json
     import os
     import shutil
@@ -15,7 +14,7 @@ with console.status("Loading Griptape Nodes...") as status:
     import tempfile
     from dataclasses import dataclass
     from pathlib import Path
-    from typing import Any, Literal
+    from typing import Any
 
     import httpx
     from rich.box import HEAVY_EDGE
@@ -28,10 +27,12 @@ with console.status("Loading Griptape Nodes...") as status:
     from griptape_nodes.app import start_app
     from griptape_nodes.drivers.storage import StorageBackend
     from griptape_nodes.drivers.storage.griptape_cloud_storage_driver import GriptapeCloudStorageDriver
-    from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes, engine_version
+    from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
     from griptape_nodes.retained_mode.managers.config_manager import ConfigManager
     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
 
 CONFIG_DIR = xdg_config_home() / "griptape_nodes"
 DATA_DIR = xdg_data_home() / "griptape_nodes"
@@ -330,7 +331,12 @@ def _get_args() -> argparse.Namespace:
         metavar="SUBCOMMAND",
         required=True,
     )
-    config_subparsers.add_parser("show", help="Show configuration values.")
+    config_show_parser = config_subparsers.add_parser("show", help="Show configuration values.")
+    config_show_parser.add_argument(
+        "config_path",
+        nargs="?",
+        help="Optional config path to show specific value (e.g., 'workspace_directory').",
+    )
     config_subparsers.add_parser("list", help="List configuration values.")
     config_subparsers.add_parser("reset", help="Reset configuration to defaults.")
 
@@ -609,7 +615,7 @@ def _get_latest_version(package: str, install_source: str) -> str:
                 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()
+                return get_current_version()
     elif install_source == "git":
         # We only install auto updating from the 'latest' tag
         revision = LATEST_TAG
@@ -624,20 +630,20 @@ def _get_latest_version(package: str, install_source: str) -> str:
                 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()
+                return get_current_version()
             except httpx.HTTPStatusError as e:
                 console.print(f"[red]Error fetching latest version: {e}[/red]")
-                return __get_current_version()
+                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_current_version()
 
 
 def _auto_update_self() -> None:
     """Automatically updates the script to the latest version if the user confirms."""
     console.print("[bold green]Checking for updates...[/bold green]")
-    source, commit_id = __get_install_source()
-    current_version = __get_current_version()
+    source, commit_id = get_install_source()
+    current_version = get_current_version()
     latest_version = _get_latest_version(PACKAGE_NAME, source)
 
     if source == "git" and commit_id is not None:
@@ -663,10 +669,10 @@ def _update_self() -> None:
 
 def _sync_libraries() -> None:
     """Download and sync Griptape Nodes libraries, copying only directories from synced libraries."""
-    install_source, _ = __get_install_source()
+    install_source, _ = get_install_source()
     # Unless we're installed from PyPi, grab libraries from the 'latest' tag
     if install_source == "pypi":
-        version = __get_current_version()
+        version = get_current_version()
     else:
         version = LATEST_TAG
 
@@ -681,12 +687,13 @@ def _sync_libraries() -> None:
 
         # Streaming download with a tiny progress bar
         with httpx.stream("GET", tar_url, follow_redirects=True) as r, Progress() as progress:
+            task = progress.add_task("[green]Downloading...", total=int(r.headers.get("Content-Length", 0)))
+            progress.start()
             try:
                 r.raise_for_status()
             except httpx.HTTPStatusError as e:
                 console.print(f"[red]Error fetching libraries: {e}[/red]")
                 return
-            task = progress.add_task("[green]Downloading...", total=int(r.headers.get("Content-Length", 0)))
             with tar_path.open("wb") as f:
                 for chunk in r.iter_bytes():
                     f.write(chunk)
@@ -724,18 +731,29 @@ def _sync_libraries() -> None:
 
 def _print_current_version() -> None:
     """Prints the current version of the script."""
-    version = __get_current_version()
-    source, commit_id = __get_install_source()
-    if commit_id is None:
-        console.print(f"[bold green]{version} ({source})[/bold green]")
-    else:
-        console.print(f"[bold green]{version} ({source} - {commit_id})[/bold green]")
+    version_string = get_complete_version_string()
+    console.print(f"[bold green]{version_string}[/bold green]")
+
 
+def _print_user_config(config_path: str | None = None) -> None:
+    """Prints the user configuration from the config file.
 
-def _print_user_config() -> None:
-    """Prints the user configuration from the config file."""
-    config = config_manager.merged_config
-    sys.stdout.write(json.dumps(config, indent=2))
+    Args:
+        config_path: Optional path to specific config value. If None, prints entire config.
+    """
+    if config_path is None:
+        config = config_manager.merged_config
+        sys.stdout.write(json.dumps(config, indent=2))
+    else:
+        try:
+            value = config_manager.get_config_value(config_path)
+            if isinstance(value, (dict, list)):
+                sys.stdout.write(json.dumps(value, indent=2))
+            else:
+                sys.stdout.write(str(value))
+        except (KeyError, AttributeError, ValueError):
+            console.print(f"[bold red]Config path '{config_path}' not found[/bold red]")
+            sys.exit(1)
 
 
 def _list_user_configs() -> None:
@@ -791,7 +809,10 @@ def _uninstall_self() -> None:
     # Remove the executable
     console.print("[bold]Removing the executable...[/bold]")
     console.print("[bold yellow]When done, press Enter to exit.[/bold yellow]")
-    os_manager.replace_process(["uv", "tool", "uninstall", "griptape-nodes"])
+
+    # Remove the tool using UV
+    uv_path = find_uv_bin()
+    os_manager.replace_process([uv_path, "tool", "uninstall", "griptape-nodes"])
 
 
 def _parse_key_value_pairs(pairs: list[str] | None) -> dict[str, Any] | None:
@@ -857,7 +878,7 @@ def _process_args(args: argparse.Namespace) -> None:  # noqa: C901, PLR0912
         elif args.subcommand == "reset":
             _reset_user_config()
         elif args.subcommand == "show":
-            _print_user_config()
+            _print_user_config(args.config_path)
     elif args.command == "self":
         if args.subcommand == "update":
             _update_self()
@@ -873,33 +894,6 @@ def _process_args(args: argparse.Namespace) -> None:  # noqa: C901, PLR0912
         raise ValueError(msg)
 
 
-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.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 __init_system_config() -> None:
     """Initializes the system config directory if it doesn't exist."""
     if not CONFIG_DIR.exists():

{griptape_nodes-0.43.1 → griptape_nodes-0.45.0}/src/griptape_nodes/app/api.py

@@ -13,8 +13,6 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from rich.logging import RichHandler
 
-from griptape_nodes.retained_mode.events.base_events import EventRequest, deserialize_event
-
 if TYPE_CHECKING:
     from queue import Queue
 
@@ -27,9 +25,11 @@ STATIC_SERVER_PORT = int(os.getenv("STATIC_SERVER_PORT", "8124"))
 # URL path for the static server
 STATIC_SERVER_URL = os.getenv("STATIC_SERVER_URL", "/static")
 # Log level for the static server
-STATIC_SERVER_LOG_LEVEL = os.getenv("STATIC_SERVER_LOG_LEVEL", "info").lower()
+STATIC_SERVER_LOG_LEVEL = os.getenv("STATIC_SERVER_LOG_LEVEL", "ERROR").lower()
 
 logger = logging.getLogger("griptape_nodes_api")
+logging.getLogger("uvicorn").addHandler(RichHandler(show_time=True, show_path=False, markup=True, rich_tracebacks=True))
+
 
 # Global event queue - initialized as None and set when starting the API
 event_queue: Queue | None = None
@@ -124,8 +124,41 @@ async def _list_static_files(static_directory: Annotated[Path, Depends(get_stati
         return {"files": file_names}
 
 
+@app.delete("/static-files/{file_path:path}")
+async def _delete_static_file(file_path: str, static_directory: Annotated[Path, Depends(get_static_dir)]) -> dict:
+    """Delete a static file from the static server."""
+    if not STATIC_SERVER_ENABLED:
+        msg = "Static server is not enabled. Please set STATIC_SERVER_ENABLED to True."
+        raise HTTPException(status_code=500, detail=msg)
+
+    file_full_path = Path(static_directory / file_path)
+
+    # Check if file exists
+    if not file_full_path.exists():
+        logger.warning("File not found for deletion: %s", file_path)
+        raise HTTPException(status_code=404, detail=f"File {file_path} not found")
+
+    # Check if it's actually a file (not a directory)
+    if not file_full_path.is_file():
+        msg = f"Path {file_path} is not a file"
+        logger.error(msg)
+        raise HTTPException(status_code=400, detail=msg)
+
+    try:
+        file_full_path.unlink()
+    except (OSError, PermissionError) as e:
+        msg = f"Failed to delete file {file_path}: {e}"
+        logger.error(msg)
+        raise HTTPException(status_code=500, detail=msg) from e
+    else:
+        logger.info("Successfully deleted static file: %s", file_path)
+        return {"message": f"File {file_path} deleted successfully"}
+
+
 @app.post("/engines/request")
 async def _create_event(request: Request, queue: Annotated[Queue, Depends(get_event_queue)]) -> None:
+    from .app import _process_api_event
+
     body = await request.json()
     _process_api_event(body, queue)
 
@@ -136,10 +169,6 @@ def start_api(static_directory: Path, queue: Queue) -> None:
     event_queue = queue
     static_dir = static_directory
 
-    logging.getLogger("uvicorn").addHandler(
-        RichHandler(show_time=True, show_path=False, markup=True, rich_tracebacks=True)
-    )
-
     if not static_dir.exists():
         static_dir.mkdir(parents=True, exist_ok=True)
 
@@ -151,7 +180,7 @@ def start_api(static_directory: Path, queue: Queue) -> None:
             "http://localhost:5173",
         ],
         allow_credentials=True,
-        allow_methods=["OPTIONS", "GET", "POST", "PUT"],
+        allow_methods=["OPTIONS", "GET", "POST", "PUT", "DELETE"],
         allow_headers=["*"],
     )
 
@@ -164,36 +193,3 @@ def start_api(static_directory: Path, queue: Queue) -> None:
     uvicorn.run(
         app, host=STATIC_SERVER_HOST, port=STATIC_SERVER_PORT, log_level=STATIC_SERVER_LOG_LEVEL, log_config=None
     )
-
-
-def _process_api_event(event: dict, event_queue: Queue) -> None:
-    """Process API events and send them to the event queue."""
-    payload = event.get("payload", {})
-
-    try:
-        payload["request"]
-    except KeyError:
-        msg = "Error: 'request' was expected but not found."
-        raise RuntimeError(msg) from None
-
-    try:
-        event_type = payload["event_type"]
-        if event_type != "EventRequest":
-            msg = "Error: 'event_type' was found on request, but did not match 'EventRequest' as expected."
-            raise RuntimeError(msg) from None
-    except KeyError:
-        msg = "Error: 'event_type' not found in request."
-        raise RuntimeError(msg) from None
-
-    # Now attempt to convert it into an EventRequest.
-    try:
-        request_event = deserialize_event(json_data=payload)
-        if not isinstance(request_event, EventRequest):
-            msg = f"Deserialized event is not an EventRequest: {type(request_event)}"
-            raise TypeError(msg)  # noqa: TRY301
-    except Exception as e:
-        msg = f"Unable to convert request JSON into a valid EventRequest object. Error Message: '{e}'"
-        raise RuntimeError(msg) from None
-
-    # Add the event to the queue
-    event_queue.put(request_event)

{griptape_nodes-0.43.1 → griptape_nodes-0.45.0}/src/griptape_nodes/app/app.py

@@ -9,7 +9,7 @@ import sys
 import threading
 from pathlib import Path
 from queue import Queue
-from typing import Any
+from typing import Any, cast
 from urllib.parse import urljoin
 
 from griptape.events import (
@@ -24,9 +24,9 @@ from websockets.asyncio.client import connect
 from websockets.exceptions import ConnectionClosed, WebSocketException
 
 from griptape_nodes.mcp_server.server import main as mcp_server
+from griptape_nodes.retained_mode.events import app_events, execution_events
 
 # This import is necessary to register all events, even if not technically used
-from griptape_nodes.retained_mode.events import app_events, execution_events
 from griptape_nodes.retained_mode.events.base_events import (
     AppEvent,
     EventRequest,
@@ -36,11 +36,14 @@ from griptape_nodes.retained_mode.events.base_events import (
     ExecutionGriptapeNodeEvent,
     GriptapeNodeEvent,
     ProgressEvent,
+    RequestPayload,
+    SkipTheLineMixin,
+    deserialize_event,
 )
 from griptape_nodes.retained_mode.events.logger_events import LogHandlerEvent
 from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
 
-from .api import _process_api_event, start_api
+from .api import start_api
 
 # This is a global event queue that will be used to pass events between threads
 event_queue = Queue()
@@ -395,3 +398,67 @@ def __schedule_async_task(coro: Any) -> None:
         asyncio.run_coroutine_threadsafe(coro, event_loop)
     else:
         logger.warning("Event loop not available for scheduling async task")
+
+
+def _process_api_event(event: dict, event_queue: Queue) -> None:
+    """Process API events and send them to the event queue."""
+    payload = event.get("payload", {})
+
+    try:
+        payload["request"]
+    except KeyError:
+        msg = "Error: 'request' was expected but not found."
+        raise RuntimeError(msg) from None
+
+    try:
+        event_type = payload["event_type"]
+        if event_type != "EventRequest":
+            msg = "Error: 'event_type' was found on request, but did not match 'EventRequest' as expected."
+            raise RuntimeError(msg) from None
+    except KeyError:
+        msg = "Error: 'event_type' not found in request."
+        raise RuntimeError(msg) from None
+
+    # Now attempt to convert it into an EventRequest.
+    try:
+        request_event = deserialize_event(json_data=payload)
+        if not isinstance(request_event, EventRequest):
+            msg = f"Deserialized event is not an EventRequest: {type(request_event)}"
+            raise TypeError(msg)  # noqa: TRY301
+    except Exception as e:
+        msg = f"Unable to convert request JSON into a valid EventRequest object. Error Message: '{e}'"
+        raise RuntimeError(msg) from None
+
+    # Check if the event implements SkipTheLineMixin for priority processing
+    if isinstance(request_event.request, SkipTheLineMixin):
+        # Handle the event immediately without queuing
+        # The request is guaranteed to be a RequestPayload since it passed earlier validation
+        result_payload = GriptapeNodes.handle_request(
+            cast("RequestPayload", request_event.request),
+            response_topic=request_event.response_topic,
+            request_id=request_event.request_id,
+        )
+
+        # Create the result event and emit response immediately
+        if result_payload.succeeded():
+            result_event = EventResultSuccess(
+                request=cast("RequestPayload", request_event.request),
+                request_id=request_event.request_id,
+                result=result_payload,
+                response_topic=request_event.response_topic,
+            )
+            dest_socket = "success_result"
+        else:
+            result_event = EventResultFailure(
+                request=cast("RequestPayload", request_event.request),
+                request_id=request_event.request_id,
+                result=result_payload,
+                response_topic=request_event.response_topic,
+            )
+            dest_socket = "failure_result"
+
+        # Emit the response immediately
+        __schedule_async_task(__emit_message(dest_socket, result_event.json(), topic=result_event.response_topic))
+    else:
+        # Add the event to the queue for normal processing
+        event_queue.put(request_event)

{griptape_nodes-0.43.1 → griptape_nodes-0.45.0}/src/griptape_nodes/app/watch.py

@@ -8,6 +8,8 @@ from typing import Any
 from watchdog.events import PatternMatchingEventHandler
 from watchdog.observers import Observer
 
+from griptape_nodes.utils.uv_utils import find_uv_bin
+
 
 class ReloadHandler(PatternMatchingEventHandler):
     def __init__(
@@ -30,8 +32,9 @@ class ReloadHandler(PatternMatchingEventHandler):
     def start_process(self) -> None:
         if self.process:
             self.process.terminate()
-        self.process = subprocess.Popen(
-            ["uv", "run", "gtn"],  # noqa: S607
+        uv_path = find_uv_bin()
+        self.process = subprocess.Popen(  # noqa: S603
+            [uv_path, "run", "gtn"],
             stdout=sys.stdout,
             stderr=sys.stderr,
         )

{griptape_nodes-0.43.1 → griptape_nodes-0.45.0}/src/griptape_nodes/bootstrap/workflow_executors/local_workflow_executor.py

@@ -144,7 +144,13 @@ class LocalWorkflowExecutor(WorkflowExecutor):
 
         return output
 
-    def run(self, workflow_name: str, flow_input: Any, storage_backend: StorageBackend = StorageBackend.LOCAL) -> None:
+    def run(
+        self,
+        workflow_name: str,
+        flow_input: Any,
+        storage_backend: StorageBackend = StorageBackend.LOCAL,
+        **kwargs: Any,  # noqa: ARG002
+    ) -> None:
         """Executes a local workflow.
 
         Executes a workflow by setting up event listeners, registering libraries,

griptape_nodes-0.45.0/src/griptape_nodes/bootstrap/workflow_executors/subprocess_workflow_executor.py

@@ -0,0 +1,90 @@
+import importlib.util
+import sys
+import threading
+from multiprocessing import Process, Queue
+from multiprocessing import Queue as ProcessQueue
+from pathlib import Path
+from typing import Any
+
+from griptape_nodes.app.api import start_api
+from griptape_nodes.app.app import _build_static_dir
+from griptape_nodes.bootstrap.workflow_executors.local_workflow_executor import LocalWorkflowExecutor
+from griptape_nodes.bootstrap.workflow_executors.workflow_executor import WorkflowExecutor
+from griptape_nodes.drivers.storage.storage_backend import StorageBackend
+from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
+
+
+class SubprocessWorkflowExecutor(WorkflowExecutor):
+    @classmethod
+    def load_workflow(cls, path_to_workflow: str) -> None:
+        """Load a workflow from a file."""
+        # Ensure file_path is a Path object
+        file_path = Path(path_to_workflow)
+
+        # Generate a unique module name
+        module_name = f"gtn_dynamic_module_{file_path.name.replace('.', '_')}_{hash(str(file_path))}"
+
+        # Load the module specification
+        spec = importlib.util.spec_from_file_location(module_name, file_path)
+        if spec is None or spec.loader is None:
+            msg = f"Could not load module specification from {file_path}"
+            raise ImportError(msg)
+
+        # Create the module
+        module = importlib.util.module_from_spec(spec)
+
+        # Add to sys.modules to handle recursive imports
+        sys.modules[module_name] = module
+
+        # Execute the module
+        spec.loader.exec_module(module)
+
+    @staticmethod
+    def _subprocess_entry(
+        exception_queue: Queue,
+        workflow_name: str,
+        flow_input: Any,
+        workflow_path: str | None = None,
+    ) -> None:
+        try:
+            static_dir = _build_static_dir()
+            event_queue = ProcessQueue()
+            threading.Thread(target=start_api, args=(static_dir, event_queue), daemon=True).start()
+
+            if workflow_path:
+                SubprocessWorkflowExecutor.load_workflow(workflow_path)
+                context_manager = GriptapeNodes.ContextManager()
+                workflow_name = context_manager.get_current_workflow_name()
+
+            workflow_runner = LocalWorkflowExecutor()
+            workflow_runner.run(workflow_name, flow_input, StorageBackend.LOCAL)
+        except Exception as e:
+            exception_queue.put(e)
+            raise
+
+    def run(
+        self,
+        workflow_name: str,
+        flow_input: Any,
+        storage_backend: StorageBackend = StorageBackend.LOCAL,  # noqa: ARG002
+        **kwargs: Any,
+    ) -> None:
+        workflow_path = kwargs.get("workflow_path")
+        exception_queue = Queue()
+        process = Process(
+            target=self._subprocess_entry,
+            args=(exception_queue, workflow_name, flow_input, workflow_path),
+        )
+        process.start()
+        process.join()
+
+        if not exception_queue.empty():
+            exception = exception_queue.get_nowait()
+            if isinstance(exception, Exception):
+                raise exception
+            msg = f"Expected an Exception but got: {type(exception)}"
+            raise RuntimeError(msg)
+
+        if process.exitcode != 0:
+            msg = f"Process exited with code {process.exitcode} but no exception was raised."
+            raise RuntimeError(msg)

{griptape_nodes-0.43.1 → griptape_nodes-0.45.0}/src/griptape_nodes/bootstrap/workflow_executors/workflow_executor.py

@@ -9,5 +9,11 @@ logger = logging.getLogger(__name__)
 
 class WorkflowExecutor(ABC):
     @abstractmethod
-    def run(self, workflow_name: str, flow_input: Any, storage_backend: StorageBackend = StorageBackend.LOCAL) -> None:
+    def run(
+        self,
+        workflow_name: str,
+        flow_input: Any,
+        storage_backend: StorageBackend = StorageBackend.LOCAL,
+        **kwargs: Any,
+    ) -> None:
         pass