agi-med-common 3.2.1__tar.gz → 3.3.1__tar.gz

{agi_med_common-3.2.1 → agi_med_common-3.3.1}/PKG-INFO

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

{agi_med_common-3.2.1 → agi_med_common-3.3.1}/src/agi_med_common/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.2.1"
+__version__ = "3.3.1"
 
 from .logger import LogLevelEnum, logger_init
 from .models import (
@@ -11,9 +11,8 @@ from .models import (
     InnerContextItem,
     OuterContextItem,
     ReplicaItem,
-    ChatItemWithState,
-    InnerContextWithState,
-    ReplicaWithState,
+    ReplicaItemPair,
 )
 from .utils import make_session_id, read_json, replace_n
 from .validators import is_file_exist, validate_prompt
+from .xml_parser import XMLParser

{agi_med_common-3.2.1 → agi_med_common-3.3.1}/src/agi_med_common/logger/logger.py

@@ -7,7 +7,7 @@ from . import LogLevelEnum
 
 def logger_init(log_level: LogLevelEnum) -> None:
     logger.remove()
-    extra = {"request_id": "NOT_A_REQUEST"}
+    extra = {"request_id": "SYSTEM_REQUEST"}
     format_ = "{time:DD-MM-YYYY HH:mm:ss} | <level>{level: <8}</level> | {extra[request_id]}"
     format_ = f"{format_} | <level>{{message}}</level>"
     logger.add(sys.stdout, colorize=True, format=format_, level=log_level)

{agi_med_common-3.2.1 → agi_med_common-3.3.1}/src/agi_med_common/models/__init__.py

@@ -1,5 +1,5 @@
 from ._base import _Base
 from .enums import TrackIdEnum, StateEnum, MTRSLabelEnum, ActionEnum, ModerationLabelEnum
-from .chat_item import ChatItem, OuterContextItem, InnerContextItem, ReplicaItem
+from .chat_item import ChatItem, OuterContextItem, InnerContextItem, ReplicaItem, ReplicaItemPair
 from .chat_item_with_state import ChatItemWithState, InnerContextWithState, ReplicaWithState
 from .base_config_models import GigaChatConfig

{agi_med_common-3.2.1 → agi_med_common-3.3.1}/src/agi_med_common/models/chat_item/__init__.py

@@ -1,4 +1,4 @@
-from .replica_item import ReplicaItem
+from .replica_item import ReplicaItem, ReplicaItemPair
 from .outer_context_item import OuterContextItem
 from .inner_context_item import InnerContextItem
 from .chat_item import ChatItem

agi_med_common-3.3.1/src/agi_med_common/models/chat_item/chat_item.py

@@ -0,0 +1,34 @@
+from pydantic import Field
+from typing import Any
+
+from . import OuterContextItem, InnerContextItem, ReplicaItemPair
+from ..enums import ActionEnum
+from .. import _Base
+
+
+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 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.model_replica)
+
+    def count_questions(self) -> int:
+        return len(
+            list(
+                filter(
+                    lambda replica: replica.role and replica.action == ActionEnum.QUESTION,
+                    self.inner_context.replicas,
+                )
+            )
+        )
+
+    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-3.2.1 → agi_med_common-3.3.1}/src/agi_med_common/models/chat_item/inner_context_item.py

@@ -6,3 +6,6 @@ from .. import _Base
 
 class InnerContextItem(_Base):
     replicas: list[ReplicaItem] = Field(alias="Replicas")
+
+    def to_dict(self) -> dict[str, list]:
+        return self.model_dump(by_alias=True)

{agi_med_common-3.2.1 → agi_med_common-3.3.1}/src/agi_med_common/models/chat_item/outer_context_item.py

@@ -1,4 +1,5 @@
 from pydantic import Field
+from typing import Any
 
 from .. import _Base
 from ..enums import TrackIdEnum
@@ -10,9 +11,14 @@ class OuterContextItem(_Base):
     user_id: str = Field("", alias="UserId", examples=["123456789"])
     session_id: str = Field("", alias="SessionId", examples=["987654321"])
     client_id: str = Field("", alias="ClientId", examples=["543216789"])
-    track_id: TrackIdEnum = Field(TrackIdEnum.DIAGNOSTIC, alias="TrackId")
+    track_id: TrackIdEnum = Field(TrackIdEnum.CONSULTATION, alias="TrackId")
 
-    def create_id(self, short: bool = False) -> str:
+    def create_id(self, short: bool = False, clean: bool = False) -> str:
         if short:
             return f"{self.user_id}_{self.session_id}_{self.client_id}"
-        return f"user_{self.user_id}_session_{self.session_id}_client_{self.client_id}"
+        if not clean:
+            return f"user_{self.user_id}_session_{self.session_id}_client_{self.client_id}"
+        return f"user_{self.user_id}_session_{self.session_id}_client_{self.client_id}_clean"
+
+    def to_dict(self) -> dict[str, Any]:
+        return self.model_dump(by_alias=True)

agi_med_common-3.3.1/src/agi_med_common/models/chat_item/replica_item.py

@@ -0,0 +1,35 @@
+from datetime import datetime
+from typing import Any
+
+from pydantic import Field
+
+from .. import _Base
+from ..enums import StateEnum, ActionEnum
+
+_TIME_FORMAT: str = "%Y-%m-%d-%H-%M-%S"
+_EXAMPLE_DATETIME: str = datetime(1970, 1, 1, 0, 0, 0).strftime(_TIME_FORMAT)
+
+
+class ReplicaItem(_Base):
+    body: str = Field("", alias="Body", examples=["Привет"])
+    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: {_TIME_FORMAT}",
+    )
+    state: StateEnum = Field(
+        StateEnum.EMPTY, alias="State", description="chat manager fsm state", examples=[StateEnum.COLLECTION]
+    )
+    action: ActionEnum = Field(
+        ActionEnum.START, alias="Action", description="chat manager fsm action", examples=[ActionEnum.DIAGNOSIS]
+    )
+
+    def to_dict(self) -> dict[str, Any]:
+        return self.model_dump(by_alias=True)
+
+
+class ReplicaItemPair(_Base):
+    user_replica: ReplicaItem = Field(alias="UserReplica")
+    model_replica: ReplicaItem = Field(alias="ModelReplica")

agi_med_common-3.3.1/src/agi_med_common/xml_parser.py

@@ -0,0 +1,17 @@
+import re
+
+
+class XMLParser:
+    @staticmethod
+    def make_xml(body: str, tag: str) -> str:
+        return f"<{tag}>{body}</{tag}>"
+
+    @staticmethod
+    def remove_xml(text: str) -> str:
+        re_xml = re.compile(r"<(.*?)>")
+        return re.sub(re_xml, "", text).replace("  ", " ").strip()
+
+    @staticmethod
+    def get_tag_list(response: str, tag: str) -> list[str]:
+        tag_content = re.findall(f"<{tag}>(.*?)</{tag}>", response, re.DOTALL)
+        return [content.lower().strip() for content in tag_content]

{agi_med_common-3.2.1 → agi_med_common-3.3.1}/src/agi_med_common.egg-info/PKG-INFO

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

{agi_med_common-3.2.1 → agi_med_common-3.3.1}/src/agi_med_common.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ requirements.txt
 src/agi_med_common/__init__.py
 src/agi_med_common/utils.py
 src/agi_med_common/validators.py
+src/agi_med_common/xml_parser.py
 src/agi_med_common.egg-info/PKG-INFO
 src/agi_med_common.egg-info/SOURCES.txt
 src/agi_med_common.egg-info/dependency_links.txt
@@ -21,10 +22,6 @@ src/agi_med_common/models/chat_item/chat_item.py
 src/agi_med_common/models/chat_item/inner_context_item.py
 src/agi_med_common/models/chat_item/outer_context_item.py
 src/agi_med_common/models/chat_item/replica_item.py
-src/agi_med_common/models/chat_item_with_state/__init__.py
-src/agi_med_common/models/chat_item_with_state/chat_with_state.py
-src/agi_med_common/models/chat_item_with_state/inner_context_with_state.py
-src/agi_med_common/models/chat_item_with_state/replica_with_state.py
 src/agi_med_common/models/enums/__init__.py
 src/agi_med_common/models/enums/action_enum.py
 src/agi_med_common/models/enums/moderation_label_enum.py

agi_med_common-3.2.1/src/agi_med_common/models/chat_item/chat_item.py

@@ -1,9 +0,0 @@
-from pydantic import Field
-
-from . import OuterContextItem, InnerContextItem
-from .. import _Base
-
-
-class ChatItem(_Base):
-    outer_context: OuterContextItem = Field(alias="OuterContext")
-    inner_context: InnerContextItem = Field(alias="InnerContext")

agi_med_common-3.2.1/src/agi_med_common/models/chat_item/replica_item.py

@@ -1,31 +0,0 @@
-from datetime import datetime
-
-from pydantic import Field, field_validator, field_serializer
-
-from .. import _Base
-
-_TIME_FORMAT: str = "%Y-%m-%d-%H-%M-%S"
-_EXAMPLE_DATETIME: datetime = datetime(1970, 1, 1, 0, 0, 0)
-
-
-class ReplicaItem(_Base):
-    body: str = Field("", alias="Body", examples=["Привет"])
-    role: bool = Field(False, alias="Role", description="True = ai, False = client", examples=[False])
-    date_time: datetime = Field(
-        _EXAMPLE_DATETIME,
-        alias="DateTime",
-        examples=[_EXAMPLE_DATETIME.strftime(_TIME_FORMAT)],
-        description=f"Format: {_TIME_FORMAT}",
-    )
-    previous_score: float | None = Field(None, alias="PreviousScore", exclude=True, deprecated=True)
-
-    @field_validator("date_time", mode="before")
-    @classmethod
-    def convert_date_time(cls, timestamp: str | datetime) -> datetime:
-        if isinstance(timestamp, datetime):
-            return timestamp
-        return datetime.strptime(timestamp, _TIME_FORMAT)
-
-    @field_serializer("date_time")
-    def serialize_date_time(self, timestamp: datetime) -> str:
-        return timestamp.strftime(_TIME_FORMAT)

agi_med_common-3.2.1/src/agi_med_common/models/chat_item_with_state/__init__.py

@@ -1,3 +0,0 @@
-from .replica_with_state import ReplicaWithState
-from .inner_context_with_state import InnerContextWithState
-from .chat_with_state import ChatItemWithState

agi_med_common-3.2.1/src/agi_med_common/models/chat_item_with_state/chat_with_state.py

@@ -1,8 +0,0 @@
-from ..chat_item import ChatItem
-from pydantic import Field
-
-from . import InnerContextWithState
-
-
-class ChatItemWithState(ChatItem):
-    inner_context: InnerContextWithState = Field(alias="InnerContext")

agi_med_common-3.2.1/src/agi_med_common/models/chat_item_with_state/inner_context_with_state.py

@@ -1,8 +0,0 @@
-from ..chat_item import InnerContextItem
-from pydantic import Field
-
-from . import ReplicaWithState
-
-
-class InnerContextWithState(InnerContextItem):
-    replicas: list[ReplicaWithState] = Field(alias="Replicas")

agi_med_common-3.2.1/src/agi_med_common/models/chat_item_with_state/replica_with_state.py

@@ -1,8 +0,0 @@
-from ..chat_item import ReplicaItem
-from pydantic import Field
-
-from ..enums import StatesEnum
-
-
-class ReplicaWithState(ReplicaItem):
-    state: StatesEnum | None = Field(None, alias="State")