arpakitlib 1.5.29__py3-none-any.whl → 1.5.30__py3-none-any.whl

arpakitlib/ar_http_request_util.py

@@ -19,17 +19,18 @@ def sync_make_request(
         *,
         method: str = "GET",
         url: str,
-        max_tries: int = 7,
+        max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
+        timeout_: timedelta = timedelta(seconds=15).total_seconds(),
         **kwargs
 ) -> requests.Response:
     tries_counter = 0
 
     kwargs["method"] = method
     kwargs["url"] = url
-    if "timeout" not in kwargs:
-        kwargs["timeout"] = (timedelta(seconds=15).total_seconds(), timedelta(seconds=15).total_seconds())
+    if timeout_ is not None:
+        kwargs["timeout"] = timeout_.total_seconds()
     if proxy_url_:
         kwargs["proxies"] = {
             "http": proxy_url_,
@@ -47,8 +48,8 @@ def sync_make_request(
                 response.raise_for_status()
             return response
         except BaseException as exception:
-            _logger.warning(f"{tries_counter}/{max_tries} {method} {url} {exception}")
-            if tries_counter >= max_tries:
+            _logger.warning(f"{tries_counter}/{max_tries_} {method} {url} {exception}")
+            if tries_counter >= max_tries_:
                 raise exception
             sync_safe_sleep(timedelta(seconds=0.1).total_seconds())
             continue
@@ -58,18 +59,19 @@ async def async_make_request(
         *,
         method: str = "GET",
         url: str,
-        max_tries: int = 7,
+        max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
+        timeout_: timedelta | None = timedelta(seconds=15),
         **kwargs
 ) -> aiohttp.ClientResponse:
     tries_counter = 0
 
     kwargs["method"] = method
     kwargs["url"] = url
-    if "timeout" not in kwargs:
-        kwargs["timeout"] = aiohttp.ClientTimeout(total=timedelta(seconds=15).total_seconds())
-    if "allow_redirects" in kwargs:
+    if timeout_ is not None:
+        kwargs["timeout"] = aiohttp.ClientTimeout(total=timeout_.total_seconds())
+    if "allow_redirects" not in kwargs:
         kwargs["allow_redirects"] = True
 
     proxy_connector: ProxyConnector | None = None
@@ -87,8 +89,8 @@ async def async_make_request(
                     await response.read()
                     return response
         except BaseException as exception:
-            _logger.warning(f"{tries_counter}/{max_tries} {method} {url} {exception}")
-            if tries_counter >= max_tries:
+            _logger.warning(f"{tries_counter}/{max_tries_} {method} {url} {exception}")
+            if tries_counter >= max_tries_:
                 raise exception
             await async_safe_sleep(timedelta(seconds=0.1).total_seconds())
             continue

arpakitlib/ar_schedule_uust_api_client.py

@@ -10,7 +10,6 @@ import pytz
 
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_http_request_util import async_make_request
-from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -76,13 +75,11 @@ class ScheduleUUSTAPIClient:
             url: str,
             params: dict | None = None
     ) -> dict[str, Any]:
-        params = combine_dicts(self.auth_params(), params)
         response = await async_make_request(
             url=url,
             method="GET",
-            params=params,
+            params=combine_dicts(params, self.auth_params()),
             proxy_url_=self.api_proxy_url,
-            max_tries=9
         )
         json_data = await response.json()
         raise_for_type(json_data, dict)
@@ -190,12 +187,7 @@ def __example():
 
 
 async def __async_example():
-    setup_normal_logging()
-    client = ScheduleUUSTAPIClient(
-        api_login="arpakit",
-        api_password_first_part="bAEb2wXJNNZ8"
-    )
-    await client.check_all()
+    pass
 
 
 if __name__ == '__main__':

{arpakitlib-1.5.29.dist-info → arpakitlib-1.5.30.dist-info}/METADATA

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

{arpakitlib-1.5.29.dist-info → arpakitlib-1.5.30.dist-info}/RECORD

@@ -40,7 +40,7 @@ arpakitlib/ar_fastapi_util.py,sha256=zru-le-J139KpLlPeo9DUjMuDygh4tR2GhAJjlr7ROs
 arpakitlib/ar_file_storage_in_dir.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_generate_env_example.py,sha256=WseNlk_So6mTVQ2amMuigWYV4ZVmd940POvXtodoYj0,325
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
-arpakitlib/ar_http_request_util.py,sha256=jx0ggOVXLvsh2hVUE7tasWaEsUnXbO0WS8-rJb0Y6BU,3063
+arpakitlib/ar_http_request_util.py,sha256=DooIL24jW6Ouz771TMTTvzDZETBc12R1RBmbXp9vNqg,3129
 arpakitlib/ar_ip_util.py,sha256=aEAa1Hvobh9DWX7cmBAPLqnXSTiKe2hRk-WJaiKMaI8,1009
 arpakitlib/ar_json_db.py,sha256=CEyhIU4WuNmX5mqwBVYxUKSdpFelXvWmf_tJ1fuxMSE,7187
 arpakitlib/ar_json_util.py,sha256=S8CskZ3uoYuJGCy1GhQ8Ikhn-fxXk-9JpLUbBvXADqI,833
@@ -55,7 +55,7 @@ arpakitlib/ar_operation_execution_util.py,sha256=i-GDXFCAXrPwi-juH1sKWNsIPQZ036Q
 arpakitlib/ar_parse_command.py,sha256=qpr2OwG3Bf7DFiL9S3iWgtbvtE80RSC35E5zFJvjG1I,2714
 arpakitlib/ar_postgresql_util.py,sha256=SAHEmAyMkZe516uk2gS830v_Wn2kRUZUYNcTNwmgXJk,1160
 arpakitlib/ar_run_cmd.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
-arpakitlib/ar_schedule_uust_api_client.py,sha256=hShokh3uJuTPC78-AMW2mv1WSJMy4cAuVDJ4sLaoqMs,6043
+arpakitlib/ar_schedule_uust_api_client.py,sha256=1JGUy6rrjAXdWjeAqiAOQlCAEV3xuc5FUDWfXODKB-A,5770
 arpakitlib/ar_sleep_util.py,sha256=9ZN4Qo4eZ_q3hjM7vNBQjFRcH-9-sqv3QLSjnxVJE90,1405
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=3zscvaloi9XY1NR70rJ4-jJlFUIqhmTbQ9wdvK-Yjf8,1379
 arpakitlib/ar_ssh_runner.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
@@ -63,8 +63,8 @@ arpakitlib/ar_str_util.py,sha256=xSEzmsDvRiZVaxyqFFjcgzpphktCbXg2FHcvsd1DYpA,188
 arpakitlib/ar_type_util.py,sha256=-h-SCsVl11eVo1u4hy2Asn0IfD5TIxmX3Ndug4AvnPE,1761
 arpakitlib/ar_yookassa_api_client.py,sha256=BwsTygaXf35AACVBl_09uYlSD_t-U1OOzbj58OOFT4Q,6480
 arpakitlib/ar_zabbix_util.py,sha256=MTQbmS0QpNCKNOGONNQHf6j7KTZsKGlIbd5rCH0R0WI,6313
-arpakitlib-1.5.29.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
-arpakitlib-1.5.29.dist-info/METADATA,sha256=BeKeVptEUesxJ2rNi-UpFTY2XuRep1w_3p1dXPN_4SM,2330
-arpakitlib-1.5.29.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
-arpakitlib-1.5.29.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.5.29.dist-info/RECORD,,
+arpakitlib-1.5.30.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
+arpakitlib-1.5.30.dist-info/METADATA,sha256=-MrOdtGHS5oI_5ygdbJYMxdl9xJQALm6cA60w0Kxbzk,2330
+arpakitlib-1.5.30.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
+arpakitlib-1.5.30.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.5.30.dist-info/RECORD,,