griptape-nodes 0.53.0__py3-none-any.whl → 0.54.0__py3-none-any.whl

griptape_nodes/__init__.py

@@ -3,6 +3,8 @@
 import sys
 from pathlib import Path
 
+from rich.console import Console
+
 
 def main() -> None:
     """Main entry point for the Griptape Nodes CLI."""
@@ -12,8 +14,9 @@ def main() -> None:
     # but current engine relies on importing files rather than packages.
     sys.path.append(str(Path.cwd()))
 
-    # Import and run the new CLI
-    from griptape_nodes.cli.main import app
+    console = Console()
+    with console.status("[bold green]Loading Griptape Nodes...", spinner="dots"):
+        from griptape_nodes.cli.main import app
 
     app()
 

griptape_nodes/app/app.py

@@ -7,7 +7,6 @@ import os
 import sys
 import threading
 from dataclasses import dataclass
-from pathlib import Path
 from typing import Any
 from urllib.parse import urljoin
 
@@ -18,8 +17,6 @@ from rich.panel import Panel
 from websockets.asyncio.client import connect
 from websockets.exceptions import ConnectionClosed, ConnectionClosedError, WebSocketException
 
-from griptape_nodes.app.api import start_static_server
-from griptape_nodes.mcp_server.server import start_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
@@ -80,9 +77,6 @@ websocket_event_loop: asyncio.AbstractEventLoop | None = None
 websocket_event_loop_ready = threading.Event()
 
 
-# Whether to enable the static server
-STATIC_SERVER_ENABLED = os.getenv("STATIC_SERVER_ENABLED", "true").lower() == "true"
-
 # Semaphore to limit concurrent requests
 REQUEST_SEMAPHORE = asyncio.Semaphore(100)
 
@@ -135,14 +129,6 @@ async def astart_app() -> None:
     main_loop = asyncio.get_running_loop()
 
     try:
-        # Start MCP server in daemon thread
-        threading.Thread(target=start_mcp_server, args=(api_key,), daemon=True, name="mcp-server").start()
-
-        # Start static server in daemon thread if enabled
-        if STATIC_SERVER_ENABLED:
-            static_dir = _build_static_dir()
-            threading.Thread(target=start_static_server, args=(static_dir,), daemon=True, name="static-server").start()
-
         # Start WebSocket tasks in daemon thread
         threading.Thread(
             target=_start_websocket_connection, args=(api_key, main_loop), daemon=True, name="websocket-tasks"
@@ -187,13 +173,11 @@ async def _run_websocket_tasks(api_key: str, main_loop: asyncio.AbstractEventLoo
     initialized = False
 
     async for ws_connection in connection_stream:
-        logger.info("WebSocket connection established")
+        logger.debug("WebSocket connection established")
         try:
             # Emit initialization event only for the first connection
             if not initialized:
-                griptape_nodes.EventManager().put_event_threadsafe(
-                    main_loop, AppEvent(payload=app_events.AppInitializationComplete())
-                )
+                griptape_nodes.EventManager().put_event(AppEvent(payload=app_events.AppInitializationComplete()))
                 initialized = True
 
             # Emit connection established event for every connection
@@ -233,12 +217,6 @@ def _ensure_api_key() -> str:
     return api_key
 
 
-def _build_static_dir() -> Path:
-    """Build the static directory path based on the workspace configuration."""
-    config_manager = griptape_nodes.ConfigManager()
-    return Path(config_manager.workspace_path) / config_manager.merged_config["static_files_directory"]
-
-
 async def _process_incoming_messages(ws_connection: Any, main_loop: asyncio.AbstractEventLoop) -> None:
     """Process incoming WebSocket requests from Nodes API."""
     logger.debug("Processing incoming WebSocket requests from WebSocket connection")
@@ -366,7 +344,7 @@ async def _send_unsubscribe_command(ws_connection: Any, topic: str) -> None:
 
 async def _process_event_queue() -> None:
     """Process events concurrently - runs on main thread."""
-    logger.info("Starting event queue processor on main thread")
+    logger.debug("Starting event queue processor on main thread")
     background_tasks = set()
 
     def _handle_task_result(task: asyncio.Task) -> None:
@@ -399,7 +377,7 @@ async def _process_event_queue() -> None:
             task.add_done_callback(_handle_task_result)
             event_queue.task_done()
     except asyncio.CancelledError:
-        logger.info("Event queue processor shutdown complete")
+        logger.debug("Event queue processor shutdown complete")
         raise
 
 

griptape_nodes/bootstrap/workflow_executors/local_workflow_executor.py

@@ -1,9 +1,12 @@
+from __future__ import annotations
+
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any, Self
 
 from griptape_nodes.bootstrap.workflow_executors.workflow_executor import WorkflowExecutor
 from griptape_nodes.drivers.storage import StorageBackend
 from griptape_nodes.exe_types.node_types import EndNode, StartNode
+from griptape_nodes.retained_mode.events.app_events import AppInitializationComplete
 from griptape_nodes.retained_mode.events.base_events import (
     EventRequest,
     ExecutionGriptapeNodeEvent,
@@ -15,6 +18,9 @@ from griptape_nodes.retained_mode.events.workflow_events import (
 )
 from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
 
+if TYPE_CHECKING:
+    from types import TracebackType
+
 logger = logging.getLogger(__name__)
 
 
@@ -23,6 +29,29 @@ class LocalExecutorError(Exception):
 
 
 class LocalWorkflowExecutor(WorkflowExecutor):
+    def __init__(
+        self,
+        storage_backend: StorageBackend = StorageBackend.LOCAL,
+    ):
+        super().__init__()
+        self._set_storage_backend(storage_backend=storage_backend)
+
+    async def __aenter__(self) -> Self:
+        """Async context manager entry: initialize queue and broadcast app initialization."""
+        GriptapeNodes.EventManager().initialize_queue()
+        await GriptapeNodes.EventManager().broadcast_app_event(AppInitializationComplete())
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
+    ) -> None:
+        """Async context manager exit."""
+        # TODO: Broadcast shutdown https://github.com/griptape-ai/griptape-nodes/issues/2149
+        return
+
     def _load_flow_for_workflow(self) -> str:
         try:
             context_manager = GriptapeNodes.ContextManager()
@@ -124,7 +153,7 @@ class LocalWorkflowExecutor(WorkflowExecutor):
         self,
         workflow_name: str,
         flow_input: Any,
-        storage_backend: StorageBackend = StorageBackend.LOCAL,
+        storage_backend: StorageBackend | None = None,
         **kwargs: Any,
     ) -> None:
         """Executes a local workflow.
@@ -140,12 +169,13 @@ class LocalWorkflowExecutor(WorkflowExecutor):
         Returns:
             None
         """
+        if storage_backend is not None:
+            msg = "The storage_backend parameter is deprecated. Pass `storage_backend` to the constructor instead."
+            raise ValueError(msg)
+
         logger.info("Executing workflow: %s", workflow_name)
         GriptapeNodes.EventManager().initialize_queue()
 
-        # Set the storage backend
-        self._set_storage_backend(storage_backend=storage_backend)
-
         # Load workflow from file if workflow_path is provided
         workflow_path = kwargs.get("workflow_path")
         if workflow_path:

griptape_nodes/bootstrap/workflow_executors/workflow_executor.py

@@ -1,7 +1,8 @@
 import asyncio
 import logging
 from abc import abstractmethod
-from typing import Any
+from types import TracebackType
+from typing import Any, Self
 
 from griptape_nodes.drivers.storage import StorageBackend
 
@@ -12,6 +13,19 @@ class WorkflowExecutor:
     def __init__(self) -> None:
         self.output: dict | None = None
 
+    async def __aenter__(self) -> Self:
+        """Async context manager entry."""
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        exc_tb: TracebackType | None,
+    ) -> None:
+        """Async context manager exit."""
+        return
+
     def run(
         self,
         workflow_name: str,

griptape_nodes/cli/commands/config.py

@@ -5,7 +5,10 @@ import sys
 
 import typer
 
-from griptape_nodes.cli.shared import config_manager, console
+from griptape_nodes.cli.shared import console
+from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
+
+config_manager = GriptapeNodes.ConfigManager()
 
 app = typer.Typer(help="Manage configuration.")
 

griptape_nodes/cli/commands/init.py

@@ -20,12 +20,14 @@ from griptape_nodes.cli.shared import (
     GT_CLOUD_BASE_URL,
     NODES_APP_URL,
     InitConfig,
-    config_manager,
     console,
-    secrets_manager,
 )
 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
+
+config_manager = GriptapeNodes.ConfigManager()
+secrets_manager = GriptapeNodes.SecretsManager()
 
 
 def init_command(  # noqa: PLR0913
@@ -98,7 +100,7 @@ def _run_init(config: InitConfig) -> None:
 
     # Sync libraries
     if config.libraries_sync is not False:
-        asyncio.run(_sync_libraries())
+        asyncio.run(_sync_libraries(load_libraries_from_config=False))
 
     console.print("[bold green]Initialization complete![/bold green]")
 

griptape_nodes/cli/commands/libraries.py

@@ -28,8 +28,13 @@ def sync() -> None:
     asyncio.run(_sync_libraries())
 
 
-async def _sync_libraries() -> None:
-    """Download and sync Griptape Nodes libraries, copying only directories from synced libraries."""
+async def _sync_libraries(*, load_libraries_from_config: bool = True) -> None:
+    """Download and sync Griptape Nodes libraries, copying only directories from synced libraries.
+
+    Args:
+        load_libraries_from_config (bool): If True, re-initialize all libraries from config
+
+    """
     install_source, _ = get_install_source()
     # Unless we're installed from PyPi, grab libraries from the 'latest' tag
     if install_source == "pypi":
@@ -80,11 +85,12 @@ async def _sync_libraries() -> None:
                 console.print(f"[green]Synced library: {library_dir.name}[/green]")
 
     # Re-initialize all libraries from config
-    console.print("[bold cyan]Initializing libraries...[/bold cyan]")
-    try:
-        await GriptapeNodes.LibraryManager().load_all_libraries_from_config()
-        console.print("[bold green]Libraries Initialized successfully.[/bold green]")
-    except Exception as e:
-        console.print(f"[red]Error initializing libraries: {e}[/red]")
+    if load_libraries_from_config:
+        console.print("[bold cyan]Initializing libraries...[/bold cyan]")
+        try:
+            await GriptapeNodes.LibraryManager().load_all_libraries_from_config()
+            console.print("[bold green]Libraries Initialized successfully.[/bold green]")
+        except Exception as e:
+            console.print(f"[red]Error initializing libraries: {e}[/red]")
 
     console.print("[bold green]Libraries synced.[/bold green]")