agi-med-common 5.0.22__tar.gz → 5.0.23__tar.gz

{agi_med_common-5.0.22 → agi_med_common-5.0.23}/PKG-INFO

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

{agi_med_common-5.0.22 → agi_med_common-5.0.23}/src/agi_med_common/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "5.0.22"
+__version__ = "5.0.23"
 
 from .models import (
     MTRSLabelEnum,

{agi_med_common-5.0.22 → agi_med_common-5.0.23}/src/agi_med_common/models/chat.py

@@ -1,11 +1,13 @@
+import warnings
+from copy import deepcopy
 from datetime import datetime
-from typing import Any, List, Dict, Literal
+from typing import Any, List, Dict, Literal, TypeVar
 
 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
-from pydantic import Field
+from pydantic import Field, ValidationError
 
 from ._base import _Base
 
@@ -15,6 +17,7 @@ _EXAMPLE_DT: str = datetime(year=1970, month=1, day=1).strftime(_DT_FORMAT)
 StrDict = Dict[str, Any]
 ContentBase = str | Widget | StrDict
 Content = ContentBase | List[ContentBase]
+T = TypeVar('T')
 
 
 def now_pretty() -> str:
@@ -34,13 +37,32 @@ class Context(_Base):
             return f"{cid}_{uid}_{sid}"
         return f"client_{cid}_user_{uid}_session_{sid}"
 
+    def _get_deprecated_extra(self, field, default):
+        # legacy: eliminate after migration
+        res = (self.extra or {}).get(field, default)
+        warnings.warn(f"Deprecated property `{field}`, should be eliminated", stacklevel=2)
+        return res
 
-def _get_str_field(obj: dict, field) -> str | None:
+    # fmt: off
+    @property
+    def sex(self) -> bool: return self._get_deprecated_extra('sex', True)
+    @property
+    def age(self) -> int: return self._get_deprecated_extra('age', 0)
+    @property
+    def entrypoint_key(self) -> str: return self._get_deprecated_extra('entrypoint_key', '')
+    @property
+    def language_code(self) -> str: return self._get_deprecated_extra('language_code', '')
+    @property
+    def parent_session_id(self) -> str: return self._get_deprecated_extra('parent_session_id', '')
+    # fmt: on
+
+
+def _get_field(obj: dict, field, val_type: type[T]) -> T | None:
     if not isinstance(obj, dict):
         return None
-    text = obj.get(field)
-    if text is not None and isinstance(text, str):
-        return text
+    val = obj.get(field)
+    if val is not None and isinstance(val, val_type):
+        return val
     return None
 
 
@@ -50,7 +72,7 @@ def _get_text(obj: Content) -> str:
     if isinstance(obj, list):
         return "".join(map(_get_text, obj))
     if isinstance(obj, dict) and obj.get("type") == "text":
-        return _get_str_field(obj, "text") or ""
+        return _get_field(obj, "text", str) or ""
     return ""
 
 
@@ -58,7 +80,7 @@ def _get_resource_id(obj: Content) -> str | None:
     if isinstance(obj, list):
         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 _get_field(obj, "resource_id", str)
     return None
 
 
@@ -66,7 +88,7 @@ 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 _get_field(obj, "command", dict)
     return None
 
 
@@ -91,6 +113,11 @@ class BaseMessage(_Base):
     def text(self) -> str:
         return _get_text(self.content)
 
+    @property
+    def body(self) -> str:
+        # legacy: eliminate after migration
+        return self.text
+
     @property
     def resource_id(self) -> str | None:
         return _get_resource_id(self.content)
@@ -129,21 +156,26 @@ ChatMessage = TypeUnion[HumanMessage, AIMessage, MiscMessage]
 
 class Chat(_Base):
     context: Context
-    messages: List[ChatMessage] = []
+    messages: List[ChatMessage] = Field(default_factory=list)
 
     def create_id(self, short: bool = False) -> str:
         return self.context.create_id(short)
 
-    @classmethod
-    def parse(self, chat_obj: str | dict) -> "Chat":
+    @staticmethod
+    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 convert_replica_item_to_message(replica: ReplicaItem) -> ChatMessage:
+    # legacy: eliminate after migration
     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
+    date_time = replica.date_time
 
     content = list(filter(None, [body, resource_id, command, widget]))
     if len(content) == 0:
@@ -151,25 +183,28 @@ def convert_replica_item_to_message(replica: ReplicaItem) -> ChatMessage:
     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,
-        ),
-    )
+    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
+    # legacy: eliminate after migration
     context = Context(
         client_id=octx.client_id,
         user_id=octx.user_id,
@@ -187,15 +222,15 @@ def convert_outer_context_to_context(octx: OuterContextItem) -> Context:
 
 
 def convert_chat_item_to_chat(chat_item: ChatItem) -> Chat:
-    # legacy: eliminate
+    # legacy: eliminate after migration
     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]
+    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) -> OuterContextItem:
-    # legacy: eliminate
+    # legacy: eliminate after migration
     extra = context.extra or {}
     return OuterContextItem(
         client_id=context.client_id,
@@ -211,20 +246,20 @@ def convert_context_to_outer_context(context: Context) -> OuterContextItem:
 
 
 def convert_message_to_replica_item(message: ChatMessage) -> ReplicaItem | None:
-    # legacy: eliminate
+    # legacy: eliminate after migration
     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")
+    extra = deepcopy(message.extra) if message.extra or {}
+    action = extra.pop("action", "")
+    moderation = extra.pop("moderation", "OK")
 
     kwargs = dict(
         role=role,
-        body=message.body,
+        body=message.text,
         resource_id=message.resource_id,
         command=message.command,
         widget=message.widget,
@@ -238,16 +273,19 @@ def convert_message_to_replica_item(message: ChatMessage) -> ReplicaItem | None:
 
 
 def convert_chat_to_chat_item(chat: Chat) -> ChatItem:
-    # legacy: eliminate
+    # legacy: eliminate after migration
     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)
+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
 
@@ -259,9 +297,10 @@ def _parse_chat(chat_obj: str | dict) -> Chat:
     return Chat.model_validate_json(chat_obj)
 
 
-def _parse_chat_compat(chat_obj: str | dict) -> Chat:
-    # legacy: eliminate
+def _parse_chat_compat(chat_obj: str | dict | ChatItem) -> Chat:
+    # legacy: eliminate after migration
     try:
         return _parse_chat(chat_obj)
-    except Exception:
+    except ValidationError as ex:
+        warnings.warn(f"Failed to parse chat: {ex}")
         return parse_chat_item_as_chat(chat_obj)

{agi_med_common-5.0.22 → agi_med_common-5.0.23}/src/agi_med_common/models/chat_item.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from typing import Annotated, Any, List
 
 from agi_med_common.models.widget import Widget
-from pydantic import Field, ConfigDict, BeforeValidator
+from pydantic import Field, ConfigDict, BeforeValidator, AfterValidator
 
 from ._base import _Base
 
@@ -39,6 +39,7 @@ class OuterContextItem(_Base):
     def to_dict(self) -> dict[str, Any]:
         return self.model_dump(by_alias=True)
 
+
 LABELS = {
     0: "OK",
     1: "NON_MED",
@@ -58,9 +59,15 @@ def fix_deprecated_moderation(moderation):
         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: str | None = Field(None, alias="ResourceId", examples=["<link-id>"])
+    resource_id: Annotated[str | None, AfterValidator(nullify_empty)] = Field(
+        None, alias="ResourceId", examples=["<link-id>"]
+    )
     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])

{agi_med_common-5.0.22 → agi_med_common-5.0.23}/src/agi_med_common.egg-info/PKG-INFO

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