mmar-mapi 1.0.15__tar.gz → 1.0.16__tar.gz

{mmar_mapi-1.0.15 → mmar_mapi-1.0.16}/PKG-INFO

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

{mmar_mapi-1.0.15 → mmar_mapi-1.0.16}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "mmar-mapi"
 # dynamic version is not supported yet on uv_build
-version = "1.0.15"
+version = "1.0.16"
 description = "Common pure/IO utilities for multi-modal architectures team"
 authors = [{name = "Eugene Tagin", email = "tagin@airi.net"}]
 license = "MIT"

{mmar_mapi-1.0.15 → mmar_mapi-1.0.16}/src/mmar_mapi/file_storage.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from zipfile import ZipFile, is_zipfile
 
 ResourceId = str
-ASCII_DIGITS_SPECIAL = set(string.ascii_lowercase + string.digits + '-')
+ASCII_DIGITS_SPECIAL = set(string.ascii_lowercase + string.digits + "-")
 SUFFIX_DIR = ".dir"
 SUFFIX_METADATA = ".metadata"
 
@@ -61,8 +61,11 @@ class FileStorage:
 
         return str(fpath)
 
-    def get_metadata_path(self, resource_id: ResourceId) -> ResourceId:
-        return Path(resource_id).with_suffix(SUFFIX_METADATA).as_posix()
+    def get_metadata(self, resource_id: ResourceId) -> dict | None:
+        metadata_path = Path(resource_id).with_suffix(SUFFIX_METADATA)
+        if not metadata_path.exists():
+            return None
+        return json.loads(metadata_path.read_text())
 
     async def upload_async(self, content: bytes | str, fname: str) -> ResourceId:
         return self.upload(content, fname)

{mmar_mapi-1.0.15 → mmar_mapi-1.0.16}/src/mmar_mapi/models/chat.py

@@ -4,14 +4,14 @@ from copy import deepcopy
 from datetime import datetime
 from typing import Any, Literal, TypeVar
 
-from mmar_mapi.models.chat_item import ChatItem, ReplicaItem, OuterContextItem
+from pydantic import Field, ValidationError
+
+from mmar_mapi.models.chat_item import ChatItem, OuterContextItem, ReplicaItem
 from mmar_mapi.models.widget import Widget
 from mmar_mapi.type_union import TypeUnion
-from pydantic import Field, ValidationError
 
 from .base import Base
 
-
 _DT_FORMAT: str = "%Y-%m-%d-%H-%M-%S"
 _EXAMPLE_DT: str = datetime(year=1970, month=1, day=1).strftime(_DT_FORMAT)
 StrDict = dict[str, Any]
@@ -96,6 +96,22 @@ def _get_resource_id(obj: Content) -> str | None:
     return None
 
 
+def _get_resource_name(obj: Content) -> str | None:
+    if isinstance(obj, list):
+        return next((el for el in map(_get_resource_name, obj) if el), None)
+    if isinstance(obj, dict) and obj.get("type") == "resource_id":
+        return _get_field(obj, "resource_name", str)
+    return None
+
+
+def _get_resource(obj: Content) -> str | None:
+    if isinstance(obj, list):
+        return next((el for el in map(_get_resource_id, obj) if el), None)
+    if isinstance(obj, dict) and obj.get("type") == "resource_id":
+        return obj
+    return None
+
+
 def _get_command(obj: Content) -> dict | None:
     if isinstance(obj, list):
         return next((el for el in map(_get_command, obj) if el), None)
@@ -138,6 +154,15 @@ class BaseMessage(Base):
     def resource_id(self) -> str | None:
         return _get_resource_id(self.content)
 
+    @property
+    def resource_name(self) -> str | None:
+        res = _get_resource_name(self.content)
+        return res
+
+    @property
+    def resource(self) -> dict | None:
+        return _get_resource(self.content)
+
     @property
     def command(self) -> dict | None:
         return _get_command(self.content)
@@ -162,7 +187,7 @@ class BaseMessage(Base):
         return _DT_FORMAT
 
     @staticmethod
-    def find_resource_id(msg: "BaseMessage", ext: str | None = None, type: str=None) -> str | None:
+    def find_resource_id(msg: "BaseMessage", ext: str | None = None, type: str = None) -> str | None:
         resource_id = msg.resource_id
         if type and type != msg.type:
             return None
@@ -188,6 +213,7 @@ class AIMessage(BaseMessage):
     def with_state(self, state: str) -> "AIMessage":
         return self.model_copy(update=dict(state=state))
 
+
 class MiscMessage(BaseMessage):
     type: Literal["misc"] = "misc"
 
@@ -259,20 +285,37 @@ def make_content(
     text: str | None = None,
     *,
     resource_id: str | None = None,
+    resource: dict | 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}
+    if resource and resource_id:
+        raise ValueError("Cannot pass both 'resource' and 'resource_id'")
+
+    if resource_id:
+        resource = {"type": "resource_id", "resource_id": resource_id}
+    elif resource:
+        if not isinstance(resource, dict):
+            raise TypeError("'resource' must be a dict")
+        resource_id = resource.get("resource_id")
+        if not resource_id:
+            raise ValueError("'resource' must contain 'resource_id'")
+        resource_name = resource.get("resource_name")
+        resource = {"type": "resource_id", "resource_id": resource_id}
+        if resource_name:
+            resource["resource_name"] = resource_name
+    else:
+        resource = None
+
     command = (command or None) and {"type": "command", "command": command}
 
     content = content if isinstance(content, list) else [content] if content else []
-    content += list(filter(None, [text, resource_id, command, widget]))
+    content += list(filter(None, [text, resource, command, widget]))
     if len(content) == 0:
         content = ""
     elif len(content) == 1:
         content = content[0]
-
     return content
 
 
@@ -285,13 +328,19 @@ def convert_replica_item_to_message(replica: ReplicaItem) -> ChatMessage:
         widget=replica.widget,
     )
     # legacy: eliminate after migration
-    resource_id = (replica.resource_id or None) and {"type": "resource_id", "resource_id": replica.resource_id}
+    if resource_id := replica.resource_id:
+        resource = {"type": "resource_id", "resource_id": resource_id}
+        resource_name = replica.resource_name
+        if resource_name:
+            resource["resource_name"] = resource_name
+    else:
+        resource = None
     body = replica.body
     command = (replica.command or None) and {"type": "command", "command": replica.command}
     widget = replica.widget
     date_time = replica.date_time
 
-    content = list(filter(None, [body, resource_id, command, widget]))
+    content = list(filter(None, [body, resource, command, widget]))
     if len(content) == 0:
         content = ""
     elif len(content) == 1:
@@ -375,6 +424,7 @@ def convert_message_to_replica_item(message: ChatMessage) -> ReplicaItem | None:
         role=role,
         body=message.text,
         resource_id=message.resource_id,
+        resource_name=message.resource_name,
         command=message.command,
         widget=message.widget,
         date_time=message.date_time,
@@ -388,10 +438,11 @@ def convert_message_to_replica_item(message: ChatMessage) -> ReplicaItem | None:
 
 def convert_chat_to_chat_item(chat: Chat) -> ChatItem:
     # legacy: eliminate after migration
-    return ChatItem(
+    res = ChatItem(
         outer_context=convert_context_to_outer_context(chat.context),
         inner_context=dict(replicas=list(map(convert_message_to_replica_item, chat.messages))),
     )
+    return res
 
 
 def parse_chat_item_as_chat(chat_obj: str | dict | ChatItem) -> Chat:

{mmar_mapi-1.0.15 → mmar_mapi-1.0.16}/src/mmar_mapi/models/chat_item.py

@@ -69,6 +69,9 @@ class ReplicaItem(Base):
     resource_id: Annotated[str | None, AfterValidator(nullify_empty)] = Field(
         None, alias="ResourceId", examples=["<link-id>"]
     )
+    resource_name: Annotated[str | None, AfterValidator(nullify_empty)] = Field(
+        None, alias="ResourceName", examples=["filename"]
+    )
     widget: Widget | None = Field(None, alias="Widget", examples=[None])
     command: dict | None = Field(None, alias="Command", examples=[None])
     role: bool = Field(False, alias="Role", description="True = ai, False = client", examples=[False])

{mmar_mapi-1.0.15 → mmar_mapi-1.0.16}/src/mmar_mapi/utils.py

@@ -6,7 +6,7 @@ from datetime import datetime
 def make_session_id(with_millis=False) -> str:
     dt = datetime.now()
     fmt = "%Y-%m-%d--%H-%M-%S-%f" if with_millis else "%Y-%m-%d--%H-%M-%S"
-    return datetime.now().strftime(fmt)
+    return dt.strftime(fmt)
 
 
 def chunked(items: Iterable, n) -> list:

{mmar_mapi-1.0.15 → mmar_mapi-1.0.16}/src/mmar_mapi/utils_import.py

@@ -4,8 +4,9 @@ from types import ModuleType
 
 from loguru import logger
 
+
 def convert_snake_to_pascal(name: str) -> str:
-    """ snake_to_pascal -> SnakeToPascal """
+    """snake_to_pascal -> SnakeToPascal"""
     return "".join(map(str.capitalize, name.split("_")))