mm-std 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

mm_std/config.py

@@ -1,9 +1,11 @@
 import io
+import sys
 from pathlib import Path
 
 import yaml
 from pydantic import BaseModel, ConfigDict, ValidationError
 
+from .print_ import print_plain
 from .result import Err, Ok, Result
 from .str import str_to_list
 from .zip import read_text_from_zip_archive
@@ -50,6 +52,23 @@ class BaseConfig(BaseModel):
 
             return Ok(cls(**yaml.full_load(config_path)))
         except ValidationError as err:
-            return Err("validator error", data={"validaton_errors": 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
+        res = cls.read_config(config_path, zip_password)  # type: ignore[attr-defined]
+        if isinstance(res, Ok):
+            return res.unwrap()  # type: ignore[no-any-return]
+
+        if res.err == "validator_error":
+            print_plain("config validation errors")
+            for e in res.data["errors"]:
+                loc = e["loc"]
+                field = ".".join(str(lo) for lo in loc) if len(loc) > 0 else ""
+                print_plain(f"{field} {e['msg']}")
+        else:
+            print_plain(f"can't parse config file: {res.err}")
+
+        sys.exit(1)

mm_std/json_.py

@@ -1,4 +1,5 @@
 import json
+from collections.abc import Callable
 from dataclasses import asdict, is_dataclass
 from datetime import date, datetime
 from decimal import Decimal
@@ -28,8 +29,9 @@ class CustomJSONEncoder(JSONEncoder):
             return o.model_dump()
         if isinstance(o, Exception):
             return str(o)
+
         return JSONEncoder.default(self, o)
 
 
-def json_dumps(data: object) -> str:
-    return json.dumps(data, cls=CustomJSONEncoder)
+def json_dumps(data: object, default: Callable[[object], str] | None = None) -> str:
+    return json.dumps(data, cls=CustomJSONEncoder, default=default)

mm_std/print_.py

@@ -1,4 +1,5 @@
 import sys
+from collections.abc import Callable
 from enum import Enum, unique
 from typing import Any, NoReturn
 
@@ -21,13 +22,13 @@ def fatal(message: str, code: int = 1) -> NoReturn:
     sys.exit(code)
 
 
-def print_console(*messages: object, print_json: bool = False) -> None:
+def print_console(*messages: object, print_json: bool = False, default: Callable[[object], str] | None = None) -> None:
     if len(messages) == 1:
         message = messages[0]
         if isinstance(message, str):
             print(message)  # noqa: T201
         elif print_json:
-            rich.print_json(json_dumps(message))
+            rich.print_json(json_dumps(message, default=default))
         else:
             rich.print(message)
     else:
@@ -39,9 +40,9 @@ def print_plain(messages: object, print_format: PrintFormat | None = None) -> No
         print(messages)  # noqa: T201
 
 
-def print_json(data: object, print_format: PrintFormat | None = None) -> None:
+def print_json(data: object, default: Callable[[object], str] | None = None, print_format: PrintFormat | None = None) -> None:
     if print_format is None or print_format == PrintFormat.JSON:
-        rich.print_json(json_dumps(data))
+        rich.print_json(json_dumps(data, default=default))
 
 
 def print_table(title: str, columns: list[str], rows: list[list[Any]], print_format: PrintFormat | None = None) -> None:

mm_std/result.py

@@ -1,13 +1,11 @@
 from __future__ import annotations
 
 import time
-from typing import TYPE_CHECKING, Any, Literal, NoReturn
+from collections.abc import Callable
+from typing import Any, Literal, NoReturn
 
 from pydantic_core import core_schema
 
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
 
 class Ok[T]:
     __match_args__ = ("ok",)

{mm_std-0.1.11.dist-info → mm_std-0.1.13.dist-info}/METADATA

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: mm-std
-Version: 0.1.11
+Version: 0.1.13
 Requires-Python: >=3.12
 Requires-Dist: cryptography~=44.0.0
 Requires-Dist: httpx[http2,socks]~=0.28.1
-Requires-Dist: pydantic~=2.10.5
+Requires-Dist: pydantic~=2.10.6
 Requires-Dist: pydash~=8.0.5
 Requires-Dist: python-dotenv~=1.0.1
 Requires-Dist: pyyaml~=6.0.2

{mm_std-0.1.11.dist-info → mm_std-0.1.13.dist-info}/RECORD

@@ -1,23 +1,23 @@
 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=qXvUqA_hvLyKSaCrt_gtEJKRI1jRFw3Nq3oEhalQYj8,2285
+mm_std/config.py,sha256=VEVIg9FuFXDoqPNcFYtKI-toUrAOmr54QMMqpC6BY4Q,3065
 mm_std/crypto.py,sha256=jdk0_TCmeU0pPXMyz9xH6kQHSjjZ9GcGClBwQps5vBo,340
 mm_std/date.py,sha256=976eEkSONuNqHQBgSRu8hrtH23tJqztbmHFHLdbP2TY,1879
 mm_std/dict.py,sha256=kJBPVG9vEqHiSgKKoji8gVGL1yEBbxAmFNn0zz17AUg,180
 mm_std/env.py,sha256=5zaR9VeIfObN-4yfgxoFeU5IM1GDeZZj9SuYf7t9sOA,125
 mm_std/fs.py,sha256=RwarNRJq3tIMG6LVX_g03hasfYpjYFh_O27oVDt5IPQ,291
 mm_std/http_.py,sha256=QaPPXVb-rOS0BpoKdYQ0ABm_-mcR5dNa7Uqn-SeW_kE,4119
-mm_std/json_.py,sha256=VWjJsfLt-dQJiwc7vgpTElMr69NxpzX_mpmBoCkeoT8,999
+mm_std/json_.py,sha256=tzrTqXDsaMX6D_J-4uesfhe9GdaxRXmEPzUzSBWSKX0,1102
 mm_std/log.py,sha256=6ux6njNKc_ZCQlvWn1FZR6vcSY2Cem-mQzmNXvsg5IE,913
 mm_std/net.py,sha256=qdRCBIDneip6FaPNe5mx31UtYVmzqam_AoUF7ydEyjA,590
-mm_std/print_.py,sha256=HAhaiEMZZLV3CpG6UfwoUb6-Ftcun16YFC-CRcAcXOY,1525
+mm_std/print_.py,sha256=SKLZaxecy0ceP7olkzs5oH4XAydoquoifRuiIkhAvQY,1692
 mm_std/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_std/random_.py,sha256=OuUX4VJeSd13NZBya4qrGpR2TfN7_87tfebOY6DBUnI,1113
-mm_std/result.py,sha256=w2Y1dji0LozcJpPMnFkqN0UbxJUm1C8Kc5ZB1vLXx20,7443
+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.11.dist-info/METADATA,sha256=sXI3xGl2sE5Z-gh_wHLVqDOhT0jymzXZimdaPYKO3O0,307
-mm_std-0.1.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.1.11.dist-info/RECORD,,
+mm_std-0.1.13.dist-info/METADATA,sha256=PZUazR5ItzzZqC-MqwXGur80VJ1Ly_ICNTxkilqN23U,307
+mm_std-0.1.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_std-0.1.13.dist-info/RECORD,,