agi-med-common 5.0.16__py3-none-any.whl → 5.0.17__py3-none-any.whl

agi_med_common/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "5.0.16"
+__version__ = "5.0.17"
 
 from .models import (
     MTRSLabelEnum,

agi_med_common/models/chat.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 from typing import Any, List, Dict, Literal
 
+from agi_med_common.models.chat_item import ChatItem, ReplicaItem, OuterContextItem
 from agi_med_common.models.widget import Widget
 from agi_med_common.type_union import TypeUnion
 from agi_med_common.utils import first_nonnull
@@ -55,12 +56,31 @@ def _get_text(obj: Content) -> str:
 
 def _get_resource_id(obj: Content) -> str | None:
     if isinstance(obj, list):
-        return first_nonnull(_get_str_field(el, "resource_id") for el in obj)
+        return first_nonnull(map(_get_resource_id, obj))
     if isinstance(obj, dict) and obj.get("type") == "resource_id":
         return _get_str_field(obj, "resource_id")
     return None
 
 
+def _get_command(obj: Content) -> dict | None:
+    if isinstance(obj, list):
+        return first_nonnull(map(_get_command, obj))
+    if isinstance(obj, dict) and obj.get("type") == "command":
+        return _get_str_field(obj, "command")
+    return None
+
+
+def _get_widget(obj: Content) -> Widget | None:
+    if isinstance(obj, list):
+        return first_nonnull(map(_get_widget, obj))
+    if isinstance(obj, Widget):
+        return obj
+    return None
+
+
+# todo fix: generalize functions above
+
+
 class BaseMessage(_Base):
     type: str
     content: Content = Field("", examples=["Привет"])
@@ -75,6 +95,14 @@ class BaseMessage(_Base):
     def resource_id(self) -> str | None:
         return _get_resource_id(self.content)
 
+    @property
+    def command(self) -> dict | None:
+        return _get_command(self.content)
+
+    @property
+    def widget(self) -> Widget | None:
+        return _get_widget(self.content)
+
     @staticmethod
     def DATETIME_FORMAT() -> str:
         return _DT_FORMAT
@@ -105,3 +133,135 @@ class Chat(_Base):
 
     def create_id(self, short: bool = False) -> str:
         return self.context.create_id(short)
+
+    @classmethod
+    def parse(self, chat_obj: str | dict) -> "Chat":
+        return _parse_chat_compat(chat_obj)
+
+
+def convert_replica_item_to_message(replica: ReplicaItem) -> ChatMessage:
+    resource_id = (replica.resource_id or None) and {"type": "resource_id", "resource_id": replica.resource_id}
+    body = replica.body
+    command = replica.command
+    widget = replica.widget
+
+    content = list(filter(None, [body, resource_id, command, widget]))
+    if len(content) == 0:
+        content = ""
+    elif len(content) == 1:
+        content = content[0]
+
+    kwargs = dict(
+        content=content,
+        date_time=replica.date_time,
+        extra=replica.extra,
+    )
+    if not replica.role:
+        return HumanMessage(**kwargs)
+    return AIMessage(
+        **kwargs,
+        state=replica.state,
+        extra=dict(
+            action=replica.action,
+            moderation=replica.moderation,
+        ),
+    )
+
+
+def convert_outer_context_to_context(octx: OuterContextItem) -> Context:
+    # legacy: eliminate
+    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
+    context = convert_outer_context_to_context(chat_item.outer_context)
+    messages = [convert_replica_item_to_message(replica) for replica in chat_item.inner_context.replicas]
+    res = Chat(context=context, messages=messages)
+    return res
+
+
+def convert_context_to_outer_context(context: Context) -> OuterContextItem:
+    # legacy: eliminate
+    extra = context.extra 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"),
+        parent_session_id=extra.get("parent_session_id"),
+        entrypoint_key=extra.get("entrypoint_key"),
+        language_code=extra.get("language_code"),
+    )
+
+
+def convert_message_to_replica_item(message: ChatMessage) -> ReplicaItem | None:
+    # legacy: eliminate
+    m_type = message.type
+    if m_type in {"ai", "human"}:
+        role = m_type == "ai"
+    else:
+        return None
+
+    extra = message.extra or {}
+    action = extra.pop("action")
+    moderation = extra.pop("moderation")
+
+    kwargs = dict(
+        role=role,
+        body=message.body,
+        resource_id=message.resource_id,
+        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) -> ChatItem:
+    # legacy: eliminate
+    return ChatItem(
+        outer_context=convert_context_to_outer_context(chat.context),
+        inner_context=dict(replicas=list(map(convert_message_to_replica_item, chat.messages))),
+    )
+
+
+def parse_chat_item_as_chat(chat_obj: str | dict) -> Chat:
+    # legacy: eliminate
+    chat_item = ChatItem.parse(chat_obj)
+    res = convert_chat_item_to_chat(chat_item)
+    return res
+
+
+def _parse_chat(chat_obj: str | dict) -> Chat:
+    if isinstance(chat_obj, dict):
+        return Chat.model_validate(chat_obj)
+
+    return Chat.model_validate_json(chat_obj)
+
+
+def _parse_chat_compat(chat_obj: str | dict) -> Chat:
+    # legacy: eliminate
+    try:
+        return _parse_chat(chat_obj)
+    except Exception:
+        return parse_chat_item_as_chat(chat_obj)

agi_med_common/models/chat_item.py

@@ -1,11 +1,8 @@
-import json
-import warnings
 from datetime import datetime
-from typing import Any, List
+from typing import Annotated, Any, List
 
 from agi_med_common.models.widget import Widget
-from loguru import logger
-from pydantic import Field, ConfigDict, ValidationError
+from pydantic import Field, ConfigDict, BeforeValidator
 
 from ._base import _Base
 
@@ -42,6 +39,24 @@ class OuterContextItem(_Base):
     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)}")
+
 
 class ReplicaItem(_Base):
     body: str = Field("", alias="Body", examples=["Привет"])
@@ -55,7 +70,9 @@ class ReplicaItem(_Base):
     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: str = Field("OK", alias="Moderation", description="moderation outcome", examples=["OK"])
+    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]:
@@ -99,40 +116,11 @@ class ChatItem(_Base):
 
     @classmethod
     def parse(cls, chat_obj: str | dict) -> "ChatItem":
-        return _parse_chat(chat_obj)
-
+        return _parse_chat_item(chat_obj)
 
-def _is_moderation_int_error(err):
-    # fmt: off
-    if err['type'] != 'string_type': return False
-    if err['loc'][0] != 'InnerContext': return False
-    if err['loc'][1] != 'Replicas': return False
-    if err['loc'][3] != 'Moderation': return False
-    if err['msg'] != 'Input should be a valid string': return False
-    # fmt: on
-    return True
 
-
-def _is_moderation_int_errors(ex):
-    errs = ex.errors()
-    return all(map(_is_moderation_int_error, errs))
-
-
-def _parse_chat(chat_obj: str | dict) -> ChatItem:
+def _parse_chat_item(chat_obj: str | dict) -> ChatItem:
     if isinstance(chat_obj, dict):
-        return ChatItem(**chat_obj)
-    try:
-        return ChatItem.model_validate_json(chat_obj)
-    except ValidationError as ex:
-        if _is_moderation_int_errors(ex):
-            msg = "Failed to parse ChatItem, fallback to old version with `Moderation:int`"
-        else:
-            msg = f"Failed to parse: {ex}"
-        warnings.warn(msg)
-
-    # old version
-    chat_dict = json.loads(chat_obj)
-    for rep in chat_dict["InnerContext"]["Replicas"]:
-        rep["Moderation"] = "OK"
-
-    return ChatItem.model_validate(chat_dict)
+        return ChatItem.model_validate(chat_obj)
+
+    return ChatItem.model_validate_json(chat_obj)

{agi_med_common-5.0.16.dist-info → agi_med_common-5.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agi_med_common
-Version: 5.0.16
+Version: 5.0.17
 Summary: Сommon for agi-med team
 Author: AGI-MED-TEAM
 Requires-Python: >=3.11

{agi_med_common-5.0.16.dist-info → agi_med_common-5.0.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-agi_med_common/__init__.py,sha256=trHujI-pVt0AGA2pd1g9XhOIizSfnlvl8v2H3LPTUvQ,1043
+agi_med_common/__init__.py,sha256=CungR6s2AI0QrMzpXdZZqekK2XQt2HpQBS9mBtMHq4E,1043
 agi_med_common/file_storage.py,sha256=T0Hbs4W-pWO6HdWcmlVqABrQHYdq7lLZH4_Vu-YNVbw,1802
 agi_med_common/parallel_map.py,sha256=Qx6xe7DqlEUDpSucp5Hm8r9y9Iquwh9JvX7lOqHhnOw,921
 agi_med_common/type_union.py,sha256=diwmzcnbqkpGFckPHNw9o8zyQ955mOGNvhTlcBJ0RMI,1905
@@ -12,14 +12,14 @@ agi_med_common/api/content_interpreter_remote_api.py,sha256=cGaIKZGuosneLXs0jCM8
 agi_med_common/api/text_generator_api.py,sha256=c-Yy7KcldyyJtJo6cK6K_qDD1cm8yTMWMiUpzn4l1Kc,171
 agi_med_common/models/__init__.py,sha256=dqr2kP-RuxFfAZhCr103PQzTVZFKIcdxyzTYiHhdTsE,375
 agi_med_common/models/_base.py,sha256=qNdH8x3x3mYbo5XgWtR9VpEarxsEvXvzynadUlDvHmU,149
-agi_med_common/models/chat.py,sha256=GTdeV3JsubSGoHDJtvbppNhWRMiYhK4i9glxsBzuhrc,2991
-agi_med_common/models/chat_item.py,sha256=o3DMYk48otYd__hx8FeQ599gv-FHWl4kUDWI8AdsjYk,5138
+agi_med_common/models/chat.py,sha256=LihfERvN_owk4zsW8eQPKOoXyYCz9lmsD5zw7db6vYk,7583
+agi_med_common/models/chat_item.py,sha256=aF_sUtucV5hXeQ42Z-Jtsz9G1sWtjSFtElRs6hr0AQQ,4648
 agi_med_common/models/enums.py,sha256=J-GNpql9MCnKnWiV9aJRQGI-pAybvV86923RZs99grA,1006
 agi_med_common/models/tracks.py,sha256=UP-jeWqDiCK6dyoMDfs7hemgl_xsJKee_DApjBf-XYc,311
 agi_med_common/models/widget.py,sha256=aJZ2vWx_PTFN02Wz16eokz9IIVrxqNuZYVDqLG36toE,710
 agi_med_common/models/base_config_models/__init__.py,sha256=KjS_bSCka8BOMsigwcIML-e6eNB2ouMU6gxlhRmzeuY,44
 agi_med_common/models/base_config_models/gigachat_config.py,sha256=WNSCTO8Fjpxc1v2LRUHfKqo9aeMDpXltTHYBFgTD2N0,422
-agi_med_common-5.0.16.dist-info/METADATA,sha256=kEcigFalG-Lm6X0LYnRKbVU5gzem85SZdUwxxZ9jJBc,518
-agi_med_common-5.0.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agi_med_common-5.0.16.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
-agi_med_common-5.0.16.dist-info/RECORD,,
+agi_med_common-5.0.17.dist-info/METADATA,sha256=GdyDBJ7fHIS-qvNIg-BpA_pXKgQ-ir8g7_FYnSnVj8Y,518
+agi_med_common-5.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agi_med_common-5.0.17.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
+agi_med_common-5.0.17.dist-info/RECORD,,