Merge branch 'main' into artemiy/add-asset-type-2

cohere/compass/clients/compass.py

@@ -729,7 +729,7 @@ def _send_request_with_retry():
                     raise CompassAuthError(message=str(e))
                 elif 400 <= e.response.status_code < 500:
                     error = f"Client error occurred: {e.response.text}"
-                    raise CompassClientError(message=error)
+                    raise CompassClientError(message=error, code=e.response.status_code)
                 else:
                     error = str(e) + " " + e.response.text
                     logger.error(

cohere/compass/exceptions.py

@@ -1,8 +1,9 @@
 class CompassClientError(Exception):
     """Exception raised for all 4xx client errors in the Compass client."""
 
-    def __init__(self, message: str = "Client error occurred."):
+    def __init__(self, message: str = "Client error occurred.", code: int = 400):
         self.message = message
+        self.code = code
         super().__init__(self.message)
 
 

cohere/compass/models/documents.py

@@ -22,20 +22,7 @@ class CompassDocumentMetadata(ValidatedModel):
     parent_document_id: str = ""
 
 
-class AssetType(str, Enum):
-    def __str__(self) -> str:
-        return self.value
-
-    # A page that has been rendered as an image
-    PAGE_IMAGE = "page_image"
-    # A Markdown representation of a page's content
-    PAGE_MARKDOWN = "page_markdown"
-    # A dump of the text extracted from a document
-    DOCUMENT_TEXT = "document_text"
-
-
 class CompassDocumentChunkAsset(BaseModel):
-    asset_type: AssetType
     content_type: str
     asset_data: str
 

cohere/compass/models/search.py

@@ -5,11 +5,8 @@
 # 3rd party imports
 from pydantic import BaseModel
 
-from cohere.compass.models.documents import AssetType
-
 
 class AssetInfo(BaseModel):
-    asset_type: AssetType
     content_type: str
     presigned_url: str
 

pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "compass-sdk"
-version = "0.9.1"
+version = "0.9.4"
 authors = []
 description = "Compass SDK"
 readme = "README.md"
 packages = [{include = "cohere"}]
 
 [tool.poetry.dependencies]
-fsspec = "^2024.10.0"
+fsspec = ">=2024.9.0"
 joblib = "1.4.2"
 pydantic = ">=2.6.3"
 python = ">=3.9,<4.0"