griptape-nodes 0.43.1__py3-none-any.whl → 0.44.0__py3-none-any.whl

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,11 @@ 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.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 +330,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 +614,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 +629,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 +668,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 +686,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 +730,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() -> None:
-    """Prints the user configuration from the config file."""
-    config = config_manager.merged_config
-    sys.stdout.write(json.dumps(config, indent=2))
+def _print_user_config(config_path: str | None = None) -> None:
+    """Prints the user configuration from the config file.
+
+    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:
@@ -857,7 +874,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 +890,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/app/api.py

@@ -27,9 +27,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,6 +126,37 @@ 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:
     body = await request.json()
@@ -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=["*"],
     )
 

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/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/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

griptape_nodes/drivers/storage/base_storage_driver.py

@@ -1,6 +1,11 @@
+import logging
 from abc import ABC, abstractmethod
 from typing import TypedDict
 
+import httpx
+
+logger = logging.getLogger("griptape_nodes")
+
 
 class CreateSignedUploadUrlResponse(TypedDict):
     """Response type for create_signed_upload_url method."""
@@ -36,3 +41,51 @@ class BaseStorageDriver(ABC):
             str: The signed URL for downloading the file.
         """
         ...
+
+    @abstractmethod
+    def delete_file(self, file_name: str) -> None:
+        """Delete a file from storage.
+
+        Args:
+            file_name: The name of the file to delete.
+        """
+        ...
+
+    @abstractmethod
+    def list_files(self) -> list[str]:
+        """List all files in storage.
+
+        Returns:
+            A list of file names in storage.
+        """
+        ...
+
+    def download_file(self, file_name: str) -> bytes:
+        """Download a file from the bucket.
+
+        Args:
+            file_name: The name of the file to download.
+
+        Returns:
+            The file content as bytes.
+
+        Raises:
+            RuntimeError: If file download fails.
+        """
+        try:
+            # Get signed download URL
+            download_url = self.create_signed_download_url(file_name)
+
+            # Download the file
+            response = httpx.get(download_url)
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            msg = f"Failed to download file {file_name}: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+        except Exception as e:
+            msg = f"Unexpected error downloading file {file_name}: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+        else:
+            return response.content

griptape_nodes/drivers/storage/griptape_cloud_storage_driver.py

@@ -76,8 +76,7 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
         return {"url": response_data["url"], "headers": response_data.get("headers", {}), "method": "PUT"}
 
     def create_signed_download_url(self, file_name: str) -> str:
-        full_file_path = self._get_full_file_path(file_name)
-        url = urljoin(self.base_url, f"/api/buckets/{self.bucket_id}/asset-urls/{full_file_path}")
+        url = urljoin(self.base_url, f"/api/buckets/{self.bucket_id}/asset-urls/{file_name}")
         try:
             response = httpx.post(url, json={"method": "GET"}, headers=self.headers)
             response.raise_for_status()
@@ -135,6 +134,37 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
         logger.info("Created new Griptape Cloud bucket '%s' with ID: %s", bucket_name, bucket_id)
         return bucket_id
 
+    def list_files(self) -> list[str]:
+        """List all files in storage.
+
+        Returns:
+            A list of file names in storage.
+
+        Raises:
+            RuntimeError: If file listing fails.
+        """
+        url = urljoin(self.base_url, f"/api/buckets/{self.bucket_id}/assets")
+        try:
+            response = httpx.get(url, headers=self.headers, params={"prefix": self.static_files_directory or ""})
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            msg = f"Failed to list files in bucket {self.bucket_id}: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+
+        response_data = response.json()
+        assets = response_data.get("assets", [])
+
+        file_names = []
+        for asset in assets:
+            name = asset.get("name", "")
+            # Remove the static files directory prefix if it exists
+            if self.static_files_directory and name.startswith(f"{self.static_files_directory}/"):
+                name = name[len(f"{self.static_files_directory}/") :]
+            file_names.append(name)
+
+        return file_names
+
     @staticmethod
     def list_buckets(*, base_url: str, api_key: str) -> list[dict]:
         """List all buckets in Griptape Cloud.
@@ -158,3 +188,20 @@ class GriptapeCloudStorageDriver(BaseStorageDriver):
             raise RuntimeError(msg) from e
 
         return response.json().get("buckets", [])
+
+    def delete_file(self, file_name: str) -> None:
+        """Delete a file from the bucket.
+
+        Args:
+            file_name: The name of the file to delete.
+        """
+        full_file_path = self._get_full_file_path(file_name)
+        url = urljoin(self.base_url, f"/api/buckets/{self.bucket_id}/assets/{full_file_path}")
+
+        try:
+            response = httpx.delete(url, headers=self.headers)
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            msg = f"Failed to delete file {file_name}: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e

griptape_nodes/drivers/storage/local_storage_driver.py

@@ -53,3 +53,40 @@ class LocalStorageDriver(BaseStorageDriver):
         # Add a cache-busting query parameter to the URL so that the browser always reloads the file
         cache_busted_url = f"{url}?t={int(time.time())}"
         return cache_busted_url
+
+    def delete_file(self, file_name: str) -> None:
+        """Delete a file from local storage.
+
+        Args:
+            file_name: The name of the file to delete.
+        """
+        # Use the static server's delete endpoint
+        delete_url = urljoin(self.base_url, f"/static-files/{file_name}")
+
+        try:
+            response = httpx.delete(delete_url)
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            msg = f"Failed to delete file {file_name}: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+
+    def list_files(self) -> list[str]:
+        """List all files in local storage.
+
+        Returns:
+            A list of file names in storage.
+        """
+        # Use the static server's list endpoint
+        list_url = urljoin(self.base_url, "/static-uploads/")
+
+        try:
+            response = httpx.get(list_url)
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            msg = f"Failed to list files: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+
+        response_data = response.json()
+        return response_data.get("files", [])