mm-std 0.1.14__py3-none-any.whl → 0.2.0__py3-none-any.whl

mm_std/config.py

@@ -1,63 +1,24 @@
-import io
 import sys
+import tomllib
 from pathlib import Path
+from typing import NoReturn
 
-import yaml
 from pydantic import BaseModel, ConfigDict, ValidationError
 
-from .print_ import print_plain
+from .print_ import print_json, print_plain
 from .result import Err, Ok, Result
-from .str import str_to_list
 from .zip import read_text_from_zip_archive
 
 
 class BaseConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
-    @classmethod
-    def to_list_str_validator(
-        cls,
-        v: str | list[str] | None,
-        *,
-        lower: bool = False,
-        unique: bool = False,
-        remove_comments: bool = False,
-        split_line: bool = False,
-    ) -> list[str]:
-        if v is None:
-            return []
-        if isinstance(v, str):
-            return str_to_list(v, unique=unique, remove_comments=remove_comments, split_line=split_line, lower=lower)
-        return v
+    def print_and_exit(self, exclude: set[str] | None = None) -> NoReturn:
+        print_json(self.model_dump(exclude=exclude))
+        sys.exit(0)
 
     @classmethod
-    def read_config[T](cls: type[T], config_path: io.TextIOWrapper | str | Path, zip_password: str = "") -> Result[T]:  # nosec
-        try:
-            # is it zip archive?
-            if isinstance(config_path, str) and config_path.endswith(".zip"):
-                config_path = str(Path(config_path).expanduser())
-                return Ok(cls(**yaml.full_load(read_text_from_zip_archive(config_path, password=zip_password))))
-            if isinstance(config_path, io.TextIOWrapper) and config_path.name.endswith(".zip"):
-                config_path = str(Path(config_path.name).expanduser())
-                return Ok(cls(**yaml.full_load(read_text_from_zip_archive(config_path, password=zip_password))))
-            if isinstance(config_path, Path) and config_path.name.endswith(".zip"):
-                config_path = str(config_path.expanduser())
-                return Ok(cls(**yaml.full_load(read_text_from_zip_archive(config_path, password=zip_password))))
-
-            # plain yml file
-            if isinstance(config_path, str):
-                return Ok(cls(**yaml.full_load(Path(config_path).expanduser().read_text())))
-            if isinstance(config_path, Path):
-                return Ok(cls(**yaml.full_load(config_path.expanduser().read_text())))
-
-            return Ok(cls(**yaml.full_load(config_path)))
-        except ValidationError as err:
-            return Err("validator_error", data={"errors": err.errors()})
-        except Exception as err:
-            return Err(err)
-
-    @classmethod
-    def read_config_or_exit[T](cls: type[T], config_path: io.TextIOWrapper | str | Path, zip_password: str = "") -> T:  # noqa: PYI019 # nosec
+    def read_toml_config_or_exit[T](cls: type[T], config_path: Path, zip_password: str = "") -> T:  # noqa: PYI019 # nosec
         res = cls.read_config(config_path, zip_password)  # type: ignore[attr-defined]
         if isinstance(res, Ok):
             return res.unwrap()  # type: ignore[no-any-return]
@@ -72,3 +33,18 @@ class BaseConfig(BaseModel):
             print_plain(f"can't parse config file: {res.err}")
 
         sys.exit(1)
+
+    @classmethod
+    def read_toml_config[T](cls: type[T], config_path: Path, zip_password: str = "") -> Result[T]:  # nosec
+        try:
+            config_path = config_path.expanduser()
+            if config_path.name.endswith(".zip"):
+                data = tomllib.loads(read_text_from_zip_archive(config_path, password=zip_password))
+            else:
+                with config_path.open("rb") as f:
+                    data = tomllib.load(f)
+            return Ok(cls(**data))
+        except ValidationError as err:
+            return Err("validator_error", data={"errors": err.errors()})
+        except Exception as err:
+            return Err(err)

mm_std/print_.py

@@ -22,7 +22,7 @@ def fatal(message: str, code: int = 1) -> NoReturn:
     sys.exit(code)
 
 
-def print_console(*messages: object, print_json: bool = False, default: Callable[[object], str] | None = None) -> None:
+def print_console(*messages: object, print_json: bool = False, default: Callable[[object], str] | None = str) -> None:
     if len(messages) == 1:
         message = messages[0]
         if isinstance(message, str):

mm_std/zip.py

@@ -1,7 +1,8 @@
+from pathlib import Path
 from zipfile import ZipFile
 
 
-def read_text_from_zip_archive(zip_archive_path: str, filename: str | None = None, password: str | None = None) -> str:
+def read_text_from_zip_archive(zip_archive_path: Path, filename: str | None = None, password: str | None = None) -> str:
     with ZipFile(zip_archive_path) as zipfile:
         if filename is None:
             filename = zipfile.filelist[0].filename

{mm_std-0.1.14.dist-info → mm_std-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mm-std
-Version: 0.1.14
+Version: 0.2.0
 Requires-Python: >=3.12
 Requires-Dist: cryptography~=44.0.0
 Requires-Dist: httpx[http2,socks]~=0.28.1

{mm_std-0.1.14.dist-info → mm_std-0.2.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mm_std/__init__.py,sha256=dtYnmQP_HkWxIJvuCJGpex3RHvG2V0Ekh7oYstRQoco,2291
 mm_std/command.py,sha256=ze286wjUjg0QSTgIu-2WZks53_Vclg69UaYYgPpQvCU,1283
 mm_std/concurrency.py,sha256=4kKLhde6YQYsjJJjH6K5eMQj6FtegEz55Mo5TmhQMM0,5242
-mm_std/config.py,sha256=VEVIg9FuFXDoqPNcFYtKI-toUrAOmr54QMMqpC6BY4Q,3065
+mm_std/config.py,sha256=RV_TFVLCvb9RDOg3xmt0GKs_-Hfkfm04R3Kqj7MGdAE,1869
 mm_std/crypto.py,sha256=jdk0_TCmeU0pPXMyz9xH6kQHSjjZ9GcGClBwQps5vBo,340
 mm_std/date.py,sha256=976eEkSONuNqHQBgSRu8hrtH23tJqztbmHFHLdbP2TY,1879
 mm_std/dict.py,sha256=kJBPVG9vEqHiSgKKoji8gVGL1yEBbxAmFNn0zz17AUg,180
@@ -11,13 +11,13 @@ mm_std/http_.py,sha256=QaPPXVb-rOS0BpoKdYQ0ABm_-mcR5dNa7Uqn-SeW_kE,4119
 mm_std/json_.py,sha256=jAL-JrSMPIwxu3y87xNoTcwhOOEHGHrTpX1BTj44Uhw,1091
 mm_std/log.py,sha256=6ux6njNKc_ZCQlvWn1FZR6vcSY2Cem-mQzmNXvsg5IE,913
 mm_std/net.py,sha256=qdRCBIDneip6FaPNe5mx31UtYVmzqam_AoUF7ydEyjA,590
-mm_std/print_.py,sha256=w6qXqR7iNhFtrbOBDY11B579VzuUudOLz61liUM-pww,1691
+mm_std/print_.py,sha256=sf_Dq8BaYETyyHl6qXMDkrVZtAq0X6vcfj6lxNtYByA,1690
 mm_std/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_std/random_.py,sha256=OuUX4VJeSd13NZBya4qrGpR2TfN7_87tfebOY6DBUnI,1113
 mm_std/result.py,sha256=KtYZbVJMkwwCPcV-Tnt0TkTNyDgiALvQB1DtIEp1prc,7405
 mm_std/str.py,sha256=jS7VAI7i_a3iqnfaW4Iw2LZRTv0Tml4kmMbP2S2IUF4,3067
 mm_std/types_.py,sha256=hvZlnvBWyB8CL_MeEWWD0Y0nN677plibYn3yD-5g7xs,99
-mm_std/zip.py,sha256=2EXcae4HO5U4kObj2Lj8jl5F2OUpT-WRlJybTyFzt6I,370
-mm_std-0.1.14.dist-info/METADATA,sha256=hlTbkE6A5eGvwWSZ_KI4zCfTHD1jiR4J_8AXZuyh71E,307
-mm_std-0.1.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.1.14.dist-info/RECORD,,
+mm_std/zip.py,sha256=axzF1BwcIygtfNNTefZH7hXKaQqwe-ZH3ChuRWr9dnk,396
+mm_std-0.2.0.dist-info/METADATA,sha256=r9EWtjknasr6kFFz7lT9-IBa3JRo-jT5uQFNB_X1vUA,306
+mm_std-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_std-0.2.0.dist-info/RECORD,,