documente_shared 0.1.23__py3-none-any.whl → 0.1.25__py3-none-any.whl

documente_shared/domain/entities.py

@@ -10,12 +10,16 @@ from documente_shared.domain.enums import (
     DocumentProcessCategory,
 )
 
+def remove_slash_from_path(path: str) -> str:
+    if path and path.startswith('/'):
+        return path[1:]
+    return path
 
 @dataclass
 class DocumentProcess(object):
     digest: str
     status: DocumentProcessStatus
-    file_path: str
+    file_path: Optional[str] = None
     file_bytes: Optional[bytes] = None
     category: Optional[DocumentProcessCategory] = None
     sub_category: Optional[DocumentProcessSubCategory] = None
@@ -77,6 +81,18 @@ class DocumentProcess(object):
     def deleted(self):
         self.status = DocumentProcessStatus.DELETED
 
+    @property
+    def file_key(self) -> str:
+        return remove_slash_from_path(self.file_path)
+
+    @property
+    def processed_csv_key(self) -> str:
+        return remove_slash_from_path(self.processed_csv_path)
+
+    @property
+    def processed_xlsx_key(self) -> str:
+        return remove_slash_from_path(self.processed_xlsx_path)
+
     @property
     def extended_filename(self) -> str:
         return self.file_path.split('/')[-1]

documente_shared/infrastructure/dynamo_repositories.py

@@ -11,7 +11,7 @@ class DynamoDocumentProcessRepository(
     DocumentProcessRepository,
 ):
     def find(self, digest: str) -> Optional[DocumentProcess]:
-        item = self.get(key=digest)
+        item = self.get(key={'digest': digest})
         if item:
             return DocumentProcess.from_dict(item)
         return None

documente_shared/infrastructure/dynamo_table.py

@@ -13,7 +13,7 @@ class DynamoDBTable(object):
     def __post_init__(self):
         self._table = boto3.resource('dynamodb').Table(self.table_name)
 
-    def get(self, key: str):
+    def get(self, key: dict):
         return self._table.get_item(Key=key).get('Item')
 
     def get_all(self):

documente_shared/infrastructure/s3_bucket.py

@@ -3,6 +3,8 @@ import boto3
 from dataclasses import dataclass
 from typing import Optional
 
+from documente_shared.domain.entities import remove_slash_from_path
+
 
 def remove_none_values(data: dict) -> dict:  # noqa: WPS110
     return {key: value for key, value in data.items() if value is not None}  # noqa: WPS110
@@ -22,7 +24,8 @@ class S3Bucket(object):
             return None
 
     def get_bytes(self, file_key: str) -> Optional[bytes]:
-        file_context = self.get(file_key)
+        cleaned_file_key = remove_slash_from_path(file_key)
+        file_context = self.get(cleaned_file_key)
         if not file_context:
             return None
         return (
@@ -32,19 +35,22 @@ class S3Bucket(object):
         )
 
     def upload(self, file_key: str, file_content, content_type: Optional[str] = None):
+        cleaned_file_key = remove_slash_from_path(file_key)
         optional_params = {'ContentType': content_type}
-        return self._resource.Object(self.bucket_name, file_key).put(
+        return self._resource.Object(self.bucket_name, cleaned_file_key).put(
             Body=file_content,
             **remove_none_values(optional_params),
         )
 
     def delete(self, file_key: str):
-        return self._resource.Object(self.bucket_name, file_key).delete()
+        cleaned_file_key = remove_slash_from_path(file_key)
+        return self._resource.Object(self.bucket_name, cleaned_file_key).delete()
 
     def get_url(self, file_key: str):
+        cleaned_file_key = remove_slash_from_path(file_key)
         return 'https://{bucket_url}.s3.amazonaws.com/{file_key}'.format(
             bucket_url=self.bucket_name,
-            file_key=file_key,
+            file_key=cleaned_file_key,
         )
 
     def read(self, file_key: str) -> bytes:

{documente_shared-0.1.23.dist-info → documente_shared-0.1.25.dist-info}/METADATA

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

{documente_shared-0.1.23.dist-info → documente_shared-0.1.25.dist-info}/RECORD

@@ -4,14 +4,14 @@ documente_shared/application/digest.py,sha256=Um6E8WfFri2_lly4RFWydJyvSfPZGFcOX-
 documente_shared/application/time_utils.py,sha256=XDH27cKgoTFO8ad1JgrxKaeT7sZ1fduuJqLkvHUjy-Q,309
 documente_shared/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 documente_shared/domain/base_enum.py,sha256=DojAfn-zQdtjtImeHUpBzE6TBTm07XrbMOdW3h8RVd8,1449
-documente_shared/domain/entities.py,sha256=zNYFjxxel5uEGAOqLk5Rs8OwHQlLMhgL2SmUnwqnKpI,5743
+documente_shared/domain/entities.py,sha256=J4B5fMBcwyiVB5xQToPFsOvF5yWIchsmyicC6iq3eRs,6222
 documente_shared/domain/enums.py,sha256=wrMpM-1KgXFkd-He-3onNcqR3Zf53Q-_axjXGjx7MIY,435
 documente_shared/domain/repositories.py,sha256=EekvB2BE4AnT5myEhU3DfwHfF9MkNJZRbqRVGFxCEWM,509
 documente_shared/infrastructure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-documente_shared/infrastructure/dynamo_repositories.py,sha256=A26S6ghyAsjKk8ySXIsR8_MDE8vbp7ZmNg7hqTOtMy0,748
-documente_shared/infrastructure/dynamo_table.py,sha256=5yF5EVQkHTZe4tLYZsfEDS8tp_iorMlMjNu-qn3Oj9E,2095
-documente_shared/infrastructure/s3_bucket.py,sha256=s4VWcl0HK6uhjjZmKefOYW5A3Dx74R9KCuMmXQKUXnQ,1582
+documente_shared/infrastructure/dynamo_repositories.py,sha256=WULK8_N7PjA397vXTZd6QB7_Kw6dEXHaVMcd9nEvSvs,760
+documente_shared/infrastructure/dynamo_table.py,sha256=Lod8vwUCGX65SNH_8hvlpG6rRUYb4jfZqoFHD1YloAA,2096
+documente_shared/infrastructure/s3_bucket.py,sha256=RwcEyYPUUXQ0fFR-Zr1KfkFGGpO6qAIfZ70CWHu1V8M,1923
 documente_shared/infrastructure/sqs_queue.py,sha256=PSiTAnjXvQ-W-9mzLpH2UjbQJTvYkMiaxNaMecF-cR4,1505
-documente_shared-0.1.23.dist-info/METADATA,sha256=3IgMXZmsknUIO5xkfAXwGltpUj5XhnG3NxTz_Js-IpE,640
-documente_shared-0.1.23.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-documente_shared-0.1.23.dist-info/RECORD,,
+documente_shared-0.1.25.dist-info/METADATA,sha256=yEjSzweJsasaYAPUJgWkwdaCSl1ZT6jZBjDTSl8GdzE,640
+documente_shared-0.1.25.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+documente_shared-0.1.25.dist-info/RECORD,,