documente_shared 0.1.80__tar.gz → 0.1.82__tar.gz

{documente_shared-0.1.80 → documente_shared-0.1.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: documente_shared
-Version: 0.1.80
+Version: 0.1.82
 Summary: Shared utilities for Documente AI projects
 License: MIT
 Author: Tech

documente_shared-0.1.82/documente_shared/application/payloads.py

@@ -0,0 +1,14 @@
+import re
+
+
+def camel_to_snake_key(name: str) -> str:
+    s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', name)
+    return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower()
+
+def camel_to_snake(data: dict | list) -> dict | list:
+    if isinstance(data, dict):
+        return {camel_to_snake_key(k): camel_to_snake(v) for k, v in data.items()}
+    elif isinstance(data, list):
+        return [camel_to_snake(item) for item in data]
+    else:
+        return data

{documente_shared-0.1.80 → documente_shared-0.1.82}/documente_shared/domain/entities/in_memory_result.py

@@ -11,6 +11,7 @@ from documente_shared.application.files import (
 class InMemoryDocument(object):
     file_path: Optional[str] = None
     file_bytes: Optional[bytes] = None
+    file_base64: Optional[str] = None
 
     @property
     def is_valid(self) -> bool:
@@ -18,13 +19,7 @@ class InMemoryDocument(object):
 
     @property
     def has_content(self) -> bool:
-        return bool(self.file_bytes)
-
-    @property
-    def file_key(self) -> Optional[str]:
-        if not self.file_path:
-            return None
-        return remove_slash_from_path(self.file_path)
+        return bool(self.file_bytes) or bool(self.file_base64)
 
     @property
     def file_name(self) -> Optional[str]:
@@ -32,20 +27,29 @@ class InMemoryDocument(object):
             return None
         return get_filename_from_path(self.file_path)
 
+    @property
+    def file_key(self) -> Optional[str]:
+        return self.file_name
+
     @property
     def is_procesable(self) -> bool:
         return self.is_valid and self.has_content
 
     @property
     def to_dict(self) -> dict:
-        return {
-            'file_path': self.file_path,
-            'file_bytes': self.file_bytes,
-        }
+        data = dict()
+        if self.file_path:
+            data['file_path'] = remove_slash_from_path(self.file_path)
+        if self.file_bytes:
+            data['file_bytes'] = self.file_bytes.decode('utf-8')
+        if self.file_base64:
+            data['file_base64'] = self.file_base64
+        return data
 
     @classmethod
     def from_dict(cls, data: dict):
         return cls(
             file_path=data.get('file_path'),
             file_bytes=data.get('file_bytes'),
+            file_base64=data.get('file_base64'),
         )

{documente_shared-0.1.80 → documente_shared-0.1.82}/documente_shared/domain/entities/processing_case.py

@@ -96,37 +96,18 @@ class ProcessingCase(object):
 
     @property
     def to_persist_dict(self) -> dict:
-        return self.to_dict
-
-    def overload(
-        self,
-        new_instance: 'ProcessingCase',
-        properties: List[str] = None,
-    ):
-        instance_properties = properties or [
-            'label',
-            'status',
-            'category',
-            'enqueued_at',
-            'started_at',
-            'failed_at',
-            'feedback',
-            'completed_at',
-            'metadata',
-            'items',
+        persist_data = self.to_dict
+        persist_data["items"] = [
+            item.to_dict for item in self.items
         ]
-        for _property in instance_properties:
-            property_value = getattr(new_instance, _property)
-            if not hasattr(self, _property):
-                continue
-            setattr(self, _property, property_value)
-        return self
+        return persist_data
 
     @classmethod
     def from_dict(cls, data: dict) -> 'ProcessingCase':
         return cls(
             uuid=data.get('uuid'),
             name=data.get('label'),
+            tenant_slug=data.get('tenant_slug'),
             status=ProcessingStatus.from_value(data.get('status')),
             case_type=(
                 ProcessingCaseType.from_value(data.get('category'))
@@ -143,3 +124,12 @@ class ProcessingCase(object):
                 for item_dict in data.get('items', [])
             ],
         )
+
+    @classmethod
+    def from_persist_dict(cls, data: dict) -> 'ProcessingCase':
+        instance = cls.from_dict(data)
+        instance.items = [
+            ProcessingCaseItem.from_persist_dict(item_dict)
+            for item_dict in data.get('items', [])
+        ]
+        return instance

{documente_shared-0.1.80 → documente_shared-0.1.82}/documente_shared/domain/entities/processing_case_item.py

@@ -106,7 +106,10 @@ class ProcessingCaseItem(object):
             'case_id': self.case_id,
             'digest': self.digest,
             'status': str(self.status),
-            'document': self.document.to_dict,
+            'document':(
+                self.document.to_dict
+                if self.document else None
+            ),
             'document_type': (
                 str(self.document_type)
                 if self.document_type else None
@@ -205,7 +208,10 @@ class ProcessingCaseItem(object):
             case_id=data.get('case_id'),
             digest=data.get('digest'),
             status=ProcessingStatus.from_value(data.get('status')),
-            document=InMemoryDocument.from_dict(data.get('document')),
+            document=(
+                InMemoryDocument.from_dict(data.get('document'))
+                if data.get('document') else None
+            ),
             document_type=(
                 ProcessingDocumentType.from_value(data.get('document_type'))
                 if data.get('document_type') else None

{documente_shared-0.1.80 → documente_shared-0.1.82}/documente_shared/infrastructure/repositories/http_processing_case.py

@@ -1,6 +1,9 @@
 from dataclasses import dataclass
 from typing import List, Optional
 
+from requests import Response
+
+from documente_shared.application.payloads import camel_to_snake
 from documente_shared.domain.entities.processing_case import ProcessingCase
 from documente_shared.domain.entities.processing_case_filters import ProcessingCaseFilters
 from documente_shared.domain.repositories.processing_case import ProcessingCaseRepository
@@ -15,7 +18,7 @@ class HttpProcessingCaseRepository(
     def find(self, uuid: str, include_items: bool = False) -> Optional[ProcessingCase]:
         response = self.session.get(f"{self.api_url}/v1/processing-cases/{uuid}/")
         if response.status_code == 200:
-            return ProcessingCase.from_dict(response.json())
+            return self._build_processing_case(response)
         return None
 
     def persist(self, instance: ProcessingCase) -> ProcessingCase:
@@ -25,7 +28,8 @@ class HttpProcessingCaseRepository(
         )
         if response.status_code not in [200, 201]:
             raise Exception(f'Error persisting processing case: {response.text}')
-        return ProcessingCase.from_dict(response.json())
+
+        return self._build_processing_case(response)
 
     def remove(self, instance: ProcessingCase):
         self.session.delete(f"{self.api_url}/v1/processing-cases/{instance.uuid}/")
@@ -40,7 +44,13 @@ class HttpProcessingCaseRepository(
         if response.status_code == 200:
             raw_response = response.json()
             return [
-                ProcessingCase.from_dict(item)
-                for item in raw_response.get('data', [])
+                ProcessingCase.from_persist_dict(camel_to_snake(item_data))
+                for item_data in raw_response.get('data', [])
             ]
-        return []
+        return []
+
+    @classmethod
+    def _build_processing_case(cls, response: Response) -> ProcessingCase:
+        response_json = response.json()
+        instance_data = response_json.get('data', {})
+        return ProcessingCase.from_persist_dict(camel_to_snake(instance_data))

{documente_shared-0.1.80 → documente_shared-0.1.82}/documente_shared/infrastructure/repositories/http_processing_case_item.py

@@ -1,6 +1,9 @@
 from dataclasses import dataclass
 from typing import List, Optional
 
+from requests import Response
+
+from documente_shared.application.payloads import camel_to_snake
 from documente_shared.domain.entities.processing_case_item import ProcessingCaseItem
 from documente_shared.domain.entities.processing_case_item_filters import ProcessingCaseItemFilters
 from documente_shared.domain.repositories.processing_case_item import ProcessingCaseItemRepository
@@ -12,41 +15,46 @@ class HttpProcessingCaseItemRepository(
     DocumenteClientMixin,
     ProcessingCaseItemRepository,
 ):
-
     def find(self, uuid: str) -> Optional[ProcessingCaseItem]:
-        response = self.session.get(f"{self.api_url}/processing-case-items/{uuid}/")
+        response = self.session.get(f"{self.api_url}/v1/processing-case-items/{uuid}/")
         if response.status_code == 200:
-            return ProcessingCaseItem.from_persist_dict(response.json())
+            return self._build_processing_case_item(response)
         return None
 
     def find_by_digest(self, digest: str) -> Optional[ProcessingCaseItem]:
-        response = self.session.get(f"{self.api_url}/processing-case-items/{digest}/")
+        response = self.session.get(f"{self.api_url}/v1/processing-case-items/{digest}/")
         if response.status_code == 200:
-            return ProcessingCaseItem.from_persist_dict(response.json())
+            return self._build_processing_case_item(response)
         return None
 
     def persist(self, instance: ProcessingCaseItem) -> ProcessingCaseItem:
-        response = self.session.put(
-            url=f"{self.api_url}/processing-case-items/{instance.uuid}/",
+        response: Response = self.session.put(
+            url=f"{self.api_url}/v1/processing-case-items/{instance.uuid}/",
             json=instance.to_persist_dict,
         )
         if response.status_code in [200, 201]:
-            return ProcessingCaseItem.from_dict(response.json())
+            return self._build_processing_case_item(response)
         return instance
 
     def remove(self, instance: ProcessingCaseItem):
-        self.session.delete(f"{self.api_url}/processing-case-items/{instance.uuid}/")
+        self.session.delete(f"{self.api_url}/v1/processing-case-items/{instance.uuid}/")
 
     def filter(
         self,
         tenant_slug: str,
         filters: ProcessingCaseItemFilters,
     ) -> List[ProcessingCaseItem]:
-        response = self.session.get(f"{self.api_url}/processing-case-items/")
+        response = self.session.get(f"{self.api_url}/v1/processing-case-items/")
         if response.status_code == 200:
             raw_response = response.json()
             return [
-                ProcessingCaseItem.from_persist_dict(item)
-                for item in raw_response.get('data', [])
+                ProcessingCaseItem.from_dict(camel_to_snake(item_data))
+                for item_data in raw_response.get('data', [])
             ]
         return []
+
+    @classmethod
+    def _build_processing_case_item(cls, response: Response) -> ProcessingCaseItem:
+        response_json = response.json()
+        instance_data = response_json.get('data', {})
+        return ProcessingCaseItem.from_dict(camel_to_snake(instance_data))

{documente_shared-0.1.80 → documente_shared-0.1.82}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "documente_shared"
-version = "0.1.80"
+version = "0.1.82"
 description = "Shared utilities for Documente AI projects"
 authors = ["Tech <tech@llamitai.com>"]
 license = "MIT"