cheshirecat-python-sdk 1.8.0__tar.gz → 1.8.2__tar.gz

{cheshirecat_python_sdk-1.8.0 → cheshirecat_python_sdk-1.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cheshirecat-python-sdk
-Version: 1.8.0
+Version: 1.8.2
 Summary: Python SDK for the Cloud-ready fork of the Cheshire Cat
 Project-URL: Repository, https://github.com/matteocacciola/cheshirecat-python-sdk
 Project-URL: Documentation, https://github.com/matteocacciola/cheshirecat-python-sdk#README

{cheshirecat_python_sdk-1.8.0 → cheshirecat_python_sdk-1.8.2}/cheshirecat_python_sdk/builders/__init__.py

@@ -1,3 +1,3 @@
-from cheshirecat_python_sdk.builders.memory import MemoryBuilder, MemoryPointBuilder
+from cheshirecat_python_sdk.builders.memory import MemoryPointBuilder
 from cheshirecat_python_sdk.builders.settings_input import SettingInputBuilder
 from cheshirecat_python_sdk.builders.why import WhyBuilder

cheshirecat_python_sdk-1.8.2/cheshirecat_python_sdk/builders/memory.py

@@ -0,0 +1,25 @@
+from typing import Dict, Any
+
+from cheshirecat_python_sdk.builders.base import BaseBuilder
+from cheshirecat_python_sdk.models.dtos import MemoryPoint
+
+
+class MemoryPointBuilder(BaseBuilder):
+    def __init__(self):
+        self.content: str = ""
+        self.metadata: Dict[str, Any] = {}
+
+    @staticmethod
+    def create():
+        return MemoryPointBuilder()
+
+    def set_content(self, content: str):
+        self.content = content
+        return self
+
+    def set_metadata(self, metadata: Dict[str, Any]):
+        self.metadata = metadata
+        return self
+
+    def build(self):
+        return MemoryPoint(self.content, self.metadata)

{cheshirecat_python_sdk-1.8.0 → cheshirecat_python_sdk-1.8.2}/cheshirecat_python_sdk/builders/why.py

@@ -1,14 +1,14 @@
-from typing import Dict, Any
+from typing import List
 
 from cheshirecat_python_sdk.builders.base import BaseBuilder
-from cheshirecat_python_sdk.models.dtos import Memory, Why
+from cheshirecat_python_sdk.models.dtos import Why
 
 
 class WhyBuilder(BaseBuilder):
     def __init__(self):
         self.input: str | None = None
-        self.intermediate_steps: Dict[str, Any] | None = None
-        self.memory: Memory | None = None
+        self.intermediate_steps: List | None = []
+        self.memory: List | None = []
 
     @staticmethod
     def create() -> "WhyBuilder":
@@ -18,12 +18,12 @@ class WhyBuilder(BaseBuilder):
         self.input = input
         return self
 
-    def set_intermediate_steps(self, intermediate_steps: Dict[str, Any] | None = None) -> "WhyBuilder":
-        self.intermediate_steps = intermediate_steps
+    def set_intermediate_steps(self, intermediate_steps: List | None = None) -> "WhyBuilder":
+        self.intermediate_steps = intermediate_steps or []
         return self
 
-    def set_memory(self, memory: Memory) -> "WhyBuilder":
-        self.memory = memory
+    def set_memory(self, memory: List | None = None) -> "WhyBuilder":
+        self.memory = memory or []
         return self
 
     def build(self) -> Why:

{cheshirecat_python_sdk-1.8.0 → cheshirecat_python_sdk-1.8.2}/cheshirecat_python_sdk/endpoints/base.py

@@ -43,12 +43,13 @@ class AbstractEndpoint(ABC):
         output_class: Type[T] | None = None,
         query: Dict[str, Any] | None = None,
         user_id: str | None = None,
+        chat_id: str | None = None,
     ) -> T:
         options = {}
         if query:
             options["params"] = query
 
-        response = self.get_http_client(agent_id, user_id).get(endpoint, **options)
+        response = self.get_http_client(agent_id, user_id, chat_id).get(endpoint, **options)
         response.raise_for_status()
 
         if output_class is None:
@@ -103,12 +104,13 @@ class AbstractEndpoint(ABC):
         output_class: Type[T] | None = None,
         payload: Dict[str, Any] | None = None,
         user_id: str | None = None,
+        chat_id: str | None = None,
     ) -> T:
         options = {}
         if payload:
             options["json"] = payload
 
-        response = self.get_http_client(agent_id, user_id).put(endpoint, **options)
+        response = self.get_http_client(agent_id, user_id, chat_id).put(endpoint, **options)
         response.raise_for_status()
 
         if output_class is None:
@@ -121,13 +123,14 @@ class AbstractEndpoint(ABC):
         agent_id: str,
         output_class: Type[T] | None = None,
         user_id: str | None = None,
+        chat_id: str | None = None,
         payload: Dict[str, Any] | None = None,
     ) -> T:
         options = {}
         if payload:
             options["json"] = payload
 
-        response = self.get_http_client(agent_id, user_id).delete(endpoint, **options)
+        response = self.get_http_client(agent_id, user_id, chat_id).delete(endpoint, **options)
         response.raise_for_status()
 
         if output_class is None:

{cheshirecat_python_sdk-1.8.0 → cheshirecat_python_sdk-1.8.2}/cheshirecat_python_sdk/endpoints/file_manager.py

@@ -53,22 +53,24 @@ class FileManagerEndpoint(AbstractEndpoint):
             payload=values,
         )
 
-    def get_file_manager_attributes(self, agent_id: str) -> FileManagerAttributes:
+    def get_file_manager_attributes(self, agent_id: str, chat_id: str | None = None) -> FileManagerAttributes:
         """
         Get the attributes of the file manager for the agent specified by agent_id
         :param agent_id: The agent id
+        :param chat_id: The chat id, optional
         :return: FileManagerAttributes, the attributes of the file manager
         """
-        return self.get(self.prefix, agent_id, output_class=FileManagerAttributes)
+        return self.get(self.prefix, agent_id, output_class=FileManagerAttributes, chat_id=chat_id)
 
-    def get_file(self, agent_id: str, file_name: str) -> Response:
+    def get_file(self, agent_id: str, file_name: str, chat_id: str | None = None) -> Response:
         """
         Download a file from the file manager for the agent specified by agent_id
         :param agent_id: The agent id
         :param file_name: The name of the file to download
+        :param chat_id: The chat id, optional
         :return: Response, the response containing the file content
         """
-        response = self.get_http_client(agent_id).get(
+        response = self.get_http_client(agent_id, chat_id=chat_id).get(
             self.format_url(f"/files/{file_name}"),
             stream=True,
             headers={"Accept": "application/octet-stream"}
@@ -77,27 +79,31 @@ class FileManagerEndpoint(AbstractEndpoint):
 
         return response
 
-    def delete_file(self, agent_id: str, file_name: str) -> FileManagerDeletedFiles:
+    def delete_file(self, agent_id: str, file_name: str, chat_id: str | None = None) -> FileManagerDeletedFiles:
         """
         Download a file from the file manager for the agent specified by agent_id
         :param agent_id: The agent id
         :param file_name: The name of the file to delete
+        :param chat_id: The chat id, optional
         :return: FileManagerDeletedFiles, the response containing info about the deleted file
         """
         return self.delete(
             self.format_url(f"/files/{file_name}"),
             agent_id,
             output_class=FileManagerDeletedFiles,
+            chat_id=chat_id,
         )
 
-    def delete_files(self, agent_id: str) -> FileManagerDeletedFiles:
+    def delete_files(self, agent_id: str, chat_id: str | None = None) -> FileManagerDeletedFiles:
         """
         Download a file from the file manager for the agent specified by agent_id
         :param agent_id: The agent id
+        :param chat_id: The chat id, optional
         :return: bool, True if all files were deleted successfully
         """
         return self.delete(
             self.format_url("/files"),
             agent_id,
             output_class=FileManagerDeletedFiles,
+            chat_id=chat_id,
         )

{cheshirecat_python_sdk-1.8.0 → cheshirecat_python_sdk-1.8.2}/cheshirecat_python_sdk/endpoints/memory.py

@@ -85,6 +85,7 @@ class MemoryEndpoint(AbstractEndpoint):
         user_id: str,
         k: int | None = None,
         metadata: Dict[str, Any] | None = None,
+        chat_id: str | None = None,
     ) -> MemoryRecallOutput:
         """
         This endpoint retrieves memory points based on the input text. The text parameter is the input text for which
@@ -94,6 +95,7 @@ class MemoryEndpoint(AbstractEndpoint):
         :param user_id: The user ID to filter the memory points.
         :param k: The number of memory points to retrieve.
         :param metadata: The metadata to filter the memory points.
+        :param chat_id: The chat id, optional
         :return: MemoryRecallOutput, a list of memory points retrieved.
         """
         query = {"text": text}
@@ -108,6 +110,7 @@ class MemoryEndpoint(AbstractEndpoint):
             output_class=MemoryRecallOutput,
             user_id=user_id,
             query=query,
+            chat_id=chat_id,
         )
 
     def post_memory_point(

{cheshirecat_python_sdk-1.8.0 → cheshirecat_python_sdk-1.8.2}/cheshirecat_python_sdk/endpoints/rabbit_hole.py

@@ -158,14 +158,16 @@ class RabbitHoleEndpoint(AbstractEndpoint):
             output_class=AllowedMimeTypesOutput
         )
 
-    def get_web_sources(self, agent_id: str) -> List[str]:
+    def get_web_sources(self, agent_id: str, chat_id: str | None = None) -> List[str]:
         """
         This method retrieves the web sources for the RabbitHole API. The web sources are the web URLs that are allowed
         to be uploaded to the RabbitHole API. The web sources are returned in a list.
         :param agent_id: The ID of the agent.
+        :param chat_id: The chat id, optional
         :return: List[str]
         """
         return self.get(
             self.format_url("/web"),
             agent_id,
+            chat_id=chat_id,
         )

{cheshirecat_python_sdk-1.8.0 → cheshirecat_python_sdk-1.8.2}/cheshirecat_python_sdk/models/dtos.py

@@ -2,10 +2,6 @@ from typing import Dict, List, Any
 from pydantic import BaseModel, Field
 
 
-class Memory(BaseModel):
-    declarative: List | None = Field(default_factory=list)
-
-
 class MemoryPoint(BaseModel):
     content: str
     metadata: Dict[str, Any]
@@ -29,4 +25,4 @@ class SettingInput(BaseModel):
 class Why(BaseModel):
     input: str | None = None
     intermediate_steps: List | None = Field(default_factory=list)
-    memory: Memory = Field(default_factory=Memory)
+    memory: List | None = Field(default_factory=list)

{cheshirecat_python_sdk-1.8.0 → cheshirecat_python_sdk-1.8.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "cheshirecat-python-sdk"
 description = "Python SDK for the Cloud-ready fork of the Cheshire Cat"
-version = "1.8.0"
+version = "1.8.2"
 requires-python = ">=3.10"
 license = { file = "LICENSE" }
 authors = [

cheshirecat_python_sdk-1.8.0/cheshirecat_python_sdk/builders/memory.py

@@ -1,44 +0,0 @@
-from typing import Dict, Any
-
-from cheshirecat_python_sdk.builders.base import BaseBuilder
-from cheshirecat_python_sdk.models.dtos import Memory, MemoryPoint
-
-
-class MemoryBuilder(BaseBuilder):
-    def __init__(self):
-        self.declarative: Dict[str, Any] | None = None
-
-    @staticmethod
-    def create():
-        return MemoryBuilder()
-
-    def set_declarative(self, declarative: Dict[str, Any] | None = None):
-        self.declarative = declarative or {}
-        return self
-
-    def build(self):
-        memory = Memory()
-        memory.declarative = self.declarative
-
-        return memory
-
-
-class MemoryPointBuilder(BaseBuilder):
-    def __init__(self):
-        self.content: str = ""
-        self.metadata: Dict[str, Any] = {}
-
-    @staticmethod
-    def create():
-        return MemoryPointBuilder()
-
-    def set_content(self, content: str):
-        self.content = content
-        return self
-
-    def set_metadata(self, metadata: Dict[str, Any]):
-        self.metadata = metadata
-        return self
-
-    def build(self):
-        return MemoryPoint(self.content, self.metadata)