agi-med-common 5.2.2__py3-none-any.whl → 5.2.3__py3-none-any.whl

agi_med_common/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "5.2.2"
+__version__ = "5.2.3"
 
 from .file_storage import FileStorage, ResourceId
 from .models.base import Base

agi_med_common/file_storage.py

@@ -1,9 +1,12 @@
 import string
 from hashlib import md5
 from pathlib import Path
+from zipfile import ZipFile, is_zipfile
+
 
 ResourceId = str
 ASCII_DIGITS = set(string.ascii_lowercase + string.digits)
+SUFFIX_DIR = ".dir"
 
 
 def _validate_exist(files_dir):
@@ -30,34 +33,81 @@ class FileStorage:
         self.files_dir.mkdir(exist_ok=True, parents=True)
         _validate_exist(self.files_dir)
 
-    def _generate_fname_path(self, content, dtype):
+    def _generate_fname_path(self, content: bytes, dtype: str):
         fpath = self.files_dir / generate_fname(content, dtype)
         return fpath
 
-    def upload_maybe(
-        self,
-        content: bytes | None,
-        dtype: str,
-    ) -> ResourceId | None:
+    def upload_maybe(self, content: bytes | None, dtype: str) -> ResourceId | None:
         if not content:
             return None
         resource_id = self.upload(content, dtype)
         return resource_id
 
-    def upload(self, content: bytes, dtype: str) -> ResourceId | None:
+    def upload(self, content: bytes | str, dtype: str) -> ResourceId:
         _validate_dtype(dtype)
+        if isinstance(content, str):
+            content = content.encode()
         fpath = self._generate_fname_path(content, dtype)
         fpath.write_bytes(content)
         return str(fpath)
 
-    def download(self, rid: ResourceId) -> bytes:
-        return Path(rid).read_bytes()
+    def upload_dir(self, resource_ids: list[ResourceId]) -> ResourceId:
+        content = "\n".join(resource_ids)
+        res = self.upload(content, "dir")
+        return res
+
+    def download(self, resource_id: ResourceId) -> bytes:
+        return Path(resource_id).read_bytes()
 
-    def download_text(self, rid: ResourceId) -> str:
-        return Path(rid).read_text(encoding="utf-8")
+    def download_text(self, resource_id: ResourceId) -> str:
+        return Path(resource_id).read_text(encoding="utf-8")
 
-    def is_valid(self, rid: ResourceId | None) -> bool:
-        return rid and Path(rid).exists() and Path(rid).is_file()
+    def read_dir_or_none(self, resource_id: ResourceId) -> list[ResourceId] | None:
+        if not self.is_dir(resource_id):
+            return None
+        res = self.download_text(resource_id).split("\n")
+        return res
 
-    def get_dtype(self, rid: ResourceId | None) -> str | None:
-        return rid and rid.rsplit(".")[-1]
+    def _get_path(self, resource_id: ResourceId | None) -> Path | None:
+        if not resource_id:
+            return None
+        path = Path(resource_id)
+        return path if (path.exists() and path.is_file()) else None
+
+    def is_valid(self, resource_id: ResourceId | None) -> bool:
+        path = self._get_path(resource_id)
+        return path is not None
+
+    def is_file(self, resource_id: ResourceId | None) -> bool:
+        path = self._get_path(resource_id)
+        return path and path.suffix != SUFFIX_DIR
+
+    def is_dir(self, resource_id: ResourceId | None) -> bool:
+        path = self._get_path(resource_id)
+        return path and path.suffix == SUFFIX_DIR
+
+    def get_dtype(self, resource_id: ResourceId | None) -> str | None:
+        return resource_id and resource_id.rsplit(".")[-1]
+
+    def unzip_file(self, resource_id: str) -> ResourceId:
+        """ takes resource_id which refer to zip-archive, unpacks it and returns directory ResourceId with content of zip-archive """
+        path = self._get_path(resource_id)
+        if not path:
+            raise ValueError(f"Not found path: {resource_id}")
+        if not is_zipfile(resource_id):
+            raise ValueError(f"Expected zip archive but found: {resource_id}")
+
+        resource_ids = []
+
+        with ZipFile(path, mode='r') as zip_file:
+            files_info = zip_file.filelist
+
+            for file_info in zip_file.filelist:
+                file_dtype = file_info.filename.rsplit('.')[-1]
+                file_bytes = zip_file.read(file_info)
+                rid = self.upload(file_bytes, file_dtype)
+                resource_ids.append(rid)
+
+        res = self.upload_dir(resource_ids)
+        return res
+                

agi_med_common/utils.py

@@ -1,13 +1,13 @@
 import codecs
 import json
 import os
+from collections.abc import Iterable
 from datetime import datetime
 from pathlib import Path
-from collections.abc import Iterable
 
 
 def make_session_id() -> str:
-    return f"{datetime.now():%y%m%d%H%M%S}"
+    return f"{datetime.now():%Y-%m-%d--%H-%M-%S}"
 
 
 def read_json(path: Path | os.PathLike[str] | str) -> list | dict:

{agi_med_common-5.2.2.dist-info → agi_med_common-5.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agi_med_common
-Version: 5.2.2
+Version: 5.2.3
 Summary: Сommon for agi-med team
 Author: AGI-MED-TEAM
 Requires-Python: >=3.11

{agi_med_common-5.2.2.dist-info → agi_med_common-5.2.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
-agi_med_common/__init__.py,sha256=RTzZYi5dcgt97c2nh9CYdAhXoaH4kb8MQc6HMCzh_L4,828
+agi_med_common/__init__.py,sha256=cwQe714hQGgtxAPXI-3X68PikBQg_wgMLwm78G-yubU,828
 agi_med_common/api.py,sha256=83Ew5SvcypjvAWQ6c1kAcnvHsPxZ8BeBHnVHXLkUJvU,1687
-agi_med_common/file_storage.py,sha256=lEh9TyzUu8dS9WkaEcshSUxESXQ1i7PAyXqejdambpg,1802
+agi_med_common/file_storage.py,sha256=bwfpoYivOu6uXV5rg2OZQuk8MOpxbT5Zp4TaYD4XjdY,3841
 agi_med_common/parallel_map.py,sha256=O6pxgPlHT9OVqqgry1yHy_0bV0U2AwvGJ42iG2e834U,1091
 agi_med_common/type_union.py,sha256=diwmzcnbqkpGFckPHNw9o8zyQ955mOGNvhTlcBJ0RMI,1905
-agi_med_common/utils.py,sha256=9nV01aSqUcudWmDI_Jzvb_8e0LJM3WJ6vsf9Vcv8DB0,1569
+agi_med_common/utils.py,sha256=xkuXctXBlNOxgnQpsb5VnC6F_UP4ua696tMXlNJjac4,1575
 agi_med_common/validators.py,sha256=vMoPN42XzC8re-zdjekk5_lNQYHuTiAWD56YLvj2Z2w,2824
 agi_med_common/xml_parser.py,sha256=VvLIX_XCZao9i0qqpTVx8nx0vbFXSe8pEbdJdXnj97g,568
 agi_med_common/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,7 +15,7 @@ agi_med_common/models/tracks.py,sha256=HKDp-BX1p7AlDfSEKfOKCu0TRSK9cD4Dmq1vJt8oR
 agi_med_common/models/widget.py,sha256=KXSP3d4yQNeificMfzRxROdByw9IkxwCjkDD0kc7tcQ,704
 agi_med_common/models/base_config_models/__init__.py,sha256=KjS_bSCka8BOMsigwcIML-e6eNB2ouMU6gxlhRmzeuY,44
 agi_med_common/models/base_config_models/gigachat_config.py,sha256=QvKTnp0VioXzd3_PUgNBeYx5RDTZT-45j-Ll-wXEI_o,421
-agi_med_common-5.2.2.dist-info/METADATA,sha256=9Kk0ayatnwaQEei0hq5sJE7mmiUnl7aEJA5FWBnPzk0,517
-agi_med_common-5.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agi_med_common-5.2.2.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
-agi_med_common-5.2.2.dist-info/RECORD,,
+agi_med_common-5.2.3.dist-info/METADATA,sha256=tpZTVKfNCzYNB-6VPnTGepK2fqNm6ZghhBiqjFqbX5Q,517
+agi_med_common-5.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agi_med_common-5.2.3.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
+agi_med_common-5.2.3.dist-info/RECORD,,