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

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/_arpakit_project_template/manage/poetry_show_arpakitlib.sh

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

arpakitlib/ar_dream_ai_api_client_util.py

@@ -47,13 +47,17 @@ class DreamAIAPIClient:
             self.headers.update({"apikey": api_key})
 
     async def _async_make_http_request(
-            self, *, method: str = "GET", url: str, params: dict[str, Any] | None = None
+            self,
+            *,
+            method: str = "GET",
+            url: str,
+            params: dict[str, Any] | None = None
     ) -> ClientResponse:
         response = await async_make_http_request(
             method=method,
             url=url,
+            params=params,
             headers=self.headers,
-            params=params
         )
         response.raise_for_status()
         return response

arpakitlib/ar_http_request_util.py

@@ -3,6 +3,7 @@
 import asyncio
 import logging
 from datetime import timedelta
+from typing import Any
 
 import aiohttp
 import requests
@@ -20,6 +21,8 @@ def sync_make_http_request(
         *,
         method: str = "GET",
         url: str,
+        headers: dict[str, Any] | None = None,
+        params: dict[str, Any] | None = None,
         max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
@@ -34,13 +37,17 @@ def sync_make_http_request(
 
     kwargs["method"] = method
     kwargs["url"] = url
-    if timeout_ is not None:
-        kwargs["timeout"] = timeout_.total_seconds()
+    if headers is not None:
+        kwargs["headers"] = headers
+    if params is not None:
+        kwargs["params"] = params
     if proxy_url_:
         kwargs["proxies"] = {
             "http": proxy_url_,
             "https": proxy_url_
         }
+    if timeout_ is not None:
+        kwargs["timeout"] = timeout_.total_seconds()
     if "allow_redirects" not in kwargs:
         kwargs["allow_redirects"] = True
 
@@ -64,6 +71,8 @@ async def async_make_http_request(
         *,
         method: str = "GET",
         url: str,
+        headers: dict[str, Any] | None = None,
+        params: dict[str, Any] | None = None,
         max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
@@ -74,6 +83,10 @@ async def async_make_http_request(
 
     kwargs["method"] = method
     kwargs["url"] = url
+    if headers is not None:
+        kwargs["headers"] = headers
+    if params is not None:
+        kwargs["params"] = params
     if timeout_ is not None:
         kwargs["timeout"] = aiohttp.ClientTimeout(total=timeout_.total_seconds())
     if "allow_redirects" not in kwargs:

arpakitlib/ar_schedule_uust_api_client_util.py

@@ -3,14 +3,14 @@
 import asyncio
 import hashlib
 import logging
-from datetime import datetime, timedelta
+from datetime import datetime
 from typing import Any
 
 import pytz
+from aiohttp import ClientResponse
 
 from arpakitlib.ar_dict_util import combine_dicts
 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"
 
@@ -72,25 +72,22 @@ class ScheduleUUSTAPIClient:
     def generate_v2_token(self) -> str:
         return self.generate_new_v2_token(password_first_part=self.api_password_first_part)
 
-    async def _async_make_http_get_request(
+    async def _async_make_http_request(
             self,
             *,
+            method: str = "GET",
             url: str,
             params: dict[str, Any] | None = None
-    ) -> dict[str, Any]:
+    ) -> ClientResponse:
         response = await async_make_http_request(
-            method="GET",
+            method=method,
             url=url,
             params=combine_dicts(params, self.auth_params()),
             proxy_url_=self.api_proxy_url,
-            max_tries_=9,
-            timeout_=timedelta(seconds=15),
             raise_for_status_=True,
             headers=self.headers
         )
-        json_data = await response.json()
-        raise_for_type(json_data, dict)
-        return json_data
+        return response
 
     async def get_current_week(self) -> int:
         """
@@ -100,10 +97,11 @@ class ScheduleUUSTAPIClient:
         }
         """
 
-        json_data = await self._async_make_http_get_request(
+        response = await self._async_make_http_request(
             url=self.api_url,
             params={"ask": "get_current_week"}
         )
+        json_data = await response.json()
         return json_data["data"][0]
 
     async def get_current_semester(self) -> str:
@@ -114,10 +112,11 @@ class ScheduleUUSTAPIClient:
         }
         """
 
-        json_data = await self._async_make_http_get_request(
+        response = await self._async_make_http_request(
             url=self.api_url,
             params={"ask": "get_current_semestr"}
         )
+        json_data = await response.json()
         return json_data["data"][0]
 
     async def get_groups(self) -> list[dict[str, Any]]:
@@ -135,10 +134,11 @@ class ScheduleUUSTAPIClient:
         }
         """
 
-        json_data = await self._async_make_http_get_request(
+        response = await self._async_make_http_request(
             url=self.api_url,
             params={"ask": "get_group_list"}
         )
+        json_data = await response.json()
         return list(json_data["data"].values())
 
     async def get_group_lessons(self, group_id: int, semester: str | None = None) -> list[dict[str, Any]]:
@@ -148,27 +148,30 @@ class ScheduleUUSTAPIClient:
         }
         if semester is not None:
             params["semester"] = semester
-        json_data = await self._async_make_http_get_request(
+        response = await self._async_make_http_request(
             url=self.api_url,
             params=params
         )
+        json_data = await response.json()
         return json_data["data"]
 
     async def get_teachers(self) -> list[dict[str, Any]]:
-        json_data = await self._async_make_http_get_request(
+        response = await self._async_make_http_request(
             url=self.api_url,
             params={"ask": "get_teacher_list"}
         )
+        json_data = await response.json()
         return list(json_data["data"].values())
 
     async def get_teacher_lessons(self, teacher_id: int, semester: str | None = None) -> list[dict[str, Any]]:
         params = {"ask": "get_teacher_schedule", "id": teacher_id}
         if semester is not None:
             params["semester"] = semester
-        json_data = await self._async_make_http_get_request(
+        response = await self._async_make_http_request(
             url=self.api_url,
             params=params
         )
+        json_data = await response.json()
         return json_data["data"]
 
     async def check_conn(self):

arpakitlib/ar_yookassa_api_client_util.py

@@ -42,7 +42,7 @@ class YookassaAPIClient:
         self.headers = {"Content-Type": "application/json"}
         self._logger = logging.getLogger(self.__class__.__name__)
 
-    def _sync_make_request(
+    def _sync_make_http_request(
             self,
             *,
             method: str,
@@ -53,10 +53,10 @@ class YookassaAPIClient:
             kwargs["headers"] = {}
         kwargs["headers"] = combine_dicts(self.headers, kwargs["headers"])
         kwargs["auth"] = (self.shop_id, self.secret_key)
-        kwargs["timeout_"] = timedelta(seconds=3)
         return sync_make_http_request(
             method=method,
             url=url,
+            timeout_=timedelta(seconds=3),
             **kwargs
         )
 
@@ -88,7 +88,7 @@ class YookassaAPIClient:
         if idempotence_key is None:
             idempotence_key = str(uuid.uuid4())
 
-        response = self._sync_make_request(
+        response = self._sync_make_http_request(
             method="POST",
             url="https://api.yookassa.ru/v3/payments",
             headers={"Idempotence-Key": idempotence_key},
@@ -104,7 +104,7 @@ class YookassaAPIClient:
     def sync_get_payment(self, payment_id: str) -> Optional[dict[str, Any]]:
         raise_for_type(payment_id, str)
 
-        response = self._sync_make_request(
+        response = self._sync_make_http_request(
             method="GET",
             url=f"https://api.yookassa.ru/v3/payments/{payment_id}",
             headers=self.headers
@@ -119,15 +119,21 @@ class YookassaAPIClient:
 
         return json_data
 
-    async def async_make_request(self, method: str, url: str, **kwargs) -> aiohttp.ClientResponse:
+    async def _async_make_http_request(
+            self,
+            *,
+            method: str = "GET",
+            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,
+            timeout_=timedelta(seconds=3),
             **kwargs
         )
 
@@ -157,7 +163,7 @@ class YookassaAPIClient:
         if idempotence_key is None:
             idempotence_key = str(uuid.uuid4())
 
-        response = await self.async_make_request(
+        response = await self._async_make_http_request(
             method="POST",
             url="https://api.yookassa.ru/v3/payments",
             headers={"Idempotence-Key": idempotence_key},
@@ -173,7 +179,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_http_request(
             method="GET",
             url=f"https://api.yookassa.ru/v3/payments/{payment_id}",
         )

{arpakitlib-1.6.92.dist-info → arpakitlib-1.6.94.dist-info}/METADATA

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

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

@@ -8,7 +8,7 @@ arpakitlib/_arpakit_project_template/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0
 arpakitlib/_arpakit_project_template/README.md,sha256=n7bVQwXStxdwN07oMF9ot5076qVjTk_H-rmUaSYfHK8,66
 arpakitlib/_arpakit_project_template/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/manage/beutify_json.py,sha256=mzmt-5piAHqgihLsqOpPx1JjDc1qA5F1XHBxDdR-BxY,215
-arpakitlib/_arpakit_project_template/manage/check_logging.py,sha256=77OQzbolrlfc6h5EK5nkJ4RamJ034mFVW8s0rVQGnhM,211
+arpakitlib/_arpakit_project_template/manage/check_logging.py,sha256=rfrl4MK5ItRKaLKb0UU_EfQLckRQSYJ1S_2VAQJQ2Yk,212
 arpakitlib/_arpakit_project_template/manage/check_settings.py,sha256=JYR-IPgvYQOmJedKY9vOctbxEcUlaxZR-P0JXT9L2JQ,143
 arpakitlib/_arpakit_project_template/manage/docker_ps.sh,sha256=uwm8vHgeuNLCOn0o9hgP_uc-PUkS9FwLyzZh6ItZ3do,15
 arpakitlib/_arpakit_project_template/manage/generate_env_example.py,sha256=gveKEz6zf5rwKNBXtHacPEjxxjPTbLy4n-Ztv0BqCWE,331
@@ -34,6 +34,7 @@ arpakitlib/_arpakit_project_template/manage/poetry_install.sh,sha256=oLSrFGHKIRW
 arpakitlib/_arpakit_project_template/manage/poetry_lock.sh,sha256=9oiTdi8ynGQWctQjI3g4ThGkvpT07-g5ajLmG47iVh8,17
 arpakitlib/_arpakit_project_template/manage/poetry_remove_and_add_arpakitlib.sh,sha256=-DvxXI-oaAQxIZFtiCfNBhqpRgJcWWuxhoHb9Nou0a4,197
 arpakitlib/_arpakit_project_template/manage/poetry_show.sh,sha256=pclR9efCNrrGyJR2HrdDM4PCUFGg0OSlRtjQ3Srv8W8,24
+arpakitlib/_arpakit_project_template/manage/poetry_show_arpakitlib.sh,sha256=5ibH12wGYc-Cj8zl5abtI_hLVSW0o4ofktt-w7I6wQo,37
 arpakitlib/_arpakit_project_template/manage/poetry_update.sh,sha256=ZtoXIC4Qq7PMTDxQMwUxvkYC6lTc5LC23ILTywWbyoU,164
 arpakitlib/_arpakit_project_template/manage/poetry_update_arpakitlib.sh,sha256=hh7vj-yKgKqLfaGb8cjsJ_NTa7fBtE4s3yxzte4D8bw,163
 arpakitlib/_arpakit_project_template/manage/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -74,7 +75,7 @@ arpakitlib/ar_base_worker_util.py,sha256=YGoSpkE52QGu_mQdrefThc-pCnhhLEhWchSM3HZ
 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_util.py,sha256=CLN0RnuFn-JzoXLiz2eqnt-z2fkG6NbZEDLThVAyR88,2770
+arpakitlib/ar_dream_ai_api_client_util.py,sha256=sn-eGYZ_3PRr3jrzpBs8xFB8DMEkq_0R2G0GYCp8Npc,2819
 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
@@ -101,7 +102,7 @@ arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyj
 arpakitlib/ar_file_util.py,sha256=XiwmeycxoLqtYnGOu5q6IEaJJXilZvtLvsKDKtwqSLY,137
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
 arpakitlib/ar_hello_world.py,sha256=5B3GTgxGIFh_s6ttyB4UKn78ncyA_8blRnDT04l-ELg,158
-arpakitlib/ar_http_request_util.py,sha256=hMzu2yedUvwIg6gafSakDjXUEC7WH5iplDGiRW9fgPw,3322
+arpakitlib/ar_http_request_util.py,sha256=aWUIfAvoRwf-2WCg6GoD7Bojj2By1j1unBGRBtShkKQ,3781
 arpakitlib/ar_ip_util.py,sha256=aEAa1Hvobh9DWX7cmBAPLqnXSTiKe2hRk-WJaiKMaI8,1009
 arpakitlib/ar_json_db_util.py,sha256=CEyhIU4WuNmX5mqwBVYxUKSdpFelXvWmf_tJ1fuxMSE,7187
 arpakitlib/ar_json_util.py,sha256=GwHDdrBWiJBHSc07Qe0aN1Gp_uM0pYpTwzU9JAgsKAo,972
@@ -111,25 +112,25 @@ arpakitlib/ar_list_util.py,sha256=2woOAHAU8oTIiVjZ8GLnx15odEaoQUq3Q0JPxlufFF0,45
 arpakitlib/ar_logging_util.py,sha256=Gyd7B9k0glIXPm6dASiigWLq9LC9lw6vhXTCeWpY5PY,1644
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=xq5bbAXJG-93CRVZUcLW0ZdM22rj-ZUW17C5hX_5grg,1699
-arpakitlib/ar_openai_util.py,sha256=dHUbfg1sVVCjsNl_fra3iCMEz1bR-Hk9fE-DdYbu7Wc,1215
+arpakitlib/ar_openai_api_client_util.py,sha256=dHUbfg1sVVCjsNl_fra3iCMEz1bR-Hk9fE-DdYbu7Wc,1215
 arpakitlib/ar_operation_execution_util.py,sha256=w_dz4XYEM4WbTxpBoYVkknG3U3_391cJmitgljJJTO0,12373
 arpakitlib/ar_parse_command.py,sha256=-s61xcATIsfw1eV_iD3xi-grsitbGzSDoAFc5V0OFy4,3447
 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=XLaXoKqZRUY-pbn9YAXwnyX7LElDYju_eSTbXHPnyEY,6037
+arpakitlib/ar_schedule_uust_api_client_util.py,sha256=IoJ5a5JhpS7kmh_xXbX5U82tUdpqfD_j5vWKXBEeBRU,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
 arpakitlib/ar_sqlalchemy_util.py,sha256=3wejwPbH5VsTZAWvJQ4qQ8tda-PWBmqVThwRyKnyGqo,4153
-arpakitlib/ar_ssh_util.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
+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=5GMvu8paByni8buhc1vpHB7n6oXe0gPfj1LSvnyZCrQ,5307
-arpakitlib/ar_zabbix_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.6.92.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.6.92.dist-info/METADATA,sha256=FZocXYl5hW3Jsx-yVBCzGlw36cXaS3il6QcsGbtcl8I,2739
-arpakitlib-1.6.92.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.6.92.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.6.92.dist-info/entry_points.txt,sha256=VHkTDXDOMrgcNzGfKhEhoOIIz6T8Kkt46hy95Zc1iL0,74
-arpakitlib-1.6.92.dist-info/RECORD,,
+arpakitlib/ar_yookassa_api_client_util.py,sha256=E5fZjPSjkl1nJ556jHEftM76gRwnIwTQCBj76zDTnGw,5403
+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,,