documente_shared 0.1.79__py3-none-any.whl → 0.1.81__py3-none-any.whl

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/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/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_persist_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/domain/entities/processing_case_item.py

@@ -135,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
@@ -148,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',
@@ -184,7 +205,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
@@ -220,3 +244,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

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from typing import List, Optional
 
+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
@@ -12,30 +13,41 @@ 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())
+            response_json = response.json()
+            instance_data = response_json.get('data', {})
+            return ProcessingCase.from_persist_dict(camel_to_snake(instance_data))
         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]:
             raise Exception(f'Error persisting processing case: {response.text}')
-        return ProcessingCase.from_dict(response.json())
+
+        response_json = response.json()
+        instance_data = response_json.get('data', {})
+        return ProcessingCase.from_persist_dict(camel_to_snake(instance_data))
 
     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()
+            instaces_data = raw_response.get('data', [])
             return [
-                ProcessingCase.from_dict(item)
-                for item in raw_response.get('data', [])
+                ProcessingCase.from_persist_dict(item_data)
+                for item_data in camel_to_snake(instaces_data)
             ]
         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.79.dist-info → documente_shared-0.1.81.dist-info}/METADATA

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

{documente_shared-0.1.79.dist-info → documente_shared-0.1.81.dist-info}/RECORD

@@ -3,6 +3,7 @@ documente_shared/application/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 documente_shared/application/digest.py,sha256=Um6E8WfFri2_lly4RFWydJyvSfPZGFcOX-opEOzDCWc,172
 documente_shared/application/exceptions.py,sha256=lQM8m7wmI9OTLGva0gd7s7YT7ldaTk_Ln4t32PpzNf8,654
 documente_shared/application/files.py,sha256=ADiWi6Mk3YQGx3boGsDqdb5wk8qmabkGRy7bhNFa1OY,649
+documente_shared/application/payloads.py,sha256=s6SjaNN18_aQ6IL083Zq2J8thRCZ_zC2sn7hkfjK_Go,453
 documente_shared/application/query_params.py,sha256=JscPqFBx28p-x9i2g6waY7Yl4FQM1zn2zSbEoTrkK1k,3938
 documente_shared/application/time_utils.py,sha256=_fxgh8VoGPkdsft47COJ16vFwt8pMbHIJCgDFHLSlrU,435
 documente_shared/application/timezone.py,sha256=NHpzTzOPD_fWQiJ4BrRqt_TIDs5XyB5ZMR7x8vUk8gQ,183
@@ -12,10 +13,10 @@ documente_shared/domain/constants.py,sha256=NG5BGaXBr_FnzudjTRPxpDpyiSDdaB_PLCdl
 documente_shared/domain/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 documente_shared/domain/entities/document.py,sha256=AthTUyA-QZE3WAT7lMoKVr_Z8mO_3qERuCnZge0DTLQ,12595
 documente_shared/domain/entities/document_metadata.py,sha256=ygyFIC5qwxlm8DUM5kvVFny9zJfPQS8vNLM2br5XsQ8,2353
-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/in_memory_result.py,sha256=0sLNUrovKFQx4M-E9e4DrAiVgch2i4AKA-9BQBRaeI8,1482
+documente_shared/domain/entities/processing_case.py,sha256=59fhosBfKh9ijWRDTkdN9agV3Qa_AIwjHEWU6FBPF4k,4978
 documente_shared/domain/entities/processing_case_filters.py,sha256=FgyxB4mQb0nEGjIbUB9OiazkKL4yHRRC6bvmjD5NT8k,1915
-documente_shared/domain/entities/processing_case_item.py,sha256=i3MpEBzsHbcDO3gHYI1Y-wfFGbaedt3RBXmJdZEtm74,8180
+documente_shared/domain/entities/processing_case_item.py,sha256=5BqKAv56R3tba0_rPdYtiTCpJ9ytP-JEjkCZgr1cjh0,9660
 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 +25,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=zeGkuvF1SZMyDOUunp93fhn7lS61NQKa1GBcNF8dzZU,2251
+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.79.dist-info/METADATA,sha256=E3rsWtAhGjm9t4-aCzAnZnEnQC6YXPP5dVjVGKuvXic,881
-documente_shared-0.1.79.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-documente_shared-0.1.79.dist-info/RECORD,,
+documente_shared-0.1.81.dist-info/METADATA,sha256=cPO-JJd3KwUjCci_9-5KKWqrDSokT-x2VCNZpoBW_Rk,881
+documente_shared-0.1.81.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+documente_shared-0.1.81.dist-info/RECORD,,