arpakitlib 1.5.37__py3-none-any.whl → 1.5.39__py3-none-any.whl

arpakitlib/{ar_cache_file.py → ar_cache_file_util.py}

@@ -7,7 +7,7 @@ from typing import Optional, Any
 import pytz
 from pydantic import BaseModel
 
-from arpakitlib.ar_json_db import JSONDbFile
+from arpakitlib.ar_json_db_util import JSONDbFile
 from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"

arpakitlib/ar_http_request_util.py

@@ -9,22 +9,27 @@ import requests
 from aiohttp_socks import ProxyConnector
 
 from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
+from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 _logger = logging.getLogger(__name__)
 
 
-def sync_make_request(
+def sync_make_http_request(
         *,
         method: str = "GET",
         url: str,
         max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
-        timeout_: timedelta = timedelta(seconds=15).total_seconds(),
+        timeout_: timedelta | float = timedelta(seconds=15).total_seconds(),
         **kwargs
 ) -> requests.Response:
+    if isinstance(timeout_, float):
+        timeout_ = timedelta(seconds=timeout_)
+    raise_for_type(timeout_, timedelta)
+
     tries_counter = 0
 
     kwargs["method"] = method
@@ -55,7 +60,7 @@ def sync_make_request(
             continue
 
 
-async def async_make_request(
+async def async_make_http_request(
         *,
         method: str = "GET",
         url: str,

arpakitlib/ar_operation_execution_util.py

@@ -10,7 +10,7 @@ from typing import Any
 from sqlalchemy import asc
 from sqlalchemy.orm import Session
 
-from arpakitlib.ar_base_worker import BaseWorker
+from arpakitlib.ar_base_worker_util import BaseWorker
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_sqlalchemy_model_util import OperationDBM, StoryLogDBM

arpakitlib/ar_postgresql_util.py

@@ -1,7 +1,7 @@
 # arpakit
 
 from arpakitlib.ar_logging_util import setup_normal_logging
-from arpakitlib.ar_run_cmd import run_cmd
+from arpakitlib.ar_run_cmd_util import run_cmd
 from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"

arpakitlib/{ar_schedule_uust_api_client.py → ar_schedule_uust_api_client_util.py}

@@ -9,7 +9,7 @@ from typing import Any
 import pytz
 
 from arpakitlib.ar_dict_util import combine_dicts
-from arpakitlib.ar_http_request_util import async_make_request
+from arpakitlib.ar_http_request_util import async_make_http_request
 from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -75,7 +75,7 @@ class ScheduleUUSTAPIClient:
             url: str,
             params: dict | None = None
     ) -> dict[str, Any]:
-        response = await async_make_request(
+        response = await async_make_http_request(
             url=url,
             method="GET",
             params=combine_dicts(params, self.auth_params()),

arpakitlib/{ar_yookassa_api_client.py → ar_yookassa_api_client_util.py}

@@ -13,7 +13,7 @@ import requests
 
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_enumeration_util import Enumeration
-from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
+from arpakitlib.ar_http_request_util import sync_make_http_request, async_make_http_request
 from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -42,56 +42,23 @@ class YookassaAPIClient:
         self.headers = {"Content-Type": "application/json"}
         self._logger = logging.getLogger(self.__class__.__name__)
 
-    def _sync_make_request(self, method: str, url: str, **kwargs) -> requests.Response:
-        max_tries = 7
-        tries = 0
-
-        kwargs["url"] = url
-        kwargs["method"] = method
-        kwargs["timeout"] = (timedelta(seconds=3).total_seconds(), timedelta(seconds=3).total_seconds())
+    def _sync_make_request(
+            self,
+            *,
+            method: str,
+            url: str,
+            **kwargs
+    ) -> requests.Response:
         if "headers" not in kwargs:
             kwargs["headers"] = {}
         kwargs["headers"] = combine_dicts(self.headers, kwargs["headers"])
         kwargs["auth"] = (self.shop_id, self.secret_key)
-
-        while True:
-            self._logger.info(f"{method} {url}")
-            tries += 1
-            try:
-                return requests.request(**kwargs)
-            except Exception as err:
-                self._logger.warning(f"{tries}/{max_tries} {err} {method} {url}")
-                if tries >= max_tries:
-                    raise YookassaAPIException(err)
-                sync_safe_sleep(timedelta(seconds=0.1).total_seconds())
-                continue
-
-    async def _async_make_request(self, method: str, url: str, **kwargs) -> aiohttp.ClientResponse:
-        max_tries = 7
-        tries = 0
-
-        kwargs["url"] = url
-        kwargs["method"] = method
-        kwargs["timeout"] = aiohttp.ClientTimeout(total=timedelta(seconds=15).total_seconds())
-        if "headers" not in kwargs:
-            kwargs["headers"] = {}
-        kwargs["headers"] = combine_dicts(self.headers, kwargs["headers"])
-        kwargs["auth"] = aiohttp.BasicAuth(login=str(self.shop_id), password=self.secret_key)
-
-        while True:
-            self._logger.info(f"{method} {url}")
-            tries += 1
-            try:
-                async with aiohttp.ClientSession() as session:
-                    async with session.request(**kwargs) as response:
-                        await response.read()
-                        return response
-            except Exception as err:
-                self._logger.warning(f"{tries}/{max_tries} {err} {method} {url}")
-                if tries >= max_tries:
-                    raise YookassaAPIException(err)
-                await async_safe_sleep(timedelta(seconds=0.1).total_seconds())
-                continue
+        kwargs["timeout_"] = timedelta(seconds=3)
+        return sync_make_http_request(
+            method=method,
+            url=url,
+            **kwargs
+        )
 
     def sync_create_payment(
             self,
@@ -121,12 +88,10 @@ class YookassaAPIClient:
         if idempotence_key is None:
             idempotence_key = str(uuid.uuid4())
 
-        headers = combine_dicts({"Idempotence-Key": idempotence_key})
-
         response = self._sync_make_request(
             method="POST",
             url="https://api.yookassa.ru/v3/payments",
-            headers=headers,
+            headers={"Idempotence-Key": idempotence_key},
             json=json_body,
         )
 
@@ -154,6 +119,18 @@ class YookassaAPIClient:
 
         return json_data
 
+    async def async_make_request(self, method: str, url: str, **kwargs) -> aiohttp.ClientResponse:
+        if "headers" not in kwargs:
+            kwargs["headers"] = {}
+        kwargs["headers"] = combine_dicts(self.headers, kwargs["headers"])
+        kwargs["auth"] = aiohttp.BasicAuth(login=str(self.shop_id), password=self.secret_key)
+        kwargs["timeout_"] = timedelta(seconds=3)
+        return await async_make_http_request(
+            method=method,
+            url=url,
+            **kwargs
+        )
+
     async def async_create_payment(
             self, json_body: dict[str, Any], idempotence_key: Optional[str] = None
     ) -> dict[str, Any]:
@@ -180,12 +157,10 @@ class YookassaAPIClient:
         if idempotence_key is None:
             idempotence_key = str(uuid.uuid4())
 
-        headers = combine_dicts({"Idempotence-Key": idempotence_key})
-
-        response = await self._async_make_request(
+        response = await self.async_make_request(
             method="POST",
             url="https://api.yookassa.ru/v3/payments",
-            headers=headers,
+            headers={"Idempotence-Key": idempotence_key},
             json=json_body,
         )
 
@@ -198,7 +173,7 @@ class YookassaAPIClient:
     async def async_get_payment(self, payment_id: str) -> Optional[dict[str, Any]]:
         raise_for_type(payment_id, str)
 
-        response = await self._async_make_request(
+        response = await self.async_make_request(
             method="GET",
             url=f"https://api.yookassa.ru/v3/payments/{payment_id}",
         )

{arpakitlib-1.5.37.dist-info → arpakitlib-1.5.39.dist-info}/METADATA

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

{arpakitlib-1.5.37.dist-info → arpakitlib-1.5.39.dist-info}/RECORD

@@ -9,12 +9,12 @@ arpakitlib/ar_arpakit_lib_module_util.py,sha256=YzobxRG8-QJ1L5r_8wBdL668CwXoQRIM
 arpakitlib/ar_arpakit_schedule_uust_api_client.py,sha256=SYWWQDohPnw0qpBIu2hEvGZRVdaI4NUUQdEjnMnseo4,18237
 arpakitlib/ar_arpakitlib_info.py,sha256=cvgrLnEznmYkCAg1adbY46ATjD6GJd-Yk8PTgOPjpKM,248
 arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
-arpakitlib/ar_base_worker.py,sha256=Y6yRFp1nhhTyv-TeGDao-3q4ICVVJ2zVsKdIlHdiGSI,2897
-arpakitlib/ar_cache_file.py,sha256=m73_vU6bMjXsIurSPO9VCLcHsiHk8ITFS0LNjfI_8Uw,3471
+arpakitlib/ar_base_worker_util.py,sha256=Y6yRFp1nhhTyv-TeGDao-3q4ICVVJ2zVsKdIlHdiGSI,2897
+arpakitlib/ar_cache_file_util.py,sha256=Fo2pH-Zqm966KWFBHG_pbiySGZvhIFCYqy7k1weRfJ0,3476
 arpakitlib/ar_datetime_util.py,sha256=Xe1NiT9oPQzNSG7RVRkhukhbg4i-hhS5ImmV7sPUc8o,971
 arpakitlib/ar_dict_util.py,sha256=cF5LQJ6tLqyGoEXfDljMDZrikeZoWPw7CgINHIFGvXM,419
-arpakitlib/ar_dream_ai_api_client.py,sha256=hDPL9wbG4MjIuhn2ed6qepueogANIkt-NddhhiPUv0Y,4029
-arpakitlib/ar_encrypt_and_decrypt_util.py,sha256=GhWnp7HHkbhwFVVCzO1H07m-5gryr4yjWsXjOaNQm1Y,520
+arpakitlib/ar_dream_ai_api_client_util.py,sha256=hDPL9wbG4MjIuhn2ed6qepueogANIkt-NddhhiPUv0Y,4029
+arpakitlib/ar_encrypt_decrypt_util.py,sha256=GhWnp7HHkbhwFVVCzO1H07m-5gryr4yjWsXjOaNQm1Y,520
 arpakitlib/ar_enumeration_util.py,sha256=0DN46uyI0Gu9JPDgso3XPbnre7hZZefYTZwmmE1iYH4,2250
 arpakitlib/ar_fastapi_static/redoc/redoc.standalone.js,sha256=WCuodUNv1qVh0oW5fjnJDwb5AwOue73jKHdI9z8iGKU,909365
 arpakitlib/ar_fastapi_static/swagger-ui/favicon-16x16.png,sha256=ryStYE3Xs7zaj5dauXMHX0ovcKQIeUShL474tjo-B8I,665
@@ -36,12 +36,12 @@ arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css.map,sha256=5wq8eXMLU6Zxb4
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js,sha256=ffrLZHHEQ_g84A-ul3yWa10Kk09waOAxHcQXPuZuavg,339292
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js.map,sha256=9UhIW7MqCOZPAz1Sl1IKfZUuhWU0p-LJqrnjjJD9Xhc,1159454
 arpakitlib/ar_fastapi_util.py,sha256=7YUx9WL4hc_TAiNjFDqxdcpAutvv0UtI5IEICbBZdVQ,16847
-arpakitlib/ar_file_storage_in_dir.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
+arpakitlib/ar_file_storage_in_dir_util.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=DooIL24jW6Ouz771TMTTvzDZETBc12R1RBmbXp9vNqg,3129
+arpakitlib/ar_http_request_util.py,sha256=hMzu2yedUvwIg6gafSakDjXUEC7WH5iplDGiRW9fgPw,3322
 arpakitlib/ar_ip_util.py,sha256=aEAa1Hvobh9DWX7cmBAPLqnXSTiKe2hRk-WJaiKMaI8,1009
-arpakitlib/ar_json_db.py,sha256=CEyhIU4WuNmX5mqwBVYxUKSdpFelXvWmf_tJ1fuxMSE,7187
+arpakitlib/ar_json_db_util.py,sha256=CEyhIU4WuNmX5mqwBVYxUKSdpFelXvWmf_tJ1fuxMSE,7187
 arpakitlib/ar_json_util.py,sha256=S8CskZ3uoYuJGCy1GhQ8Ikhn-fxXk-9JpLUbBvXADqI,833
 arpakitlib/ar_jwt_util.py,sha256=Rhm4ywoTAn6yOV8NLjDASfAtAtheROxxDP40G3XjnuQ,761
 arpakitlib/ar_list_of_dicts_to_xlsx.py,sha256=MyjEl4Jl4beLVZqLVQMMv0-XDtBD3Xh4Z_ZPDJeFu04,745
@@ -50,21 +50,21 @@ arpakitlib/ar_logging_util.py,sha256=c5wX2FLqCzb4aLckLVhIJ7go52rJQ4GN9dIkJ6KMc3o
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=n2kBETxzOSVhSVoy7qUtHtuQzgrrxzgi1_iVQimPb9o,1615
 arpakitlib/ar_openai_util.py,sha256=dHUbfg1sVVCjsNl_fra3iCMEz1bR-Hk9fE-DdYbu7Wc,1215
-arpakitlib/ar_operation_execution_util.py,sha256=Vxuu6MoYsmR2GS5UlW_fIDwNf62Gsw0UtjeSnh4Evi8,9928
+arpakitlib/ar_operation_execution_util.py,sha256=FaMFTIzETdTmGAUHaWaiKSQAleYtjVqFbHq04Gt8htA,9933
 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=1JGUy6rrjAXdWjeAqiAOQlCAEV3xuc5FUDWfXODKB-A,5770
+arpakitlib/ar_postgresql_util.py,sha256=_2MKkkH0ZSEr6sk6hJw6ml8rlPZIv7b7N_L4tbRg60g,1165
+arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
+arpakitlib/ar_schedule_uust_api_client_util.py,sha256=NpCN8GT96aPvE3Lc-IRn653abjI95CmOqNc4pbHIWxo,5780
 arpakitlib/ar_sleep_util.py,sha256=9ZN4Qo4eZ_q3hjM7vNBQjFRcH-9-sqv3QLSjnxVJE90,1405
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=tKz6n9zuebo2J9yTr6IQUHoXZ9KF340MAo4UiDXaX_4,4251
 arpakitlib/ar_sqlalchemy_util.py,sha256=VH23Xld3k5wITkwR0JcaBkO77gmxWn9jlK4eyxKuz_0,3665
 arpakitlib/ar_ssh_util.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
 arpakitlib/ar_str_util.py,sha256=xSEzmsDvRiZVaxyqFFjcgzpphktCbXg2FHcvsd1DYpA,1885
 arpakitlib/ar_type_util.py,sha256=I6jbTz7_dxR1lkhz1JfUb5ZyLLdXVhG_-hzjdgT6N6s,1932
-arpakitlib/ar_yookassa_api_client.py,sha256=WZoTd10d2lOmT0lCdlQFTB0LEVARubqLEiFtPNQLvi8,6477
+arpakitlib/ar_yookassa_api_client_util.py,sha256=5GMvu8paByni8buhc1vpHB7n6oXe0gPfj1LSvnyZCrQ,5307
 arpakitlib/ar_zabbix_util.py,sha256=MTQbmS0QpNCKNOGONNQHf6j7KTZsKGlIbd5rCH0R0WI,6313
-arpakitlib-1.5.37.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
-arpakitlib-1.5.37.dist-info/METADATA,sha256=mYUQJqE6gMICk_29Mn7VcJJcqQtkQMm-DhGce-Dd4YU,2330
-arpakitlib-1.5.37.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
-arpakitlib-1.5.37.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.5.37.dist-info/RECORD,,
+arpakitlib-1.5.39.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
+arpakitlib-1.5.39.dist-info/METADATA,sha256=KS0Ppj3Fkn82og5Kf-974S95JebalflOpolXpUx6g4M,2330
+arpakitlib-1.5.39.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
+arpakitlib-1.5.39.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.5.39.dist-info/RECORD,,