griptape-nodes 0.51.2__py3-none-any.whl → 0.52.0__py3-none-any.whl

griptape_nodes/__init__.py

@@ -6,6 +6,7 @@ console = Console()
 
 with console.status("Loading Griptape Nodes...") as status:
     import argparse
+    import asyncio
     import json
     import os
     import shutil
@@ -113,7 +114,7 @@ def _run_init(config: InitConfig) -> None:
 
     # Sync libraries
     if config.libraries_sync is not False:
-        _sync_libraries()
+        asyncio.run(_sync_libraries())
 
     console.print("[bold green]Initialization complete![/bold green]")
 
@@ -683,7 +684,7 @@ def _update_self() -> None:
     os_manager.replace_process([sys.executable, "-m", "griptape_nodes.updater"])
 
 
-def _sync_libraries() -> None:
+async def _sync_libraries() -> None:
     """Download and sync Griptape Nodes libraries, copying only directories from synced libraries."""
     install_source, _ = get_install_source()
     # Unless we're installed from PyPi, grab libraries from the 'latest' tag
@@ -737,7 +738,7 @@ def _sync_libraries() -> None:
     # Re-initialize all libraries from config
     console.print("[bold cyan]Initializing libraries...[/bold cyan]")
     try:
-        GriptapeNodes.LibraryManager().load_all_libraries_from_config()
+        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]")
@@ -904,7 +905,7 @@ def _process_args(args: argparse.Namespace) -> None:  # noqa: C901, PLR0912
             _print_current_version()
     elif args.command == "libraries":
         if args.subcommand == "sync":
-            _sync_libraries()
+            asyncio.run(_sync_libraries())
     else:
         msg = f"Unknown command: {args.command}"
         raise ValueError(msg)

griptape_nodes/app/api.py

@@ -4,7 +4,7 @@ import binascii
 import logging
 import os
 from pathlib import Path
-from typing import TYPE_CHECKING, Annotated
+from typing import Annotated
 from urllib.parse import urljoin
 
 import uvicorn
@@ -13,9 +13,6 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from rich.logging import RichHandler
 
-if TYPE_CHECKING:
-    from queue import Queue
-
 # Whether to enable the static server
 STATIC_SERVER_ENABLED = os.getenv("STATIC_SERVER_ENABLED", "true").lower() == "true"
 # Host of the static server
@@ -31,21 +28,10 @@ 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
-
 # Global static directory - initialized as None and set when starting the API
 static_dir: Path | None = None
 
 
-def get_event_queue() -> Queue:
-    """FastAPI dependency to get the event queue."""
-    if event_queue is None:
-        msg = "Event queue is not initialized"
-        raise HTTPException(status_code=500, detail=msg)
-    return event_queue
-
-
 def get_static_dir() -> Path:
     """FastAPI dependency to get the static directory."""
     if static_dir is None:
@@ -156,17 +142,19 @@ async def _delete_static_file(file_path: str, static_directory: Annotated[Path,
 
 
 @app.post("/engines/request")
-async def _create_event(request: Request, queue: Annotated[Queue, Depends(get_event_queue)]) -> None:
+async def _create_event(request: Request) -> None:
+    """Create event using centralized event utilities."""
     from .app import _process_api_event
 
     body = await request.json()
-    _process_api_event(body, queue)
 
+    # Use centralized event processing
+    await _process_api_event(body)
 
-def start_api(static_directory: Path, queue: Queue) -> None:
-    """Run FastAPI with Uvicorn in order to serve static files produced by nodes."""
-    global event_queue, static_dir  # noqa: PLW0603
-    event_queue = queue
+
+def _setup_app(static_directory: Path) -> None:
+    """Setup FastAPI app with middleware and static files."""
+    global static_dir  # noqa: PLW0603
     static_dir = static_directory
 
     if not static_dir.exists():
@@ -190,6 +178,21 @@ def start_api(static_directory: Path, queue: Queue) -> None:
         name="static",
     )
 
-    uvicorn.run(
-        app, host=STATIC_SERVER_HOST, port=STATIC_SERVER_PORT, log_level=STATIC_SERVER_LOG_LEVEL, log_config=None
-    )
+
+def start_api(static_directory: Path) -> None:
+    """Run uvicorn server synchronously using uvicorn.run."""
+    # Setup the FastAPI app
+    _setup_app(static_directory)
+
+    try:
+        # Run server using uvicorn.run
+        uvicorn.run(
+            app,
+            host=STATIC_SERVER_HOST,
+            port=STATIC_SERVER_PORT,
+            log_level=STATIC_SERVER_LOG_LEVEL,
+            log_config=None,
+        )
+    except Exception as e:
+        logger.error("API server failed: %s", e)
+        raise