arpakitlib 1.6.94__py3-none-any.whl → 1.6.95__py3-none-any.whl

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/_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/_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/_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/_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/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/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.94.dist-info → arpakitlib-1.6.95.dist-info}/METADATA

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

{arpakitlib-1.6.94.dist-info → arpakitlib-1.6.95.dist-info}/RECORD

@@ -59,11 +59,11 @@ arpakitlib/_arpakit_project_template/src/core/const.py,sha256=CZZew674y7LhCAlYhv
 arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=TNS0T9xUPw089wJV10BGoG8LCBOIb30DrDazxP2NPAU,1184
 arpakitlib/_arpakit_project_template/src/core/util.py,sha256=EXFC0OqaM9by3jDk6mc2mFO_b9RcLs3VT-qr31QemDc,1387
 arpakitlib/_arpakit_project_template/src/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template/src/test_data/make_test_data_1.py,sha256=F7c6gRJUPjS14oLEDvRGA34yEabpnb5VH59N_xxkqrI,82
-arpakitlib/_arpakit_project_template/src/test_data/make_test_data_2.py,sha256=8fIBiguJWvQJscQzDDBWdk-XeDQNAMBKULVV7RjHoR0,82
-arpakitlib/_arpakit_project_template/src/test_data/make_test_data_3.py,sha256=20He7mIb7cUM16he-LQzr5GRk4b9VPXCk8omn-s31yg,82
-arpakitlib/_arpakit_project_template/src/test_data/make_test_data_4.py,sha256=WqxgOzaIDsmIER1nFIxrywtKceyvkqtLlyt2ybTxSw0,82
-arpakitlib/_arpakit_project_template/src/test_data/make_test_data_5.py,sha256=ogTmetjQiRa57TKNfVH5A6GFTqBrU1Js0vTok6jlL_A,82
+arpakitlib/_arpakit_project_template/src/test_data/make_test_data_1.py,sha256=3WVPgRsNCIxWpA-6t_Phe-nFULdHPhS1S_DO11XRmqk,80
+arpakitlib/_arpakit_project_template/src/test_data/make_test_data_2.py,sha256=MVDc71sj5I1muWin50GwrSxMwYtOOSDOtRmeFErHcXs,80
+arpakitlib/_arpakit_project_template/src/test_data/make_test_data_3.py,sha256=89Rg0wubztpCNHBOWkhjZz3nB8Teilrl9xHlJvDWw9o,80
+arpakitlib/_arpakit_project_template/src/test_data/make_test_data_4.py,sha256=BlVvIhSFclBMQMHftETS57bRaFpkOdKPrZyxMbYJuDY,80
+arpakitlib/_arpakit_project_template/src/test_data/make_test_data_5.py,sha256=7ruCZevqJoLSdqL1OEJWUy3YPCOHQif7JqVTKxZ9acM,80
 arpakitlib/_arpakit_project_template/src/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/ar_additional_model_util.py,sha256=tNzZhZtvtJ1qC6Cn4UnyoEL58HudfpCdQy5ftkCqyik,473
 arpakitlib/ar_aiogram_util.py,sha256=5JPCDZpdBGTE-EIWPRez9amCZAX7XemFIVu5YrQK7Pw,12264
@@ -118,7 +118,7 @@ arpakitlib/ar_parse_command.py,sha256=-s61xcATIsfw1eV_iD3xi-grsitbGzSDoAFc5V0OFy
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
 arpakitlib/ar_project_template_util.py,sha256=Yh3tzNYq0rrKc1MY-qsW1Ljhi9ADz8nYXMiPDH-e6PQ,3097
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
-arpakitlib/ar_schedule_uust_api_client_util.py,sha256=IoJ5a5JhpS7kmh_xXbX5U82tUdpqfD_j5vWKXBEeBRU,6109
+arpakitlib/ar_schedule_uust_api_client_util.py,sha256=JD-hRUQSs-euK0zq9w_4QUfGO00yWM08gllWUVKTtHc,6109
 arpakitlib/ar_settings_util.py,sha256=NvFzpIaQhlMp-BZwttUY_9gamMC5cpJk2Kp2B3BtMug,1296
 arpakitlib/ar_sleep_util.py,sha256=9ZN4Qo4eZ_q3hjM7vNBQjFRcH-9-sqv3QLSjnxVJE90,1405
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=ttdgOwQfoHTKqgivBtXoSbJoBCASHDjLEFK5tJ9kNNE,4779
@@ -126,11 +126,11 @@ arpakitlib/ar_sqlalchemy_util.py,sha256=3wejwPbH5VsTZAWvJQ4qQ8tda-PWBmqVThwRyKny
 arpakitlib/ar_ssh_runner_util.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
 arpakitlib/ar_str_util.py,sha256=AhcdrEm-pXRilCaDWCdTfVkQSy0SnbE52ur43Ltr6cI,2128
 arpakitlib/ar_type_util.py,sha256=5nDnXL5Oyozlg8XvxMrogsoYiG8_atItg46A0mtv-pk,2025
-arpakitlib/ar_yookassa_api_client_util.py,sha256=E5fZjPSjkl1nJ556jHEftM76gRwnIwTQCBj76zDTnGw,5403
+arpakitlib/ar_yookassa_api_client_util.py,sha256=sh4fcUkAkdOetFn9JYoTvjcSXP-M1wU04KEY-ECLfLg,5137
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.6.94.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.6.94.dist-info/METADATA,sha256=Bi81fHUE4IqgfDmVdwF0hDKcqOqieqO_Urzch1ThlyM,2739
-arpakitlib-1.6.94.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.6.94.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.6.94.dist-info/entry_points.txt,sha256=VHkTDXDOMrgcNzGfKhEhoOIIz6T8Kkt46hy95Zc1iL0,74
-arpakitlib-1.6.94.dist-info/RECORD,,
+arpakitlib-1.6.95.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.6.95.dist-info/METADATA,sha256=U80z4aPUmskD6Lw2kxO3FgkL8mxPglIsmXUgGMtZBPI,2739
+arpakitlib-1.6.95.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.6.95.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.6.95.dist-info/entry_points.txt,sha256=VHkTDXDOMrgcNzGfKhEhoOIIz6T8Kkt46hy95Zc1iL0,74
+arpakitlib-1.6.95.dist-info/RECORD,,