mmar-mapi 1.0.24__tar.gz → 1.0.26__tar.gz

{mmar_mapi-1.0.24 → mmar_mapi-1.0.26}/PKG-INFO

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

{mmar_mapi-1.0.24 → mmar_mapi-1.0.26}/pyproject.toml

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

{mmar_mapi-1.0.24 → mmar_mapi-1.0.26}/src/mmar_mapi/api.py

@@ -44,7 +44,7 @@ class BinaryClassifiersAPI:
     def get_classifiers(self) -> list[str]:
         raise NotImplementedError
 
-    def evaluate(self, *, classifier: str, text: str) -> bool:
+    def evaluate(self, *, classifier: str | None = None, text: str) -> bool:
         raise NotImplementedError
 
 
@@ -52,18 +52,34 @@ class LLMAccessorAPI:
     def get_entrypoint_keys(self) -> list[str]:
         raise NotImplementedError
 
-    def get_response(self, *, prompt: str, entrypoint_key: str | None = None, max_retries: int = 1) -> str:
+    def get_response(
+        self,
+        *,
+        prompt: str,
+        resource_id: ResourceId | None = None,
+        entrypoint_key: str | None = None,
+        max_retries: int = 1,
+    ) -> str:
         raise NotImplementedError
 
-    def get_response_by_payload(self, *, payload: dict[str, Any], entrypoint_key: str | None = None, max_retries: int = 1) -> str:
+    def get_response_by_payload(
+        self,
+        *,
+        payload: dict[str, Any],
+        resource_id: ResourceId | None = None,
+        entrypoint_key: str | None = None,
+        max_retries: int = 1,
+    ) -> str:
         raise NotImplementedError
 
-    def get_embedding(self, *, prompt: str, entrypoint_key: str | None = None, max_retries: int = 1) -> list[float]:
-        raise NotImplementedError
-
-    def get_image_response(
-        self, *, prompt: str, resource_id: ResourceId, entrypoint_key: str | None = None, max_retries: int = 1
-    ) -> str:
+    def get_embedding(
+        self,
+        *,
+        prompt: str,
+        resource_id: ResourceId | None = None,
+        entrypoint_key: str | None = None,
+        max_retries: int = 1,
+    ) -> list[float]:
         raise NotImplementedError
 
 
@@ -71,12 +87,12 @@ class TranslatorAPI:
     def get_lang_codes(self) -> list[str]:
         raise NotImplementedError
 
-    def translate(self, *, text: str, lang_code_from: str | None, lang_code_to: str) -> str:
+    def translate(self, *, text: str, lang_code_from: str | None = None, lang_code_to: str) -> str:
         raise NotImplementedError
 
 
 class CriticAPI:
-    def evaluate(self, *, text: str, chat: Chat | None = None) -> float:
+    def evaluate(self, *, text: str, chat: Chat | None = None) -> float:  # TODO replace float with bool
         raise NotImplementedError
 
 
@@ -159,7 +175,8 @@ class ExtractedImageMetadata(BaseModel):
 
 
 class ExtractedPicture(ExtractedImage, ExtractedImageMetadata):
-    " Image of part of page "
+    "Image of part of page"
+
     pass
 
 
@@ -168,7 +185,8 @@ class ExtractedTable(ExtractedImage, ExtractedImageMetadata):
 
 
 class ExtractedPageImage(ExtractedImage):
-    " Image of all page "
+    "Image of all page"
+
     pass
 
 

{mmar_mapi-1.0.24 → mmar_mapi-1.0.26}/src/mmar_mapi/models/chat.py

@@ -2,7 +2,7 @@ import warnings
 from collections.abc import Callable
 from copy import deepcopy
 from datetime import datetime
-from typing import Any, Literal, TypeVar
+from typing import Any, Literal, NotRequired, TypedDict, TypeVar
 
 from pydantic import Field, ValidationError
 
@@ -15,7 +15,25 @@ 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]
-ContentBase = str | Widget | StrDict
+
+
+class ResourceDict(TypedDict):
+    type: Literal["resource_id"]
+    resource_id: str
+    resource_name: NotRequired[str]
+
+
+class TextDict(TypedDict):
+    type: Literal["text"]
+    text: str
+
+
+class CommandDict(TypedDict):
+    type: Literal["command"]
+    command: StrDict
+
+
+ContentBase = str | Widget | ResourceDict | CommandDict | TextDict | StrDict
 Content = ContentBase | list[ContentBase]
 T = TypeVar("T")
 
@@ -244,7 +262,7 @@ class Chat(Base):
     def parse(chat_obj: str | dict | ChatItem) -> "Chat":
         return _parse_chat_compat(chat_obj)
 
-    def to_chat_item(self, failsafe: bool=False) -> ChatItem:
+    def to_chat_item(self, failsafe: bool = False) -> ChatItem:
         return convert_chat_to_chat_item(self, failsafe)
 
     def add_message(self, message: ChatMessage):
@@ -392,14 +410,14 @@ def convert_chat_item_to_chat(chat_item: ChatItem) -> Chat:
     return res
 
 
-def convert_context_to_outer_context(context: Context, failsafe: bool=False) -> OuterContextItem:
+def convert_context_to_outer_context(context: Context, failsafe: bool = False) -> OuterContextItem:
     # legacy: eliminate after migration
     extra = context.extra or {}
     if failsafe:
-        extra['sex'] = extra.get('sex') or True
-        extra['age'] = extra.get('age') or 42
-        extra['language_code'] = extra.get('language_code') or ''
-        extra['entrypoint_key'] = extra.get('entrypoint_key') or ''
+        extra["sex"] = extra.get("sex") or True
+        extra["age"] = extra.get("age") or 42
+        extra["language_code"] = extra.get("language_code") or ""
+        extra["entrypoint_key"] = extra.get("entrypoint_key") or ""
     return OuterContextItem(
         client_id=context.client_id,
         user_id=context.user_id,
@@ -441,7 +459,7 @@ def convert_message_to_replica_item(message: ChatMessage) -> ReplicaItem | None:
     return ReplicaItem(**kwargs)
 
 
-def convert_chat_to_chat_item(chat: Chat, failsafe: bool=False) -> ChatItem:
+def convert_chat_to_chat_item(chat: Chat, failsafe: bool = False) -> ChatItem:
     # legacy: eliminate after migration
     res = ChatItem(
         outer_context=convert_context_to_outer_context(chat.context, failsafe=failsafe),