mmar-mapi 1.0.24__py3-none-any.whl → 1.0.26__py3-none-any.whl

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/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),

{mmar_mapi-1.0.24.dist-info → mmar_mapi-1.0.26.dist-info}/METADATA

@@ -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.dist-info → mmar_mapi-1.0.26.dist-info}/RECORD

@@ -1,10 +1,10 @@
 mmar_mapi/__init__.py,sha256=9Q5xsrj26uUnn7ZWvvJUvdVIuzC2oCIeNB4dEoqjF-o,1256
-mmar_mapi/api.py,sha256=CmxwKSNxupzTmHXHG2FEi88RoJa9L9NyEC729MMDsK4,5964
+mmar_mapi/api.py,sha256=VGoZ2nYIvm35U4FO4yhFG9nYSaK-gjOUC3pNyfBrq3o,6109
 mmar_mapi/decorators_maybe_lru_cache.py,sha256=eO2I6t1fHLUNRABClK1c8EZzHAmCeSK6O-hbJGb2c9E,444
 mmar_mapi/file_storage.py,sha256=km4xA0h-GU07kBc6v3cG2fd9gDF75OfwBJiy0WOmtn4,5067
 mmar_mapi/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mmar_mapi/models/base.py,sha256=mKtXV2x51XVj7W-et9tjGcPMDUUUMelW-BywMgFc2p0,411
-mmar_mapi/models/chat.py,sha256=GP5XzOEtLjXUZRvKms8Fa874JOkfeu3vgiqitdoXj10,15724
+mmar_mapi/models/chat.py,sha256=DCSHpCfF5EXA4KgDpcUdgeTwUMt7ErkQVOxE1y7tY3c,16070
 mmar_mapi/models/chat_item.py,sha256=TRuV5qn7pi3eOvSG7GUqtTHEaq4b7fPoCCZtW-TyEIU,5702
 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/type_union.py,sha256=diwmzcnbqkpGFckPHNw9o8zyQ955mOGNvhTlcBJ0RMI,1905
 mmar_mapi/utils.py,sha256=FlW9n-84xz2zSHsahHzJ3Y4Wu5mjpFer6t9z6PF6lS0,488
 mmar_mapi/utils_import.py,sha256=pUyMFd8SItTxBKI-GO9JhRmy43jG_OQlUPr8QCBOSwg,1682
 mmar_mapi/xml_parser.py,sha256=VvLIX_XCZao9i0qqpTVx8nx0vbFXSe8pEbdJdXnj97g,568
-mmar_mapi-1.0.24.dist-info/licenses/LICENSE,sha256=2A90w8WjhOgQXnFuUijKJYazaqZ4_NTokYb9Po4y-9k,1061
-mmar_mapi-1.0.24.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-mmar_mapi-1.0.24.dist-info/METADATA,sha256=ZsqNUY0BG2ZMJC3orkx7AlOVEDGt-AQb7GScEMot4vE,944
-mmar_mapi-1.0.24.dist-info/RECORD,,
+mmar_mapi-1.0.26.dist-info/licenses/LICENSE,sha256=2A90w8WjhOgQXnFuUijKJYazaqZ4_NTokYb9Po4y-9k,1061
+mmar_mapi-1.0.26.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+mmar_mapi-1.0.26.dist-info/METADATA,sha256=BckDmA6Sx8euBUG0FGEzlDmXT65406N3VZzwPjZ6za0,944
+mmar_mapi-1.0.26.dist-info/RECORD,,