arpakitlib 1.7.56__tar.gz → 1.7.58__tar.gz

{arpakitlib-1.7.56 → arpakitlib-1.7.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.7.56
+Version: 1.7.58
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

{arpakitlib-1.7.56 → arpakitlib-1.7.58}/arpakitlib/ar_http_request_util.py

@@ -27,6 +27,7 @@ def sync_make_http_request(
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
         timeout_: timedelta | float = timedelta(seconds=15).total_seconds(),
+        enable_logging_: bool = False,
         **kwargs
 ) -> requests.Response:
     if isinstance(timeout_, float):
@@ -51,16 +52,23 @@ def sync_make_http_request(
     if "allow_redirects" not in kwargs:
         kwargs["allow_redirects"] = True
 
+    if enable_logging_:
+        _logger.info(f"TRY HTTP {method} {url} {params}")
+
     while True:
         tries_counter += 1
         try:
-            _logger.info(f"{tries_counter}/{max_tries_}. {method} {url} {params}")
             response = requests.request(**kwargs)
             if raise_for_status_:
                 response.raise_for_status()
+            if enable_logging_:
+                _logger.info(f"GOOD TRY HTTP {method} {url} {params}")
             return response
         except BaseException as exception:
-            _logger.warning(f"{tries_counter}/{max_tries_}. {method} {url} {params}, exception={exception}")
+            if enable_logging_:
+                _logger.warning(
+                    f"{tries_counter}/{max_tries_}. RETRY {method} {url} {params}, exception={exception}"
+                )
             if tries_counter >= max_tries_:
                 raise exception
             sync_safe_sleep(timedelta(seconds=0.1).total_seconds())
@@ -77,6 +85,7 @@ async def async_make_http_request(
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
         timeout_: timedelta | None = timedelta(seconds=15),
+        enable_logging_: bool = False,
         **kwargs
 ) -> aiohttp.ClientResponse:
     tries_counter = 0
@@ -96,18 +105,25 @@ async def async_make_http_request(
     if proxy_url_:
         proxy_connector = ProxyConnector.from_url(proxy_url_)
 
+    if enable_logging_:
+        _logger.info(f"TRY HTTP {method} {url} {params}")
+
     while True:
         tries_counter += 1
         try:
-            _logger.info(f"{tries_counter}/{max_tries_}. {method} {url} {params}")
             async with aiohttp.ClientSession(connector=proxy_connector) as session:
                 async with session.request(**kwargs) as response:
                     if raise_for_status_:
                         response.raise_for_status()
                     await response.read()
+                    if enable_logging_:
+                        _logger.info(f"GOOD TRY HTTP {method} {url} {params}")
                     return response
         except BaseException as exception:
-            _logger.warning(f"{tries_counter}/{max_tries_}. {method} {url} {params}, exception={exception}")
+            if enable_logging_:
+                _logger.warning(
+                    f"{tries_counter}/{max_tries_}. RETRY HTTP {method} {url} {params}, exception={exception}"
+                )
             if tries_counter >= max_tries_:
                 raise exception
             await async_safe_sleep(timedelta(seconds=0.1).total_seconds())

{arpakitlib-1.7.56 → arpakitlib-1.7.58}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.7.56"
+version = "1.7.58"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"