agi-med-common 4.2.16__tar.gz → 5.0.0__tar.gz

{agi_med_common-4.2.16 → agi_med_common-5.0.0}/PKG-INFO

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

{agi_med_common-4.2.16 → agi_med_common-5.0.0}/src/agi_med_common/__init__.py

@@ -1,14 +1,12 @@
-__version__ = "4.2.16"
+__version__ = "5.0.0"
 
 from .logger import LogLevelEnum, logger_init, log_llm_error
 from .models import (
     MTRSLabelEnum,
-    ModerationLabelEnum,
     ChatItem,
     InnerContextItem,
     OuterContextItem,
     ReplicaItem,
-    ReplicaItemPair,
 )
 from .models.widget import Widget
 from .file_storage import FileStorage, ResourceId

agi_med_common-5.0.0/src/agi_med_common/models/__init__.py

@@ -0,0 +1,6 @@
+from ._base import _Base
+
+from .enums import MTRSLabelEnum, DiagnosticsXMLTagEnum, MTRSXMLTagEnum, DoctorChoiceXMLTagEnum
+
+from .chat_item import ChatItem, OuterContextItem, InnerContextItem, ReplicaItem
+from .base_config_models import GigaChatConfig

{agi_med_common-4.2.16 → agi_med_common-5.0.0}/src/agi_med_common/models/chat_item.py

@@ -1,48 +1,40 @@
 from datetime import datetime
-from typing import Any
+from typing import Any, List
 
-from pydantic import Field, ConfigDict
 from agi_med_common.models.widget import Widget
+from pydantic import Field, ConfigDict
 
-from .enums import ModerationLabelEnum
 from ._base import _Base
 
 
-_DATETIME_FORMAT: str = "%Y-%m-%d-%H-%M-%S"
-_EXAMPLE_DATETIME_0 = datetime(1970, 1, 1, 0, 0, 0)
-_EXAMPLE_DATETIME: str = _EXAMPLE_DATETIME_0.strftime(_DATETIME_FORMAT)
+_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]
-    )
+    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"]
-    )
+    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, clean: bool = False) -> str:
+    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}"
-        if not clean:
-            return f"user_{uid}_session_{sid}_client_{cid}"
-        return f"user_{uid}_session_{sid}_client_{cid}_clean"
+        return f"user_{uid}_session_{sid}_client_{cid}"
 
     def to_dict(self) -> dict[str, Any]:
         return self.model_dump(by_alias=True)
@@ -55,19 +47,12 @@ class ReplicaItem(_Base):
     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(
-        _EXAMPLE_DATETIME,
-        alias="DateTime",
-        examples=[_EXAMPLE_DATETIME],
-        description=f"Format: {_DATETIME_FORMAT}",
-    )
-    state: str = Field("EMPTY", alias="State", description="chat manager fsm state", examples=["COLLECTION"])
-    action: str = Field("START", alias="Action", description="chat manager fsm action", examples=["DIAGNOSIS"])
-    moderation: ModerationLabelEnum = Field(
-        ModerationLabelEnum.OK,
-        alias="Moderation",
-        description="chat manager moderated outcome type",
-        examples=[ModerationLabelEnum.NON_MED],
+        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: 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]:
@@ -75,11 +60,10 @@ class ReplicaItem(_Base):
 
     @staticmethod
     def DATETIME_FORMAT() -> str:
-        return _DATETIME_FORMAT
+        return _DT_FORMAT
 
     def with_now_datetime(self):
-        dt = datetime.now().strftime(ReplicaItem.DATETIME_FORMAT())
-        return self.model_copy(update=dict(date_time=dt))
+        return self.model_copy(update=dict(date_time=now_pretty()))
 
 
 class InnerContextItem(_Base):
@@ -90,27 +74,22 @@ class InnerContextItem(_Base):
         return self.model_dump(by_alias=True)
 
 
-class ReplicaItemPair(_Base):
-    # remove annoying warning for protected `model_` namespace
-    model_config = ConfigDict(protected_namespaces=())
-
-    user_replica: ReplicaItem = Field(alias="UserReplica")
-    bot_replica: ReplicaItem = Field(alias="BotReplica")
-
-
 class ChatItem(_Base):
     outer_context: OuterContextItem = Field(alias="OuterContext")
     inner_context: InnerContextItem = Field(alias="InnerContext")
 
-    def create_id(self, short: bool = False, clean: bool = False) -> str:
-        return self.outer_context.create_id(short, clean)
+    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 update(self, replica_pair: ReplicaItemPair) -> None:
-        self.inner_context.replicas.append(replica_pair.user_replica)
-        self.inner_context.replicas.append(replica_pair.bot_replica)
+    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 zip_history(self, field: str) -> list[Any]:
         return [replica.to_dict().get(field, None) for replica in self.inner_context.replicas]

{agi_med_common-4.2.16 → agi_med_common-5.0.0}/src/agi_med_common/models/enums.py

@@ -1,17 +1,4 @@
-from enum import IntEnum, StrEnum, auto
-
-
-class ModerationLabelEnum(IntEnum):
-    @staticmethod
-    def _generate_next_value_(name, start, count, last_values):
-        return count
-
-    OK = auto()
-    NON_MED = auto()
-    CHILD = auto()
-    ABSURD = auto()
-    GREETING = auto()
-    RECEIPT = auto()
+from enum import StrEnum, auto
 
 
 class DoctorChoiceXMLTagEnum(StrEnum):
@@ -51,5 +38,3 @@ class DiagnosticsXMLTagEnum(StrEnum):
     DIAG = auto()
     DOC = auto()
     DESC = auto()
-
-

{agi_med_common-4.2.16 → agi_med_common-5.0.0}/src/agi_med_common.egg-info/PKG-INFO

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

agi_med_common-4.2.16/src/agi_med_common/models/__init__.py

@@ -1,6 +0,0 @@
-from ._base import _Base
-
-from .enums import MTRSLabelEnum, ModerationLabelEnum, DiagnosticsXMLTagEnum, MTRSXMLTagEnum, DoctorChoiceXMLTagEnum
-
-from .chat_item import ChatItem, OuterContextItem, InnerContextItem, ReplicaItem, ReplicaItemPair
-from .base_config_models import GigaChatConfig