arpakitlib 1.7.243__tar.gz → 1.7.244__tar.gz

{arpakitlib-1.7.243 → arpakitlib-1.7.244}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.7.243
+Version: 1.7.244
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company
@@ -39,6 +39,7 @@ Requires-Dist: paramiko (>=3.5.0,<4.0.0)
 Requires-Dist: pika (>=1.3.2,<2.0.0)
 Requires-Dist: poetry (>=2.0.1,<3.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.10,<3.0.0)
+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)
@@ -46,6 +47,7 @@ Requires-Dist: pymongo (>=4.10.1,<5.0.0)
 Requires-Dist: pytz (>=2024.2,<2025.0)
 Requires-Dist: pyzabbix (>=1.3.1,<2.0.0)
 Requires-Dist: requests[socks] (>=2.32.3,<3.0.0)
+Requires-Dist: scipy (>=1.15.1,<2.0.0)
 Requires-Dist: sqladmin (>=0.20.1,<0.21.0)
 Requires-Dist: sqlalchemy (>=2.0.37,<3.0.0)
 Requires-Dist: twine (>=6.1.0,<7.0.0)

{arpakitlib-1.7.243 → arpakitlib-1.7.244}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -8,6 +8,7 @@ from pydantic_core.core_schema import ValidationInfo
 
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 from arpakitlib.ar_settings_util import SimpleSettings
+from arpakitlib.ar_sqlalchemy_util import generate_sqlalchemy_url
 from src.core.const import ProjectPaths
 
 
@@ -27,14 +28,40 @@ class Settings(SimpleSettings):
     @field_validator("sql_db_url", mode="after")
     def validate_sql_db_url(cls, v: Any, validation_info: ValidationInfo) -> str | None:
         if v is not None:
-            return None
-        user = validation_info.data.get('sql_db_user')
-        password = validation_info.data.get('sql_db_password')
-        port = validation_info.data.get('sql_db_port')
-        database = validation_info.data.get('sql_db_database')
-        if user is not None and password is not None and port is not None and database is not None:
-            return f"postgresql://{user}:{password}@127.0.0.1:{port}/{database}"
-        return None
+            return v
+
+        user = validation_info.data.get("sql_db_user")
+        password = validation_info.data.get("sql_db_password")
+        port = validation_info.data.get("sql_db_port")
+        database = validation_info.data.get("sql_db_database")
+
+        return generate_sqlalchemy_url(
+            base="postgresql",
+            user=user,
+            password=password,
+            port=port,
+            database=database
+        )
+
+    async_sql_db_url: str | None = None
+
+    @field_validator("async_sql_db_url", mode="after")
+    def validate_async_sql_db_url(cls, v: Any, validation_info: ValidationInfo) -> str | None:
+        if v is not None:
+            return v
+
+        user = validation_info.data.get("sql_db_user")
+        password = validation_info.data.get("sql_db_password")
+        port = validation_info.data.get("sql_db_port")
+        database = validation_info.data.get("sql_db_database")
+
+        return generate_sqlalchemy_url(
+            base="postgresql+asyncpg",
+            user=user,
+            password=password,
+            port=port,
+            database=database
+        )
 
     sql_db_echo: bool = False
 

{arpakitlib-1.7.243 → arpakitlib-1.7.244}/arpakitlib/_arpakit_project_template/src/db/util.py

@@ -16,6 +16,7 @@ def get_base_dbm() -> type[BaseDBM]:
 def create_sqlalchemy_db() -> SQLAlchemyDB:
     return SQLAlchemyDB(
         db_url=get_cached_settings().sql_db_url,
+        async_db_url=get_cached_settings().async_sql_db_url,
         db_echo=get_cached_settings().sql_db_echo,
         base_dbm=get_base_dbm()
     )

{arpakitlib-1.7.243 → arpakitlib-1.7.244}/arpakitlib/ar_sqlalchemy_util.py

@@ -3,6 +3,7 @@ import asyncio
 import logging
 from datetime import timedelta, datetime
 from typing import Any
+from urllib.parse import quote_plus
 from uuid import uuid4
 
 from sqlalchemy import create_engine, QueuePool, text, func, inspect, AsyncAdaptedQueuePool
@@ -23,37 +24,98 @@ def get_string_info_from_declarative_base(class_: type[DeclarativeBase]):
     return res
 
 
+def generate_sqlalchemy_url(
+        *,
+        base: str = "postgresql",
+        user: str | None = None,
+        password: str | None = None,
+        host: str = "127.0.0.1",
+        port: int | None = None,
+        database: str | None = None,
+        **query_params
+) -> str:
+    """
+    Генерация URL для SQLAlchemy.
+
+    :param base: Базовая строка для подключения, например "postgresql+asyncpg" или "sqlite".
+    :param user: Имя пользователя (необязательно).
+    :param password: Пароль (необязательно).
+    :param host: Хост (по умолчанию "127.0.0.1").
+    :param port: Порт (необязательно).
+    :param database: Имя базы данных или путь к файлу для SQLite (необязательно).
+    :param query_params: Дополнительные параметры строки подключения.
+    :return: Строка подключения для SQLAlchemy.
+    """
+    # Формируем часть с авторизацией
+    auth_part = ""
+    if user and password:
+        auth_part = f"{quote_plus(user)}:{quote_plus(password)}@"
+    elif user:
+        auth_part = f"{quote_plus(user)}@"
+
+    # Формируем часть с хостом и портом
+    host_part = ""
+    if base.startswith("sqlite"):
+        # Для SQLite хост и порт не нужны
+        host_part = ""
+    else:
+        host_part = f"{host}"
+        if port:
+            host_part += f":{port}"
+
+    # Формируем часть с базой данных
+    database_part = f"/{database}" if database else ""
+    if base.startswith("sqlite") and database:
+        # Для SQLite путь указывается как абсолютный
+        database_part = f"/{database}"
+
+    # Дополнительные параметры
+    query_part = ""
+    if query_params:
+        query_items = [f"{key}={quote_plus(str(value))}" for key, value in query_params.items()]
+        query_part = f"?{'&'.join(query_items)}"
+
+    return f"{base}://{auth_part}{host_part}{database_part}{query_part}"
+
+
 class SQLAlchemyDB:
     def __init__(
             self,
             *,
-            db_url: str = "postgresql://arpakitlib:arpakitlib@localhost:50517/arpakitlib",
-            async_db_url: str = "postgresql+asyncpg://arpakitlib:arpakitlib@localhost:50517/arpakitlib",
+            db_url: str | None = "postgresql://arpakitlib:arpakitlib@localhost:50517/arpakitlib",
+            async_db_url: str | None = "postgresql+asyncpg://arpakitlib:arpakitlib@localhost:50517/arpakitlib",
             db_echo: bool = False,
             base_dbm: type[BaseDBM] | None = None,
             db_models: list[Any] | None = None,
     ):
-        self._logger = logging.getLogger(self.__class__.__name__)
-        self.engine = create_engine(
-            url=db_url,
-            echo=db_echo,
-            pool_size=10,
-            max_overflow=10,
-            poolclass=QueuePool,
-            pool_timeout=timedelta(seconds=30).total_seconds(),
-        )
+        self._logger = logging.getLogger()
+
+        self.db_url = db_url
+        if self.db_url is not None:
+            self.engine = create_engine(
+                url=db_url,
+                echo=db_echo,
+                pool_size=10,
+                max_overflow=10,
+                poolclass=QueuePool,
+                pool_timeout=timedelta(seconds=30).total_seconds(),
+            )
         self.sessionmaker = sessionmaker(bind=self.engine)
         self.func_new_session_counter = 0
-        self.async_engine = create_async_engine(
-            url=async_db_url,
-            echo=db_echo,
-            pool_size=10,
-            max_overflow=10,
-            poolclass=AsyncAdaptedQueuePool,
-            pool_timeout=timedelta(seconds=30).total_seconds()
-        )
+
+        self.async_db_url = async_db_url
+        if self.async_db_url is not None:
+            self.async_engine = create_async_engine(
+                url=async_db_url,
+                echo=db_echo,
+                pool_size=10,
+                max_overflow=10,
+                poolclass=AsyncAdaptedQueuePool,
+                pool_timeout=timedelta(seconds=30).total_seconds()
+            )
         self.async_sessionmaker = async_sessionmaker(bind=self.async_engine)
         self.func_new_async_session_counter = 0
+
         self.base_dbm = base_dbm
 
     def is_table_exists(self, table_name: str) -> bool:

{arpakitlib-1.7.243 → arpakitlib-1.7.244}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.7.243"
+version = "1.7.244"
 description = "arpakitlib"
 authors = [
     { name = "arpakit", email = "arpakit@gmail.com" },
@@ -56,6 +56,8 @@ dependencies = [
     "cryptography (>=44.0.0,<45.0.0)",
     "pika (>=1.3.2,<2.0.0)",
     "aio-pika (>=9.5.4,<10.0.0)",
+    "scipy (>=1.15.1,<2.0.0)",
+    "pulp (>=2.9.0,<3.0.0)",
 ]