agi-med-common 5.1.6__py3-none-any.whl → 5.1.8__py3-none-any.whl

agi_med_common/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "5.1.6"
+__version__ = "5.1.8"
 
 from .file_storage import FileStorage, ResourceId
 from .models.base import Base

agi_med_common/api.py

@@ -1,6 +1,8 @@
 from typing import List, Tuple
 
-from agi_med_common.models import Chat, ChatMessage, DomainInfo, TrackInfo
+from agi_med_common.models.chat import Chat, ChatMessage
+from agi_med_common.models.tracks import DomainInfo, TrackInfo
+
 from pydantic import BaseModel
 
 

agi_med_common/file_storage.py

@@ -15,12 +15,12 @@ def _validate_exist(files_dir):
 def _validate_dtype(dtype: str):
     if all(map(ASCII_DIGITS.__contains__, dtype)):
         return
-    raise ValueError(f'Bad dtype: {dtype}')
+    raise ValueError(f"Bad dtype: {dtype}")
 
 
 def generate_fname(content, dtype):
     fname_hash = md5(content).hexdigest()
-    fname = f'{fname_hash}.{dtype}'
+    fname = f"{fname_hash}.{dtype}"
     return fname
 
 
@@ -54,10 +54,10 @@ class FileStorage:
         return Path(rid).read_bytes()
 
     def download_text(self, rid: ResourceId) -> str:
-        return Path(rid).read_text(encoding='utf-8')
+        return Path(rid).read_text(encoding="utf-8")
 
     def is_valid(self, rid: ResourceId | None) -> bool:
         return rid and Path(rid).exists() and Path(rid).is_file()
 
     def get_dtype(self, rid: ResourceId | None) -> str | None:
-        return rid and rid.rsplit('.')[-1]
+        return rid and rid.rsplit(".")[-1]

agi_med_common/models/base_config_models/gigachat_config.py

@@ -4,7 +4,6 @@ from pydantic import BaseModel, model_validator, SecretStr
 
 
 class GigaChatConfig(BaseModel):
-
     client_id: SecretStr = SecretStr("")
     client_secret: SecretStr = SecretStr("")
 

agi_med_common/models/chat.py

@@ -7,7 +7,7 @@ from agi_med_common.models.chat_item import ChatItem, ReplicaItem, OuterContextI
 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, ValidationError
+from pydantic import Field, ValidationError, Extra
 
 from .base import Base
 
@@ -28,7 +28,7 @@ class Context(Base):
     client_id: str = Field("", examples=["543216789"])
     user_id: str = Field("", examples=["123456789"])
     session_id: str = Field("", examples=["987654321"])
-    track_id: str = Field(examples=["Hello"])
+    track_id: str = Field("", examples=["Hello"])
     extra: StrDict | None = Field(None, examples=[None])
 
     def create_id(self, short: bool = False) -> str:
@@ -183,9 +183,18 @@ ChatMessage = TypeUnion[HumanMessage, AIMessage, MiscMessage]
 
 
 class Chat(Base):
-    context: Context
+    context: Context = Field(default_factory=Context)
     messages: List[ChatMessage] = Field(default_factory=list)
 
+    class Config:
+        extra = Extra.ignore
+
+    def __init__(self, **data):
+        extra_fields = set(data.keys()) - set(self.__fields__.keys())
+        if extra_fields:
+            warnings.warn(f"Chat initialization: extra fields will be ignored: {extra_fields}")
+        super().__init__(**data)
+
     def create_id(self, short: bool = False) -> str:
         return self.context.create_id(short)
 
@@ -368,8 +377,21 @@ def _parse_chat(chat_obj: str | dict) -> Chat:
     return Chat.model_validate_json(chat_obj)
 
 
+def is_chat_item(chat_obj: str | dict | ChatItem) -> bool:
+    if isinstance(chat_obj, ChatItem):
+        return True
+    if isinstance(chat_obj, dict):
+        return "OuterContext" in chat_obj
+    if isinstance(chat_obj, str):
+        return "OuterContext" in chat_obj
+    warnings.warn(f"Unexpected chat object: {chat_obj} :: {type(chat_obj)}")
+    return False
+
+
 def _parse_chat_compat(chat_obj: str | dict | ChatItem) -> Chat:
     # legacy: eliminate after migration
+    if is_chat_item(chat_obj):
+        return parse_chat_item_as_chat(chat_obj)
     try:
         return _parse_chat(chat_obj)
     except ValidationError as ex:

agi_med_common/models/chat_item.py

@@ -141,7 +141,6 @@ class ChatItem(Base):
                 return replica.state
         return default
 
-
     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/parallel_map.py

@@ -13,7 +13,7 @@ def parallel_map(
     multiple_args: bool = False,
     max_workers: int = 2,
     show_tqdm: bool = False,
-    desc: str = ""
+    desc: str = "",
 ) -> list[X]:
     pool = (
         concurrent.futures.ProcessPoolExecutor(max_workers=max_workers)
@@ -27,7 +27,5 @@ def parallel_map(
                 futures.append(executor.submit(func, *item))
             else:
                 futures.append(executor.submit(func, item))
-        results: list[X] = [
-            future.result() for future in tqdm(futures, disable=(not show_tqdm), desc=desc)
-        ]
+        results: list[X] = [future.result() for future in tqdm(futures, disable=(not show_tqdm), desc=desc)]
     return results

{agi_med_common-5.1.6.dist-info → agi_med_common-5.1.8.dist-info}/METADATA

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

{agi_med_common-5.1.6.dist-info → agi_med_common-5.1.8.dist-info}/RECORD

@@ -1,21 +1,21 @@
-agi_med_common/__init__.py,sha256=39fgV3DFWzmaYaToPbnWC9uwDi0XBzgsOhBrpENlhOs,828
-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
+agi_med_common/__init__.py,sha256=aXn_rUR5Xf20VlJInpgXkZkzfJQFynJMnlzM8bE-LiU,828
+agi_med_common/api.py,sha256=aKiqLtliBQfFPGB9Rc46XxrWuf7cI5DgpM0B6p823i8,1874
+agi_med_common/file_storage.py,sha256=lEh9TyzUu8dS9WkaEcshSUxESXQ1i7PAyXqejdambpg,1802
+agi_med_common/parallel_map.py,sha256=WuS4x1mbyGnjp6lSvfORoxt0Sh5v3HiX3THB8JzIQ-0,900
 agi_med_common/type_union.py,sha256=diwmzcnbqkpGFckPHNw9o8zyQ955mOGNvhTlcBJ0RMI,1905
 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=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/chat.py,sha256=LcmclAC16wBRQJ4YfehM-bLb24RpYQKi5ENz_bcKJWA,12327
+agi_med_common/models/chat_item.py,sha256=03YW6Exx3pDC4IsI2lsS_3_cYAwbqjYml2l9CpPMHVs,5541
 agi_med_common/models/enums.py,sha256=J-GNpql9MCnKnWiV9aJRQGI-pAybvV86923RZs99grA,1006
 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.6.dist-info/METADATA,sha256=7Inu5IWDNmi9-ruL1G-Z0oUYcq-5v7mV60SScJuhS5o,517
-agi_med_common-5.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-agi_med_common-5.1.6.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
-agi_med_common-5.1.6.dist-info/RECORD,,
+agi_med_common/models/base_config_models/gigachat_config.py,sha256=QvKTnp0VioXzd3_PUgNBeYx5RDTZT-45j-Ll-wXEI_o,421
+agi_med_common-5.1.8.dist-info/METADATA,sha256=UYw1CJGNb4G5ouvAMi4tQLyAUViVVf7ogYl9vIeH-mY,517
+agi_med_common-5.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+agi_med_common-5.1.8.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
+agi_med_common-5.1.8.dist-info/RECORD,,