mm-std 0.3.7__py3-none-any.whl → 0.3.9__py3-none-any.whl

mm_std/config.py

@@ -1,7 +1,7 @@
 import sys
 import tomllib
 from pathlib import Path
-from typing import NoReturn
+from typing import NoReturn, Self
 
 from pydantic import BaseModel, ConfigDict, ValidationError
 
@@ -35,7 +35,7 @@ class BaseConfig(BaseModel):
         sys.exit(1)
 
     @classmethod
-    def read_toml_config[T](cls: type[T], config_path: Path, zip_password: str = "") -> Result[T]:  # nosec
+    def read_toml_config(cls, config_path: Path, zip_password: str = "") -> Result[Self]:  # nosec
         try:
             config_path = config_path.expanduser()
             if config_path.name.endswith(".zip"):

mm_std/dict.py

@@ -2,35 +2,14 @@ def replace_empty_dict_values(
     data: dict[object, object],
     defaults: dict[object, object] | None = None,
     zero_is_empty: bool = False,
+    false_is_empty: bool = False,
 ) -> dict[object, object]:
-    """
-    Replace empty values in a dictionary with provided default values, or remove them if no default exists.
-
-    An "empty" value is defined as one of the following:
-      - None
-      - An empty string ("")
-
-    If the flag `zero_is_empty` is True, the numeric value 0 is also considered empty.
-
-    For each key in the input dictionary `data`, if its value is empty, the function checks the
-    `defaults` dictionary for a replacement. If a default exists, it uses that value; otherwise, the
-    key is omitted from the resulting dictionary.
-
-    Parameters:
-        data (dict[object, object]): The input dictionary with key-value pairs to process.
-        defaults (dict[object, object] | None, optional): A dictionary of default values to use as
-            replacements for empty entries. If None, no default replacements are applied.
-        zero_is_empty (bool, optional): If True, treats the value 0 as empty. Defaults to False.
-
-    Returns:
-        dict[object, object]: A new dictionary with empty values replaced by defaults or removed if no
-        default is provided.
-    """
+    """Replace empty values in a dictionary with provided default values, or remove them if no default exists."""
     if defaults is None:
         defaults = {}
     result = {}
     for key, value in data.items():
-        if value is None or value == "" or (zero_is_empty and value == 0):
+        if value is None or value == "" or (zero_is_empty and value == 0) or (false_is_empty and value is False):
             value = defaults.get(key, None)  # noqa: PLW2901
         if value is not None:
             result[key] = value

mm_std/http_.py

@@ -3,9 +3,9 @@ from dataclasses import asdict, dataclass, field
 from typing import Any
 from urllib.parse import urlencode
 
-import httpx
 import pydash
-from httpx._types import AuthTypes
+import requests
+from requests.auth import AuthBase
 
 from mm_std.result import Err, Ok, Result
 
@@ -90,7 +90,7 @@ def hrequest(
     timeout: float = 10,
     user_agent: str | None = None,
     json_params: bool = True,
-    auth: AuthTypes | None = None,
+    auth: AuthBase | tuple[str, str] | None = None,
     verify: bool = True,
 ) -> HResponse:
     query_params: dict[str, Any] | None = None
@@ -108,11 +108,18 @@ def hrequest(
     else:
         data = params
 
+    proxies = None
+    if proxy:
+        proxies = {
+            "http": proxy,
+            "https": proxy,
+        }
+
     try:
-        r = httpx.request(
+        r = requests.request(
             method,
             url,
-            proxy=proxy,
+            proxies=proxies,
             timeout=timeout,
             cookies=cookies,
             auth=auth,
@@ -123,11 +130,11 @@ def hrequest(
             data=data,
         )
         return HResponse(code=r.status_code, body=r.text, headers=dict(r.headers))
-    except httpx.TimeoutException:
+    except requests.exceptions.Timeout:
         return HResponse(error="timeout")
-    except httpx.ProxyError:
+    except requests.exceptions.ProxyError:
         return HResponse(error="proxy_error")
-    except httpx.HTTPError as err:
+    except requests.exceptions.RequestException as err:
         return HResponse(error=f"connection_error: {err}")
     except Exception as err:
         return HResponse(error=f"exception: {err}")

{mm_std-0.3.7.dist-info → mm_std-0.3.9.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: mm-std
-Version: 0.3.7
+Version: 0.3.9
 Requires-Python: >=3.12
 Requires-Dist: cryptography~=44.0.2
-Requires-Dist: httpx[http2,socks]~=0.28.1
 Requires-Dist: pydantic~=2.10.6
 Requires-Dist: pydash~=8.0.5
 Requires-Dist: python-dotenv~=1.0.1
+Requires-Dist: requests[socks]~=2.32.3
 Requires-Dist: rich~=13.9.4
 Requires-Dist: tomlkit~=0.13.2

{mm_std-0.3.7.dist-info → mm_std-0.3.9.dist-info}/RECORD

@@ -1,13 +1,13 @@
 mm_std/__init__.py,sha256=wzKZe6qMG7cmZLqnA-thfr4QaFaPudJzcQKqLsfZeB8,2500
 mm_std/command.py,sha256=ze286wjUjg0QSTgIu-2WZks53_Vclg69UaYYgPpQvCU,1283
 mm_std/concurrency.py,sha256=4kKLhde6YQYsjJJjH6K5eMQj6FtegEz55Mo5TmhQMM0,5242
-mm_std/config.py,sha256=4DGzjLO8TYno1xF8wj2hRaw2-gfNzt_W1_bt7w8ovno,1874
+mm_std/config.py,sha256=4ox4D2CgGR76bvZ2n2vGQOYUDagFnlKEDb87to5zpxE,1871
 mm_std/crypto.py,sha256=jdk0_TCmeU0pPXMyz9xH6kQHSjjZ9GcGClBwQps5vBo,340
 mm_std/date.py,sha256=976eEkSONuNqHQBgSRu8hrtH23tJqztbmHFHLdbP2TY,1879
-mm_std/dict.py,sha256=E8YxRCs-hdXt0yhZUzR_o892LYokHzcFxSaGh835yjI,1588
+mm_std/dict.py,sha256=6GkhJPXD0LiJDxPcYe6jPdEDw-MN7P7mKu6U5XxwYDk,675
 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/http_.py,sha256=NkA98bCAqBmjJgoain0KZVORizGwH0TkbtYvjBEsrB4,4305
 mm_std/json_.py,sha256=Naa6mBE4D0yiQGkPNRrFvndnUH3R7ovw3FeaejWV60o,1196
 mm_std/log.py,sha256=6ux6njNKc_ZCQlvWn1FZR6vcSY2Cem-mQzmNXvsg5IE,913
 mm_std/net.py,sha256=qdRCBIDneip6FaPNe5mx31UtYVmzqam_AoUF7ydEyjA,590
@@ -19,6 +19,6 @@ mm_std/str.py,sha256=BEjJ1p5O4-uSYK0h-enasSSDdwzkBbiwdQ4_dsrlEE8,3257
 mm_std/toml.py,sha256=CNznWKR0bpOxS6e3VB5LGS-Oa9lW-wterkcPUFtPcls,610
 mm_std/types_.py,sha256=hvZlnvBWyB8CL_MeEWWD0Y0nN677plibYn3yD-5g7xs,99
 mm_std/zip.py,sha256=axzF1BwcIygtfNNTefZH7hXKaQqwe-ZH3ChuRWr9dnk,396
-mm_std-0.3.7.dist-info/METADATA,sha256=Fy4PKSoAghLXCIQa8zJMIeO64q3GFRuYucv9XDlz360,308
-mm_std-0.3.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.3.7.dist-info/RECORD,,
+mm_std-0.3.9.dist-info/METADATA,sha256=QqBM2hxSUenibV7VnHSuu0QHn5eVoKOPGClxbmfklEI,305
+mm_std-0.3.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_std-0.3.9.dist-info/RECORD,,