agi-med-common 4.1.0__py3-none-any.whl → 4.2.1__py3-none-any.whl

agi_med_common/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.1.0"
+__version__ = "4.2.1"
 
 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, SecretStrNotEmpty, Prompt
 from .xml_parser import XMLParser
 from .parallel_map import parallel_map

agi_med_common/validators.py

@@ -1,14 +1,39 @@
 import os
 import re
 from pathlib import Path
+from typing import Annotated, TypeVar
+from pydantic import AfterValidator, SecretStr
 
 
-def is_file_exist(filepath: str | os.PathLike[str] | Path) -> str | os.PathLike | Path:
+PathLike = str | os.PathLike[str] | Path
+
+
+def validate_existing_path(filepath: PathLike) -> PathLike:
     if not os.path.exists(filepath):
-        raise ValueError(f"File {filepath} is not exist. Check the path")
+        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)]
+SecretStrNotEmpty = Annotated[SecretStr, 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):
@@ -16,3 +41,36 @@ def validate_prompt(prompt: str, prompt_required_keys: set[str]) -> str:
     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.1.0.dist-info → agi_med_common-4.2.1.dist-info}/METADATA

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

{agi_med_common-4.1.0.dist-info → agi_med_common-4.2.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-agi_med_common/__init__.py,sha256=nNut_TCYM2HS35F9wW8lZHMgqpI5MM1ZqESH5Oyp_4Y,575
+agi_med_common/__init__.py,sha256=kSY51g91X68T7k39gwISEOrDa3Qi9IWCnN3wgr0VQ-E,611
 agi_med_common/file_storage.py,sha256=uyZE3ePKrbVLNVcvxw9lbgumy1UPwDGIwQMs1Bd8HFI,1502
 agi_med_common/parallel_map.py,sha256=Qx6xe7DqlEUDpSucp5Hm8r9y9Iquwh9JvX7lOqHhnOw,921
 agi_med_common/utils.py,sha256=5iurKl5d1zZ_cN4yqtc0_FhrwuNBcDurbWilu28_saE,325
-agi_med_common/validators.py,sha256=R678gjPp-5XbnocRuEtdOQgJyCCOurxwaOe2nT04kSg,705
+agi_med_common/validators.py,sha256=PGP_ztcS3pOnVCIR9LVBOaC4F3u_JePrKKUO4vp214E,2501
 agi_med_common/xml_parser.py,sha256=VvLIX_XCZao9i0qqpTVx8nx0vbFXSe8pEbdJdXnj97g,568
 agi_med_common/logger/__init__.py,sha256=RW_0VZtbeJ4RsLqUXZUQWl5CtV9g840rU7qRlf5u49E,96
 agi_med_common/logger/log_level_enum.py,sha256=lWuSMho9I0v_xf1RuwpERx5o8NJXaavjwxSdh8fxMqE,477
@@ -23,7 +23,7 @@ agi_med_common/models/enums/moderation_label_enum.py,sha256=lbGG4Pu7cQp57uEyQEpt
 agi_med_common/models/enums/mtrs_label_enum.py,sha256=6emBndt3SCsQVZZFKQYCV2_iyjjmZEhwejJKJu39ZAw,257
 agi_med_common/models/enums/mtrs_xml_tag_enum.py,sha256=6OxuRsrx4b2uBjfrBgm4Y789Ly337_mQXL9VPRCpLyg,273
 agi_med_common/models/enums/track_id_enum.py,sha256=N3KUd97a4xDet_NKZ5URm0qWAAv3ts1l_foOjdlGY4c,532
-agi_med_common-4.1.0.dist-info/METADATA,sha256=mScZ7Fxwcd4tOZO39IKRK_lFZz8J0_WOBjjnrd6JwRY,546
-agi_med_common-4.1.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-agi_med_common-4.1.0.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
-agi_med_common-4.1.0.dist-info/RECORD,,
+agi_med_common-4.2.1.dist-info/METADATA,sha256=1Gfop4JXcz0yraYXd7XXydl5DY9vGmd6Da5EnYQVANc,546
+agi_med_common-4.2.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+agi_med_common-4.2.1.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
+agi_med_common-4.2.1.dist-info/RECORD,,