mmar-mapi 1.0.6__tar.gz → 1.0.8__tar.gz

{mmar_mapi-1.0.6 → mmar_mapi-1.0.8}/PKG-INFO

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

{mmar_mapi-1.0.6 → mmar_mapi-1.0.8}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "mmar-mapi"
 # dynamic version is not supported yet on uv_build
-version = "1.0.6"
+version = "1.0.8"
 description = "Common pure/IO utilities for multi-modal architectures team"
 authors = [{name = "Eugene Tagin", email = "tagin@airi.net"}]
 license = "MIT"
@@ -51,6 +51,7 @@ ci = [
     "mypy>=1.10",
     "types-markdown>=3.6",
     "types-pyyaml>=6.0",
+    "more-itertools>=10.8.0",
 ]
 
 [tool.uv]

mmar_mapi-1.0.8/src/mmar_mapi/__init__.py

@@ -0,0 +1,47 @@
+from .file_storage import FileStorage, ResourceId
+from .models.base import Base
+from .models.chat import (
+    Chat,
+    Context,
+    ChatMessage,
+    AIMessage,
+    HumanMessage,
+    MiscMessage,
+    make_content,
+    Content,
+    BaseMessage,
+)
+from .models.chat_item import ChatItem, OuterContextItem, InnerContextItem, ReplicaItem
+from .models.enums import MTRSLabelEnum, DiagnosticsXMLTagEnum, MTRSXMLTagEnum, DoctorChoiceXMLTagEnum
+from .models.tracks import TrackInfo, DomainInfo
+from .models.widget import Widget
+from .utils import make_session_id
+from .xml_parser import XMLParser
+
+__all__ = [
+    "AIMessage",
+    "Base",
+    "BaseMessage",
+    "Chat",
+    "ChatItem",
+    "ChatMessage",
+    "Content",
+    "Context",
+    "DiagnosticsXMLTagEnum",
+    "DoctorChoiceXMLTagEnum",
+    "DomainInfo",
+    "FileStorage",
+    "HumanMessage",
+    "InnerContextItem",
+    "MTRSLabelEnum",
+    "MTRSXMLTagEnum",
+    "MiscMessage",
+    "OuterContextItem",
+    "ReplicaItem",
+    "ResourceId",
+    "TrackInfo",
+    "Widget",
+    "XMLParser",
+    "make_content",
+    "make_session_id",
+]

{mmar_mapi-1.0.6 → mmar_mapi-1.0.8}/src/mmar_mapi/models/chat.py

@@ -1,13 +1,13 @@
 import warnings
+from collections.abc import Callable
 from copy import deepcopy
 from datetime import datetime
 from typing import Any, Literal, TypeVar
-from collections.abc import Callable
 
 from mmar_mapi.models.chat_item import ChatItem, ReplicaItem, OuterContextItem
 from mmar_mapi.models.widget import Widget
 from mmar_mapi.type_union import TypeUnion
-from pydantic import Field, ValidationError, Extra
+from pydantic import Field, ValidationError
 
 from .base import Base
 
@@ -146,10 +146,6 @@ class BaseMessage(Base):
     def widget(self) -> Widget | None:
         return _get_widget(self.content)
 
-    @staticmethod
-    def DATETIME_FORMAT() -> str:
-        return _DT_FORMAT
-
     def with_now_datetime(self):
         return self.model_copy(update=dict(date_time=now_pretty()))
 
@@ -161,6 +157,21 @@ class BaseMessage(Base):
     def is_human(self):
         return self.type == "human"
 
+    @staticmethod
+    def DATETIME_FORMAT() -> str:
+        return _DT_FORMAT
+
+    @staticmethod
+    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
+        if not resource_id:
+            return None
+        if ext and not resource_id.endswith(ext):
+            return None
+        return resource_id
+
 
 class HumanMessage(BaseMessage):
     type: Literal["human"] = "human"
@@ -182,15 +193,18 @@ class MiscMessage(BaseMessage):
 ChatMessage = TypeUnion[HumanMessage, AIMessage, MiscMessage]
 
 
+def find_in_messages(messages: list[ChatMessage], func: Callable[[ChatMessage], T | None]) -> T | None:
+    return next(filter(None, map(func, messages)), None)
+
+
 class Chat(Base):
     context: Context = Field(default_factory=Context)
     messages: list[ChatMessage] = Field(default_factory=list)
 
-    class Config:
-        extra = Extra.ignore
+    model_config = {"extra": "ignore"}
 
     def __init__(self, **data):
-        extra_fields = set(data.keys()) - set(self.__fields__.keys())
+        extra_fields = set(data.keys()) - set(type(self).model_fields.keys())
         if extra_fields:
             warnings.warn(f"Chat initialization: extra fields will be ignored: {extra_fields}")
         super().__init__(**data)
@@ -222,6 +236,19 @@ class Chat(Base):
                 return message.state
         return default
 
+    def find_in_messages(self, func: Callable[[ChatMessage], T | None]) -> T | None:
+        return find_in_messages(self.messages, func)
+
+    def rfind_in_messages(self, func: Callable[[ChatMessage], T | None]) -> T | None:
+        return find_in_messages(self.messages[::-1], func)
+
+    def get_last_user_message(self) -> HumanMessage | None:
+        messages = self.messages
+        if not messages:
+            return []
+        message = messages[-1]
+        return message if isinstance(message, HumanMessage) else None
+
 
 def make_content(
     text: str | None = None,

{mmar_mapi-1.0.6 → mmar_mapi-1.0.8}/src/mmar_mapi/models/widget.py

@@ -1,5 +1,6 @@
 from typing import Self, Literal
 
+from more_itertools import chunked
 from pydantic import BaseModel, model_validator
 
 
@@ -20,3 +21,22 @@ class Widget(BaseModel):
                     continue
                 raise ValueError(f"Expected buttons like `<callback>:<caption>`, found: {btn}")
         return self
+
+    @staticmethod
+    def make_inline_buttons(ibuttons: dict[str, str], by=1) -> "Widget":
+        return _make_inline_buttons(ibuttons=ibuttons, by=by)
+
+    @staticmethod
+    def make_buttons(buttons: list[str], by=1) -> "Widget":
+        return _make_buttons(buttons=buttons, by=1)
+
+
+def _make_inline_buttons(ibuttons: dict[str, str], by=1) -> "Widget":
+    ibs0 = [f"{key}:{val}" for key, val in ibuttons.items()]
+    res = Widget(ibuttons=list(chunked(ibs0, n=by)))
+    return res
+
+
+def _make_buttons(buttons: list[str], by=1) -> "Widget":
+    res = Widget(buttons=list(chunked(buttons, n=by)))
+    return res

mmar_mapi-1.0.6/src/mmar_mapi/__init__.py

@@ -1,12 +0,0 @@
-__version__ = "5.2.4"
-
-from .file_storage import FileStorage, ResourceId
-from .models.base import Base
-from .models.base_config_models import GigaChatConfig
-from .models.chat import Chat, Context, ChatMessage, AIMessage, HumanMessage, MiscMessage, make_content, Content
-from .models.chat_item import ChatItem, OuterContextItem, InnerContextItem, ReplicaItem
-from .models.enums import MTRSLabelEnum, DiagnosticsXMLTagEnum, MTRSXMLTagEnum, DoctorChoiceXMLTagEnum
-from .models.tracks import TrackInfo, DomainInfo
-from .models.widget import Widget
-from .utils import make_session_id
-from .xml_parser import XMLParser

mmar_mapi-1.0.6/src/mmar_mapi/models/base_config_models/__init__.py

@@ -1 +0,0 @@
-from .gigachat_config import GigaChatConfig

mmar_mapi-1.0.6/src/mmar_mapi/models/base_config_models/gigachat_config.py

@@ -1,14 +0,0 @@
-from typing import Self
-
-from pydantic import BaseModel, model_validator, SecretStr
-
-
-class GigaChatConfig(BaseModel):
-    client_id: SecretStr = SecretStr("")
-    client_secret: SecretStr = SecretStr("")
-
-    @model_validator(mode="after")
-    def empty_validator(self) -> Self:
-        if not (self.client_id and self.client_secret):
-            raise ValueError("creds for gigachat is not filled")
-        return self