agi-med-common 5.1.3__py3-none-any.whl → 5.1.5__py3-none-any.whl

agi_med_common/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "5.1.3"
+__version__ = "5.1.5"
 
 from .models import (
     MTRSLabelEnum,
@@ -12,6 +12,7 @@ from .models import (
     AIMessage,
     HumanMessage,
     MiscMessage,
+    Base,
 )
 from .models.widget import Widget
 from .file_storage import FileStorage, ResourceId

agi_med_common/models/__init__.py

@@ -1,4 +1,4 @@
-from ._base import _Base
+from .base import Base
 
 from .enums import MTRSLabelEnum, DiagnosticsXMLTagEnum, MTRSXMLTagEnum, DoctorChoiceXMLTagEnum
 from .chat_item import ChatItem, OuterContextItem, InnerContextItem, ReplicaItem

agi_med_common/models/base.py

@@ -0,0 +1,15 @@
+import json
+from typing import Any
+
+from pydantic import ConfigDict, BaseModel, model_validator
+
+
+class Base(BaseModel):
+    model_config = ConfigDict(populate_by_name=True, str_strip_whitespace=True)
+
+    @model_validator(mode="before")
+    @classmethod
+    def validate_to_json(cls, value: str | Any) -> Any:
+        if isinstance(value, str):
+            return cls(**json.loads(value))
+        return value

agi_med_common/models/chat.py

@@ -9,7 +9,7 @@ from agi_med_common.type_union import TypeUnion
 from agi_med_common.utils import first_nonnull
 from pydantic import Field, ValidationError
 
-from ._base import _Base
+from .base import Base
 
 
 _DT_FORMAT: str = "%Y-%m-%d-%H-%M-%S"
@@ -24,7 +24,7 @@ def now_pretty() -> str:
     return datetime.now().strftime(_DT_FORMAT)
 
 
-class Context(_Base):
+class Context(Base):
     client_id: str = Field("", examples=["543216789"])
     user_id: str = Field("", examples=["123456789"])
     session_id: str = Field("", examples=["987654321"])
@@ -115,7 +115,7 @@ def _get_widget(obj: Content) -> Widget | None:
 # todo fix: generalize functions _get_field
 
 
-class BaseMessage(_Base):
+class BaseMessage(Base):
     type: str
     content: Content = Field("", examples=["Привет"])
     date_time: str = Field(default_factory=now_pretty, examples=[_EXAMPLE_DT])
@@ -182,7 +182,7 @@ class MiscMessage(BaseMessage):
 ChatMessage = TypeUnion[HumanMessage, AIMessage, MiscMessage]
 
 
-class Chat(_Base):
+class Chat(Base):
     context: Context
     messages: List[ChatMessage] = Field(default_factory=list)
 

agi_med_common/models/chat_item.py

@@ -4,7 +4,7 @@ from typing import Annotated, Any, List, Callable
 from agi_med_common.models.widget import Widget
 from pydantic import Field, ConfigDict, BeforeValidator, AfterValidator
 
-from ._base import _Base
+from .base import Base
 
 
 _DT_FORMAT: str = "%Y-%m-%d-%H-%M-%S"
@@ -16,7 +16,7 @@ def now_pretty() -> str:
     return datetime.now().strftime(ReplicaItem.DATETIME_FORMAT())
 
 
-class OuterContextItem(_Base):
+class OuterContextItem(Base):
     # remove annoying warning for protected `model_` namespace
     model_config = ConfigDict(protected_namespaces=())
 
@@ -63,7 +63,7 @@ def nullify_empty(text: str) -> str | None:
     return text or None
 
 
-class ReplicaItem(_Base):
+class ReplicaItem(Base):
     body: str = Field("", alias="Body", examples=["Привет"])
     resource_id: Annotated[str | None, AfterValidator(nullify_empty)] = Field(
         None, alias="ResourceId", examples=["<link-id>"]
@@ -105,7 +105,7 @@ class ReplicaItem(_Base):
         return self.model_copy(update=dict(body=body_upd))
 
 
-class InnerContextItem(_Base):
+class InnerContextItem(Base):
     replicas: list[ReplicaItem] = Field(alias="Replicas")
     attrs: dict[str, str | int] | None = Field(default={}, alias="Attrs")
 
@@ -113,7 +113,7 @@ class InnerContextItem(_Base):
         return self.model_dump(by_alias=True)
 
 
-class ChatItem(_Base):
+class ChatItem(Base):
     outer_context: OuterContextItem = Field(alias="OuterContext")
     inner_context: InnerContextItem = Field(alias="InnerContext")
 

agi_med_common/models/tracks.py

@@ -1,14 +1,14 @@
 from pydantic import Field
 
-from ._base import _Base
+from .base import Base
 
 
-class TrackInfo(_Base):
+class TrackInfo(Base):
     track_id: str = Field(alias="TrackId")
     name: str = Field(alias="Name")
     domain_id: str = Field(alias="DomainId")
 
 
-class DomainInfo(_Base):
+class DomainInfo(Base):
     domain_id: str = Field(alias="DomainId")
     name: str = Field(alias="Name")

{agi_med_common-5.1.3.dist-info → agi_med_common-5.1.5.dist-info}/METADATA

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

{agi_med_common-5.1.3.dist-info → agi_med_common-5.1.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-agi_med_common/__init__.py,sha256=E6mljKp3mSDWOYfFE1tPlPL-DrkuGH5TcEHIavj-N60,739
+agi_med_common/__init__.py,sha256=widUkjiAlBOsHUoB7rPNe0oSkEuaSHmY02ZV8rwiDY0,749
 agi_med_common/api.py,sha256=gj6BPEAOvpT6GHWeE7bzmKIR-pvq0yORZ3L0ADvI8ps,1828
 agi_med_common/file_storage.py,sha256=T0Hbs4W-pWO6HdWcmlVqABrQHYdq7lLZH4_Vu-YNVbw,1802
 agi_med_common/parallel_map.py,sha256=Qx6xe7DqlEUDpSucp5Hm8r9y9Iquwh9JvX7lOqHhnOw,921
@@ -6,16 +6,16 @@ agi_med_common/type_union.py,sha256=diwmzcnbqkpGFckPHNw9o8zyQ955mOGNvhTlcBJ0RMI,
 agi_med_common/utils.py,sha256=EeeXRv5BjrB-_GtHzI3V5swyVO0KPR-SMpjHRx2r2aM,1560
 agi_med_common/validators.py,sha256=vMoPN42XzC8re-zdjekk5_lNQYHuTiAWD56YLvj2Z2w,2824
 agi_med_common/xml_parser.py,sha256=VvLIX_XCZao9i0qqpTVx8nx0vbFXSe8pEbdJdXnj97g,568
-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=fYG79Niemwc9NF9tIl3P4agmZIT-apEG4dlZtd_FmGI,11536
-agi_med_common/models/chat_item.py,sha256=QlJ5Q40eX7lEeH9YBmdTH71ugrEtsU-4thkhD8cJhu0,5548
+agi_med_common/models/__init__.py,sha256=-wM3sdET5WU2mf9rK-VUNtTTmEEK44F_xPL2EKBQo50,373
+agi_med_common/models/base.py,sha256=mKtXV2x51XVj7W-et9tjGcPMDUUUMelW-BywMgFc2p0,411
+agi_med_common/models/chat.py,sha256=hW8lZLEHGRMUP06jbbKE-QDZ_ZEO-ROGYS5HYuoM_7E,11531
+agi_med_common/models/chat_item.py,sha256=HSgCVlQ0GqQL3rw1pbDM1b9D9gOosQa8kLeSdzge818,5542
 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/tracks.py,sha256=HKDp-BX1p7AlDfSEKfOKCu0TRSK9cD4Dmq1vJt8oRjw,307
 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.1.3.dist-info/METADATA,sha256=XNJpGPJzRJQHdD-ZGvkB4FL19Zw-Q-KBk7b4TRNktQM,517
-agi_med_common-5.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agi_med_common-5.1.3.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
-agi_med_common-5.1.3.dist-info/RECORD,,
+agi_med_common-5.1.5.dist-info/METADATA,sha256=TrHsozgGmMe1bzGs3UkrdGn_YLtc35xgyV4GGfdsXX4,517
+agi_med_common-5.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agi_med_common-5.1.5.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
+agi_med_common-5.1.5.dist-info/RECORD,,

agi_med_common/models/_base.py

@@ -1,5 +0,0 @@
-from pydantic import ConfigDict, BaseModel
-
-
-class _Base(BaseModel):
-    model_config = ConfigDict(populate_by_name=True, str_strip_whitespace=True)