documente_shared 0.1.78__py3-none-any.whl → 0.1.80__py3-none-any.whl

documente_shared/domain/entities/processing_case_item.py

@@ -16,8 +16,8 @@ class ProcessingCaseItem(object):
     case_id: str
     digest: str
     status: ProcessingStatus
-    document_type: ProcessingDocumentType
     document: InMemoryDocument
+    document_type: Optional[ProcessingDocumentType] = None
     uploaded_from: Optional[ProcessingSource] = None
     processed_csv: Optional[InMemoryDocument] = None
     processed_xlsx: Optional[InMemoryDocument] = None
@@ -107,7 +107,10 @@ class ProcessingCaseItem(object):
             'digest': self.digest,
             'status': str(self.status),
             'document': self.document.to_dict,
-            'document_type': str(self.document_type),
+            'document_type': (
+                str(self.document_type)
+                if self.document_type else None
+            ),
             'uploaded_from': (
                 str(self.uploaded_from)
                 if self.uploaded_from else None
@@ -132,12 +135,24 @@ class ProcessingCaseItem(object):
                 str(self.processing_confidence.quantize(Decimal('0.001')))
                 if self.processing_confidence else None
             ),
-            'uploaded_at': self.uploaded_at.isoformat() if self.uploaded_at else None,
-            'started_at': self.started_at.isoformat() if self.started_at else None,
-            'failed_at': self.failed_at.isoformat() if self.failed_at else None,
+            'uploaded_at': (
+                self.uploaded_at.isoformat()
+                if self.uploaded_at else None
+            ),
+            'started_at': (
+                self.started_at.isoformat()
+                if self.started_at else None
+            ),
+            'failed_at': (
+                self.failed_at.isoformat()
+                if self.failed_at else None
+            ),
             'feedback': self.feedback,
             'metadata': self.metadata,
-            'completed_at': self.completed_at.isoformat() if self.completed_at else None,
+            'completed_at': (
+                self.completed_at.isoformat()
+                if self.completed_at else None
+            ),
         }
 
     @property
@@ -145,6 +160,15 @@ class ProcessingCaseItem(object):
         simple_dict = self.to_dict.copy()
         return simple_dict
 
+    @property
+    def to_persist_dict(self) -> dict:
+        simple_dict = self.to_dict.copy()
+        simple_dict["document_path"] = self.document.file_path if self.document else None
+        simple_dict["processed_csv_path"] = self.processed_csv.file_path if self.processed_csv else None
+        simple_dict["processed_xlsx_path"] = self.processed_xlsx.file_path if self.processed_xlsx else None
+        simple_dict["processed_json_path"] = self.processed_json.file_path if self.processed_json else None
+        return simple_dict
+
     def overload(
         self,
         new_instance: 'ProcessingCaseItem',
@@ -152,8 +176,8 @@ class ProcessingCaseItem(object):
     ):
         instance_properties = properties or [
             'status',
-            'document_type',
             'document',
+            'document_type',
             'uploaded_from',
             'processed_csv',
             'processed_xlsx',
@@ -182,7 +206,10 @@ class ProcessingCaseItem(object):
             digest=data.get('digest'),
             status=ProcessingStatus.from_value(data.get('status')),
             document=InMemoryDocument.from_dict(data.get('document')),
-            document_type=ProcessingDocumentType.from_value(data.get('document_type')),
+            document_type=(
+                ProcessingDocumentType.from_value(data.get('document_type'))
+                if data.get('document_type') else None
+            ),
             uploaded_from=(
                 ProcessingSource.from_value(data.get('uploaded_from'))
                 if data.get('uploaded_from') else None
@@ -214,3 +241,16 @@ class ProcessingCaseItem(object):
             metadata=data.get('metadata', {}),
             completed_at=get_datetime_from_data(input_datetime=data.get('completed_at')),
         )
+
+    @classmethod
+    def from_persist_dict(cls, data: dict) -> 'ProcessingCaseItem':
+        instance = cls.from_dict(data)
+        if "document_path" in data:
+            instance.document = InMemoryDocument(file_path=data["document_path"])
+        if "processed_csv_path" in data:
+            instance.processed_csv = InMemoryDocument(file_path=data["processed_csv_path"])
+        if "processed_xlsx_path" in data:
+            instance.processed_xlsx = InMemoryDocument(file_path=data["processed_xlsx_path"])
+        if "processed_json_path" in data:
+            instance.processed_json = InMemoryDocument(file_path=data["processed_json_path"])
+        return instance

documente_shared/domain/repositories/processing_case.py

@@ -8,7 +8,7 @@ from documente_shared.domain.entities.processing_case_filters import ProcessingC
 class ProcessingCaseRepository(ABC):
 
     @abstractmethod
-    def find(self, uuid: str) -> Optional[ProcessingCase]:
+    def find(self, uuid: str, include_items: bool = False) -> Optional[ProcessingCase]:
         raise NotImplementedError
 
     @abstractmethod

documente_shared/infrastructure/repositories/dynamo_processing_case.py

@@ -3,7 +3,7 @@ from typing import Optional, List
 from boto3.dynamodb.conditions import Key
 
 from documente_shared.domain.entities.processing_case import ProcessingCase
-from documente_shared.domain.enums.common import ProcessingStatus
+from documente_shared.domain.entities.processing_case_filters import ProcessingCaseFilters
 from documente_shared.domain.repositories.processing_case import ProcessingCaseRepository
 
 from documente_shared.infrastructure.dynamo_table import DynamoDBTable
@@ -13,7 +13,7 @@ class DynamoProcessingCaseRepository(
     DynamoDBTable,
     ProcessingCaseRepository,
 ):
-    def find(self, uuid: str) -> Optional[ProcessingCase]:
+    def find(self, uuid: str, include_items: bool = False) -> Optional[ProcessingCase]:
         item = self.get(key={'uuid': uuid})
         if item:
             return ProcessingCase.from_dict(item)
@@ -26,10 +26,10 @@ class DynamoProcessingCaseRepository(
     def remove(self, instance: ProcessingCase):
         self.delete(key={'uuid': instance.uuid})
 
-    def filter(self, statuses: List[ProcessingStatus]) -> List[ProcessingCase]:
+    def filter(self, tenant_slug: str, filters: ProcessingCaseFilters) -> List[ProcessingCase]:
         items = []
 
-        for status in statuses:
+        for status in filters.statuses:
             response = self._table.query(
                 IndexName='status',
                 KeyConditionExpression=Key('status').eq(status.value),

documente_shared/infrastructure/repositories/http_processing_case.py

@@ -12,15 +12,15 @@ class HttpProcessingCaseRepository(
     DocumenteClientMixin,
     ProcessingCaseRepository,
 ):
-    def find(self, uuid: str) -> Optional[ProcessingCase]:
-        response = self.session.get(f"{self.api_url}/processing-cases/{uuid}/")
+    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 None
 
     def persist(self, instance: ProcessingCase) -> ProcessingCase:
         response = self.session.put(
-            url=f"{self.api_url}/processing-cases/{instance.uuid}/",
+            url=f"{self.api_url}/v1/processing-cases/{instance.uuid}/",
             json=instance.to_dict,
         )
         if response.status_code not in [200, 201]:
@@ -28,10 +28,15 @@ class HttpProcessingCaseRepository(
         return ProcessingCase.from_dict(response.json())
 
     def remove(self, instance: ProcessingCase):
-        self.session.delete(f"{self.api_url}/processing-cases/{instance.uuid}/")
+        self.session.delete(f"{self.api_url}/v1/processing-cases/{instance.uuid}/")
 
     def filter(self, tenant_slug: str, filters: ProcessingCaseFilters) -> List[ProcessingCase]:
-        response = self.session.get(f"{self.api_url}/processing-cases/")
+        response = self.session.get(
+            url=f"{self.api_url}/v1/processing-cases/",
+            headers={
+                "X-Tenant": tenant_slug,
+            }
+        )
         if response.status_code == 200:
             raw_response = response.json()
             return [

documente_shared/infrastructure/repositories/http_processing_case_item.py

@@ -16,19 +16,19 @@ class HttpProcessingCaseItemRepository(
     def find(self, uuid: str) -> Optional[ProcessingCaseItem]:
         response = self.session.get(f"{self.api_url}/processing-case-items/{uuid}/")
         if response.status_code == 200:
-            return ProcessingCaseItem.from_dict(response.json())
+            return ProcessingCaseItem.from_persist_dict(response.json())
         return None
 
     def find_by_digest(self, digest: str) -> Optional[ProcessingCaseItem]:
         response = self.session.get(f"{self.api_url}/processing-case-items/{digest}/")
         if response.status_code == 200:
-            return ProcessingCaseItem.from_dict(response.json())
+            return ProcessingCaseItem.from_persist_dict(response.json())
         return None
 
     def persist(self, instance: ProcessingCaseItem) -> ProcessingCaseItem:
         response = self.session.put(
             url=f"{self.api_url}/processing-case-items/{instance.uuid}/",
-            json=instance.to_simple_dict,
+            json=instance.to_persist_dict,
         )
         if response.status_code in [200, 201]:
             return ProcessingCaseItem.from_dict(response.json())
@@ -46,7 +46,7 @@ class HttpProcessingCaseItemRepository(
         if response.status_code == 200:
             raw_response = response.json()
             return [
-                ProcessingCaseItem.from_dict(item)
+                ProcessingCaseItem.from_persist_dict(item)
                 for item in raw_response.get('data', [])
             ]
         return []

{documente_shared-0.1.78.dist-info → documente_shared-0.1.80.dist-info}/METADATA

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

{documente_shared-0.1.78.dist-info → documente_shared-0.1.80.dist-info}/RECORD

@@ -15,7 +15,7 @@ documente_shared/domain/entities/document_metadata.py,sha256=ygyFIC5qwxlm8DUM5kv
 documente_shared/domain/entities/in_memory_result.py,sha256=Q1E9vnLL5Hz5xunOqWtQmJOMjoK5KN42LZr18GlBAZo,1246
 documente_shared/domain/entities/processing_case.py,sha256=3bL6BgFwWe6F5keZ6A1K_lLsrwGpkcKg98roM_i6kEQ,5167
 documente_shared/domain/entities/processing_case_filters.py,sha256=FgyxB4mQb0nEGjIbUB9OiazkKL4yHRRC6bvmjD5NT8k,1915
-documente_shared/domain/entities/processing_case_item.py,sha256=hglyPhZBSjlMKVdEVccyHXU3aQRdZ8hfZlXDJnkf7wA,7996
+documente_shared/domain/entities/processing_case_item.py,sha256=zav9tZ3EjQIJMccQzguF_0UJY4vc3yzfcNEQI_evMj4,9578
 documente_shared/domain/entities/processing_case_item_filters.py,sha256=-cAQTSWOepMMcGCBg2X3dd0W_8XHuBTlvOB1d-3sVVM,1971
 documente_shared/domain/entities/processing_event.py,sha256=m1O0gcNaE_SszeIhxM3uYPHSpyOUmize6mfRw1_bYZo,1723
 documente_shared/domain/enums/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -24,19 +24,19 @@ documente_shared/domain/enums/document.py,sha256=NltZA1YVgJ7dVfSQdJFIE0ZUGf9Y-nx
 documente_shared/domain/enums/processing_case.py,sha256=LhFhcoWlockxcpplsVdC6M2kpXn7sOdzQySf24wFhx8,1572
 documente_shared/domain/repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 documente_shared/domain/repositories/document.py,sha256=vJzr6c92gqBzyhaEdjrvnoneKRrWmJ0AsvocPnhxiLU,767
-documente_shared/domain/repositories/processing_case.py,sha256=bpks3SAM_L4wx29P29iFo5g-oi4fxSXQEzhveARjo3c,767
+documente_shared/domain/repositories/processing_case.py,sha256=9jGpnUnXaDgQE1ZKiet7zDVCc7wVvHUrcPOeacebb3s,796
 documente_shared/domain/repositories/processing_case_item.py,sha256=gPZaQCMYlD6vlnEt6cVIqRmi1K-JWvmDx1f74nd97Cs,974
 documente_shared/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 documente_shared/infrastructure/documente_client.py,sha256=UjVWs9DKa-yhw5DVbcEs8iJxalHOarusVayi_ob6QhE,494
 documente_shared/infrastructure/dynamo_table.py,sha256=TMQbcuty7wjDMbuhI8PbT0IGXelgELsNTtqTEQeZ824,2112
 documente_shared/infrastructure/repositories/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 documente_shared/infrastructure/repositories/dynamo_document.py,sha256=_Yp4gtA-n-hJ2w2wAM5BMCs2Mf46Q2Kq3eHqlxudkL4,1443
-documente_shared/infrastructure/repositories/dynamo_processing_case.py,sha256=UJcROnmfKvE5k_GZOHvaYDvnNSX4Rm22xCB7tUaUUEU,1386
+documente_shared/infrastructure/repositories/dynamo_processing_case.py,sha256=IoIHtlaEe4G5TqIV9IvG45a3HRBVHLfNC9sSgQjabUk,1464
 documente_shared/infrastructure/repositories/dynamo_processing_case_item.py,sha256=4guM8V3YfP7kzYcuVWunGJGmXi0kSSUW8otks39g1vs,1754
-documente_shared/infrastructure/repositories/http_processing_case.py,sha256=4PHNqbzDlt8Bicv3IUwJ58e4WNlIU_Hxq0cPuaLFgtw,1724
-documente_shared/infrastructure/repositories/http_processing_case_item.py,sha256=FfKHLPir5uXsVu8WVqEbzcbsO9uzNLvbwDiw-Up1Ddo,2085
+documente_shared/infrastructure/repositories/http_processing_case.py,sha256=-zNGiFCfINFWgE2ISWcEvPZThZCp45WRQhKFEL7QZW8,1869
+documente_shared/infrastructure/repositories/http_processing_case_item.py,sha256=OSkOd7WdksS4O75uALU530kCsLkpjRTEBCmg3wg0ZFY,2110
 documente_shared/infrastructure/s3_bucket.py,sha256=vT_yN42RFQXubtUn8ln-j13Os_-25UGClVtXg5Bkv6I,1932
 documente_shared/infrastructure/sqs_queue.py,sha256=KZWeHZ9zmXmrxoNpOQX7GEdDhZ1knbPXgwSwFwJblGg,1504
-documente_shared-0.1.78.dist-info/METADATA,sha256=sHypOM9x1ydabbuwQ5qUZE4zZwn3-_dsX-kutHVNPVI,881
-documente_shared-0.1.78.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-documente_shared-0.1.78.dist-info/RECORD,,
+documente_shared-0.1.80.dist-info/METADATA,sha256=2RZnPEBEtepeyxgb9XCEQ8jbrItRuEyhQf6MvAfbOgY,881
+documente_shared-0.1.80.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+documente_shared-0.1.80.dist-info/RECORD,,