camel-ai 0.2.67__py3-none-any.whl → 0.2.80a2__py3-none-any.whl

camel/storages/key_value_storages/json.py

@@ -17,6 +17,8 @@ from enum import EnumMeta
 from pathlib import Path
 from typing import Any, ClassVar, Dict, List, Optional
 
+from pydantic import BaseModel
+
 from camel.storages.key_value_storages import BaseKeyValueStorage
 from camel.types import (
     ModelType,
@@ -27,8 +29,13 @@ from camel.types import (
 
 
 class CamelJSONEncoder(json.JSONEncoder):
-    r"""A custom JSON encoder for serializing specifically enumerated types.
-    Ensures enumerated types can be stored in and retrieved from JSON format.
+    r"""A custom JSON encoder for serializing CAMEL-specific types.
+
+    Handles serialization of:
+    - Enumerated types (RoleType, TaskType, ModelType, OpenAIBackendRole)
+    - Pydantic BaseModel objects (from structured outputs)
+
+    Ensures these types can be stored in and retrieved from JSON format.
     """
 
     CAMEL_ENUMS: ClassVar[Dict[str, EnumMeta]] = {
@@ -39,8 +46,14 @@ class CamelJSONEncoder(json.JSONEncoder):
     }
 
     def default(self, obj) -> Any:
+        # Handle CAMEL enum types
         if type(obj) in self.CAMEL_ENUMS.values():
             return {"__enum__": str(obj)}
+
+        # Handle Pydantic BaseModel objects (e.g., from structured outputs)
+        if isinstance(obj, BaseModel):
+            return obj.model_dump()
+
         # Let the base class default method raise the TypeError
         return json.JSONEncoder.default(self, obj)
 

camel/storages/key_value_storages/mem0_cloud.py

@@ -103,34 +103,6 @@ class Mem0Storage(BaseKeyValueStorage):
         }
         return {k: v for k, v in options.items() if v is not None}
 
-    def _prepare_filters(
-        self,
-        agent_id: Optional[str] = None,
-        user_id: Optional[str] = None,
-        filters: Optional[Dict[str, Any]] = None,
-    ) -> Dict[str, Any]:
-        r"""Helper method to prepare filters for Mem0 API calls.
-
-        Args:
-            agent_id (Optional[str], optional): Agent ID to filter by
-                (default: :obj:`None`).
-            user_id (Optional[str], optional): User ID to filter by (default:
-                :obj:`None`).
-            filters (Optional[Dict[str, Any]], optional): Additional filters
-                (default: :obj:`None`).
-
-        Returns:
-            Dict[str, Any]: Prepared filters dictionary for API calls.
-        """
-        base_filters: Dict[str, Any] = {"AND": []}
-        if filters:
-            base_filters["AND"].append(filters)
-        if agent_id or self.agent_id:
-            base_filters["AND"].append({"agent_id": agent_id or self.agent_id})
-        if user_id or self.user_id:
-            base_filters["AND"].append({"user_id": user_id or self.user_id})
-        return base_filters if base_filters["AND"] else {}
-
     def _prepare_messages(
         self,
         records: List[Dict[str, Any]],
@@ -164,11 +136,11 @@ class Mem0Storage(BaseKeyValueStorage):
                 agent_id=self.agent_id,
                 user_id=self.user_id,
                 metadata=self.metadata,
+                version="v2",
             )
             self.client.add(messages, **options)
         except Exception as e:
             logger.error(f"Error adding memory: {e}")
-            logger.error(f"Error: {e}")
 
     def load(self) -> List[Dict[str, Any]]:
         r"""Loads all stored records from the Mem0 storage system.
@@ -178,47 +150,76 @@ class Mem0Storage(BaseKeyValueStorage):
                 represents a stored record.
         """
         try:
-            filters = self._prepare_filters(
-                agent_id=self.agent_id,
-                user_id=self.user_id,
-            )
-            results = self.client.get_all(version="v2", **filters)
+            # Build filters for get_all using proper Mem0 filter format
+            filters = {}
+            if self.agent_id:
+                filters = {"AND": [{"user_id": self.agent_id}]}
+            if self.user_id:
+                filters = {"AND": [{"user_id": self.user_id}]}
+
+            results = self.client.get_all(version="v2", filters=filters)
 
             # Transform results into MemoryRecord objects
             transformed_results = []
             for result in results:
+                # Ensure metadata is a dictionary, not None
+                metadata = result.get("metadata") or {}
+
                 memory_record = MemoryRecord(
                     uuid=UUID(result["id"]),
                     message=BaseMessage(
-                        role_name="user",
+                        role_name="memory",
                         role_type=RoleType.USER,
-                        meta_dict={},
+                        meta_dict=metadata,
                         content=result["memory"],
                     ),
                     role_at_backend=OpenAIBackendRole.USER,
-                    extra_info=result.get("metadata", {}),
+                    extra_info=metadata,
                     timestamp=datetime.fromisoformat(
-                        result["created_at"]
+                        result["created_at"].replace('Z', '+00:00')
                     ).timestamp(),
-                    agent_id=result.get("agent_id", ""),
+                    agent_id=result.get("agent_id", self.agent_id or ""),
                 )
                 transformed_results.append(memory_record.to_dict())
 
             return transformed_results
         except Exception as e:
-            logger.error(f"Error searching memories: {e}")
+            logger.error(f"Error loading memories: {e}")
             return []
 
     def clear(
         self,
+        agent_id: Optional[str] = None,
+        user_id: Optional[str] = None,
     ) -> None:
-        r"""Removes all records from the Mem0 storage system."""
+        r"""Removes all records from the Mem0 storage system.
+
+        Args:
+            agent_id (Optional[str]): Specific agent ID to clear memories for.
+            user_id (Optional[str]): Specific user ID to clear memories for.
+        """
         try:
-            filters = self._prepare_filters(
-                agent_id=self.agent_id,
-                user_id=self.user_id,
-            )
-            self.client.delete_users(**filters)
+            # Use provided IDs or fall back to instance defaults
+            target_user_id = user_id or self.user_id
+            target_agent_id = agent_id or self.agent_id
+
+            # Build kwargs for delete_users method
+            kwargs = {}
+            if target_user_id:
+                kwargs['user_id'] = target_user_id
+            if target_agent_id:
+                kwargs['agent_id'] = target_agent_id
+
+            if kwargs:
+                # Use delete_users (plural) - this is the correct method name
+                self.client.delete_users(**kwargs)
+                logger.info(
+                    f"Successfully cleared memories with filters: {kwargs}"
+                )
+            else:
+                logger.warning(
+                    "No user_id or agent_id available for clearing memories"
+                )
+
         except Exception as e:
             logger.error(f"Error deleting memories: {e}")
-            logger.error(f"Error: {e}")

camel/storages/object_storages/google_cloud.py

@@ -46,7 +46,7 @@ class GoogleCloudStorage(BaseObjectStorage):
         create_if_not_exists: bool = True,
         anonymous: bool = False,
     ) -> None:
-        from google.cloud import storage
+        from google.cloud import storage  # type: ignore[attr-defined]
 
         self.create_if_not_exists = create_if_not_exists
 

camel/storages/vectordb_storages/__init__.py

@@ -19,10 +19,13 @@ from .base import (
     VectorDBStatus,
     VectorRecord,
 )
+from .chroma import ChromaStorage
 from .faiss import FaissStorage
 from .milvus import MilvusStorage
 from .oceanbase import OceanBaseStorage
+from .pgvector import PgVectorStorage
 from .qdrant import QdrantStorage
+from .surreal import SurrealStorage
 from .tidb import TiDBStorage
 from .weaviate import WeaviateStorage
 
@@ -30,6 +33,7 @@ __all__ = [
     'BaseVectorStorage',
     'VectorDBQuery',
     'VectorDBQueryResult',
+    'ChromaStorage',
     'QdrantStorage',
     'MilvusStorage',
     "TiDBStorage",
@@ -38,4 +42,6 @@ __all__ = [
     'WeaviateStorage',
     'VectorRecord',
     'VectorDBStatus',
+    'PgVectorStorage',
+    'SurrealStorage',
 ]