arpakitlib 1.8.320__tar.gz → 1.8.326__tar.gz

{arpakitlib-1.8.320 → arpakitlib-1.8.326}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arpakitlib
-Version: 1.8.320
+Version: 1.8.326
 Summary: arpakitlib
 License-Expression: Apache-2.0
 License-File: LICENSE

arpakitlib-1.8.320/arpakitlib/include_fastapi_routers_from_dir.py → arpakitlib-1.8.326/arpakitlib/ar_include_fastapi_routers_from_dir_util.py

@@ -20,6 +20,8 @@ def include_fastapi_routers_from_dir(
         exclude_filenames = ["__init__.py"]
 
     for root, _, files in os.walk(base_dir):
+        files.sort()
+
         for filename in files:
             if not filename.endswith(".py") or filename in exclude_filenames:
                 continue

{arpakitlib-1.8.320 → arpakitlib-1.8.326}/arpakitlib/ar_sqlalchemy_util.py

@@ -273,7 +273,7 @@ class SQLAlchemyDb:
         self._logger.info("alembic tables data were removed")
 
     def ensure_check_constraints(self):
-        from arpakitlib.ar_ensure_sqlalchemy_check_constraints import ensure_sqlalchemy_check_constraints
+        from arpakitlib.ar_sqlalchemy_ensure_check_constraints import ensure_sqlalchemy_check_constraints
         ensure_sqlalchemy_check_constraints(base_=self.base_dbm, engine=self.engine)
 
     def drop_check_constraints(self):

{arpakitlib-1.8.320 → arpakitlib-1.8.326}/arpakitlib/ar_str_util.py

@@ -107,7 +107,7 @@ def remove_tags_and_html(string: str) -> str:
 
 def raise_if_string_blank(string: str) -> str:
     if not string:
-        raise ValueError("not string")
+        raise ValueError("string is blank")
     return string
 
 

arpakitlib-1.8.326/arpakitlib/ar_yookassa_api_client_util.py

@@ -0,0 +1,175 @@
+from __future__ import annotations
+
+import asyncio
+import logging
+import uuid
+from datetime import timedelta
+from typing import Any
+
+import aiohttp
+import requests
+from arpakitlib.ar_dict_util import combine_dicts
+from arpakitlib.ar_enumeration_util import Enumeration
+from arpakitlib.ar_http_request_util import sync_make_http_request, async_make_http_request
+from arpakitlib.ar_type_util import raise_for_type
+
+"""
+https://yookassa.ru/developers/api
+"""
+
+
+class YookassaAPIClient:
+    class PaymentStatuses(Enumeration):
+        pending = "pending"
+        waiting_for_capture = "waiting_for_capture"
+        succeeded = "succeeded"
+        canceled = "canceled"
+
+    def __init__(self, *, secret_key: str, shop_id: int):
+        super().__init__()
+        self.secret_key = secret_key
+        self.shop_id = shop_id
+        self.headers = {"Content-Type": "application/json"}
+        self._logger = logging.getLogger(f"{self.__class__.__name__}-{shop_id}")
+
+    def _sync_make_http_request(
+            self,
+            *,
+            method: str,
+            url: str,
+            headers: dict[str, Any] | None = None,
+            **kwargs
+    ) -> requests.Response:
+        return sync_make_http_request(
+            method=method,
+            url=url,
+            headers=combine_dicts(self.headers, (headers if headers is not None else {})),
+            max_tries_=3,
+            raise_for_status_=True,
+            timeout_=timedelta(seconds=3),
+            not_raise_for_statuses_=[404],
+            auth=(self.shop_id, self.secret_key),
+            enable_logging_=False,
+            **kwargs
+        )
+
+    async def _async_make_http_request(
+            self,
+            *,
+            method: str = "GET",
+            url: str,
+            headers: dict[str, Any] | None = None,
+            **kwargs
+    ) -> aiohttp.ClientResponse:
+        return await async_make_http_request(
+            method=method,
+            url=url,
+            headers=combine_dicts(self.headers, (headers if headers is not None else {})),
+            max_tries_=3,
+            raise_for_status_=True,
+            not_raise_for_statuses_=[404],
+            timeout_=timedelta(seconds=3),
+            auth=aiohttp.BasicAuth(login=str(self.shop_id), password=self.secret_key),
+            enable_logging_=False,
+            **kwargs
+        )
+
+    def sync_create_payment(self, *, json_body: dict[str, Any]) -> dict[str, Any]:
+
+        """
+        json_body example
+        json_body = {
+            "amount": {
+                "value": "2.0",
+                "currency": "RUB"
+            },
+            "description": "description",
+            "confirmation": {
+                "type": "redirect",
+                "return_url": f"https://t.me/{get_tg_bot_username()}",
+                "locale": "ru_RU"
+            },
+            "capture": True,
+            "metadata": {},
+            "merchant_customer_id": ""
+        }
+        """
+
+        response = self._sync_make_http_request(
+            method="POST",
+            url="https://api.yookassa.ru/v3/payments",
+            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) -> 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_create_payment(self, *, json_body: dict[str, Any]) -> dict[str, Any]:
+
+        """
+        json_body example
+        json_body = {
+            "amount": {
+                "value": "2.0",
+                "currency": "RUB"
+            },
+            "description": "description",
+            "confirmation": {
+                "type": "redirect",
+                "return_url": f"https://t.me/{get_tg_bot_username()}",
+                "locale": "ru_RU"
+            },
+            "capture": True,
+            "metadata": {},
+            "merchant_customer_id": ""
+        }
+        """
+
+        response = await self._async_make_http_request(
+            method="POST",
+            url="https://api.yookassa.ru/v3/payments",
+            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) -> dict[str, Any] | None:
+        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
+
+
+def __example():
+    pass
+
+
+async def __async_example():
+    pass
+
+
+if __name__ == '__main__':
+    __example()
+    asyncio.run(__async_example())

{arpakitlib-1.8.320 → arpakitlib-1.8.326}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.320"
+version = "1.8.326"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_company", email = "support@arpakit.com" }