arpakitlib 1.8.4__tar.gz → 1.8.5__tar.gz

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.4
+Version: 1.8.5
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/alembic/env.py

@@ -6,7 +6,7 @@ from sqlalchemy import pool
 
 from arpakitlib.ar_type_util import raise_for_type
 from core.settings import get_cached_settings
-from sqlalchemy_db.sqlalchemy_model import get_simple_dbm
+from sqlalchemy_db_.sqlalchemy_model import get_simple_dbm
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/auth.py

@@ -31,6 +31,10 @@ class APIAuthData(BaseModel):
     is_token_correct: bool | None = None
     is_api_key_correct: bool | None = None
 
+    require_mode_type: str | None = None
+    require_not_mode_type: str | None = None
+    current_mode_type: str | None = None
+
 
 def api_auth(
         *,
@@ -41,7 +45,9 @@ def api_auth(
         correct_api_keys: str | list[str] | None = None,
         correct_tokens: str | list[str] | None = None,
         require_correct_api_key: bool = False,
-        require_correct_token: bool = False
+        require_correct_token: bool = False,
+        require_mode_type: str | None = None,
+        require_not_mode_type: str | None = None
 ) -> Callable:
     if isinstance(correct_api_keys, str):
         correct_api_keys = [correct_api_keys]
@@ -80,7 +86,10 @@ def api_auth(
             require_api_key_string=require_api_key_string,
             require_token_string=require_token_string,
             require_correct_api_key=require_correct_api_key,
-            require_correct_token=require_correct_token
+            require_correct_token=require_correct_token,
+            require_mode_type=require_mode_type,
+            require_not_mode_type=require_not_mode_type,
+            current_mode_type=get_cached_settings().mode_type
         )
 
         # parse api_key
@@ -130,6 +139,26 @@ def api_auth(
         if not api_auth_data.token_string:
             api_auth_data.token_string = None
 
+        # require_mode_type
+
+        if require_mode_type is not None:
+            if get_cached_settings().mode_type != require_mode_type:
+                raise APIException(
+                    status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                    error_code=APIErrorCodes.cannot_authorize,
+                    error_data=safely_transfer_obj_to_json_str_to_json_obj(api_auth_data.model_dump())
+                )
+
+        # require_not_mode_type
+
+        if require_not_mode_type is not None:
+            if get_cached_settings().mode_type == require_not_mode_type:
+                raise APIException(
+                    status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                    error_code=APIErrorCodes.cannot_authorize,
+                    error_data=safely_transfer_obj_to_json_str_to_json_obj(api_auth_data.model_dump())
+                )
+
         # require_api_key_string
 
         if require_api_key_string and not api_auth_data.api_key_string:

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/event.py

@@ -9,7 +9,7 @@ from core.settings import get_cached_settings
 from json_db.json_db import get_cached_json_db
 from operation_execution.operation_executor_worker import create_operation_executor_worker
 from operation_execution.scheduled_operation_creator_worker import create_scheduled_operation_creator_worker
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/exception_handler.py

@@ -18,8 +18,8 @@ from arpakitlib.ar_func_util import raise_if_not_async_callable, is_async_callab
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 from arpakitlib.ar_type_util import raise_for_type
 from core.settings import get_cached_settings
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
-from sqlalchemy_db.sqlalchemy_model import StoryLogDBM
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/router/main_router.py

@@ -4,9 +4,6 @@ from api.router.v1.main_router import main_v1_api_router
 
 main_api_router = APIRouter()
 
-# V1 API Router
-
-
 main_api_router.include_router(
     prefix="/v1",
     router=main_v1_api_router,

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/router/v1/clear_log_file.py

@@ -1,8 +1,7 @@
 import fastapi
 from fastapi import APIRouter, Depends
 
-from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func, \
-    correct_tokens_from_settings__validate_api_key_func
+from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func
 from api.schema.common.out import RawDataCommonSO, ErrorCommonSO
 from arpakitlib.ar_logging_util import init_log_file
 from core.settings import get_cached_settings
@@ -22,11 +21,11 @@ async def _(
         response: fastapi.responses.Response,
         api_auth_data: APIAuthData = Depends(api_auth(
             require_api_key_string=True,
-            require_token_string=True,
+            require_token_string=False,
             validate_api_key_func=correct_api_keys_from_settings__validate_api_key_func(),
-            validate_token_func=correct_tokens_from_settings__validate_api_key_func(),
+            validate_token_func=None,
             require_correct_api_key=True,
-            require_correct_token=True,
+            require_correct_token=False,
         ))
 ):
     init_log_file(log_filepath=get_cached_settings().log_filepath)

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/router/v1/get_errors_info.py

@@ -1,6 +1,7 @@
 import fastapi.requests
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends
 
+from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func
 from api.const import APIErrorCodes, APIErrorSpecificationCodes
 from api.schema.common.out import ErrorCommonSO, ErrorsInfoCommonSO
 
@@ -17,6 +18,14 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = Depends(api_auth(
+            require_api_key_string=True,
+            require_token_string=False,
+            validate_api_key_func=correct_api_keys_from_settings__validate_api_key_func(),
+            validate_token_func=None,
+            require_correct_api_key=True,
+            require_correct_token=False,
+        ))
 ):
     return ErrorsInfoCommonSO(
         api_error_codes=APIErrorCodes.values_list(),

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/router/v1/get_log_file.py

@@ -2,8 +2,7 @@ import fastapi
 from fastapi import APIRouter, Depends
 from fastapi.responses import FileResponse
 
-from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func, \
-    correct_tokens_from_settings__validate_api_key_func
+from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func
 from arpakitlib.ar_logging_util import init_log_file
 from core.settings import get_cached_settings
 
@@ -22,11 +21,11 @@ async def _(
         response: fastapi.responses.Response,
         api_auth_data: APIAuthData = Depends(api_auth(
             require_api_key_string=True,
-            require_token_string=True,
+            require_token_string=False,
             validate_api_key_func=correct_api_keys_from_settings__validate_api_key_func(),
-            validate_token_func=correct_tokens_from_settings__validate_api_key_func(),
+            validate_token_func=None,
             require_correct_api_key=True,
-            require_correct_token=True,
+            require_correct_token=False,
         ))
 ):
     init_log_file(log_filepath=get_cached_settings().log_filepath)

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/router/v1/main_router.py

@@ -1,68 +1,60 @@
 from fastapi import APIRouter
 
 from api.router.v1 import healthcheck, get_errors_info, now_utc_datetime, clear_log_file, get_log_file, \
-    arpakitlib_project_template
+    arpakitlib_project_template_info, reinit_sqlalchemy_db
 from api.router.v1 import raise_fake_error, check_auth
 
 main_v1_api_router = APIRouter()
 
-# Healthcheck
-
 main_v1_api_router.include_router(
     router=healthcheck.api_router,
     prefix="/healthcheck",
     tags=["Healthcheck"]
 )
 
-# arpakitlib_
-
 main_v1_api_router.include_router(
-    router=arpakitlib_project_template.api_router,
-    prefix="/arpakitlib",
+    router=arpakitlib_project_template_info.api_router,
+    prefix="/arpakitlib_project_template_info",
     tags=["arpakitlib"]
 )
 
-# Get errors info
-
 main_v1_api_router.include_router(
     router=get_errors_info.api_router,
     prefix="/get_errors_info",
     tags=["Errors info"]
 )
 
-# Check auth
-
 main_v1_api_router.include_router(
     router=check_auth.api_router,
     prefix="/check_auth",
     tags=["Check auth"]
 )
 
-# Raise fake error
-
 main_v1_api_router.include_router(
     router=raise_fake_error.api_router,
     prefix="/raise_fake_error",
     tags=["Fake error"]
 )
 
-# Now UTC Datetime
-
 main_v1_api_router.include_router(
     router=now_utc_datetime.api_router,
     prefix="/now_utc_datetime",
     tags=["Now UTC datetime"]
 )
 
-# Log file
-
+main_v1_api_router.include_router(
+    router=get_log_file.api_router,
+    prefix="/get_log_file",
+    tags=["Log file"]
+)
 main_v1_api_router.include_router(
     router=clear_log_file.api_router,
     prefix="/clear_log_file",
     tags=["Log file"]
 )
+
 main_v1_api_router.include_router(
-    router=get_log_file.api_router,
-    prefix="/get_log_file",
-    tags=["Log file"]
+    router=reinit_sqlalchemy_db.api_router,
+    prefix="/reinit_sqlalchemy_db",
+    tags=["Reinit SQLAlchemy db"]
 )

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/router/v1/raise_fake_error.py

@@ -2,8 +2,7 @@ import fastapi
 import starlette.exceptions
 from fastapi import APIRouter, Depends
 
-from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func, \
-    correct_tokens_from_settings__validate_api_key_func
+from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func
 from api.schema.common.out import ErrorCommonSO
 
 api_router = APIRouter()
@@ -22,11 +21,11 @@ async def _(
         n: int | None = None,
         api_auth_data: APIAuthData = Depends(api_auth(
             require_api_key_string=True,
-            require_token_string=True,
+            require_token_string=False,
             validate_api_key_func=correct_api_keys_from_settings__validate_api_key_func(),
-            validate_token_func=correct_tokens_from_settings__validate_api_key_func(),
+            validate_token_func=None,
             require_correct_api_key=True,
-            require_correct_token=True,
+            require_correct_token=False,
         ))
 ):
     if n == 1:

arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/api/router/v1/reinit_sqlalchemy_db.py

@@ -0,0 +1,33 @@
+import fastapi
+from fastapi import APIRouter
+
+from api.auth import APIAuthData, api_auth
+from api.schema.common.out import ErrorCommonSO, RawDataCommonSO
+from core.settings import ModeTypes
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    "",
+    name="Reinit SQLAlchemy db",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=RawDataCommonSO | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = fastapi.Depends(api_auth(
+            require_api_key_string=True,
+            require_token_string=False,
+            validate_api_key_func=None,
+            validate_token_func=None,
+            require_correct_api_key=False,
+            require_correct_token=False,
+            require_not_mode_type=ModeTypes.prod
+        ))
+):
+    get_cached_sqlalchemy_db().reinit()
+    return RawDataCommonSO(data={"sqlalchemy_was_reinited": True})

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/api/schema/v1/out.py

@@ -4,7 +4,7 @@ import datetime as dt
 from typing import Any
 
 from api.schema.base_schema import BaseSO
-from sqlalchemy_db.sqlalchemy_model import OperationDBM, StoryLogDBM
+from sqlalchemy_db_.sqlalchemy_model import OperationDBM, StoryLogDBM
 
 
 class BaseV1SO(BaseSO):

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/business_service/remove_operations.py

@@ -1,8 +1,8 @@
 import asyncio
 
 from arpakitlib.ar_type_util import raise_for_type
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
-from sqlalchemy_db.sqlalchemy_model import OperationDBM
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
 def remove_operations(

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/command/check_sqlalchemy_db.py

@@ -1,5 +1,5 @@
 from core.util import setup_logging
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/command/drop_sqlalchemy_db.py

@@ -1,6 +1,6 @@
 from core.settings import get_cached_settings
 from core.util import setup_logging
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():
@@ -8,6 +8,7 @@ def __command():
     get_cached_settings().raise_if_mode_type_prod()
     get_cached_sqlalchemy_db().drop()
     get_cached_sqlalchemy_db().drop_celery_tables()
+    get_cached_sqlalchemy_db().drop_alembic_tables()
 
 
 if __name__ == '__main__':

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/command/init_sqlalchemy_db.py

@@ -1,5 +1,5 @@
 from core.util import setup_logging
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/command/reinit_sqlalchemy_db.py

@@ -1,6 +1,6 @@
 from core.settings import get_cached_settings
 from core.util import setup_logging
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/command/remove_story_logs.py

@@ -1,7 +1,7 @@
 from core.settings import get_cached_settings
 from core.util import setup_logging
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
-from sqlalchemy_db.sqlalchemy_model import StoryLogDBM
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 
 
 def __command():

arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/command/start_api_for_prod.py

@@ -0,0 +1,19 @@
+import uvicorn
+
+from core.settings import get_cached_settings
+from core.util import setup_logging
+
+
+def __command():
+    setup_logging()
+    uvicorn.run(
+        app="api.asgi:app",
+        host="127.0.0.1",
+        port=get_cached_settings().api_port,
+        reload=False,
+        workers=4
+    )
+
+
+if __name__ == '__main__':
+    __command()

arpakitlib-1.8.4/arpakitlib/_arpakit_project_template_v_1/command/start_sync_operation_executor_worker.py → arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/command/start_operation_executor_worker_for_not_prod.py

@@ -1,6 +1,6 @@
 from core.util import setup_logging
 from operation_execution.operation_executor_worker import OperationExecutorWorker
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

arpakitlib-1.8.4/arpakitlib/_arpakit_project_template_v_1/command/start_sync_operation_executor_workers.py → arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/command/start_operation_executor_workers_for_not_prod.py

@@ -1,7 +1,7 @@
 from arpakitlib.ar_base_worker_util import safe_run_workers_in_background, SafeRunInBackgroundModes
 from core.util import setup_logging
 from operation_execution.operation_executor_worker import OperationExecutorWorker
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/command/start_tg_bot_for_prod.py

@@ -0,0 +1,11 @@
+from core.util import setup_logging
+from tg_bot.start_tg_bot import start_tg_bot
+
+
+def __command():
+    setup_logging()
+    start_tg_bot()
+
+
+if __name__ == '__main__':
+    __command()

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/core/const.py

@@ -17,7 +17,9 @@ class ProjectPaths(Enumeration):
 
     templates_dirpath: str = os.path.join(resource_dirpath, "templates")
 
-    arpakit_lib_project_template_filepath: str = os.path.join(base_dirpath, "arpakitlib_project_template.json")
+    arpakit_lib_project_template_info_filepath: str = os.path.join(
+        base_dirpath, "arpakitlib_project_template_info.json"
+    )
 
 
 def __example():

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/core/settings.py

@@ -45,7 +45,7 @@ class Settings(SimpleSettings):
         if self.is_mode_type_prod:
             raise ValueError(f"mode type = {self.mode_type}")
 
-    project_name: str | None = None
+    project_name: str | None = "project"
 
     sqlalchemy_db_user: str | None = project_name
 
@@ -99,7 +99,7 @@ class Settings(SimpleSettings):
 
     sqlalchemy_db_echo: bool = False
 
-    api_port: int | None = 50519
+    api_port: int | None = 8080
 
     api_init_sqlalchemy_db: bool = False
 

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/operation_execution/operation_executor_worker.py

@@ -13,8 +13,8 @@ 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_type_util import raise_for_type
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
-from sqlalchemy_db.sqlalchemy_model import OperationDBM, StoryLogDBM
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_model import OperationDBM, StoryLogDBM
 
 
 class OperationExecutorWorker(BaseWorker):

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/operation_execution/scheduled_operation_creator_worker.py

@@ -6,8 +6,8 @@ from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_type
 from operation_execution.scheduled_operations import ScheduledOperation, get_scheduled_operations
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
-from sqlalchemy_db.sqlalchemy_model import OperationDBM
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
 class ScheduledOperationCreatorWorker(BaseWorker):

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/operation_execution/scheduled_operations.py

@@ -5,7 +5,7 @@ from pydantic import ConfigDict
 from pydantic.v1 import BaseModel
 
 from operation_execution.util import every_timedelta_is_time_func
-from sqlalchemy_db.sqlalchemy_model import OperationDBM
+from sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
 class ScheduledOperation(BaseModel):

arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/resource/static/helloworld

@@ -0,0 +1 @@
+HELLO WORLD

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/sqladmin_/add_admin_in_app.py

@@ -4,7 +4,7 @@ from sqladmin import Admin
 from core.settings import get_cached_settings
 from sqladmin_.admin_auth import SQLAdminAuth
 from sqladmin_.model_view import get_simple_mv
-from sqlalchemy_db.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def add_sqladmin_in_app(*, app: FastAPI, base_url: str = "/sqladmin") -> FastAPI:

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/sqladmin_/model_view.py

@@ -1,7 +1,7 @@
 from sqladmin import ModelView
 
 from arpakitlib.ar_sqladmin_util import get_string_info_from_model_view
-from sqlalchemy_db.sqlalchemy_model import StoryLogDBM, OperationDBM
+from sqlalchemy_db_.sqlalchemy_model import StoryLogDBM, OperationDBM
 
 
 class SimpleMV(ModelView):

{arpakitlib-1.8.4/arpakitlib/_arpakit_project_template_v_1/sqlalchemy_db → arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/sqlalchemy_db_}/sqlalchemy_db.py

@@ -2,7 +2,7 @@ from functools import lru_cache
 
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from core.settings import get_cached_settings
-from sqlalchemy_db.sqlalchemy_model import get_simple_dbm
+from sqlalchemy_db_.sqlalchemy_model import get_simple_dbm
 
 
 def create_sqlalchemy_db() -> SQLAlchemyDb | None:

{arpakitlib-1.8.4/arpakitlib/_arpakit_project_template_v_1/sqlalchemy_db → arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/sqlalchemy_db_}/sqlalchemy_model.py

@@ -9,7 +9,7 @@ from sqlalchemy.orm import mapped_column, Mapped
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, BaseDBM
-from sqlalchemy_db.util import generate_default_long_id
+from sqlalchemy_db_.util import generate_default_long_id
 
 
 class SimpleDBM(BaseDBM):

arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/tg_bot/blank/blank.py

@@ -0,0 +1,24 @@
+from functools import lru_cache
+
+from emoji import emojize
+
+from arpakitlib.ar_blank_util import BaseBlank
+
+
+class TgBotBlank(BaseBlank):
+    def hello_world(self) -> str:
+        res = ":smile: Hello world :smile:"
+        return emojize(res.strip())
+
+    def healthcheck(self) -> str:
+        res = "healthcheck"
+        return emojize(res.strip())
+
+
+def create_tg_bot_blank() -> TgBotBlank:
+    return TgBotBlank()
+
+
+@lru_cache()
+def get_cached_tg_bot_blank() -> TgBotBlank:
+    return create_tg_bot_blank()

{arpakitlib-1.8.4 → arpakitlib-1.8.5}/arpakitlib/_arpakit_project_template_v_1/tg_bot/const.py

@@ -4,7 +4,7 @@ from arpakitlib.ar_enumeration_util import Enumeration
 class TgBotCommands(Enumeration):
     # public
     healthcheck = "healthcheck"
-    arpakitlib = "arpakitlib"
+    arpakitlib_project_template_info = "arpakitlib_project_template_info"
     start = "start"
     about = "about"