mmar-mapi 1.0.23__py3-none-any.whl → 1.0.25__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,6 +175,8 @@ class ExtractedImageMetadata(BaseModel):
 
 
 class ExtractedPicture(ExtractedImage, ExtractedImageMetadata):
+    "Image of part of page"
+
     pass
 
 
@@ -167,6 +185,8 @@ class ExtractedTable(ExtractedImage, ExtractedImageMetadata):
 
 
 class ExtractedPageImage(ExtractedImage):
+    "Image of all page"
+
     pass
 
 

mmar_mapi/file_storage.py

@@ -78,7 +78,7 @@ class FileStorage:
 
     def upload_dir(self, resource_ids: list[ResourceId]) -> ResourceId:
         content = "\n".join(resource_ids)
-        res = self.upload(content, "dir")
+        res = self.upload(content=content, fname=".dir")
         return res
 
     def download(self, resource_id: ResourceId) -> bytes:

mmar_mapi/models/chat.py

@@ -244,8 +244,8 @@ class Chat(Base):
     def parse(chat_obj: str | dict | ChatItem) -> "Chat":
         return _parse_chat_compat(chat_obj)
 
-    def to_chat_item(self) -> ChatItem:
-        return convert_chat_to_chat_item(self)
+    def to_chat_item(self, failsafe: bool=False) -> ChatItem:
+        return convert_chat_to_chat_item(self, failsafe)
 
     def add_message(self, message: ChatMessage):
         self.messages.append(message)
@@ -392,19 +392,24 @@ def convert_chat_item_to_chat(chat_item: ChatItem) -> Chat:
     return res
 
 
-def convert_context_to_outer_context(context: Context) -> 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 ''
     return OuterContextItem(
         client_id=context.client_id,
         user_id=context.user_id,
         session_id=context.session_id,
         track_id=context.track_id,
-        sex=extra.get("sex"),
-        age=extra.get("age"),
+        sex=extra["sex"],
+        age=extra["age"],
+        entrypoint_key=extra["entrypoint_key"],
+        language_code=extra["language_code"],
         parent_session_id=extra.get("parent_session_id"),
-        entrypoint_key=extra.get("entrypoint_key"),
-        language_code=extra.get("language_code"),
     )
 
 
@@ -436,10 +441,10 @@ def convert_message_to_replica_item(message: ChatMessage) -> ReplicaItem | None:
     return ReplicaItem(**kwargs)
 
 
-def convert_chat_to_chat_item(chat: Chat) -> 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),
+        outer_context=convert_context_to_outer_context(chat.context, failsafe=failsafe),
         inner_context=dict(replicas=list(map(convert_message_to_replica_item, chat.messages))),
     )
     return res

{mmar_mapi-1.0.23.dist-info → mmar_mapi-1.0.25.dist-info}/METADATA

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

{mmar_mapi-1.0.23.dist-info → mmar_mapi-1.0.25.dist-info}/RECORD

@@ -1,10 +1,10 @@
 mmar_mapi/__init__.py,sha256=9Q5xsrj26uUnn7ZWvvJUvdVIuzC2oCIeNB4dEoqjF-o,1256
-mmar_mapi/api.py,sha256=QvbFY-r5d_V6jb9zBj_BL-tbquynR4v1K_8OjMBtXJU,5908
+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=xJU59HmXFsfc53XALdx53IwyqV_k4218AzzXq1Q65Js,5052
+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=-XilkiderIOFG1oSKRDG9NDOEN21sBpbTPHUrqVPjc4,15400
+mmar_mapi/models/chat.py,sha256=GP5XzOEtLjXUZRvKms8Fa874JOkfeu3vgiqitdoXj10,15724
 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.23.dist-info/licenses/LICENSE,sha256=2A90w8WjhOgQXnFuUijKJYazaqZ4_NTokYb9Po4y-9k,1061
-mmar_mapi-1.0.23.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-mmar_mapi-1.0.23.dist-info/METADATA,sha256=5PQS2XT9NvB5gYkSANUn441g0NUP3famSLZPt69V5ZU,944
-mmar_mapi-1.0.23.dist-info/RECORD,,
+mmar_mapi-1.0.25.dist-info/licenses/LICENSE,sha256=2A90w8WjhOgQXnFuUijKJYazaqZ4_NTokYb9Po4y-9k,1061
+mmar_mapi-1.0.25.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+mmar_mapi-1.0.25.dist-info/METADATA,sha256=Jc4gOROtsYCnECtEltlL_OJfEFJkUSc1kvgiOOPlAPg,944
+mmar_mapi-1.0.25.dist-info/RECORD,,