arpakitlib 1.7.250__py3-none-any.whl → 1.7.253__py3-none-any.whl

arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -1,121 +1,13 @@
 import os
 from functools import lru_cache
-from typing import Any
-
-import pytz
-from pydantic import field_validator
-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 arpakitlib.ar_settings_util import AdvancedSettings
 from src.core.const import ProjectPaths
 
 
-class Settings(SimpleSettings):
-    project_name: str | None = "{{PROJECT_NAME}}"
-
-    sql_db_user: str | None = project_name
-
-    sql_db_password: str | None = project_name
-
-    sql_db_port: int | None = int("{{SQL_DB_PORT}}") if "{{SQL_DB_PORT}}".strip().isdigit() else None
-
-    sql_db_database: str | None = project_name
-
-    sql_db_url: str | None = None
-
-    @field_validator("sql_db_url", mode="after")
-    def validate_sql_db_url(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> 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",
-            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, **kwargs) -> 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
-
-    api_init_sql_db_at_start: bool = True
-
-    api_title: str | None = project_name
-
-    api_description: str | None = f"{project_name} (arpakitlib)"
-
-    api_logging_func_before_response: bool = True
-
-    api_story_log_func_before_response: bool = True
-
-    api_start_operation_executor_worker: bool = False
-
-    api_start_scheduled_operation_creator_worker: bool = False
-
-    api_port: int | None = int("{{API_PORT}}") if "{{API_PORT}}".strip().isdigit() else None
-
-    api_correct_api_key: str | None = "1"
-
-    api_correct_token: str | None = "1"
-
-    api_enable_admin1: bool = True
-
-    var_dirname: str | None = "var"
-
-    var_dirpath: str | None = os.path.join(ProjectPaths.base_dirpath, var_dirname)
-
-    log_filename: str | None = "story.log"
-
-    log_filepath: str | None = os.path.join(var_dirpath, log_filename)
-
-    cache_dirname: str | None = "cache"
-
-    cache_dirpath: str | None = os.path.join(var_dirpath, cache_dirname)
-
-    media_dirname: str | None = "media"
-
-    media_dirpath: str | None = os.path.join(var_dirpath, media_dirname)
-
-    dump_dirname: str | None = "dump"
-
-    dump_dirpath: str | None = os.path.join(var_dirpath, dump_dirname)
-
-    local_timezone: str | None = None
-
-    @property
-    def local_timezone_as_pytz(self) -> Any:
-        return pytz.timezone(self.local_timezone)
-
-    admin1_secret_key: str | None = "85a9583cb91c4de7a78d7eb1e5306a04418c9c43014c447ea8ec8dd5deb4cf71"
-
-    # ...
+class Settings(AdvancedSettings):
+    var_dirpath: str | None = os.path.join(ProjectPaths.base_dirpath, "var")
 
 
 @lru_cache()

arpakitlib/_arpakit_project_template/src/just_script/example.py

@@ -0,0 +1,16 @@
+import logging
+
+from src.core.util import setup_logging
+
+_logger = logging.getLogger(__name__)
+
+
+def send_msg_to_users():
+    setup_logging()
+    input("r u sure?")
+    _logger.info("sending")
+    _logger.info("sent")
+
+
+if __name__ == '__main__':
+    send_msg_to_users()

arpakitlib/_arpakit_project_template/src/operation_execution/_start_operation_executor_worker.py

@@ -1,7 +1,7 @@
 from arpakitlib.ar_operation_execution_util import OperationExecutorWorker
 from src.core.util import setup_logging
-from src.db.util import get_cached_sqlalchemy_db
 from src.operation_execution.operation_executor import OperationExecutor
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _start_operation_executor_worker():

arpakitlib/_arpakit_project_template/src/operation_execution/_start_scheduled_operation_creator_worker.py

@@ -1,7 +1,7 @@
 from arpakitlib.ar_operation_execution_util import ScheduledOperationCreatorWorker
 from src.core.util import setup_logging
-from src.db.util import get_cached_sqlalchemy_db
 from src.operation_execution.scheduled_operations import SCHEDULED_OPERATIONS
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _start_scheduled_operation_creator_worker():

arpakitlib/_arpakit_project_template/src/{db → sql_db}/_check_conn_sqlalchemy_db.py

@@ -1,5 +1,5 @@
 from src.core.util import setup_logging
-from src.db.util import get_cached_sqlalchemy_db
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _check_conn_sqlalchemy_db():

arpakitlib/_arpakit_project_template/src/{db → sql_db}/_drop_sqlalchemy_db.py

@@ -1,6 +1,6 @@
 from src.core.settings import get_cached_settings
 from src.core.util import setup_logging
-from src.db.util import get_cached_sqlalchemy_db
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _reinit_sqlalchemy_db():

arpakitlib/_arpakit_project_template/src/{db → sql_db}/_init_sqlalchemy_db.py

@@ -1,5 +1,5 @@
 from src.core.util import setup_logging
-from src.db.util import get_cached_sqlalchemy_db
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _init_sqlalchemy_db():

arpakitlib/_arpakit_project_template/src/{db → sql_db}/_reinit_sqlalchemy_db.py

@@ -1,6 +1,6 @@
 from src.core.settings import get_cached_settings
 from src.core.util import setup_logging
-from src.db.util import get_cached_sqlalchemy_db
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _reinit_sqlalchemy_db():

arpakitlib/_arpakit_project_template/src/{operation_execution → sql_db}/_remove_operations.py

@@ -1,7 +1,7 @@
 from arpakitlib.ar_operation_execution_util import remove_operations
 from src.core.settings import get_cached_settings
 from src.core.util import setup_logging
-from src.db.util import get_cached_sqlalchemy_db
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _remove_operations():

arpakitlib/_arpakit_project_template/src/sql_db/_remove_story_logs.py

@@ -0,0 +1,16 @@
+from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM
+from src.core.settings import get_cached_settings
+from src.core.util import setup_logging
+from src.sql_db.util import get_cached_sqlalchemy_db
+
+
+def _remove_story_logs():
+    setup_logging()
+    get_cached_settings().raise_if_mode_type_prod()
+    with get_cached_sqlalchemy_db().new_session() as session:
+        session.query(StoryLogDBM).delete()
+        session.commit()
+
+
+if __name__ == '__main__':
+    _remove_story_logs()

arpakitlib/_arpakit_project_template/src/{db → sql_db}/util.py

@@ -1,21 +1,21 @@
 from functools import lru_cache
 
 from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
+from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from src.core.settings import get_cached_settings
-from src.db.sqlalchemy_model import import_project_sqlalchemy_models
 
 
 def get_base_dbm() -> type[BaseDBM]:
     from arpakitlib.ar_sqlalchemy_model_util import import_ar_sqlalchemy_models
     import_ar_sqlalchemy_models()
+    from src.sql_db.sqlalchemy_model import import_project_sqlalchemy_models
     import_project_sqlalchemy_models()
     return BaseDBM
 
 
-def create_sqlalchemy_db() -> SQLAlchemyDB:
-    return SQLAlchemyDB(
-        db_url=get_cached_settings().sql_db_url,
+def create_sqlalchemy_db() -> SQLAlchemyDb:
+    return SQLAlchemyDb(
+        sync_db_url=get_cached_settings().sync_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()
@@ -23,7 +23,5 @@ def create_sqlalchemy_db() -> SQLAlchemyDB:
 
 
 @lru_cache()
-def get_cached_sqlalchemy_db() -> SQLAlchemyDB:
+def get_cached_sqlalchemy_db() -> SQLAlchemyDb:
     return create_sqlalchemy_db()
-
-# ...

arpakitlib/_arpakit_project_template/src/tg_bot/transmitted_tg_data.py

@@ -1,17 +1,6 @@
-from aiogram import Bot
-
-from arpakitlib.ar_aiogram_util import BaseTransmittedTgBotData
-from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
+from arpakitlib.ar_aiogram_util import AdvancedTransmittedTgBotData
 from src.core.settings import Settings
 
 
-class TransmittedTgData(BaseTransmittedTgBotData):
-    settings: Settings
-    sqlalchemy_db: SQLAlchemyDB | None = None
-    media_file_storage_in_dir: FileStorageInDir | None = None
-    cache_file_storage_in_dir: FileStorageInDir | None = None
-    dump_file_storage_in_dir: FileStorageInDir | None = None
-    tg_bot: Bot
-
-    # ...
+class TransmittedTgData(AdvancedTransmittedTgBotData):
+    settings: Settings | None = None

arpakitlib/ar_aiogram_util.py

@@ -4,7 +4,7 @@ import asyncio
 import logging
 from typing import Optional, Any, Union, Callable, Iterable
 
-from aiogram import types, Bot
+from aiogram import types, Bot, Dispatcher
 from aiogram.client.default import DefaultBotProperties
 from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.enums import ChatType, ParseMode
@@ -13,8 +13,12 @@ from aiogram.filters import CommandObject, Filter
 from aiogram.filters.callback_data import CallbackData
 from pydantic import BaseModel, ConfigDict
 
+from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
+from arpakitlib.ar_json_db_util import JSONDb
 from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
 from arpakitlib.ar_parse_command import BadCommandFormat, parse_command
+from arpakitlib.ar_settings_util import SimpleSettings, BaseSettings2
+from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_types, raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -315,6 +319,18 @@ class BaseTransmittedTgBotData(BaseModel):
     model_config = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
 
 
+class SimpleTransmittedTgBotData(BaseTransmittedTgBotData):
+    settings: BaseSettings2 | None = None
+
+
+class AdvancedTransmittedTgBotData(SimpleTransmittedTgBotData):
+    sqlalchemy_db: SQLAlchemyDb | None = None
+    json_db: JSONDb | None = None
+    media_file_storage_in_dir: FileStorageInDir | None = None
+    cache_file_storage_in_dir: FileStorageInDir | None = None
+    dump_file_storage_in_dir: FileStorageInDir | None = None
+
+
 def create_aiogram_tg_bot(*, token: str, proxy_url_: str | None = None, **kwargs) -> Bot:
     kwargs["token"] = token
 
@@ -333,9 +349,16 @@ def create_aiogram_tg_bot(*, token: str, proxy_url_: str | None = None, **kwargs
     return tg_bot
 
 
-def create_tg_bot_dispatcher():
-    # TODO
-    pass
+# def create_tg_bot_dispatcher(
+#         *,
+#         settings:
+# ):
+#     tg_dp = Dispatcher(
+#         storage=MemoryStorage(),
+#         settings=get_settings(),
+#         db=db,
+#         transmitted_tg_bot_data=transmitted_tg_bot_data
+#     )
 
 
 def __example():

arpakitlib/ar_arpakit_project_template_util.py

@@ -3,7 +3,7 @@
 import logging
 import os
 
-from arpakitlib.ar_str_util import make_none_if_blank, raise_if_string_blank
+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"
@@ -15,23 +15,17 @@ def init_arpakit_project_template(
         *,
         project_dirpath: str = "./",
         overwrite_if_exists: bool = False,
-        project_name: str | None = None,
-        sql_db_port: int | None = None,
-        api_port: int | None = None,
+        params: dict[str, str] | None = None,
         ignore_paths_startswith: list[str] | str | None = None,
         only_paths_startswith: list[str] | str | None = None,
 ):
     raise_if_string_blank(project_dirpath)
 
-    if project_name:
-        project_name = project_name.strip()
-    project_name = make_none_if_blank(project_name)
+    raise_for_type(overwrite_if_exists, bool)
 
-    if sql_db_port is not None:
-        raise_for_type(sql_db_port, int)
-
-    if api_port is not None:
-        raise_for_type(api_port, int)
+    if params is None:
+        params = {}
+    raise_for_type(params, dict)
 
     if isinstance(ignore_paths_startswith, str):
         ignore_paths_startswith = [ignore_paths_startswith]
@@ -68,12 +62,8 @@ def init_arpakit_project_template(
                     continue
                 with open(os.path.join(root, file), "r", encoding="utf-8") as _file:
                     _content = _file.read()
-                if project_name is not None:
-                    _content = _content.replace("{{PROJECT_NAME}}", project_name)
-                if sql_db_port is not None:
-                    _content = _content.replace("{{SQL_DB_PORT}}", str(sql_db_port))
-                if api_port is not None:
-                    _content = _content.replace("{{API_PORT}}", str(api_port))
+                for key, value in params.items():
+                    _content = _content.replace("{{" + key.upper().strip() + "}}", value)
                 res[rel_path] = _content
         return res
 

arpakitlib/ar_arpakit_schedule_uust_api_client_util.py

@@ -225,10 +225,6 @@ class ARPAKITScheduleUUSTAPIClient:
         else:
             self.ttl_cache = None
 
-    def clear_cache(self):
-        if self.ttl_cache is not None:
-            self.ttl_cache.clear()
-
     async def _async_make_http_request(
             self,
             *,
@@ -242,11 +238,16 @@ class ARPAKITScheduleUUSTAPIClient:
             url=url,
             headers=self.headers,
             params=params,
+            max_tries_=5,
             raise_for_status_=True,
             **kwargs
         )
         return response
 
+    def clear_cache(self):
+        if self.ttl_cache is not None:
+            self.ttl_cache.clear()
+
     async def check_auth(self) -> dict[str, Any]:
         response = await self._async_make_http_request(
             method="GET", url=urljoin(self.base_url, "check_auth")

arpakitlib/ar_arpakitlib_cli_util.py

@@ -29,46 +29,34 @@ def execute_arpakitlib_cli(*, full_command: str | None = None):
         print("-c init_arpakit_project_template")
         print("-project_dirpath ...")
         print("-overwrite_if_exists ...")
-        print("-project_name ...")
-        print("-sql_db_port ...")
-        print("-api_port ...")
         print("-ignore_paths_startswith ...")
         print("-only_paths_startswith ...")
         print("\n")
 
     elif command == "init_arpakit_project_template":
-        project_dirpath = raise_if_string_blank(parsed_command.get_value_by_keys(keys=["pd", "project_dirpath"]))
+        project_dirpath = raise_if_string_blank(parsed_command.get_value_by_keys(keys=["project_dirpath"]))
         overwrite_if_exists: bool = parse_need_type(
-            value=parsed_command.get_value_by_keys(keys=["oie", "overwrite_if_exists"]),
+            value=parsed_command.get_value_by_keys(keys=["overwrite_if_exists"]),
             need_type=NeedTypes.bool_,
             allow_none=False
         )
-        project_name: str = parsed_command.get_value_by_keys(keys=["pm", "project_name"])
-        project_name = project_name.strip() if project_name and project_name.strip() else None
-        sql_db_port: int | None = parse_need_type(
-            value=parsed_command.get_value_by_keys(keys=["sdp", "sql_db_port"]),
-            need_type=NeedTypes.int_,
-            allow_none=True
-        )
-        api_port: int | None = parse_need_type(
-            value=parsed_command.get_value_by_keys(keys=["ap", "api_port"]),
-            need_type=NeedTypes.int_,
-            allow_none=True
-        )
+        params = parsed_command.key_to_value
         ignore_paths_startswith: list[str] | None = parse_need_type(
-            value=parsed_command.get_value_by_keys(keys=["ipsw", "ignore_paths_startswith"]),
+            value=parsed_command.get_value_by_keys(keys=["ignore_paths_startswith"]),
             need_type=NeedTypes.list_of_str,
             allow_none=True
         )
         only_paths_startswith: list[str] | None = parse_need_type(
-            value=parsed_command.get_value_by_keys(keys=["ops", "only_paths_startswith"]),
+            value=parsed_command.get_value_by_keys(keys=["only_paths_startswith"]),
             need_type=NeedTypes.list_of_str,
             allow_none=True
         )
         init_arpakit_project_template(
-            project_dirpath=project_dirpath, overwrite_if_exists=overwrite_if_exists,
-            project_name=project_name, sql_db_port=sql_db_port, api_port=api_port,
-            ignore_paths_startswith=ignore_paths_startswith, only_paths_startswith=only_paths_startswith
+            project_dirpath=project_dirpath,
+            overwrite_if_exists=overwrite_if_exists,
+            params=params,
+            ignore_paths_startswith=ignore_paths_startswith,
+            only_paths_startswith=only_paths_startswith
         )
 
     else:

arpakitlib/ar_class_util.py

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

arpakitlib/ar_cryptomus_api_client_util.py

@@ -0,0 +1,21 @@
+# arpakit
+import asyncio
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+class CryptomusAPIClient:
+    pass
+
+
+def __example():
+    pass
+
+
+async def __async_example():
+    pass
+
+
+if __name__ == '__main__':
+    __example()
+    asyncio.run(__async_example())