arpakitlib 1.6.93__tar.gz → 1.6.95__tar.gz

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/PKG-INFO

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

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/arpakitlib/_arpakit_project_template/manage/check_logging.py

@@ -4,6 +4,7 @@ from src.core.util import setup_logging
 
 _logger = logging.getLogger(__name__)
 
+
 def command():
     setup_logging()
     _logger.info("checking logging")

arpakitlib-1.6.95/arpakitlib/_arpakit_project_template/manage/poetry_show_arpakitlib.sh

@@ -0,0 +1,2 @@
+cd ..
+poetry show arpakitlib --no-dev

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_1.py

@@ -1,8 +1,6 @@
-
 def make_test_data_1():
     pass
 
 
 async def async_make_test_data_1():
     pass
-

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_2.py

@@ -1,8 +1,6 @@
-
 def make_test_data_2():
     pass
 
 
 async def async_make_test_data_2():
     pass
-

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_3.py

@@ -1,8 +1,6 @@
-
 def make_test_data_3():
     pass
 
 
 async def async_make_test_data_3():
     pass
-

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_4.py

@@ -1,8 +1,6 @@
-
 def make_test_data_4():
     pass
 
 
 async def async_make_test_data_4():
     pass
-

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/arpakitlib/_arpakit_project_template/src/test_data/make_test_data_5.py

@@ -1,8 +1,6 @@
-
 def make_test_data_5():
     pass
 
 
 async def async_make_test_data_5():
     pass
-

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/arpakitlib/ar_schedule_uust_api_client_util.py

@@ -82,10 +82,10 @@ class ScheduleUUSTAPIClient:
         response = await async_make_http_request(
             method=method,
             url=url,
+            headers=self.headers,
             params=combine_dicts(params, self.auth_params()),
             proxy_url_=self.api_proxy_url,
-            raise_for_status_=True,
-            headers=self.headers
+            raise_for_status_=True
         )
         return response
 

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/arpakitlib/ar_yookassa_api_client_util.py

@@ -40,6 +40,7 @@ class YookassaAPIClient:
         self.secret_key = secret_key
         self.shop_id = shop_id
         self.headers = {"Content-Type": "application/json"}
+        self.timeout_ = timedelta(seconds=3)
         self._logger = logging.getLogger(self.__class__.__name__)
 
     def _sync_make_http_request(
@@ -47,23 +48,21 @@ class YookassaAPIClient:
             *,
             method: str,
             url: str,
+            headers: dict[str, Any] | None = None,
             **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)
         return sync_make_http_request(
             method=method,
             url=url,
-            timeout_=timedelta(seconds=3),
+            headers=combine_dicts(self.headers, (headers if headers is not None else {})),
+            timeout_=self.timeout_,
+            auth=(self.shop_id, self.secret_key),
             **kwargs
         )
 
     def sync_create_payment(
             self,
-            json_body: dict[str, Any],
-            idempotence_key: Optional[str] = None
+            json_body: dict[str, Any]
     ) -> dict[str, Any]:
 
         """
@@ -85,38 +84,27 @@ class YookassaAPIClient:
         }
         """
 
-        if idempotence_key is None:
-            idempotence_key = str(uuid.uuid4())
-
         response = self._sync_make_http_request(
             method="POST",
             url="https://api.yookassa.ru/v3/payments",
-            headers={"Idempotence-Key": idempotence_key},
+            headers={"Idempotence-Key": str(uuid.uuid4())},
             json=json_body,
         )
-
         json_data = response.json()
-
         response.raise_for_status()
-
         return json_data
 
-    def sync_get_payment(self, payment_id: str) -> Optional[dict[str, Any]]:
+    def sync_get_payment(self, payment_id: str) -> dict[str, Any] | None:
         raise_for_type(payment_id, str)
-
         response = self._sync_make_http_request(
             method="GET",
             url=f"https://api.yookassa.ru/v3/payments/{payment_id}",
             headers=self.headers
         )
-
         json_data = response.json()
-
         if response.status_code == 404:
             return None
-
         response.raise_for_status()
-
         return json_data
 
     async def _async_make_http_request(
@@ -124,21 +112,20 @@ class YookassaAPIClient:
             *,
             method: str = "GET",
             url: str,
+            headers: dict[str, Any] | None = None,
             **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)
         return await async_make_http_request(
             method=method,
             url=url,
-            timeout_=timedelta(seconds=3),
+            headers=combine_dicts(self.headers, (headers if headers is not None else {})),
+            timeout_=self.timeout_,
+            auth=aiohttp.BasicAuth(login=str(self.shop_id), password=self.secret_key),
             **kwargs
         )
 
     async def async_create_payment(
-            self, json_body: dict[str, Any], idempotence_key: Optional[str] = None
+            self, json_body: dict[str, Any]
     ) -> dict[str, Any]:
 
         """
@@ -160,37 +147,26 @@ class YookassaAPIClient:
         }
         """
 
-        if idempotence_key is None:
-            idempotence_key = str(uuid.uuid4())
-
         response = await self._async_make_http_request(
             method="POST",
             url="https://api.yookassa.ru/v3/payments",
-            headers={"Idempotence-Key": idempotence_key},
+            headers={"Idempotence-Key": str(uuid.uuid4())},
             json=json_body,
         )
-
         json_data = await response.json()
-
         response.raise_for_status()
-
         return json_data
 
     async def async_get_payment(self, payment_id: str) -> Optional[dict[str, Any]]:
         raise_for_type(payment_id, str)
-
         response = await self._async_make_http_request(
             method="GET",
             url=f"https://api.yookassa.ru/v3/payments/{payment_id}",
         )
-
         json_data = await response.json()
-
         if response.status == 404:
             return None
-
         response.raise_for_status()
-
         return json_data
 
 

{arpakitlib-1.6.93 → arpakitlib-1.6.95}/pyproject.toml

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