agi-med-common 4.2.0__py3-none-any.whl → 4.2.2__py3-none-any.whl

agi_med_common/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "4.2.0"
+__version__ = "4.2.2"
 
 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 ExistingPath, ExistingFile, StrNotEmpty, Prompt
+from .validators import ExistingPath, ExistingFile, ExistingDir, StrNotEmpty, SecretStrNotEmpty, Prompt, Message
 from .xml_parser import XMLParser
 from .parallel_map import parallel_map

agi_med_common/file_storage.py

@@ -18,6 +18,12 @@ def _validate_dtype(dtype: str):
     raise ValueError(f'Bad dtype: {dtype}')
 
 
+def generate_fname(content, dtype):
+    fname_hash = md5(content).hexdigest()
+    fname = f'{fname_hash}.{dtype}'
+    return fname
+
+
 class FileStorage:
     def __init__(self, files_dir):
         self.files_dir = Path(files_dir)
@@ -25,9 +31,7 @@ class FileStorage:
         _validate_exist(self.files_dir)
 
     def _generate_fname_path(self, content, dtype):
-        fname_hash = md5(content).hexdigest()
-        fname = f'{fname_hash}.{dtype}'
-        fpath = self.files_dir / fname
+        fpath = self.files_dir / generate_fname(content, dtype)
         return fpath
 
     def upload_maybe(

agi_med_common/validators.py

@@ -2,9 +2,11 @@ import os
 import re
 from pathlib import Path
 from typing import Annotated, TypeVar
-from pydantic import AfterValidator
+from pydantic import AfterValidator, SecretStr
 
 
+Message = Annotated[str, AfterValidator(lambda msg: msg.replace("\\n", "\n"))]
+
 PathLike = str | os.PathLike[str] | Path
 
 
@@ -20,8 +22,15 @@ def validate_existing_file(filepath: PathLike) -> PathLike:
     return filepath
 
 
+def validate_existing_dir(filepath: PathLike) -> PathLike:
+    if not os.path.isdir(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)]
+ExistingDir = Annotated[Path, AfterValidator(validate_existing_dir)]
 
 
 def validate_not_empty(text: any) -> any:
@@ -31,6 +40,7 @@ def validate_not_empty(text: any) -> any:
 
 
 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:

{agi_med_common-4.2.0.dist-info → agi_med_common-4.2.2.dist-info}/METADATA

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

{agi_med_common-4.2.0.dist-info → agi_med_common-4.2.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-agi_med_common/__init__.py,sha256=IvElxZ-gSgSUhXTYjdzg0e5p8C74xFqsslUXktPQf5w,592
-agi_med_common/file_storage.py,sha256=uyZE3ePKrbVLNVcvxw9lbgumy1UPwDGIwQMs1Bd8HFI,1502
+agi_med_common/__init__.py,sha256=XO04WfJZPQAsLHHRTU0U-S2lKAItsZNO9TlRrlubhjM,633
+agi_med_common/file_storage.py,sha256=F31pzqkVtWSqcCqShJCrJc78iU4VmNeAY0p4eUbOPNI,1574
 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=sWXWsJn9FBlbyUHCNBNSMiEnD9ZenXhzMBNTXjC7yRE,2413
+agi_med_common/validators.py,sha256=vMoPN42XzC8re-zdjekk5_lNQYHuTiAWD56YLvj2Z2w,2824
 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.2.0.dist-info/METADATA,sha256=oSn4FoibCezpwEn5Qx1jUmfVAIOdnUraA3gxA_iVy0s,546
-agi_med_common-4.2.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-agi_med_common-4.2.0.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
-agi_med_common-4.2.0.dist-info/RECORD,,
+agi_med_common-4.2.2.dist-info/METADATA,sha256=IvEpNyZI8ToS8muCz2RxwjygoKP5HyBqB2jjQ8zacgc,546
+agi_med_common-4.2.2.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+agi_med_common-4.2.2.dist-info/top_level.txt,sha256=26o565jF_7wYQj7-YJfTedtT9yDxDcf8RNikOYuPq78,15
+agi_med_common-4.2.2.dist-info/RECORD,,