arpakitlib 1.5.38__tar.gz → 1.5.39__tar.gz

{arpakitlib-1.5.38 → arpakitlib-1.5.39}/PKG-INFO

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

arpakitlib-1.5.38/arpakitlib/ar_cache_file.py → arpakitlib-1.5.39/arpakitlib/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-1.5.38 → arpakitlib-1.5.39}/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-1.5.38 → arpakitlib-1.5.39}/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-1.5.38 → arpakitlib-1.5.39}/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-1.5.38/arpakitlib/ar_schedule_uust_api_client.py → arpakitlib-1.5.39/arpakitlib/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-1.5.38/arpakitlib/ar_yookassa_api_client.py → arpakitlib-1.5.39/arpakitlib/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.38 → arpakitlib-1.5.39}/pyproject.toml

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