mmar-mapi 1.0.25__tar.gz → 1.1.0__tar.gz

{mmar_mapi-1.0.25 → mmar_mapi-1.1.0}/PKG-INFO

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

{mmar_mapi-1.0.25 → mmar_mapi-1.1.0}/pyproject.toml

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

{mmar_mapi-1.0.25 → mmar_mapi-1.1.0}/src/mmar_mapi/__init__.py

@@ -11,7 +11,6 @@ from .models.chat import (
     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
@@ -25,7 +24,6 @@ __all__ = [
     "Base",
     "BaseMessage",
     "Chat",
-    "ChatItem",
     "ChatMessage",
     "Content",
     "Context",
@@ -34,12 +32,9 @@ __all__ = [
     "DomainInfo",
     "FileStorage",
     "HumanMessage",
-    "InnerContextItem",
     "MTRSLabelEnum",
     "MTRSXMLTagEnum",
     "MiscMessage",
-    "OuterContextItem",
-    "ReplicaItem",
     "ResourceId",
     "TrackInfo",
     "Widget",

{mmar_mapi-1.0.25 → mmar_mapi-1.1.0}/src/mmar_mapi/models/chat.py

@@ -1,12 +1,10 @@
 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
+from pydantic import Field
 
-from mmar_mapi.models.chat_item import ChatItem, OuterContextItem, ReplicaItem
 from mmar_mapi.models.widget import Widget
 from mmar_mapi.type_union import TypeUnion
 
@@ -15,7 +13,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")
 
@@ -33,10 +49,12 @@ class Context(Base):
 
     def create_id(self, short: bool = False) -> str:
         uid, sid, cid = self.user_id, self.session_id, self.client_id
-        if short:
-            return f"{cid}_{uid}_{sid}"
         return f"client_{cid}_user_{uid}_session_{sid}"
 
+    def create_trace_id(self) -> str:
+        uid, sid, cid = self.user_id, self.session_id, self.client_id
+        return f"{cid}_{uid}_{sid}"
+
     def _get_deprecated_extra(self, field, default):
         # legacy: eliminate after migration
         res = (self.extra or {}).get(field, default)
@@ -241,11 +259,8 @@ class Chat(Base):
         return self.context.create_id(short)
 
     @staticmethod
-    def parse(chat_obj: str | dict | ChatItem) -> "Chat":
-        return _parse_chat_compat(chat_obj)
-
-    def to_chat_item(self, failsafe: bool=False) -> ChatItem:
-        return convert_chat_to_chat_item(self, failsafe)
+    def parse(chat_obj: str | dict) -> "Chat":
+        return _parse_chat(chat_obj)
 
     def add_message(self, message: ChatMessage):
         self.messages.append(message)
@@ -277,7 +292,10 @@ class Chat(Base):
         message = messages[-1]
         return message if isinstance(message, HumanMessage) else None
 
-    def count_messages(self, func: Callable[[ChatMessage], bool]) -> int:
+    def count_messages(self, func: Callable[[ChatMessage], bool] | type) -> int:
+        if isinstance(func, type):
+            msg_type = func
+            func = lambda msg: isinstance(msg, msg_type)
         return sum(map(func, self.messages))
 
 
@@ -319,171 +337,11 @@ def make_content(
     return content
 
 
-def convert_replica_item_to_message(replica: ReplicaItem) -> ChatMessage:
-    date_time = replica.date_time
-    content = make_content(
-        text=replica.body,
-        resource_id=replica.resource_id,
-        command=replica.command,
-        widget=replica.widget,
-    )
-    # legacy: eliminate after migration
-    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, command, widget]))
-    if len(content) == 0:
-        content = ""
-    elif len(content) == 1:
-        content = content[0]
-
-    is_bot_message = replica.role
-
-    if is_bot_message:
-        kwargs = dict(
-            content=content,
-            date_time=date_time,
-            state=replica.state,
-            extra=dict(
-                **(replica.extra or {}),
-                action=replica.action,
-                moderation=replica.moderation,
-            ),
-        )
-        res = AIMessage(**kwargs)
-    else:
-        kwargs = dict(content=content, date_time=date_time)
-        res = HumanMessage(**kwargs)
-    return res
-
-
-def convert_outer_context_to_context(octx: OuterContextItem) -> Context:
-    # legacy: eliminate after migration
-    context = Context(
-        client_id=octx.client_id,
-        user_id=octx.user_id,
-        session_id=octx.session_id,
-        track_id=octx.track_id,
-        extra=dict(
-            sex=octx.sex,
-            age=octx.age,
-            parent_session_id=octx.parent_session_id,
-            entrypoint_key=octx.entrypoint_key,
-            language_code=octx.language_code,
-        ),
-    )
-    return context
-
-
-def convert_chat_item_to_chat(chat_item: ChatItem) -> Chat:
-    # legacy: eliminate after migration
-    context = convert_outer_context_to_context(chat_item.outer_context)
-    messages = list(map(convert_replica_item_to_message, chat_item.inner_context.replicas))
-    res = Chat(context=context, messages=messages)
-    return res
-
-
-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["sex"],
-        age=extra["age"],
-        entrypoint_key=extra["entrypoint_key"],
-        language_code=extra["language_code"],
-        parent_session_id=extra.get("parent_session_id"),
-    )
-
-
-def convert_message_to_replica_item(message: ChatMessage) -> ReplicaItem | None:
-    # legacy: eliminate after migration
-    m_type = message.type
-    if m_type in {"ai", "human"}:
-        role = m_type == "ai"
-    else:
-        return None
-
-    extra = deepcopy(message.extra) if message.extra else {}
-    action = extra.pop("action", "")
-    moderation = extra.pop("moderation", "OK")
-
-    kwargs = dict(
-        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,
-        extra=extra or None,
-        state=getattr(message, "state", ""),
-        action=action,
-        moderation=moderation,
-    )
-    return ReplicaItem(**kwargs)
-
-
-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),
-        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:
-    # legacy: eliminate after migration
-    if isinstance(chat_obj, ChatItem):
-        chat_item = chat_obj
-    else:
-        chat_item = ChatItem.parse(chat_obj)
-    res = convert_chat_item_to_chat(chat_item)
-    return res
-
-
-def _parse_chat(chat_obj: str | dict) -> Chat:
+def _parse_chat(chat_obj: str | dict | Chat) -> Chat:
+    if isinstance(chat_obj, Chat):
+        return chat_obj
     if isinstance(chat_obj, dict):
         return Chat.model_validate(chat_obj)
-
-    return Chat.model_validate_json(chat_obj)
-
-
-def is_chat_item(chat_obj: str | dict | ChatItem) -> bool:
-    if isinstance(chat_obj, ChatItem):
-        return True
-    if isinstance(chat_obj, dict):
-        return "OuterContext" in chat_obj
     if isinstance(chat_obj, str):
-        return "OuterContext" in chat_obj
-    warnings.warn(f"Unexpected chat object: {chat_obj} :: {type(chat_obj)}")
-    return False
-
-
-def _parse_chat_compat(chat_obj: str | dict | ChatItem) -> Chat:
-    # legacy: eliminate after migration
-    if is_chat_item(chat_obj):
-        return parse_chat_item_as_chat(chat_obj)
-    try:
-        return _parse_chat(chat_obj)
-    except ValidationError as ex:
-        warnings.warn(f"Failed to parse chat: {ex}")
-        return parse_chat_item_as_chat(chat_obj)
+        return Chat.model_validate_json(chat_obj)
+    raise ValueError(f"Bad chat_obj {type(chat_obj)}: {chat_obj}")

mmar_mapi-1.0.25/src/mmar_mapi/models/chat_item.py

@@ -1,160 +0,0 @@
-from datetime import datetime
-from typing import Annotated, Any
-from collections.abc import Callable
-
-from mmar_mapi.models.widget import Widget
-from pydantic import Field, ConfigDict, BeforeValidator, AfterValidator
-
-from .base import Base
-
-
-_DT_FORMAT: str = "%Y-%m-%d-%H-%M-%S"
-_EXAMPLE_DT_0 = datetime(1970, 1, 1, 0, 0, 0)
-_EXAMPLE_DT: str = _EXAMPLE_DT_0.strftime(_DT_FORMAT)
-
-
-def now_pretty() -> str:
-    return datetime.now().strftime(ReplicaItem.DATETIME_FORMAT())
-
-
-class OuterContextItem(Base):
-    # remove annoying warning for protected `model_` namespace
-    model_config = ConfigDict(protected_namespaces=())
-
-    sex: bool = Field(False, alias="Sex", description="True = male, False = female", examples=[True])
-    age: int = Field(0, alias="Age", examples=[20])
-    user_id: str = Field("", alias="UserId", examples=["123456789"])
-    parent_session_id: str | None = Field(None, alias="ParentSessionId", examples=["987654320"])
-    session_id: str = Field("", alias="SessionId", examples=["987654321"])
-    client_id: str = Field("", alias="ClientId", examples=["543216789"])
-    track_id: str = Field(default="Consultation", alias="TrackId")
-    entrypoint_key: str = Field("", alias="EntrypointKey", examples=["giga"])
-    language_code: str = Field("ru", alias="LanguageCode", examples=["ru"])
-
-    def create_id(self, short: bool = False) -> str:
-        uid, sid, cid = self.user_id, self.session_id, self.client_id
-        if short:
-            return f"{uid}_{sid}_{cid}"
-        return f"user_{uid}_session_{sid}_client_{cid}"
-
-    def to_dict(self) -> dict[str, Any]:
-        return self.model_dump(by_alias=True)
-
-
-LABELS = {
-    0: "OK",
-    1: "NON_MED",
-    2: "CHILD",
-    3: "ABSURD",
-    4: "GREETING",
-    5: "RECEIPT",
-}
-
-
-def fix_deprecated_moderation(moderation):
-    if isinstance(moderation, int):
-        return LABELS.get(moderation, "OK")
-    elif isinstance(moderation, str):
-        return moderation
-    else:
-        raise ValueError(f"Unsupported moderation: {moderation} :: {type(moderation)}")
-
-
-def nullify_empty(text: str) -> str | None:
-    return text or None
-
-
-class ReplicaItem(Base):
-    body: str = Field("", alias="Body", examples=["Привет"])
-    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])
-    date_time: str = Field(
-        default_factory=now_pretty, alias="DateTime", examples=[_EXAMPLE_DT], description=f"Format: {_DT_FORMAT}"
-    )
-    state: str = Field("", alias="State", description="chat manager fsm state", examples=["COLLECTION"])
-    action: str = Field("", alias="Action", description="chat manager fsm action", examples=["DIAGNOSIS"])
-    # todo fix: support loading from `moderation: int`
-    moderation: Annotated[str, BeforeValidator(str)] = Field(
-        "OK", alias="Moderation", description="moderation outcome", examples=["OK"]
-    )
-    extra: dict | None = Field(None, alias="Extra", examples=[None])
-
-    def to_dict(self) -> dict[str, Any]:
-        return self.model_dump(by_alias=True)
-
-    @staticmethod
-    def DATETIME_FORMAT() -> str:
-        return _DT_FORMAT
-
-    def with_now_datetime(self):
-        return self.model_copy(update=dict(date_time=now_pretty()))
-
-    @property
-    def is_ai(self):
-        return self.role
-
-    @property
-    def is_human(self):
-        return not self.role
-
-    def modify_text(self, callback: Callable[[str], str]) -> "ReplicaItem":
-        body_upd = callback(self.body)
-        return self.model_copy(update=dict(body=body_upd))
-
-
-class InnerContextItem(Base):
-    replicas: list[ReplicaItem] = Field(alias="Replicas")
-    attrs: dict[str, str | int] | None = Field(default={}, alias="Attrs")
-
-    def to_dict(self) -> dict[str, list]:
-        return self.model_dump(by_alias=True)
-
-
-class ChatItem(Base):
-    outer_context: OuterContextItem = Field(alias="OuterContext")
-    inner_context: InnerContextItem = Field(alias="InnerContext")
-
-    def create_id(self, short: bool = False) -> str:
-        return self.outer_context.create_id(short)
-
-    def to_dict(self) -> dict[str, Any]:
-        return self.model_dump(by_alias=True)
-
-    def add_replica(self, replica: ReplicaItem):
-        self.inner_context.replicas.append(replica)
-
-    def add_replicas(self, replicas: list[ReplicaItem]):
-        for replica in replicas:
-            self.inner_context.replicas.append(replica)
-
-    def replace_replicas(self, replicas: list[ReplicaItem]):
-        return self.model_copy(update=dict(inner_context=InnerContextItem(replicas=replicas)))
-
-    def get_last_state(self, default: str = "empty") -> str:
-        replicas = self.inner_context.replicas
-        for ii in range(len(replicas) - 1, -1, -1):
-            replica = replicas[ii]
-            if replica.role:
-                return replica.state
-        return default
-
-    def zip_history(self, field: str) -> list[Any]:
-        return [replica.to_dict().get(field, None) for replica in self.inner_context.replicas]
-
-    @classmethod
-    def parse(cls, chat_obj: str | dict) -> "ChatItem":
-        return _parse_chat_item(chat_obj)
-
-
-def _parse_chat_item(chat_obj: str | dict) -> ChatItem:
-    if isinstance(chat_obj, dict):
-        return ChatItem.model_validate(chat_obj)
-
-    return ChatItem.model_validate_json(chat_obj)