arpakitlib 1.7.255__tar.gz → 1.7.257__tar.gz

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.7.255
+Version: 1.7.257
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company
@@ -85,11 +85,10 @@ poetry add arpakitlib
 pip install arpakitlib
 ```
 
-### Init template
+### arpakitlib command
 
 ```
-# poetry run arpakitlib -c help
-poetry run arpakitlib -c init_arpakit_project_template -project_dirpath ./ -overwrite_if_exists true -project_name ... -sql_db_port ... (optional) -api_port ... (optional) -ignore_paths_startswith ... (optional) -only_paths_startswith ...(optional)
+poetry run arpakitlib -c help
 ```
 
 ---

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/README.md

@@ -25,11 +25,10 @@ poetry add arpakitlib
 pip install arpakitlib
 ```
 
-### Init template
+### arpakitlib command
 
 ```
-# poetry run arpakitlib -c help
-poetry run arpakitlib -c init_arpakit_project_template -project_dirpath ./ -overwrite_if_exists true -project_name ... -sql_db_port ... (optional) -api_port ... (optional) -ignore_paths_startswith ... (optional) -only_paths_startswith ...(optional)
+poetry run arpakitlib -c help
 ```
 
 ---

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/alembic/env.py

@@ -4,14 +4,16 @@ from alembic import context
 from sqlalchemy import engine_from_config
 from sqlalchemy import pool
 
+from arpakitlib.ar_type_util import raise_for_type
 from src.core.settings import get_cached_settings
-from src.sql_db.util import get_base_dbm
+from src.sqlalchemy_db.util import get_base_dbm
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config
 
-config.set_section_option("alembic", "sqlalchemy.url", get_cached_settings().sync_sql_db_url)
+raise_for_type(get_cached_settings().sqlalchemy_sync_db_url, str)
+config.set_section_option("alembic", "sqlalchemy.url", get_cached_settings().sqlalchemy_sync_db_url)
 
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/example.env

@@ -1,15 +1,15 @@
 # mode_type=
 # project_name=
-# sql_db_user=
-# sql_db_password=
-# sql_db_host=
-# sql_db_port=
-# sql_db_database=
-# sync_sql_db_url=
-# async_sql_db_url=
-# sql_db_echo=
+# sqlalchemy_db_user=
+# sqlalchemy_db_password=
+# sqlalchemy_db_host=
+# sqlalchemy_db_port=
+# sqlalchemy_db_database=
+# sqlalchemy_sync_db_url=
+# sqlalchemy_async_db_url=
+# sqlalchemy_db_echo=
 # api_port=
-# api_init_sql_db=
+# api_init_sqlalchemy_db=
 # api_init_json_db=
 # api_logging__api_func_before_in_handle_exception=
 # api_story_log__api_func_before_in_handle_exception=
@@ -19,7 +19,9 @@
 # api_start_operation_executor_worker=
 # api_start_scheduled_operation_creator_worker=
 # admin1_secret_key=
-# tg_bot_init_sql_db=
+# tg_bot_token=
+# tg_bot_proxy_url=
+# tg_bot_init_sqlalchemy_db=
 # tg_bot_init_json_db=
 # var_dirpath=
 # log_filepath=

arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/manage/docker_run_postgres.sh

@@ -0,0 +1,5 @@
+cd ..
+source .env
+docker rm ${project_name}_postgres
+docker run --name ${project_name}_postgres -d -p ${sqlalchemy_db_port}:5432 -e POSTGRES_USER=${sqlalchemy_db_user} -e POSTGRES_PASSWORD=${sqlalchemy_db_password} -e POSTGRES_DB=${sqlalchemy_db_database} postgres:16 -c max_connections=100
+docker start ${project_name}_postgres

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/event.py

@@ -26,7 +26,7 @@ class StartupAPIEvent(BaseStartupAPIEvent):
         if self.transmitted_api_data.dump_file_storage_in_dir is not None:
             self.transmitted_api_data.dump_file_storage_in_dir.init()
 
-        if self.transmitted_api_data.settings.api_init_sql_db:
+        if self.transmitted_api_data.settings.api_init_sqlalchemy_db:
             self.transmitted_api_data.sqlalchemy_db.init()
 
         if self.transmitted_api_data.settings.api_init_json_db:

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/api/util.py

@@ -5,13 +5,13 @@ from src.core.settings import get_cached_settings
 from src.core.util import get_cached_media_file_storage_in_dir, get_cached_cache_file_storage_in_dir, \
     get_cached_dump_file_storage_in_dir
 from src.json_db.util import get_json_db
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def create_transmitted_api_data() -> TransmittedAPIData:
     settings = get_cached_settings()
 
-    sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sync_sql_db_url is not None else None
+    sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sqlalchemy_sync_db_url is not None else None
 
     json_db = get_json_db() if settings.json_db_dirpath is not None else None
 

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/core/_show_settings.py

@@ -4,7 +4,6 @@ from src.core.settings import get_cached_settings
 
 def _check_settings():
     print(safely_transfer_obj_to_json_str(get_cached_settings().model_dump(mode="json")))
-    print(get_cached_settings().is_any_sql_db_url_set)
 
 
 if __name__ == '__main__':

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/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.operation_execution.operation_executor import OperationExecutor
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _start_operation_executor_worker():

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/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.operation_execution.scheduled_operations import SCHEDULED_OPERATIONS
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _start_scheduled_operation_creator_worker():

{arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_check_conn_sqlalchemy_db.py

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

{arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_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.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _reinit_sqlalchemy_db():

{arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_init_sqlalchemy_db.py

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

{arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_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.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _reinit_sqlalchemy_db():

{arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_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.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _remove_operations():

{arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_remove_story_logs.py

@@ -1,7 +1,7 @@
 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
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _remove_story_logs():

{arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.257/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/util.py

@@ -8,16 +8,16 @@ from src.core.settings import get_cached_settings
 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
+    from src.sqlalchemy_db.sqlalchemy_model import import_project_sqlalchemy_models
     import_project_sqlalchemy_models()
     return BaseDBM
 
 
 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,
+        sync_db_url=get_cached_settings().sqlalchemy_sync_db_url,
+        async_db_url=get_cached_settings().sqlalchemy_async_db_url,
+        db_echo=get_cached_settings().sqlalchemy_db_echo,
         base_dbm=get_base_dbm()
     )
 

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/event.py

@@ -20,7 +20,7 @@ class StartupTgBotEvent:
         if self.transmitted_tg_bot_data.dump_file_storage_in_dir is not None:
             self.transmitted_tg_bot_data.dump_file_storage_in_dir.init()
 
-        if self.transmitted_tg_bot_data.settings.api_init_sql_db:
+        if self.transmitted_tg_bot_data.settings.api_init_sqlalchemy_db:
             self.transmitted_tg_bot_data.sqlalchemy_db.init()
 
         if self.transmitted_tg_bot_data.settings.api_init_json_db:

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/_arpakit_project_template/src/tg_bot/util.py

@@ -4,14 +4,14 @@ from src.core.settings import get_cached_settings
 from src.core.util import get_cached_media_file_storage_in_dir, get_cached_cache_file_storage_in_dir, \
     get_cached_dump_file_storage_in_dir
 from src.json_db.util import get_json_db
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 from src.tg_bot.transmitted_tg_data import TransmittedTgData
 
 
 def create_transmitted_tg_bot_data() -> TransmittedTgData:
     settings = get_cached_settings()
 
-    sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sync_sql_db_url is not None else None
+    sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sqlalchemy_sync_db_url is not None else None
 
     json_db = get_json_db() if settings.json_db_dirpath is not None else None
 

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_arpakit_project_template_util.py

@@ -15,10 +15,11 @@ def init_arpakit_project_template(
         *,
         project_dirpath: str = "./",
         overwrite_if_exists: bool = False,
-        params: dict[str, str] | None = None,
         ignore_paths_startswith: list[str] | str | None = None,
         only_paths_startswith: list[str] | str | None = None,
+        params: dict[str, str] | None = None,
 ):
+    raise_for_type(project_dirpath, str)
     raise_if_string_blank(project_dirpath)
 
     raise_for_type(overwrite_if_exists, bool)
@@ -31,11 +32,13 @@ def init_arpakit_project_template(
         ignore_paths_startswith = [ignore_paths_startswith]
     if ignore_paths_startswith is None:
         ignore_paths_startswith = []
+    raise_for_type(ignore_paths_startswith, list)
 
     if isinstance(only_paths_startswith, str):
         only_paths_startswith = [only_paths_startswith]
     if only_paths_startswith is None:
         only_paths_startswith = []
+    raise_for_type(only_paths_startswith, list)
 
     def _generate_filepath_to_content() -> dict[str, str]:
         arpakit_project_template_dirpath = os.path.join(

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_arpakitlib_cli_util.py

@@ -5,7 +5,6 @@ import sys
 from arpakitlib.ar_arpakit_project_template_util import init_arpakit_project_template
 from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
 from arpakitlib.ar_parse_command import parse_command
-from arpakitlib.ar_str_util import raise_if_string_blank
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -27,20 +26,26 @@ def execute_arpakitlib_cli(*, full_command: str | None = None):
         print("Commands:")
         print()
         print("-c init_arpakit_project_template")
-        print("-project_dirpath ...")
+        print("-project_dirpath ./")
         print("-overwrite_if_exists ...")
         print("-ignore_paths_startswith ...")
         print("-only_paths_startswith ...")
+        print("-param1 ...")
+        print("-param2 ...")
+        print("-param3 ...")
         print("\n")
 
     elif command == "init_arpakit_project_template":
-        project_dirpath = raise_if_string_blank(parsed_command.get_value_by_keys(keys=["project_dirpath"]))
+        project_dirpath: str = parse_need_type(
+            value=parsed_command.get_value_by_keys(keys=["project_dirpath"]),
+            need_type=NeedTypes.str_,
+            allow_none=False
+        )
         overwrite_if_exists: bool = parse_need_type(
             value=parsed_command.get_value_by_keys(keys=["overwrite_if_exists"]),
             need_type=NeedTypes.bool_,
             allow_none=False
         )
-        params = parsed_command.key_to_value
         ignore_paths_startswith: list[str] | None = parse_need_type(
             value=parsed_command.get_value_by_keys(keys=["ignore_paths_startswith"]),
             need_type=NeedTypes.list_of_str,
@@ -54,9 +59,9 @@ def execute_arpakitlib_cli(*, full_command: str | None = None):
         init_arpakit_project_template(
             project_dirpath=project_dirpath,
             overwrite_if_exists=overwrite_if_exists,
-            params=params,
             ignore_paths_startswith=ignore_paths_startswith,
-            only_paths_startswith=only_paths_startswith
+            only_paths_startswith=only_paths_startswith,
+            params=parsed_command.key_to_value,
         )
 
     else:

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_need_type_util.py

@@ -23,6 +23,9 @@ def parse_need_type(value: Any, need_type: str, allow_none: bool = False) -> Any
     if allow_none and value is None:
         return None
 
+    if not allow_none and value is None:
+        raise ValueError("value is None")
+
     NeedTypes.parse_and_validate_values(need_type)
 
     if need_type == NeedTypes.str_:

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/arpakitlib/ar_settings_util.py

@@ -88,57 +88,57 @@ class AdvancedSettings(SimpleSettings):
             return v.strip()
         return v
 
-    sql_db_user: str | None = None
+    sqlalchemy_db_user: str | None = None
 
-    sql_db_password: str | None = None
+    sqlalchemy_db_password: str | None = None
 
-    sql_db_host: str | None = None
+    sqlalchemy_db_host: str | None = None
 
-    sql_db_port: int | None = None
+    sqlalchemy_db_port: int | None = None
 
-    sql_db_database: str | None = None
+    sqlalchemy_db_database: str | None = None
 
-    sync_sql_db_url: str | None = None
+    sqlalchemy_sync_db_url: str | None = None
 
-    @field_validator("sync_sql_db_url", mode="after")
-    def validate_sync_sql_db_url(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> str | None:
+    @field_validator("sqlalchemy_sync_db_url", mode="after")
+    def validate_sqlalchemy_sync_db_url(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> str | None:
         if v is not None:
             return v
 
         return generate_sqlalchemy_url(
             base="postgresql",
-            user=validation_info.data.get("sql_db_user"),
-            password=validation_info.data.get("sql_db_password"),
-            host=validation_info.data.get("sql_db_host"),
-            port=validation_info.data.get("sql_db_port"),
-            database=validation_info.data.get("sql_db_database")
+            user=validation_info.data.get("sqlalchemy_db_user"),
+            password=validation_info.data.get("sqlalchemy_db_password"),
+            host=validation_info.data.get("sqlalchemy_db_host"),
+            port=validation_info.data.get("sqlalchemy_db_port"),
+            database=validation_info.data.get("sqlalchemy_db_database")
         )
 
-    async_sql_db_url: str | None = None
+    sqlalchemy_async_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:
+    @field_validator("sqlalchemy_async_db_url", mode="after")
+    def validate_sqlalchemy_async_db_url(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> str | None:
         if v is not None:
             return v
 
         return generate_sqlalchemy_url(
-            base="postgresql+asyncpg",
-            user=validation_info.data.get("sql_db_user"),
-            password=validation_info.data.get("sql_db_password"),
-            host=validation_info.data.get("sql_db_host"),
-            port=validation_info.data.get("sql_db_port"),
-            database=validation_info.data.get("sql_db_database")
+            base="postgresql",
+            user=validation_info.data.get("sqlalchemy_db_user"),
+            password=validation_info.data.get("sqlalchemy_db_password"),
+            host=validation_info.data.get("sqlalchemy_db_host"),
+            port=validation_info.data.get("sqlalchemy_db_port"),
+            database=validation_info.data.get("sqlalchemy_db_database")
         )
 
     @property
     def is_any_sql_db_url_set(self) -> bool:
-        if self.sync_sql_db_url is not None:
+        if self.sqlalchemy_sync_db_url is not None:
             return True
-        if self.async_sql_db_url is not None:
+        if self.sqlalchemy_async_db_url is not None:
             return True
         return False
 
-    sql_db_echo: bool = False
+    sqlalchemy_db_echo: bool = False
 
     api_port: int | None = None
 
@@ -149,7 +149,7 @@ class AdvancedSettings(SimpleSettings):
                 return int(v)
         return None
 
-    api_init_sql_db: bool = False
+    api_init_sqlalchemy_db: bool = False
 
     api_init_json_db: bool = False
 
@@ -173,7 +173,7 @@ class AdvancedSettings(SimpleSettings):
 
     tg_bot_proxy_url: str | None = None
 
-    tg_bot_init_sql_db: bool = False
+    tg_bot_init_sqlalchemy_db: bool = False
 
     tg_bot_init_json_db: bool = False
 

{arpakitlib-1.7.255 → arpakitlib-1.7.257}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.7.255"
+version = "1.7.257"
 description = "arpakitlib"
 authors = [
     { name = "arpakit", email = "arpakit@gmail.com" },

arpakitlib-1.7.255/arpakitlib/_arpakit_project_template/manage/docker_run_postgres.sh

@@ -1,5 +0,0 @@
-cd ..
-source .env
-docker rm ${project_name}_postgres
-docker run --name ${project_name}_postgres -d -p ${sql_db_port}:5432 -e POSTGRES_USER=${sql_db_user} -e POSTGRES_PASSWORD=${sql_db_password} -e POSTGRES_DB=${sql_db_database} postgres:16 -c max_connections=100
-docker start ${project_name}_postgres