griptape-nodes 0.62.3__tar.gz → 0.63.1__tar.gz

{griptape_nodes-0.62.3 → griptape_nodes-0.63.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: griptape-nodes
-Version: 0.62.3
+Version: 0.63.1
 Summary: Add your description here
 Requires-Dist: griptape>=1.8.12
 Requires-Dist: pydantic>=2.10.6
@@ -20,10 +20,11 @@ Requires-Dist: binaryornot>=0.4.4
 Requires-Dist: pillow>=11.3.0
 Requires-Dist: watchfiles>=1.1.0
 Requires-Dist: typer>=0.15.0
-Requires-Dist: huggingface-hub>=1.0.1
+Requires-Dist: huggingface-hub>=1.1.0
 Requires-Dist: rich>=14.1.0
 Requires-Dist: semver>=3.0.4
 Requires-Dist: aiofiles>=25.1.0
+Requires-Dist: aioshutil>=1.5
 Requires-Dist: ruamel-yaml>=0.18.15
 Requires-Dist: asyncio-thread-runner>=1.0
 Requires-Dist: austin-dist>=3.7.0 ; extra == 'profiling'

{griptape_nodes-0.62.3 → griptape_nodes-0.63.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "griptape-nodes"
-version = "0.62.3"
+version = "0.63.1"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12.0, <3.13"
@@ -24,10 +24,11 @@ dependencies = [
   "pillow>=11.3.0",
   "watchfiles>=1.1.0",
   "typer>=0.15.0",
-  "huggingface-hub>=1.0.1",
+  "huggingface-hub>=1.1.0",
   "rich>=14.1.0",
   "semver>=3.0.4",
   "aiofiles>=25.1.0",
+  "aioshutil>=1.5",
   "ruamel.yaml>=0.18.15",
   "asyncio-thread-runner>=1.0",
 ]

{griptape_nodes-0.62.3 → griptape_nodes-0.63.1}/src/griptape_nodes/cli/commands/libraries.py

@@ -2,7 +2,6 @@
 
 import asyncio
 import shutil
-import stat
 import tarfile
 import tempfile
 from pathlib import Path
@@ -17,6 +16,7 @@ from griptape_nodes.cli.shared import (
     NODES_TARBALL_URL,
     console,
 )
+from griptape_nodes.retained_mode.events.os_events import DeleteFileRequest, DeleteFileResultSuccess
 from griptape_nodes.retained_mode.griptape_nodes import GriptapeNodes
 from griptape_nodes.utils.version_utils import get_current_version, get_install_source
 
@@ -81,7 +81,11 @@ async def _sync_libraries(*, load_libraries_from_config: bool = True) -> None:
             if library_dir.is_dir():
                 dest_library_dir = dest_nodes / library_dir.name
                 if dest_library_dir.exists():
-                    shutil.rmtree(dest_library_dir, onexc=_remove_readonly)
+                    # Use DeleteFileRequest for centralized deletion with Windows compatibility
+                    request = DeleteFileRequest(path=str(dest_library_dir), workspace_only=False)
+                    result = await GriptapeNodes.OSManager().on_delete_file_request(request)
+                    if not isinstance(result, DeleteFileResultSuccess):
+                        console.print(f"[yellow]Warning: Failed to delete existing library {library_dir.name}[/yellow]")
                 shutil.copytree(library_dir, dest_library_dir)
                 console.print(f"[green]Synced library: {library_dir.name}[/green]")
 
@@ -95,22 +99,3 @@ async def _sync_libraries(*, load_libraries_from_config: bool = True) -> None:
             console.print(f"[red]Error initializing libraries: {e}[/red]")
 
     console.print("[bold green]Libraries synced.[/bold green]")
-
-
-def _remove_readonly(func, path, excinfo) -> None:  # noqa: ANN001, ARG001
-    """Handles read-only files and long paths on Windows during shutil.rmtree.
-
-    https://stackoverflow.com/a/50924863
-    """
-    if not GriptapeNodes.OSManager().is_windows():
-        return
-
-    long_path = Path(GriptapeNodes.OSManager().normalize_path_for_platform(Path(path)))
-
-    try:
-        Path.chmod(long_path, stat.S_IWRITE)
-        func(long_path)
-    except Exception as e:
-        console.print(f"[red]Error removing read-only file: {path}[/red]")
-        console.print(f"[red]Details: {e}[/red]")
-        raise

{griptape_nodes-0.62.3 → griptape_nodes-0.63.1}/src/griptape_nodes/cli/commands/models.py

@@ -239,19 +239,36 @@ def _format_download_row(download: "ModelDownloadStatus") -> tuple[str, str, str
 
 def _format_progress(download: "ModelDownloadStatus") -> str:
     """Format download progress information."""
-    if download.total_files is not None and download.completed_files is not None and download.total_files > 0:
-        progress_percent = (download.completed_files / download.total_files) * 100
+    if download.total_bytes is not None and download.completed_bytes is not None and download.total_bytes > 0:
+        progress_percent = (download.completed_bytes / download.total_bytes) * 100
         return f"{progress_percent:.1f}%"
     return "Unknown"
 
 
 def _format_size(download: "ModelDownloadStatus") -> str:
     """Format download size information."""
-    if download.total_files is not None and download.completed_files is not None:
-        return f"{download.completed_files}/{download.total_files} files"
+    if download.total_bytes is not None and download.completed_bytes is not None:
+        return f"{_format_bytes(download.completed_bytes)}/{_format_bytes(download.total_bytes)}"
     return "Unknown"
 
 
+def _format_bytes(num_bytes: int) -> str:
+    """Format bytes to human-readable string."""
+    if num_bytes == 0:
+        return "0 B"
+
+    bytes_per_unit = 1024.0
+    units = ["B", "KB", "MB", "GB", "TB"]
+    unit_index = 0
+    size = float(num_bytes)
+
+    while size >= bytes_per_unit and unit_index < len(units) - 1:
+        size /= bytes_per_unit
+        unit_index += 1
+
+    return f"{size:.2f} {units[unit_index]}"
+
+
 def _format_eta(download: "ModelDownloadStatus") -> str:
     """Format estimated time of arrival."""
     # ETA is not available in the current ModelDownloadStatus structure

griptape_nodes-0.63.1/src/griptape_nodes/drivers/thread_storage/__init__.py

@@ -0,0 +1,15 @@
+"""Thread storage drivers."""
+
+from griptape_nodes.drivers.thread_storage.base_thread_storage_driver import BaseThreadStorageDriver
+from griptape_nodes.drivers.thread_storage.griptape_cloud_thread_storage_driver import (
+    GriptapeCloudThreadStorageDriver,
+)
+from griptape_nodes.drivers.thread_storage.local_thread_storage_driver import LocalThreadStorageDriver
+from griptape_nodes.drivers.thread_storage.thread_storage_backend import ThreadStorageBackend
+
+__all__ = [
+    "BaseThreadStorageDriver",
+    "GriptapeCloudThreadStorageDriver",
+    "LocalThreadStorageDriver",
+    "ThreadStorageBackend",
+]

griptape_nodes-0.63.1/src/griptape_nodes/drivers/thread_storage/base_thread_storage_driver.py

@@ -0,0 +1,106 @@
+"""Base thread storage driver abstract class."""
+
+from abc import ABC, abstractmethod
+
+from griptape.drivers.memory.conversation import BaseConversationMemoryDriver
+
+from griptape_nodes.retained_mode.events.agent_events import ThreadMetadata
+from griptape_nodes.retained_mode.managers.config_manager import ConfigManager
+from griptape_nodes.retained_mode.managers.secrets_manager import SecretsManager
+
+
+class BaseThreadStorageDriver(ABC):
+    """Abstract base class for thread storage backends."""
+
+    def __init__(self, config_manager: ConfigManager, secrets_manager: SecretsManager) -> None:
+        """Initialize the thread storage driver.
+
+        Args:
+            config_manager: Configuration manager instance
+            secrets_manager: Secrets manager instance
+        """
+        self.config_manager = config_manager
+        self.secrets_manager = secrets_manager
+
+    @abstractmethod
+    def create_thread(self, title: str | None = None, local_id: str | None = None) -> tuple[str, dict]:
+        """Create a new thread with metadata.
+
+        Args:
+            title: Optional thread title
+            local_id: Optional client-side identifier
+
+        Returns:
+            Tuple of (thread_id, metadata_dict)
+        """
+        ...
+
+    @abstractmethod
+    def get_thread_metadata(self, thread_id: str) -> dict:
+        """Get metadata for a thread.
+
+        Args:
+            thread_id: The thread identifier
+
+        Returns:
+            Metadata dictionary
+        """
+        ...
+
+    @abstractmethod
+    def update_thread_metadata(self, thread_id: str, **updates) -> dict:
+        """Update thread metadata.
+
+        Args:
+            thread_id: The thread identifier
+            **updates: Key-value pairs to update in metadata
+
+        Returns:
+            Updated metadata dictionary
+        """
+        ...
+
+    @abstractmethod
+    def list_threads(self) -> list[ThreadMetadata]:
+        """List all threads with metadata.
+
+        Returns:
+            List of ThreadMetadata objects
+        """
+        ...
+
+    @abstractmethod
+    def delete_thread(self, thread_id: str) -> None:
+        """Delete a thread.
+
+        Args:
+            thread_id: The thread identifier
+
+        Raises:
+            ValueError: If thread is not archived or doesn't exist
+        """
+        ...
+
+    @abstractmethod
+    def thread_exists(self, thread_id: str) -> bool:
+        """Check if a thread exists.
+
+        Args:
+            thread_id: The thread identifier
+
+        Returns:
+            True if thread exists, False otherwise
+        """
+        ...
+
+    @abstractmethod
+    def get_conversation_memory_driver(self, thread_id: str | None) -> BaseConversationMemoryDriver:
+        """Get the appropriate conversation memory driver for this thread.
+
+        Args:
+            thread_id: The thread identifier (can be None for GTC backend)
+
+        Returns:
+            Conversation memory driver instance
+        """
+        ...

griptape_nodes-0.63.1/src/griptape_nodes/drivers/thread_storage/griptape_cloud_thread_storage_driver.py

@@ -0,0 +1,213 @@
+"""Griptape Cloud thread storage driver."""
+
+import logging
+import os
+from datetime import UTC, datetime
+from urllib.parse import urljoin
+
+import httpx
+from griptape.drivers.memory.conversation import BaseConversationMemoryDriver
+from griptape.drivers.memory.conversation.griptape_cloud import GriptapeCloudConversationMemoryDriver
+
+from griptape_nodes.drivers.thread_storage.base_thread_storage_driver import BaseThreadStorageDriver
+from griptape_nodes.retained_mode.events.agent_events import ThreadMetadata
+
+API_KEY_ENV_VAR = "GT_CLOUD_API_KEY"
+HTTP_NOT_FOUND = 404
+logger = logging.getLogger("griptape_nodes")
+
+
+class GriptapeCloudThreadStorageDriver(BaseThreadStorageDriver):
+    """Griptape Cloud implementation of thread storage."""
+
+    @property
+    def base_url(self) -> str:
+        """Get the base URL for Griptape Cloud API."""
+        return os.environ.get("GT_CLOUD_BASE_URL", "https://cloud.griptape.ai")
+
+    @property
+    def _headers(self) -> dict:
+        """Get the authorization headers for API requests."""
+        api_key = self.secrets_manager.get_secret(API_KEY_ENV_VAR)
+        if not api_key:
+            msg = f"Secret '{API_KEY_ENV_VAR}' not found for Griptape Cloud thread storage"
+            raise ValueError(msg)
+        return {"Authorization": f"Bearer {api_key}"}
+
+    def _get_url(self, path: str) -> str:
+        """Construct full API URL from path."""
+        return urljoin(self.base_url, path)
+
+    def create_thread(self, title: str | None = None, local_id: str | None = None) -> tuple[str, dict]:
+        url = self._get_url("/api/threads")
+
+        now = datetime.now(UTC).isoformat()
+
+        # Build metadata for the request
+        metadata = {
+            "created_at": now,
+            "updated_at": now,
+        }
+        if local_id is not None:
+            metadata["local_id"] = local_id
+
+        # Build request body
+        request_body: dict[str, str | dict] = {"metadata": metadata}
+        if title is not None:
+            request_body["name"] = title
+
+        try:
+            response = httpx.post(url, json=request_body, headers=self._headers)
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            msg = f"Failed to create thread in Griptape Cloud: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+
+        response_data = response.json()
+        thread_id = response_data["thread_id"]
+
+        # Build metadata dict to return (matching local driver behavior)
+        result_metadata = response_data.get("metadata", {})
+        if title is not None:
+            result_metadata["title"] = title
+
+        return thread_id, result_metadata
+
+    def get_thread_metadata(self, thread_id: str) -> dict:
+        url = self._get_url(f"/api/threads/{thread_id}")
+
+        try:
+            response = httpx.get(url, headers=self._headers)
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            if e.response.status_code == HTTP_NOT_FOUND:
+                return {}
+            msg = f"Failed to get thread {thread_id} from Griptape Cloud: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+
+        response_data = response.json()
+
+        # Extract metadata from response
+        metadata = response_data.get("metadata", {})
+
+        # Map GTC's "name" field to our "title" field for consistency
+        if response_data.get("name"):
+            metadata["title"] = response_data["name"]
+
+        return metadata
+
+    def update_thread_metadata(self, thread_id: str, **updates) -> dict:
+        # First, get current metadata
+        current_metadata = self.get_thread_metadata(thread_id)
+
+        now = datetime.now(UTC).isoformat()
+
+        # Merge updates into current metadata
+        for key, value in updates.items():
+            if value is not None:
+                current_metadata[key] = value
+
+        current_metadata["updated_at"] = now
+
+        if "created_at" not in current_metadata:
+            current_metadata["created_at"] = now
+
+        url = self._get_url(f"/api/threads/{thread_id}")
+
+        # Build request body
+        request_body: dict[str, str | dict] = {"metadata": current_metadata}
+
+        # If title was updated, also set the name field
+        if "title" in updates and updates["title"] is not None:
+            request_body["name"] = updates["title"]
+
+        try:
+            response = httpx.patch(url, json=request_body, headers=self._headers)
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            msg = f"Failed to update thread {thread_id} in Griptape Cloud: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+
+        response_data = response.json()
+
+        # Return updated metadata
+        result_metadata = response_data.get("metadata", {})
+        if response_data.get("name"):
+            result_metadata["title"] = response_data["name"]
+
+        return result_metadata
+
+    def list_threads(self) -> list[ThreadMetadata]:
+        url = self._get_url("/api/threads")
+
+        try:
+            response = httpx.get(url, headers=self._headers)
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            msg = f"Failed to list threads from Griptape Cloud: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+
+        response_data = response.json()
+        threads_data = response_data.get("threads", [])
+
+        threads = []
+        for thread_data in threads_data:
+            thread_id = thread_data.get("thread_id")
+            if not thread_id:
+                continue
+
+            metadata = thread_data.get("metadata", {})
+
+            thread_metadata = ThreadMetadata(
+                thread_id=thread_id,
+                title=thread_data.get("name"),
+                created_at=metadata.get("created_at"),
+                updated_at=metadata.get("updated_at"),
+                message_count=thread_data.get("message_count", 0),
+                archived=metadata.get("archived", False),
+                local_id=metadata.get("local_id"),
+            )
+            threads.append(thread_metadata)
+
+        # Sort by updated_at descending (most recent first)
+        threads.sort(key=lambda t: t.updated_at or "", reverse=True)
+
+        return threads
+
+    def delete_thread(self, thread_id: str) -> None:
+        if not self.thread_exists(thread_id):
+            msg = f"Thread {thread_id} not found"
+            raise ValueError(msg)
+
+        meta = self.get_thread_metadata(thread_id)
+        if not meta.get("archived", False):
+            msg = f"Cannot delete thread {thread_id}. Archive it first."
+            raise ValueError(msg)
+
+        url = self._get_url(f"/api/threads/{thread_id}")
+
+        try:
+            response = httpx.delete(url, headers=self._headers)
+            response.raise_for_status()
+        except httpx.HTTPStatusError as e:
+            msg = f"Failed to delete thread {thread_id} from Griptape Cloud: {e}"
+            logger.error(msg)
+            raise RuntimeError(msg) from e
+
+    def thread_exists(self, thread_id: str) -> bool:
+        try:
+            meta = self.get_thread_metadata(thread_id)
+            return bool(meta)
+        except Exception:
+            return False
+
+    def get_conversation_memory_driver(self, thread_id: str | None) -> BaseConversationMemoryDriver:
+        api_key = self.secrets_manager.get_secret(API_KEY_ENV_VAR)
+        if not api_key:
+            msg = f"Secret '{API_KEY_ENV_VAR}' not found for Griptape Cloud thread storage"
+            raise ValueError(msg)
+        return GriptapeCloudConversationMemoryDriver(api_key=api_key, thread_id=thread_id)

griptape_nodes-0.63.1/src/griptape_nodes/drivers/thread_storage/local_thread_storage_driver.py

@@ -0,0 +1,137 @@
+"""Local filesystem thread storage driver."""
+
+import uuid
+from datetime import UTC, datetime
+from pathlib import Path
+
+from griptape.drivers.memory.conversation import BaseConversationMemoryDriver
+from griptape.drivers.memory.conversation.local import LocalConversationMemoryDriver
+from griptape.memory.structure import ConversationMemory
+
+from griptape_nodes.drivers.thread_storage.base_thread_storage_driver import BaseThreadStorageDriver
+from griptape_nodes.retained_mode.events.agent_events import ThreadMetadata
+from griptape_nodes.retained_mode.managers.config_manager import ConfigManager
+from griptape_nodes.retained_mode.managers.secrets_manager import SecretsManager
+
+
+class LocalThreadStorageDriver(BaseThreadStorageDriver):
+    """Local filesystem implementation of thread storage."""
+
+    def __init__(self, threads_directory: Path, config_manager: ConfigManager, secrets_manager: SecretsManager) -> None:
+        """Initialize the local thread storage driver.
+
+        Args:
+            threads_directory: Directory for storing thread data
+            config_manager: Configuration manager instance
+            secrets_manager: Secrets manager instance
+        """
+        super().__init__(config_manager, secrets_manager)
+        self.threads_directory = threads_directory
+
+    def create_thread(self, title: str | None = None, local_id: str | None = None) -> tuple[str, dict]:
+        thread_id = str(uuid.uuid4())
+
+        conversation_memory = self._get_or_create_conversation_memory(thread_id)
+
+        now = datetime.now(UTC).isoformat()
+        conversation_memory.meta = {
+            "created_at": now,
+            "updated_at": now,
+        }
+
+        if title is not None:
+            conversation_memory.meta["title"] = title
+        if local_id is not None:
+            conversation_memory.meta["local_id"] = local_id
+
+        conversation_memory.conversation_memory_driver.store(conversation_memory.runs, conversation_memory.meta)
+
+        return thread_id, conversation_memory.meta
+
+    def get_thread_metadata(self, thread_id: str) -> dict:
+        conversation_memory = self._get_or_create_conversation_memory(thread_id)
+        if conversation_memory.meta is None:
+            return {}
+        return conversation_memory.meta
+
+    def update_thread_metadata(self, thread_id: str, **updates) -> dict:
+        conversation_memory = self._get_or_create_conversation_memory(thread_id)
+        now = datetime.now(UTC).isoformat()
+
+        if conversation_memory.meta is None:
+            conversation_memory.meta = {}
+
+        for key, value in updates.items():
+            if value is not None:
+                conversation_memory.meta[key] = value
+
+        conversation_memory.meta["updated_at"] = now
+
+        if "created_at" not in conversation_memory.meta:
+            conversation_memory.meta["created_at"] = now
+
+        conversation_memory.conversation_memory_driver.store(conversation_memory.runs, conversation_memory.meta)
+
+        return conversation_memory.meta
+
+    def list_threads(self) -> list[ThreadMetadata]:
+        threads = []
+
+        if not self.threads_directory.exists():
+            return threads
+
+        thread_ids = [
+            thread_file.stem.replace("thread_", "") for thread_file in self.threads_directory.glob("thread_*.json")
+        ]
+
+        for thread_id in thread_ids:
+            meta = self.get_thread_metadata(thread_id)
+            conversation_memory = self._get_or_create_conversation_memory(thread_id)
+            message_count = len(conversation_memory.runs)
+
+            threads.append(
+                ThreadMetadata(
+                    thread_id=thread_id,
+                    title=meta.get("title"),
+                    created_at=meta.get("created_at", ""),
+                    updated_at=meta.get("updated_at", ""),
+                    message_count=message_count,
+                    archived=meta.get("archived", False),
+                    local_id=meta.get("local_id"),
+                )
+            )
+
+        threads.sort(key=lambda t: t.updated_at, reverse=True)
+
+        return threads
+
+    def delete_thread(self, thread_id: str) -> None:
+        thread_file = self.threads_directory / f"thread_{thread_id}.json"
+
+        if not thread_file.exists():
+            msg = f"Thread {thread_id} not found"
+            raise ValueError(msg)
+
+        meta = self.get_thread_metadata(thread_id)
+        if not meta.get("archived", False):
+            msg = f"Cannot delete thread {thread_id}. Archive it first."
+            raise ValueError(msg)
+
+        thread_file.unlink()
+
+    def thread_exists(self, thread_id: str) -> bool:
+        thread_file = self.threads_directory / f"thread_{thread_id}.json"
+        return thread_file.exists()
+
+    def get_conversation_memory_driver(self, thread_id: str | None) -> BaseConversationMemoryDriver:
+        if thread_id is None:
+            msg = "thread_id is required for local storage backend"
+            raise ValueError(msg)
+
+        thread_file = self.threads_directory / f"thread_{thread_id}.json"
+        return LocalConversationMemoryDriver(persist_file=str(thread_file))
+
+    def _get_or_create_conversation_memory(self, thread_id: str) -> ConversationMemory:
+        """Get or create ConversationMemory instance for a thread."""
+        driver = self.get_conversation_memory_driver(thread_id)
+        return ConversationMemory(conversation_memory_driver=driver)

griptape_nodes-0.63.1/src/griptape_nodes/drivers/thread_storage/thread_storage_backend.py

@@ -0,0 +1,10 @@
+"""Thread storage backend enumeration."""
+
+from enum import StrEnum
+
+
+class ThreadStorageBackend(StrEnum):
+    """Enumeration of available thread storage backends."""
+
+    LOCAL = "local"
+    GTC = "gtc"