mm-std 0.4.14__py3-none-any.whl → 0.4.16__py3-none-any.whl

mm_std/__init__.py

@@ -17,7 +17,7 @@ from .date import parse_date as parse_date
 from .date import utc_delta as utc_delta
 from .date import utc_now as utc_now
 from .date import utc_random as utc_random
-from .dict import replace_empty_dict_values as replace_empty_dict_values
+from .dict import replace_empty_dict_entries as replace_empty_dict_entries
 from .env import get_dotenv as get_dotenv
 from .http.http_request import http_request as http_request
 from .http.http_request_sync import http_request_sync as http_request_sync

mm_std/dict.py

@@ -1,16 +1,49 @@
-def replace_empty_dict_values(
-    data: dict[object, object],
-    defaults: dict[object, object] | None = None,
+from collections import defaultdict
+from collections.abc import Mapping, MutableMapping
+from typing import TypeVar, cast
+
+K = TypeVar("K")
+V = TypeVar("V")
+DictType = TypeVar("DictType", bound=MutableMapping[K, V])  # type: ignore[valid-type]
+
+
+def replace_empty_dict_entries(
+    data: DictType,
+    defaults: Mapping[K, V] | 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."""
+    empty_string_is_empty: bool = True,
+) -> DictType:
+    """
+    Replace empty entries in a dictionary with provided default values,
+    or remove them if no default is available. Returns the same type as the input dictionary.
+    """
     if defaults is None:
         defaults = {}
-    result = {}
+
+    try:
+        if isinstance(data, defaultdict):
+            result: MutableMapping[K, V] = defaultdict(data.default_factory)
+        else:
+            result = data.__class__()
+    except Exception:
+        result = {}
+
     for key, value in data.items():
-        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
-    return result
+        should_replace = (
+            value is None
+            or (empty_string_is_empty and value == "")
+            or (zero_is_empty and value == 0)
+            or (false_is_empty and value is False)
+        )
+
+        if should_replace:
+            if key in defaults:
+                new_value = defaults[key]
+            else:
+                continue  # Skip the key if no default is available
+        else:
+            new_value = value
+
+        result[key] = new_value
+    return cast(DictType, result)

mm_std/http/http_request.py

@@ -1,5 +1,5 @@
 import aiohttp
-from aiohttp import ClientHttpProxyError
+from aiohttp import ClientHttpProxyError, InvalidUrlClientError
 from aiohttp.typedefs import LooseCookies, Query
 from aiohttp_socks import ProxyConnectionError, ProxyConnector
 from multidict import CIMultiDictProxy
@@ -57,6 +57,8 @@ async def http_request(
         return HttpResponse(error=HttpError.TIMEOUT, error_message=str(err))
     except (aiohttp.ClientProxyConnectionError, ProxyConnectionError, ClientHttpProxyError) as err:
         return HttpResponse(error=HttpError.PROXY, error_message=str(err))
+    except InvalidUrlClientError as e:
+        return HttpResponse(error=HttpError.INVALID_URL, error_message=str(e))
     except Exception as err:
         return HttpResponse(error=HttpError.ERROR, error_message=str(err))
 

mm_std/http/http_request_sync.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 import requests
-from requests.exceptions import ProxyError
+from requests.exceptions import InvalidSchema, MissingSchema, ProxyError
 
 from mm_std.http.http_response import HttpError, HttpResponse
 
@@ -53,9 +53,11 @@ def http_request_sync(
             body=res.text,
             headers=dict(res.headers),
         )
-    except requests.Timeout as err:
-        return HttpResponse(error=HttpError.TIMEOUT, error_message=str(err))
-    except ProxyError as err:
-        return HttpResponse(error=HttpError.PROXY, error_message=str(err))
-    except Exception as err:
-        return HttpResponse(error=HttpError.ERROR, error_message=str(err))
+    except requests.Timeout as e:
+        return HttpResponse(error=HttpError.TIMEOUT, error_message=str(e))
+    except ProxyError as e:
+        return HttpResponse(error=HttpError.PROXY, error_message=str(e))
+    except (InvalidSchema, MissingSchema) as e:
+        return HttpResponse(error=HttpError.INVALID_URL, error_message=str(e))
+    except Exception as e:
+        return HttpResponse(error=HttpError.ERROR, error_message=str(e))

mm_std/http/http_response.py

@@ -15,6 +15,7 @@ from mm_std.result import Result
 class HttpError(str, enum.Enum):
     TIMEOUT = "timeout"
     PROXY = "proxy"
+    INVALID_URL = "invalid_url"
     CONNECTION = "connection"
     ERROR = "error"
 

{mm_std-0.4.14.dist-info → mm_std-0.4.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mm-std
-Version: 0.4.14
+Version: 0.4.16
 Requires-Python: >=3.12
 Requires-Dist: aiohttp-socks~=0.10.1
 Requires-Dist: aiohttp~=3.11.18

{mm_std-0.4.14.dist-info → mm_std-0.4.16.dist-info}/RECORD

@@ -1,9 +1,9 @@
-mm_std/__init__.py,sha256=SlfY7KoSiv9YEkeBrjUksIUtLkkG17Ii-DYpC1TGphY,2886
+mm_std/__init__.py,sha256=atBLjXR-O2osgfiZru7mA2SSAPb60fRRDFqxf1soMZM,2888
 mm_std/command.py,sha256=ze286wjUjg0QSTgIu-2WZks53_Vclg69UaYYgPpQvCU,1283
 mm_std/config.py,sha256=3-FxFCtOffY2t9vuu9adojwbzTPwdAH2P6qDaZnHLbY,3206
 mm_std/crypto.py,sha256=jdk0_TCmeU0pPXMyz9xH6kQHSjjZ9GcGClBwQps5vBo,340
 mm_std/date.py,sha256=976eEkSONuNqHQBgSRu8hrtH23tJqztbmHFHLdbP2TY,1879
-mm_std/dict.py,sha256=6GkhJPXD0LiJDxPcYe6jPdEDw-MN7P7mKu6U5XxwYDk,675
+mm_std/dict.py,sha256=DxFbZnl5KK4vJ4wLH_pCT0PWzfaIL3YyLNpRsVexfjw,1465
 mm_std/env.py,sha256=5zaR9VeIfObN-4yfgxoFeU5IM1GDeZZj9SuYf7t9sOA,125
 mm_std/fs.py,sha256=RwarNRJq3tIMG6LVX_g03hasfYpjYFh_O27oVDt5IPQ,291
 mm_std/json_.py,sha256=YVvROb5egcF1aQ2fXzyWG8Yw0JvYwpNBwtcBzsOADPo,1133
@@ -25,9 +25,9 @@ mm_std/concurrency/sync_decorators.py,sha256=syCQBOmN7qPO55yzgJB2rbkh10CVww376hm
 mm_std/concurrency/sync_scheduler.py,sha256=j4tBL_cBI1spr0cZplTA7N2CoYsznuORMeRN8rpR6gY,2407
 mm_std/concurrency/sync_task_runner.py,sha256=s5JPlLYLGQGHIxy4oDS-PN7O9gcy-yPZFoNm8RQwzcw,1780
 mm_std/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_std/http/http_request.py,sha256=pPLQk6tIbMLSgkua9kQjij08sC1tabIRLwzVoApIa8M,3947
-mm_std/http/http_request_sync.py,sha256=b2ieX-scqFTj1QQduvKttU5Ja1pgd2OkUGAJ4zlpmJ0,1690
-mm_std/http/http_response.py,sha256=vrRv7Rjr5_kTUGllfW5oJ8ZqkcfiXc9T8PlBGAr-TBM,3884
-mm_std-0.4.14.dist-info/METADATA,sha256=iq8ucYUAh63VvnankDUPCIyAiLmGL9C1iveVI1xarc8,415
-mm_std-0.4.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.4.14.dist-info/RECORD,,
+mm_std/http/http_request.py,sha256=6bg3t49c3dG0jKRFxhcceeYb5yKrMoZwuyb25zBG3tY,4088
+mm_std/http/http_request_sync.py,sha256=zXLeDplYWTFIwaD1Ydyg9yTi37WcI-fReLM0mVnuvhM,1835
+mm_std/http/http_response.py,sha256=7ZllZFPKJ9s6m-18Dfhrm7hwc2XFnyX7ppt0O8gNmlE,3916
+mm_std-0.4.16.dist-info/METADATA,sha256=_cSVs-cNmY9lZicgVuawtbNuG5vDmpn6rrFQY_bzwI4,415
+mm_std-0.4.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_std-0.4.16.dist-info/RECORD,,