agi-med-common 4.0.6__tar.gz → 4.2.0__tar.gz

{agi_med_common-4.0.6 → agi_med_common-4.2.0}/PKG-INFO

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

{agi_med_common-4.0.6 → agi_med_common-4.2.0}/src/agi_med_common/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.0.6"
+__version__ = "4.2.0"
 
 from .logger import LogLevelEnum, logger_init
 from .models import (
@@ -16,6 +16,6 @@ from .models import (
 from .file_storage import FileStorage
 from .models import DiagnosticsXMLTagEnum, MTRSXMLTagEnum, DoctorChoiceXMLTagEnum
 from .utils import make_session_id, read_json
-from .validators import is_file_exist, validate_prompt
+from .validators import ExistingPath, ExistingFile, StrNotEmpty, Prompt
 from .xml_parser import XMLParser
 from .parallel_map import parallel_map

{agi_med_common-4.0.6 → agi_med_common-4.2.0}/src/agi_med_common/models/chat_item/outer_context_item.py

@@ -1,4 +1,4 @@
-from pydantic import Field
+from pydantic import Field, ConfigDict
 from typing import Any
 
 from .. import _Base
@@ -6,12 +6,16 @@ from ..enums import TrackIdEnum
 
 
 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])
     age: int = Field(0, alias="Age", examples=[20])
     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 | str = Field(default=TrackIdEnum.CONSULTATION, alias="TrackId")
+    model_id: str = Field("", alias="ModelId", examples=["gigachat-2"])
 
     def create_id(self, short: bool = False, clean: bool = False) -> str:
         if short:

agi_med_common-4.2.0/src/agi_med_common/validators.py

@@ -0,0 +1,75 @@
+import os
+import re
+from pathlib import Path
+from typing import Annotated, TypeVar
+from pydantic import AfterValidator
+
+
+PathLike = str | os.PathLike[str] | Path
+
+
+def validate_existing_path(filepath: PathLike) -> PathLike:
+    if not os.path.exists(filepath):
+        raise ValueError(f"Path {filepath} is not exist")
+    return filepath
+
+
+def validate_existing_file(filepath: PathLike) -> PathLike:
+    if not os.path.isfile(filepath):
+        raise ValueError(f"Path {filepath} is not file")
+    return filepath
+
+
+ExistingPath = Annotated[Path, AfterValidator(validate_existing_path)]
+ExistingFile = Annotated[Path, AfterValidator(validate_existing_file)]
+
+
+def validate_not_empty(text: any) -> any:
+    if not text:
+        raise ValueError("Expected not empty")
+    return text
+
+
+StrNotEmpty = Annotated[str, AfterValidator(validate_not_empty)]
+
+
+def validate_prompt(prompt: str, prompt_required_keys: set[str]) -> str:
+    exist_keys: set[str] = set(re.findall(r"{(.*?)}", prompt))
+    if missed_keys := prompt_required_keys.difference(exist_keys):
+        raise ValueError(f"Missing required key in prompt: {missed_keys}")
+    if extern_keys := exist_keys.difference(prompt_required_keys):
+        raise ValueError(f"You have more keys for prompt: {extern_keys}")
+    return prompt
+
+
+def validate_keys(*keys):
+    assert keys and all(isinstance(key, str) for key in keys)
+
+    def validate(prompt: str) -> str:
+        prompt_required_keys: set[str] = set(keys)
+        exist_keys: set[str] = set(re.findall(r"{(.*?)}", prompt))
+        if missed_keys := prompt_required_keys.difference(exist_keys):
+            raise ValueError(f"Missing required key in prompt: {missed_keys}")
+        if extern_keys := exist_keys.difference(prompt_required_keys):
+            raise ValueError(f"You have more keys for prompt: {extern_keys}")
+        return prompt
+
+    return validate
+
+
+K = TypeVar("K", bound=str)
+
+
+class Prompt:
+    # use inside pydantic models: prompt: Prompt['base_context']
+    def __class_getitem__(cls, keys: K | tuple[K, ...]) -> type[str]:
+        if isinstance(keys, tuple):
+            keys_tuple = keys
+        else:
+            keys_tuple = (keys,)
+
+        # Validate that all keys are strings
+        if not all(isinstance(key, str) for key in keys_tuple):
+            raise TypeError("All keys must be strings")
+
+        return Annotated[str, AfterValidator(validate_keys(*keys_tuple))]

{agi_med_common-4.0.6 → agi_med_common-4.2.0}/src/agi_med_common.egg-info/PKG-INFO

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

agi_med_common-4.0.6/src/agi_med_common/validators.py

@@ -1,18 +0,0 @@
-import os
-import re
-from pathlib import Path
-
-
-def is_file_exist(filepath: str | os.PathLike[str] | Path) -> str | os.PathLike | Path:
-    if not os.path.exists(filepath):
-        raise ValueError(f"File {filepath} is not exist. Check the path")
-    return filepath
-
-
-def validate_prompt(prompt: str, prompt_required_keys: set[str]) -> str:
-    exist_keys: set[str] = set(re.findall(r"{(.*?)}", prompt))
-    if missed_keys := prompt_required_keys.difference(exist_keys):
-        raise ValueError(f"Missing required key in prompt: {missed_keys}")
-    if extern_keys := exist_keys.difference(prompt_required_keys):
-        raise ValueError(f"You have more keys for prompt: {extern_keys}")
-    return prompt