mmar-mapi 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

mmar_mapi/file_storage.py

@@ -1,12 +1,14 @@
+import json
 import string
+from datetime import datetime
 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"
+SUFFIX_METADATA = ".metadata"
 
 
 def _validate_exist(files_dir):
@@ -37,18 +39,26 @@ class FileStorage:
         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 | str | None, fname: str) -> ResourceId | None:
         if not content:
             return None
-        resource_id = self.upload(content, dtype)
+        resource_id = self.upload(content, fname)
         return resource_id
 
-    def upload(self, content: bytes | str, dtype: str) -> ResourceId:
-        _validate_dtype(dtype)
+    def upload(self, content: bytes | str, fname: str) -> ResourceId:
         if isinstance(content, str):
             content = content.encode()
+
+        dtype = fname.rsplit(".", 1)[-1]
+        _validate_dtype(dtype)
         fpath = self._generate_fname_path(content, dtype)
         fpath.write_bytes(content)
+
+        fpath_md = fpath.with_suffix(SUFFIX_METADATA)
+        update_date = f"{datetime.now():%Y-%m-%d--%H-%M-%S}"
+        metadata = {"fname": fname, "update_date": update_date, "size": len(content)}
+        fpath_md.write_text(json.dumps(metadata, ensure_ascii=False))
+
         return str(fpath)
 
     def upload_dir(self, resource_ids: list[ResourceId]) -> ResourceId:
@@ -90,7 +100,7 @@ class FileStorage:
         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 """
+        """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}")
@@ -99,15 +109,12 @@ class FileStorage:
 
         resource_ids = []
 
-        with ZipFile(path, mode='r') as zip_file:
-            files_info = zip_file.filelist
-
+        with ZipFile(path, mode="r") as zip_file:
             for file_info in zip_file.filelist:
-                file_dtype = file_info.filename.rsplit('.')[-1]
+                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
-                

mmar_mapi/models/chat.py

@@ -229,11 +229,13 @@ def make_content(
     resource_id: str | None = None,
     command: dict | None = None,
     widget: Widget | None = None,
+    content: Content | None = None,
 ) -> Content:
     resource_id = (resource_id or None) and {"type": "resource_id", "resource_id": resource_id}
     command = (command or None) and {"type": "command", "command": command}
 
-    content = list(filter(None, [text, resource_id, command, widget]))
+    content = content if isinstance(content, list) else [content] if content else []
+    content += list(filter(None, [text, resource_id, command, widget]))
     if len(content) == 0:
         content = ""
     elif len(content) == 1:

{mmar_mapi-1.0.3.dist-info → mmar_mapi-1.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mmar-mapi
-Version: 1.0.3
+Version: 1.0.5
 Summary: Common pure/IO utilities for multi-modal architectures team
 Keywords: 
 Author: Eugene Tagin

{mmar_mapi-1.0.3.dist-info → mmar_mapi-1.0.5.dist-info}/RECORD

@@ -1,11 +1,11 @@
 mmar_mapi/__init__.py,sha256=cj3McZDG8zU1nLSMjwtVHG0u99xN7LaNLW90d4tK7Io,613
 mmar_mapi/api.py,sha256=C9Sr8dISvf51xfEznPjccI_odaG4coQE3HI_0jVpjMQ,1677
-mmar_mapi/file_storage.py,sha256=bwfpoYivOu6uXV5rg2OZQuk8MOpxbT5Zp4TaYD4XjdY,3841
+mmar_mapi/file_storage.py,sha256=NbmCjTLinpWwZJRvNo7kuR1BiIIwUrsuw0xnl5R6A2g,4170
 mmar_mapi/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mmar_mapi/models/base.py,sha256=mKtXV2x51XVj7W-et9tjGcPMDUUUMelW-BywMgFc2p0,411
 mmar_mapi/models/base_config_models/__init__.py,sha256=KjS_bSCka8BOMsigwcIML-e6eNB2ouMU6gxlhRmzeuY,44
 mmar_mapi/models/base_config_models/gigachat_config.py,sha256=QvKTnp0VioXzd3_PUgNBeYx5RDTZT-45j-Ll-wXEI_o,421
-mmar_mapi/models/chat.py,sha256=KisHhE-wRU2ulwmizqkfUojqe9kWB2LMwgwRjvIZ7-M,12358
+mmar_mapi/models/chat.py,sha256=sAYuudA--i7qVfEERy5K5wmAkIFAjn6vUrKRT_BmfIE,12480
 mmar_mapi/models/chat_item.py,sha256=ZfCKvTqr7gpuJSAuHVxWRnlTefRwki_IVNA2N_CXGdg,5557
 mmar_mapi/models/enums.py,sha256=J-GNpql9MCnKnWiV9aJRQGI-pAybvV86923RZs99grA,1006
 mmar_mapi/models/tracks.py,sha256=HKDp-BX1p7AlDfSEKfOKCu0TRSK9cD4Dmq1vJt8oRjw,307
@@ -13,7 +13,7 @@ mmar_mapi/models/widget.py,sha256=KXSP3d4yQNeificMfzRxROdByw9IkxwCjkDD0kc7tcQ,70
 mmar_mapi/type_union.py,sha256=diwmzcnbqkpGFckPHNw9o8zyQ955mOGNvhTlcBJ0RMI,1905
 mmar_mapi/utils.py,sha256=hcKJVslvTBLw2vjZ9zcKZxh_tqk48obHcVs_i3Rxn3M,112
 mmar_mapi/xml_parser.py,sha256=VvLIX_XCZao9i0qqpTVx8nx0vbFXSe8pEbdJdXnj97g,568
-mmar_mapi-1.0.3.dist-info/licenses/LICENSE,sha256=2A90w8WjhOgQXnFuUijKJYazaqZ4_NTokYb9Po4y-9k,1061
-mmar_mapi-1.0.3.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
-mmar_mapi-1.0.3.dist-info/METADATA,sha256=oOWAqW2HW1Hp3zK05RCK0OlL6tTZkNzlSoxxOutRlO8,914
-mmar_mapi-1.0.3.dist-info/RECORD,,
+mmar_mapi-1.0.5.dist-info/licenses/LICENSE,sha256=2A90w8WjhOgQXnFuUijKJYazaqZ4_NTokYb9Po4y-9k,1061
+mmar_mapi-1.0.5.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
+mmar_mapi-1.0.5.dist-info/METADATA,sha256=-lflaOAZ06lU3sUyvsCaweurmww3viGsfG5i3K9gUC8,914
+mmar_mapi-1.0.5.dist-info/RECORD,,