arpakitlib 1.8.333__tar.gz → 1.8.343__tar.gz

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arpakitlib
-Version: 1.8.333
+Version: 1.8.343
 Summary: arpakitlib
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -24,6 +24,7 @@ Requires-Dist: aiosmtplib (>=4.0.0,<5.0.0)
 Requires-Dist: aiosqlite (>=0.21.0,<0.22.0)
 Requires-Dist: alembic (>=1.14.1,<2.0.0)
 Requires-Dist: asyncpg (>=0.30.0,<0.31.0)
+Requires-Dist: asyncssh (>=2.21.1,<3.0.0)
 Requires-Dist: bs4 (>=0.0.2,<0.0.3)
 Requires-Dist: cachetools (>=5.5.1,<6.0.0)
 Requires-Dist: celery (>=5.4.0,<6.0.0)
@@ -33,9 +34,11 @@ Requires-Dist: fastapi (>=0.118.0,<0.119.0)
 Requires-Dist: gunicorn (>=23.0.0,<24.0.0)
 Requires-Dist: itsdangerous (>=2.2.0,<3.0.0)
 Requires-Dist: markdown (>=3.7,<4.0)
+Requires-Dist: openai (>=2.6.1,<3.0.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: orjson (>=3.10.15,<4.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
+Requires-Dist: paramiko (>=4.0.0,<5.0.0)
 Requires-Dist: pika (>=1.3.2,<2.0.0)
 Requires-Dist: poetry (>=2.0.1,<3.0.0)
 Requires-Dist: poetry-plugin-export (>=1.9.0)
@@ -61,8 +64,9 @@ Requires-Dist: xlrd (>=2.0.1,<3.0.0)
 Requires-Dist: xlsxwriter (>=3.2.5,<4.0.0)
 Project-URL: Documentation, https://github.com/ARPAKIT-Company/arpakitlib
 Project-URL: Homepage, https://github.com/ARPAKIT-Company/arpakitlib
-Project-URL: Repository, https://github.com/ARPAKIT-Company/arpakitlib
 Project-URL: arpakit_company_site, https://arpakit.com
+Project-URL: arpakit_company_support_tg, https://t.me/arpakit_company_support
+Project-URL: git_repository, https://github.com/ARPAKIT-Company/arpakitlib
 Project-URL: telegram_channel, https://t.me/arpakitlib
 Description-Content-Type: text/markdown
 
@@ -87,6 +91,8 @@ workflow
 
 ```
 poetry add arpakitlib
+# or
+poetry add git+https://github.com/ARPAKIT-Company/arpakitlib.git@master
 ```
 
 ### Installation with pip

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/README.md

@@ -19,6 +19,8 @@ workflow
 
 ```
 poetry add arpakitlib
+# or
+poetry add git+https://github.com/ARPAKIT-Company/arpakitlib.git@master
 ```
 
 ### Installation with pip

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/util/create_obj_schema_from_dbm.py

@@ -1,6 +1,6 @@
 from typing import Type
 
-from arpakitlib.ar_sqlalchemy_util import BaseDBM
+from arpakitlib.ar_sqlalchemy_base_dbm_util import BaseDBM
 from pydantic import BaseModel
 
 

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/_arpakit_project_template_v_5/project/core/settings.py

@@ -8,7 +8,7 @@ from pydantic_core.core_schema import ValidationInfo
 
 from arpakitlib.ar_json_util import transfer_data_to_json_str
 from arpakitlib.ar_settings_util import SimpleSettings
-from arpakitlib.ar_sqlalchemy_util import generate_sqlalchemy_url
+from arpakitlib.ar_sqlalchemy_base_dbm_util import generate_sqlalchemy_url
 from arpakitlib.ar_type_util import raise_for_type
 from project.core.const import ProjectPaths
 

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/_arpakit_project_template_v_5/project/operation_execution/operation_executor_worker.py

@@ -11,7 +11,7 @@ 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_exception_util import exception_to_traceback_str
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
+from arpakitlib.ar_sqlalchemy_base_dbm_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_type
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM, StoryLogDBM

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operation_creator_worker.py

@@ -4,7 +4,7 @@ from typing import Any
 from arpakitlib.ar_base_worker_util import BaseWorker
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
+from arpakitlib.ar_sqlalchemy_base_dbm_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_type
 from project.operation_execution.scheduled_operations import ScheduledOperation, get_scheduled_operations
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_db.py

@@ -1,6 +1,6 @@
 from functools import lru_cache
 
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
+from arpakitlib.ar_sqlalchemy_base_dbm_util import SQLAlchemyDb
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
 

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/__init__.py

@@ -1,4 +1,4 @@
-from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base_2
+from arpakitlib.ar_sqlalchemy_base_dbm_util import get_string_info_from_declarative_base_2
 
 from project.sqlalchemy_db_.sqlalchemy_model.api_key import ApiKeyDBM
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py

@@ -8,7 +8,7 @@ from sqlalchemy import func
 from sqlalchemy.orm import mapped_column, Mapped, validates
 
 from arpakitlib.ar_datetime_util import now_utc_dt
-from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, BaseDBM
+from arpakitlib.ar_sqlalchemy_base_dbm_util import get_string_info_from_declarative_base, BaseDBM
 from arpakitlib.ar_str_util import make_none_if_blank
 
 

arpakitlib-1.8.343/arpakitlib/ar_base_http_api_client_util.py

@@ -0,0 +1,47 @@
+import logging
+from typing import Any
+
+import aiohttp
+import requests
+
+from arpakitlib.ar_dict_util import combine_dicts
+from arpakitlib.ar_http_request_util import async_make_http_request, sync_make_http_request
+
+
+class BaseHTTPAPIClient:
+    def __init__(self):
+        self.headers = {"Content-Type": "application/json"}
+        self._logger = logging.getLogger(f"{self.__class__.__name__}")
+
+    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 {})),
+            **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 {})),
+            **kwargs
+        )
+
+    def healthcheck(self) -> bool:
+        raise NotImplemented()

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/ar_list_util.py

@@ -57,6 +57,28 @@ def remove_from_lists_if_left(
     return lists_
 
 
+def int_to_list_(value: int | list | None) -> list[int] | None:
+    if isinstance(value, int):
+        return [value]
+    elif isinstance(value, list):
+        return value
+    elif value is None:
+        return None
+    else:
+        raise TypeError(f"{type(value)=}")
+
+
+def str_to_list_(value: str | list | None) -> list[str] | None:
+    if isinstance(value, str):
+        return [value]
+    elif isinstance(value, list):
+        return value
+    elif value is None:
+        return None
+    else:
+        raise TypeError(f"{type(value)=}")
+
+
 def __example():
     a = remove_from_list_if_left(
         list_=[1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3],

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/ar_ssh_runner_util.py

@@ -13,11 +13,11 @@ from arpakitlib.ar_json_util import transfer_data_to_json_str
 from pydantic import BaseModel, ConfigDict
 
 
-class _BaseSSHException(Exception):
+class BaseSSHException(Exception):
     pass
 
 
-class ConnectionSSHException(_BaseSSHException):
+class ConnectionSSHException(BaseSSHException):
     def __init__(self, ssh_runner: SSHRunner, base_exception: Exception | None = None):
         self.ssh_runner = ssh_runner
         self.base_exception = base_exception
@@ -35,7 +35,7 @@ class ConnectionSSHException(_BaseSSHException):
         return str(self)
 
 
-class ErrorInRunSSHException(_BaseSSHException):
+class ErrorInRunSSHException(BaseSSHException):
     def __init__(self, ssh_runner: SSHRunner, base_exception: Exception | None = None, message: str | None = None):
         self.ssh_runner = ssh_runner
         self.base_exception = base_exception
@@ -56,7 +56,7 @@ class ErrorInRunSSHException(_BaseSSHException):
         return str(self)
 
 
-class SSHRunResultHasErrorSSHException(_BaseSSHException):
+class SSHRunResultHasErrorSSHException(BaseSSHException):
     def __init__(self, ssh_run_result: SSHRunResult, message: str | None = None):
         self.ssh_run_result = ssh_run_result
         self.message = message

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/arpakitlib/ar_yookassa_api_client_util.py

@@ -9,6 +9,7 @@ from typing import Any
 import aiohttp
 import requests
 
+from arpakitlib.ar_base_http_api_client_util import BaseHTTPAPIClient
 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
@@ -19,7 +20,7 @@ https://yookassa.ru/developers/api
 """
 
 
-class YookassaAPIClient:
+class EasyYookassaAPIClient(BaseHTTPAPIClient):
     class PaymentStatuses(Enumeration):
         pending = "pending"
         waiting_for_capture = "waiting_for_capture"
@@ -163,6 +164,9 @@ class YookassaAPIClient:
         return json_data
 
 
+YookassaAPIClient = EasyYookassaAPIClient
+
+
 def __example():
     pass
 

{arpakitlib-1.8.333 → arpakitlib-1.8.343}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.333"
+version = "1.8.343"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_company", email = "support@arpakit.com" }
@@ -64,15 +64,19 @@ dependencies = [
     "poetry-plugin-export (>=1.9.0)",
     "aiogram (>=3.22.0,<4.0.0)",
     "pytelegrambotapi (>=4.29.1,<5.0.0)",
+    "paramiko (>=4.0.0,<5.0.0)",
+    "openai (>=2.6.1,<3.0.0)",
+    "asyncssh (>=2.21.1,<3.0.0)",
 ]
 
 
 [project.urls]
 homepage = "https://github.com/ARPAKIT-Company/arpakitlib"
-repository = "https://github.com/ARPAKIT-Company/arpakitlib"
+git_repository = "https://github.com/ARPAKIT-Company/arpakitlib"
 documentation = "https://github.com/ARPAKIT-Company/arpakitlib"
 telegram_channel = "https://t.me/arpakitlib"
 arpakit_company_site = "https://arpakit.com"
+arpakit_company_support_tg = "https://t.me/arpakit_company_support"
 
 
 [tool.poetry]
@@ -94,9 +98,3 @@ requires = ["poetry-core>=2.0.0,<3.0.0"]
 build-backend = "poetry.core.masonry.api"
 
 
-[dependency-groups]
-full = [
-    "openai (>=2.6.1,<3.0.0)",
-    "asyncssh (>=2.21.1,<3.0.0)",
-    "paramiko (>=4.0.0,<5.0.0)"
-]