arpakitlib 1.9.6__tar.gz → 1.9.23__tar.gz

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arpakitlib
-Version: 1.9.6
+Version: 1.9.23
 Summary: arpakitlib
 License-Expression: Apache-2.0
 License-File: LICENSE
@@ -37,7 +37,6 @@ 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)
@@ -47,7 +46,6 @@ Requires-Dist: pulp (>=2.9.0,<3.0.0)
 Requires-Dist: pydantic (>=2.10.5,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.7.1,<3.0.0)
 Requires-Dist: pyjwt (>=2.10.1,<3.0.0)
-Requires-Dist: pymongo (>=4.10.1,<5.0.0)
 Requires-Dist: pytelegrambotapi (>=4.29.1,<5.0.0)
 Requires-Dist: pytest (>=8.4.2,<9.0.0)
 Requires-Dist: pytz (>=2024.2,<2025.0)
@@ -77,21 +75,21 @@ Description-Content-Type: text/markdown
 A collection of lightweight and convenient development tools by arpakit, designed to simplify and accelerate your
 workflow
 
-## Important
-
-The most up-to-date version is on GitHub or GitLab.
-
 ---
 
 ### Supported Python version
 
-- Python 3.12.4
+- Python 3.12.4+
 
 ---
 
-### Installation with Poetry
+### Installation methods
 
 ```
+poetry add arpakitlib
+# or
+pip add arpakitlib
+# or
 poetry add git+https://github.com/ARPAKIT-Company/arpakitlib.git@master
 ```
 

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/README.md

@@ -5,21 +5,21 @@
 A collection of lightweight and convenient development tools by arpakit, designed to simplify and accelerate your
 workflow
 
-## Important
-
-The most up-to-date version is on GitHub or GitLab.
-
 ---
 
 ### Supported Python version
 
-- Python 3.12.4
+- Python 3.12.4+
 
 ---
 
-### Installation with Poetry
+### Installation methods
 
 ```
+poetry add arpakitlib
+# or
+pip add arpakitlib
+# or
 poetry add git+https://github.com/ARPAKIT-Company/arpakitlib.git@master
 ```
 

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_aiogram_as_tg_command_2_util.py

@@ -13,8 +13,6 @@ from pydantic_core import PydanticUndefined
 
 from arpakitlib.ar_parse_command_util import parse_command
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 _logger = logging.getLogger(__name__)
 
 

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_aiogram_as_tg_command_util.py

@@ -15,8 +15,6 @@ from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
 from arpakitlib.ar_parse_command_util import BadCommandFormat, parse_command
 from arpakitlib.ar_type_util import raise_for_types
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 _logger = logging.getLogger(__name__)
 
 _logger.warning(f"Module '{Path(__file__).name}' is deprecated; use 'ar_aiogram_as_tg_command_2_util' instead.")

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_arpakit_project_template_util.py

@@ -6,8 +6,6 @@ import os
 from arpakitlib.ar_str_util import raise_if_string_blank
 from arpakitlib.ar_type_util import raise_for_type
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 _logger = logging.getLogger(__name__)
 
 

arpakitlib-1.9.6/arpakitlib/ar_arpakit_lib_module_util.py → arpakitlib-1.9.23/arpakitlib/ar_arpakitlib_module_util.py

@@ -4,14 +4,11 @@ import json
 import os
 import pathlib
 from importlib.util import spec_from_file_location, module_from_spec
-from typing import NamedTuple, Any, Iterator, Optional
-
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+from typing import NamedTuple, Any, Iterator
 
 
 class ArpakitLibModule(NamedTuple):
     module_name: str
-    module_version: Optional[str]
     module_content: str
     module_hash: str
     module_has_error: bool
@@ -22,7 +19,6 @@ class ArpakitLibModule(NamedTuple):
     def simple_dict(self) -> dict[str, Any]:
         return {
             "module_name": self.module_name,
-            "module_version": self.module_version,
             "module_content": self.module_content,
             "module_hash": self.module_hash,
             "module_has_error": self.module_has_error,
@@ -61,13 +57,9 @@ class ArpakitLibModules(NamedTuple):
     def module_name_to_module_simple_dict(self) -> dict[str, dict]:
         return {module.module_name: module.simple_dict() for module in self.arpakit_lib_modules}
 
-    def module_name_to_module_version(self) -> dict[str, str]:
-        return {module.module_name: module.module_version for module in self.arpakit_lib_modules}
-
-    def module_name_to_module_version_and_module_has_errors(self) -> dict[str, dict[str, Any]]:
+    def module_name_to_has_errors(self) -> dict[str, dict[str, Any]]:
         return {
             module.module_name: {
-                "module_version": module.module_version,
                 "module_has_errors": module.module_has_error,
             } for module in self.arpakit_lib_modules
         }
@@ -104,7 +96,7 @@ class ArpakitLibModules(NamedTuple):
         return {module.module_name: module.module_content for module in self.arpakit_lib_modules}
 
 
-def get_arpakit_lib_modules() -> ArpakitLibModules:
+def get_arpakitlib_modules() -> ArpakitLibModules:
     base_dirpath: str = str(pathlib.Path(__file__).parent)
 
     filenames: list[str] = os.listdir(base_dirpath)
@@ -116,19 +108,15 @@ def get_arpakit_lib_modules() -> ArpakitLibModules:
         if not filename.endswith(".py") or filename == "__init__.py":
             continue
         module_name = filename.replace(".py", "")
-        module_version: Optional[str] = None
         try:
             spec = spec_from_file_location(module_name, os.path.join(base_dirpath, filename))
             module = module_from_spec(spec)
             spec.loader.exec_module(module)
-            module_version = getattr(module, "_ARPAKIT_LIB_MODULE_VERSION", None)
             module_has_error = False
             module_exception = None
         except Exception as error:
             module_has_error = True
             module_exception = error
-        if module_version is not None and not isinstance(module_version, str):
-            continue
         if module_name in [
             arpakit_lib_module.module_name for arpakit_lib_module in arpakit_lib_modules.arpakit_lib_modules
         ]:
@@ -137,7 +125,6 @@ def get_arpakit_lib_modules() -> ArpakitLibModules:
         module_hash = hashlib.sha256(module_content.encode('utf-8')).hexdigest()
         arpakit_lib_modules.arpakit_lib_modules.append(ArpakitLibModule(
             module_name=module_name,
-            module_version=module_version,
             module_content=module_content,
             module_hash=module_hash,
             module_has_error=module_has_error,
@@ -150,7 +137,7 @@ def get_arpakit_lib_modules() -> ArpakitLibModules:
 
 
 def __example():
-    pass
+    print(get_arpakitlib_modules())
 
 
 if __name__ == '__main__':

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_base64_util.py

@@ -3,8 +3,6 @@
 import base64
 from typing import Optional
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def convert_base64_string_to_bytes(base64_string: str, raise_for_error: bool = False) -> Optional[bytes]:
     try:

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_base_http_api_client_util.py

@@ -45,3 +45,6 @@ class BaseHTTPAPIClient:
 
     def healthcheck(self) -> bool:
         raise NotImplemented()
+
+    async def async_healthcheck(self) -> bool:
+        raise NotImplemented()

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_base_worker_util.py

@@ -14,8 +14,6 @@ from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_func_util import is_async_func, is_sync_func, is_coroutine
 from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class BaseWorker(ABC):
     def __init__(

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_blank_util.py

@@ -1,8 +1,6 @@
 # arpakit
 from arpakitlib.ar_enumeration_util import Enumeration
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class BaseBlank:
     class Languages(Enumeration):

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_cache_file_util.py

@@ -10,8 +10,6 @@ from pydantic import BaseModel
 from arpakitlib.ar_json_db_util import JSONDbFile
 from arpakitlib.ar_type_util import raise_for_type
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class CacheBlock(BaseModel):
     key: str

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_class_util.py

@@ -1,7 +1,5 @@
 # arpakit
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class CollectingSubclassesMeta(type):
     """

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_clone_pydantic_model_fields_util.py

@@ -4,8 +4,6 @@ from typing import Any, Type, Iterable
 from pydantic import BaseModel, create_model
 from pydantic_core import PydanticUndefined
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def clone_pydantic_model_fields(
         *,

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_datetime_util.py

@@ -7,8 +7,6 @@ import pytz
 
 from arpakitlib.ar_type_util import raise_for_type
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def convert_dt_tz(dt: datetime, tz_info):
     return dt.astimezone(tz_info)

arpakitlib-1.9.23/arpakitlib/ar_dict_as_object.py

@@ -0,0 +1,46 @@
+from arpakitlib.ar_json_util import transfer_data_to_json_str
+
+
+class DictAsObject:
+    def __init__(self, data: dict | list):
+        self._real_data = data
+
+    def __getattr__(self, item):
+        if isinstance(self._real_data, dict):
+            try:
+                return self.wrap(self._real_data[item])
+            except KeyError:
+                raise AttributeError(item)
+
+        raise AttributeError(item)
+
+    def __getitem__(self, key):
+        if isinstance(self._real_data, (list, dict)):
+            return self.wrap(self._real_data[key])
+        raise TypeError(f"{type(self._real_data)} is not subscriptable")
+
+    def __len__(self):
+        return len(self._real_data)
+
+    def __repr__(self):
+        return transfer_data_to_json_str(self._real_data, beautify=True)
+
+    @staticmethod
+    def wrap(value):
+        if isinstance(value, (dict, list)):
+            return DictAsObject(value)
+        return value
+
+    def get_raw_from_dict(self, *, key: str, allow_non_exist: bool = True):
+        """
+        Возвращает значение напрямую из _real_data, без wrap
+        """
+
+        if not isinstance(self._real_data, dict):
+            raise TypeError("not isinstance(self._real_data, dict)")
+
+        if key not in self._real_data:
+            if allow_non_exist is True:
+                return None
+
+        return self._real_data[key]

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_dict_util.py

@@ -2,8 +2,6 @@
 
 from typing import Any
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def combine_dicts(*dicts: dict) -> dict[Any, Any]:
     res = {}

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_encrypt_decrypt_util.py

@@ -2,8 +2,6 @@
 
 from cryptography.fernet import Fernet
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def generate_secret_key() -> str:
     return Fernet.generate_key().decode()

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_enumeration_util.py

@@ -2,8 +2,6 @@
 
 from typing import Union, Iterator, Iterable, Any
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 ValueType = Union[int, str]
 ValuesForParseType = Union[ValueType, Iterable[ValueType]]
 

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_exception_util.py

@@ -1,7 +1,5 @@
 import traceback
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def exception_to_traceback_str(exception: BaseException) -> str:
     try:

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_file_storage_in_dir_util.py

@@ -9,8 +9,6 @@ from typing import Optional, Union, Iterator
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_str_util import none_if_blank
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class FileStorageInDir:
 

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_file_util.py

@@ -1,7 +1,5 @@
 import os
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def raise_if_path_not_exists(path: str):
     if not os.path.exists(path):

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_func_util.py

@@ -2,8 +2,6 @@ import asyncio
 import inspect
 from typing import Callable
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def is_async_func(func: Callable) -> bool:
     if inspect.ismethod(func) or inspect.isfunction(func):

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_hash_util.py

@@ -2,8 +2,6 @@
 
 import hashlib
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def hash_string(string: str) -> str:
     return hashlib.sha256(string.encode()).hexdigest()

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_http_request_util.py

@@ -13,8 +13,6 @@ from arpakitlib.ar_json_util import transfer_data_to_json_str
 from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 from arpakitlib.ar_type_util import raise_for_type
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 _logger = logging.getLogger(__name__)
 
 

arpakitlib-1.9.23/arpakitlib/ar_include_aiogram_routers_from_dir_util.py

@@ -0,0 +1,38 @@
+import importlib.util
+import os
+
+from aiogram import Router
+
+
+def include_aiogram_routers_from_dir(
+        *,
+        router: Router,
+        base_dir: str = ".",
+        exclude_filenames: list[str] | None = None,
+):
+    if exclude_filenames is None:
+        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
+
+            file_path = os.path.join(root, filename)
+            module_name = (
+                os.path.relpath(file_path, base_dir)
+                .replace(os.sep, ".")
+                .removesuffix(".py")
+            )
+
+            spec = importlib.util.spec_from_file_location(module_name, file_path)
+            module = importlib.util.module_from_spec(spec)
+            spec.loader.exec_module(module)
+
+            tg_bot_router = getattr(module, "tg_bot_router", None)
+            if isinstance(tg_bot_router, Router):
+                router.include_router(
+                    router=tg_bot_router,
+                )

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_ip_util.py

@@ -2,8 +2,6 @@
 
 import ipaddress
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def is_ipv4_address(value: str) -> bool:
     try:

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_json_db_util.py

@@ -8,8 +8,6 @@ from typing import Any, Optional, Self
 
 from arpakitlib.ar_type_util import raise_for_type
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class JSONDbFile:
 

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_json_util.py

@@ -5,8 +5,6 @@ from typing import Any, Iterable
 
 import orjson
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def transfer_json_str_to_data(
         json_str: str, fast: bool = False

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_jwt_util.py

@@ -7,8 +7,6 @@ from jwt import PyJWTError
 
 from arpakitlib.ar_type_util import raise_for_type
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def encode_jwt_token(
         *,

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_list_of_dicts_to_xlsx_util.py

@@ -4,8 +4,6 @@ from typing import Any
 
 import pandas
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def list_of_dicts_to_xlsx(
         list_of_dicts: list[dict[str, Any]],

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_list_util.py

@@ -2,8 +2,6 @@
 
 from typing import Any
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def iter_group_list(list_: list[Any], n: int):
     part = []

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_log_async_func_if_error_util.py

@@ -1,6 +1,5 @@
 # arpakit
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 import logging
 

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_logging_util.py

@@ -3,8 +3,6 @@
 import logging
 import os
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def init_log_file(*, log_filepath: str | None):
     if not log_filepath:

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_need_type_util.py

@@ -5,8 +5,6 @@ from typing import Any
 
 from arpakitlib.ar_enumeration_util import Enumeration
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class NeedTypes(Enumeration):
     str_ = "str"

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_openai_api_client_util.py

@@ -4,10 +4,11 @@ import asyncio
 import logging
 
 import httpx
-from arpakitlib.ar_base64_util import convert_file_to_base64_string
 from openai import OpenAI, AsyncOpenAI
 from openai.types.chat import ChatCompletion
 
+from arpakitlib.ar_base64_util import convert_file_to_base64_string
+
 """
 https://platform.openai.com/docs/
 """

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_parse_command_util.py

@@ -4,8 +4,6 @@ import shlex
 
 from pydantic import BaseModel
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class BadCommandFormat(Exception):
     pass

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_postgresql_util.py

@@ -1,10 +1,10 @@
 # arpakit
 
+from shlex import quote
+
 from arpakitlib.ar_run_cmd_util import run_cmd
 from arpakitlib.ar_type_util import raise_for_type
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def make_postgresql_db_dump(
         *,
@@ -13,21 +13,30 @@ def make_postgresql_db_dump(
         db_name: str,
         port: int = 5432,
         out_filepath: str = "db_dump.sql",
-        password: str | None = None
+        password: str | None = None,
 ) -> str:
     raise_for_type(user, str)
     raise_for_type(host, str)
     raise_for_type(db_name, str)
     raise_for_type(port, int)
+    raise_for_type(out_filepath, str)
+
+    env_prefix = ""
     if password:
-        run_cmd_res = run_cmd(
-            command=f"echo {password} | pg_dump -U {user} -h {host} {db_name} -p {port} > {out_filepath}"
-        )
-    else:
-        run_cmd_res = run_cmd(
-            command=f"pg_dump -U {user} -h {host} {db_name} -p {port} > {out_filepath}"
-        )
-    run_cmd_res.raise_for_bad_return_code()
+        env_prefix = f"PGPASSWORD={quote(password)} "
+
+    command = (
+        f"{env_prefix}"
+        f"pg_dump "
+        f"-U {quote(user)} "
+        f"-h {quote(host)} "
+        f"-p {port} "
+        f"-f {quote(out_filepath)} "
+        f"{quote(db_name)}"
+    )
+
+    res = run_cmd(command)
+    res.raise_for_bad_return_code()
 
     return out_filepath
 

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_pydantic_schema_from_sqlalchemy_model_util.py

@@ -5,8 +5,6 @@ from pydantic import BaseModel, ConfigDict
 from sqlalchemy import inspect
 from sqlalchemy.orm import ColumnProperty, Mapped
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def _define_sqlalchemy_column_mapped_type(type_: Any) -> Any:
     """

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_raise_own_exception_if_exception_util.py

@@ -5,8 +5,6 @@ import logging
 from functools import wraps
 from typing import Any, Callable, Awaitable, Tuple, TypeVar, ParamSpec, cast
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 PARAMS_SPEC = ParamSpec("PARAMS_SPEC")
 RESULT_SPEC = TypeVar("RESULT_SPEC")
 

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_retry_func_util.py

@@ -7,8 +7,6 @@ from typing import Any
 
 from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 async def async_retry_func(
         *,

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_run_cmd_util.py

@@ -6,8 +6,6 @@ import subprocess
 
 from pydantic import BaseModel
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class RunCmdResHasErr(Exception):
     pass

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_safe_func_util.py

@@ -6,8 +6,6 @@ from pydantic import BaseModel, ConfigDict, Field
 
 from arpakitlib.ar_datetime_util import now_utc_dt
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class SafeFuncResult(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_settings_util.py

@@ -5,8 +5,6 @@ from pydantic import ConfigDict, model_validator
 from pydantic_core import PydanticUndefined
 from pydantic_settings import BaseSettings
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def generate_env_example(settings_class: Union[BaseSettings, type[BaseSettings]]) -> str:
     res = ""

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_sleep_util.py

@@ -5,8 +5,6 @@ import math
 from datetime import timedelta
 from time import sleep
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def sync_safe_sleep(n: timedelta | float | int):
     if isinstance(n, timedelta):

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_sqlalchemy_base_dbm_util.py

@@ -13,8 +13,6 @@ from sqlalchemy.orm.session import Session
 
 from arpakitlib.ar_datetime_util import now_utc_dt
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class BaseDBM(DeclarativeBase):
     __abstract__ = True
@@ -26,7 +24,8 @@ class BaseDBM(DeclarativeBase):
             *,
             include_pk: bool = True,
             exclude_names: list[str] | None = None,
-            exclude_if_have_foreign_keys: bool = False
+            exclude_if_have_foreign_keys: bool = False,
+            filter_prefixes: list[str] | None = None
     ) -> list[str]:
         if exclude_names is None:
             exclude_names = []
@@ -38,6 +37,10 @@ class BaseDBM(DeclarativeBase):
                 continue
             if exclude_if_have_foreign_keys and c.foreign_keys:
                 continue
+            if filter_prefixes is not None and not any(
+                    c.key.startswith(prefix) for prefix in filter_prefixes
+            ):
+                continue
             res.append(c.key)
         return res
 
@@ -257,8 +260,8 @@ class SQLAlchemyDb:
             self.engine = create_engine(
                 url=sync_db_url,
                 echo=db_echo,
-                pool_size=10,
-                max_overflow=10,
+                pool_size=20,
+                max_overflow=30,
                 poolclass=QueuePool,
                 pool_timeout=timedelta(seconds=30).total_seconds(),
             )
@@ -270,8 +273,8 @@ class SQLAlchemyDb:
             self.async_engine = create_async_engine(
                 url=async_db_url,
                 echo=db_echo,
-                pool_size=10,
-                max_overflow=10,
+                pool_size=20,
+                max_overflow=30,
                 poolclass=AsyncAdaptedQueuePool,
                 pool_timeout=timedelta(seconds=30).total_seconds()
             )

arpakitlib-1.9.23/arpakitlib/ar_sqlalchemy_etc_util.py

@@ -0,0 +1,23 @@
+from typing import Any
+
+
+def _str_no_self(v: str) -> str:
+    return v.replace("self.", "").strip()
+
+
+def generate_sqlalchemy_model_repr(*, title: str, parts: list[Any]):
+    res = []
+    for part in parts:
+        if part is None:
+            continue
+        if isinstance(part, int):
+            part = str(part)
+        elif isinstance(part, bool):
+            part = str(part)
+        elif isinstance(part, str):
+            part = _str_no_self(part)
+            part = part.strip()
+        if not part:
+            continue
+        res.append(part)
+    return f"{title} ({', '.join(res)})"

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_str_util.py

@@ -4,8 +4,6 @@ from typing import Optional, Any
 
 from arpakitlib.ar_type_util import raise_for_type
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 def str_in(string: str, main_string: str, *, max_diff: Optional[int] = None) -> bool:
     if string not in main_string:

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_type_util.py

@@ -1,8 +1,6 @@
 # arpakit
 from typing import Optional, Any
 
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
 
 class NotSet:
     pass

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/arpakitlib/ar_yookassa_api_client_util.py

@@ -47,9 +47,9 @@ class EasyYookassaAPIClient(BaseHTTPAPIClient):
             method=method,
             url=url,
             headers=combine_dicts(self.headers, (headers if headers is not None else {})),
-            max_tries_=3,
+            max_tries_=1,
             raise_for_status_=True,
-            timeout_=timedelta(seconds=3),
+            timeout_=timedelta(seconds=5),
             not_raise_for_statuses_=not_raise_for_statuses_,
             auth=(self.shop_id, self.secret_key),
             enable_logging_=False,
@@ -69,10 +69,10 @@ class EasyYookassaAPIClient(BaseHTTPAPIClient):
             method=method,
             url=url,
             headers=combine_dicts(self.headers, (headers if headers is not None else {})),
-            max_tries_=3,
+            max_tries_=1,
             raise_for_status_=True,
             not_raise_for_statuses_=not_raise_for_statuses_,
-            timeout_=timedelta(seconds=3),
+            timeout_=timedelta(seconds=5),
             auth=aiohttp.BasicAuth(login=str(self.shop_id), password=self.secret_key),
             enable_logging_=False,
             **kwargs

{arpakitlib-1.9.6 → arpakitlib-1.9.23}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.9.6"
+version = "1.9.23"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_company", email = "support@arpakit.com" }
@@ -34,13 +34,11 @@ dependencies = [
     "cachetools (>=5.5.1,<6.0.0)",
     "bs4 (>=0.0.2,<0.0.3)",
     "celery (>=5.4.0,<6.0.0)",
-    "pandas (>=2.2.3,<3.0.0)",
     "twine (>=6.1.0,<7.0.0)",
     "itsdangerous (>=2.2.0,<3.0.0)",
     "email-validator (>=2.2.0,<3.0.0)",
     "openpyxl (>=3.1.5,<4.0.0)",
     "alembic (>=1.14.1,<2.0.0)",
-    "pymongo (>=4.10.1,<5.0.0)",
     "pydantic (>=2.10.5,<3.0.0)",
     "pika (>=1.3.2,<2.0.0)",
     "aio-pika (>=9.5.4,<10.0.0)",

arpakitlib-1.9.6/arpakitlib/ar_mongodb_util.py

@@ -1,122 +0,0 @@
-# arpakit
-
-import asyncio
-import logging
-from abc import abstractmethod
-from random import randint
-
-from pymongo import MongoClient
-from pymongo.collection import Collection
-from pymongo.database import Database
-
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
-
-class EasyMongoDb:
-    def __init__(
-            self,
-            *,
-            db_name: str,
-            username: str | None = None,
-            password: str | None = None,
-            hostname: str = "127.0.0.1",
-            port: int = 27017,
-            auth_source: str | None = None,
-    ):
-        self._logger = logging.getLogger(self.__class__.__name__)
-        self.hostname = hostname
-        self.username = username
-        self.password = password
-        self.auth_source = auth_source
-        self.port = port
-        self.db_name = db_name
-        self.used_collections: list[Collection] = []
-
-    def init(self):
-        self.ensure_indexes()
-
-    def reinit(self):
-        self.drop_all_collections()
-        self.init()
-
-    def get_pymongo_client(self) -> MongoClient:
-        kwargs = {
-            "host": self.hostname,
-            "port": self.port,
-            "tz_aware": True
-        }
-        if self.username is not None:
-            kwargs["username"] = self.username
-        if self.password is not None:
-            kwargs["password"] = self.password
-        if self.auth_source is not None:
-            kwargs["authSource"] = self.auth_source
-        kwargs["timeoutMS"] = 5000
-        kwargs["connectTimeoutMS"] = 5000
-        kwargs["socketTimeoutMS"] = 5000
-        kwargs["serverSelectionTimeoutMS"] = 5000
-        return MongoClient(**kwargs)
-
-    def check_conn(self):
-        self.get_pymongo_client().server_info()
-
-    def is_db_conn_good(self) -> bool:
-        try:
-            self.get_pymongo_client().server_info()
-        except Exception as e:
-            self._logger.error(e)
-            return False
-        return True
-
-    def get_pymongo_db(self) -> Database:
-        return self.get_pymongo_client().get_database(self.db_name)
-
-    def drop_all_collections(self):
-        for collection in self.get_pymongo_db().list_collections():
-            self.get_pymongo_db().get_collection(collection["name"]).drop()
-
-    def drop_used_collections(self):
-        for collection in self.used_collections:
-            collection.drop()
-
-    def generate_collection_int_id(self, collection: Collection) -> int:
-        existing_ids = set(
-            doc["id"] for doc in collection.find({}, {"id": True}) if "id" in doc.keys()
-        )
-        if existing_ids:
-            res = max(existing_ids) + 1
-        else:
-            res = 1
-        while res in existing_ids:
-            res += 1
-        return res
-
-    def generate_collection_rand_int_id(self, collection: Collection, max_rand_int: int = 30) -> int:
-        existing_ids = set(
-            doc["id"] for doc in collection.find({}, {"id": True}) if "id" in doc.keys()
-        )
-
-        id_ = self.generate_collection_int_id(collection=collection)
-        res = id_ + randint(1, max_rand_int)
-        while res in existing_ids:
-            id_ += 1
-            res = id_ + randint(1, max_rand_int)
-
-        return res
-
-    @abstractmethod
-    def ensure_indexes(self):
-        raise NotImplemented()
-
-
-def __example():
-    pass
-
-
-async def __async_example():
-    pass
-
-
-if __name__ == '__main__':
-    __example()
-    asyncio.run(__async_example())