arpakitlib 1.8.5__tar.gz → 1.8.6__tar.gz

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

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

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

@@ -5,8 +5,8 @@ from sqlalchemy import engine_from_config
 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 project.core.settings import get_cached_settings
+from project.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.6/arpakitlib/_arpakit_project_template_v_2/arpakitlib_project_template_info.json

@@ -0,0 +1,3 @@
+{
+  "arpakitlib_project_template_version": "2"
+}

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/check_logging.py

@@ -1,6 +1,6 @@
 import logging
 
-from core.util import setup_logging
+from project.core.util import setup_logging
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/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 project.core.util import setup_logging
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/drop_json_db.py

@@ -1,6 +1,6 @@
-from core.settings import get_cached_settings
-from core.util import setup_logging
-from json_db.json_db import get_cached_json_db
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.json_db.json_db import get_cached_json_db
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/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 project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/generate_settings_env_example.py

@@ -1,8 +1,8 @@
 import os.path
 
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
-from core.const import ProjectPaths
-from core.settings import Settings, get_cached_settings
+from project.core.const import ProjectPaths
+from project.core.settings import get_cached_settings, Settings
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/init_json_db.py

@@ -1,5 +1,5 @@
-from core.util import setup_logging
-from json_db.json_db import get_cached_json_db
+from project.core.util import setup_logging
+from project.json_db.json_db import get_cached_json_db
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/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 project.core.util import setup_logging
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/reinit_json_db.py

@@ -1,6 +1,6 @@
-from core.settings import get_cached_settings
-from core.util import setup_logging
-from json_db.json_db import get_cached_json_db
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.json_db.json_db import get_cached_json_db
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/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 project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/command/remove_operations.py

@@ -0,0 +1,13 @@
+from project.business_service.remove_operations import remove_operations
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+
+
+def __command():
+    setup_logging()
+    get_cached_settings().raise_if_mode_type_prod()
+    remove_operations()
+
+
+if __name__ == '__main__':
+    __command()

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/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 project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/rm_all_records_in_json_db.py

@@ -1,6 +1,6 @@
-from core.settings import get_cached_settings
-from core.util import setup_logging
-from json_db.json_db import get_cached_json_db
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.json_db.json_db import get_cached_json_db
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/show_settings.py

@@ -1,5 +1,5 @@
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
-from core.settings import get_cached_settings
+from project.core.settings import get_cached_settings
 
 
 def __command():

arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/command/start_api_without_reload_for_not_prod.py → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/command/start_api_for_not_prod.py

@@ -1,13 +1,13 @@
 import uvicorn
 
-from core.settings import get_cached_settings
-from core.util import setup_logging
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
 
 
 def __command():
     setup_logging()
     uvicorn.run(
-        "api.asgi:app",
+        "project.api.asgi:app",
         port=get_cached_settings().api_port,
         host="localhost",
         workers=1,

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/start_api_for_prod.py

@@ -1,13 +1,13 @@
 import uvicorn
 
-from core.settings import get_cached_settings
-from core.util import setup_logging
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
 
 
 def __command():
     setup_logging()
     uvicorn.run(
-        app="api.asgi:app",
+        app="project.api.asgi:app",
         host="127.0.0.1",
         port=get_cached_settings().api_port,
         reload=False,

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/start_api_with_reload_for_not_prod.py

@@ -1,13 +1,13 @@
 import uvicorn
 
-from core.settings import get_cached_settings
-from core.util import setup_logging
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
 
 
 def __command():
     setup_logging()
     uvicorn.run(
-        "api.asgi:app",
+        "project.api.asgi:app",
         port=get_cached_settings().api_port,
         host="localhost",
         workers=1,

arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/command/start_operation_executor_worker_for_not_prod.py

@@ -0,0 +1,15 @@
+from project.core.util import setup_logging
+from project.operation_execution.operation_executor_worker import OperationExecutorWorker
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+
+
+def __command():
+    setup_logging()
+    worker = OperationExecutorWorker(
+        sqlalchemy_db=get_cached_sqlalchemy_db(),
+    )
+    worker.sync_safe_run()
+
+
+if __name__ == '__main__':
+    __command()

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/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 project.core.util import setup_logging
+from project.operation_execution.operation_executor_worker import OperationExecutorWorker
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/start_scheduled_operation_creator_worker_for_not_prod.py

@@ -1,5 +1,5 @@
-from core.util import setup_logging
-from operation_execution.scheduled_operation_creator_worker import create_scheduled_operation_creator_worker
+from project.core.util import setup_logging
+from project.operation_execution.scheduled_operation_creator_worker import create_scheduled_operation_creator_worker
 
 
 def __command():

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2}/command/start_tg_bot_for_prod.py

@@ -1,5 +1,5 @@
-from core.util import setup_logging
-from tg_bot.start_tg_bot import start_tg_bot
+from project.core.util import setup_logging
+from project.tg_bot.start_tg_bot import start_tg_bot
 
 
 def __command():

arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project/api/asgi.py

@@ -0,0 +1,3 @@
+from project.api.create_api_app import create_api_app
+
+app = create_api_app()

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/auth.py

@@ -8,12 +8,12 @@ from fastapi import Security
 from fastapi.security import APIKeyHeader
 from pydantic import BaseModel, ConfigDict
 
-from api.const import APIErrorCodes
-from api.exception import APIException
 from arpakitlib.ar_func_util import is_async_callable, is_sync_function
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str_to_json_obj
 from arpakitlib.ar_type_util import raise_for_type
-from core.settings import get_cached_settings
+from project.api.const import APIErrorCodes
+from project.api.exception import APIException
+from project.core.settings import get_cached_settings
 
 
 class APIAuthData(BaseModel):

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/create_api_app.py

@@ -5,13 +5,13 @@ from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 
-from api.event import get_api_startup_events, get_api_shutdown_events
-from api.exception_handler import add_exception_handler_to_app
-from api.openapi_ui import add_local_openapi_ui_to_app
-from api.router.main_router import main_api_router
-from core.const import ProjectPaths
-from core.settings import get_cached_settings
-from core.util import setup_logging
+from project.api.event import get_api_startup_events, get_api_shutdown_events
+from project.api.exception_handler import add_exception_handler_to_app
+from project.api.openapi_ui import add_local_openapi_ui_to_app
+from project.api.router.main_router import main_api_router
+from project.core.const import ProjectPaths
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
 
 _logger = logging.getLogger(__name__)
 
@@ -63,7 +63,7 @@ def create_api_app(*, prefix: str = "/api") -> FastAPI:
     api_app.mount("/static", StaticFiles(directory=ProjectPaths.static_dirpath), name="static")
 
     if get_cached_settings().api_enable_sqladmin:
-        from sqladmin_.add_admin_in_app import add_sqladmin_in_app
+        from project.sqladmin_.add_admin_in_app import add_sqladmin_in_app
         add_sqladmin_in_app(app=api_app)
 
     _logger.info("finish")

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/event.py

@@ -2,14 +2,14 @@ import logging
 from typing import Callable
 
 from arpakitlib.ar_base_worker_util import safe_run_worker_in_background, SafeRunInBackgroundModes
-from core.cache_file_storage_in_dir import get_cached_cache_file_storage_in_dir
-from core.dump_file_storage_in_dir import get_cached_dump_file_storage_in_dir
-from core.media_file_storage_in_dir import get_cached_media_file_storage_in_dir
-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 project.core.cache_file_storage_in_dir import get_cached_cache_file_storage_in_dir
+from project.core.dump_file_storage_in_dir import get_cached_dump_file_storage_in_dir
+from project.core.media_file_storage_in_dir import get_cached_media_file_storage_in_dir
+from project.core.settings import get_cached_settings
+from project.json_db.json_db import get_cached_json_db
+from project.operation_execution.operation_executor_worker import create_operation_executor_worker
+from project.operation_execution.scheduled_operation_creator_worker import create_scheduled_operation_creator_worker
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/exception.py

@@ -2,8 +2,8 @@ from typing import Any
 
 import fastapi.security
 
-from api.const import APIErrorCodes
-from api.schema.common.out import ErrorCommonSO
+from project.api.const import APIErrorCodes
+from project.api.schema.common.out import ErrorCommonSO
 
 
 class APIException(fastapi.exceptions.HTTPException):

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/exception_handler.py

@@ -7,19 +7,19 @@ from typing import Any, Callable
 import fastapi
 import starlette.exceptions
 
-from api.const import APIErrorCodes
-from api.exception import APIException
-from api.response import APIJSONResponse
-from api.schema.common.out import ErrorCommonSO
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_exception_util import exception_to_traceback_str
 from arpakitlib.ar_func_util import raise_if_not_async_callable, is_async_callable, is_sync_function
 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 project.api.const import APIErrorCodes
+from project.api.exception import APIException
+from project.api.response import APIJSONResponse
+from project.api.schema.common.out import ErrorCommonSO
+from project.core.settings import get_cached_settings
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 
 _logger = logging.getLogger(__name__)
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/response.py

@@ -2,8 +2,8 @@ from typing import Any
 
 import fastapi
 
-from api.schema.v1.out import BaseSO
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str_to_json_obj
+from project.api.schema.v1.out import BaseSO
 
 
 class APIJSONResponse(fastapi.responses.JSONResponse):

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/main_router.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from api.router.v1.main_router import main_v1_api_router
+from project.api.router.v1.main_router import main_v1_api_router
 
 main_api_router = APIRouter()
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/v1/check_auth.py

@@ -1,9 +1,9 @@
 import fastapi.requests
 from fastapi import APIRouter, Depends
 
-from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func, \
+from project.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.schema.common.out import ErrorCommonSO, RawDataCommonSO
+from project.api.schema.common.out import ErrorCommonSO, RawDataCommonSO
 
 api_router = APIRouter()
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/v1/clear_log_file.py

@@ -1,10 +1,10 @@
 import fastapi
 from fastapi import APIRouter, Depends
 
-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
+from project.api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func
+from project.api.schema.common.out import RawDataCommonSO, ErrorCommonSO
+from project.core.settings import get_cached_settings
 
 api_router = APIRouter()
 

arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1/api/router/v1/arpakitlib_project_template_info.py → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project/api/router/v1/get_arpakitlib_project_template_info.py

@@ -1,8 +1,8 @@
 import fastapi
 from fastapi import APIRouter
 
-from api.schema.common.out import ErrorCommonSO, RawDataCommonSO
-from util.read_arpakitlib_project_template_file import read_arpakitlib_project_template_file
+from project.api.schema.common.out import ErrorCommonSO, RawDataCommonSO
+from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
 
 api_router = APIRouter()
 
@@ -18,5 +18,5 @@ async def _(
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
 ):
-    arpakitlib_project_template_data = read_arpakitlib_project_template_file()
+    arpakitlib_project_template_data = get_arpakitlib_project_template_info()
     return RawDataCommonSO(data=arpakitlib_project_template_data)

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/v1/get_errors_info.py

@@ -1,9 +1,9 @@
 import fastapi.requests
 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
+from project.api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func
+from project.api.const import APIErrorCodes, APIErrorSpecificationCodes
+from project.api.schema.common.out import ErrorCommonSO, ErrorsInfoCommonSO
 
 api_router = APIRouter()
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/v1/get_log_file.py

@@ -2,9 +2,9 @@ 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
 from arpakitlib.ar_logging_util import init_log_file
-from core.settings import get_cached_settings
+from project.api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func
+from project.core.settings import get_cached_settings
 
 api_router = APIRouter()
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/v1/healthcheck.py

@@ -1,8 +1,8 @@
 import fastapi
 from fastapi import APIRouter
 
-from api.schema.common.out import ErrorCommonSO
-from api.schema.v1.out import HealthcheckV1SO
+from project.api.schema.common.out import ErrorCommonSO
+from project.api.schema.v1.out import HealthcheckV1SO
 
 api_router = APIRouter()
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/v1/main_router.py

@@ -1,8 +1,7 @@
 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_info, reinit_sqlalchemy_db
-from api.router.v1 import raise_fake_error, check_auth
+from project.api.router.v1 import healthcheck, get_errors_info, now_utc_datetime, clear_log_file, get_log_file, \
+    get_arpakitlib_project_template_info, reinit_sqlalchemy_db, check_auth, raise_fake_error
 
 main_v1_api_router = APIRouter()
 
@@ -13,9 +12,9 @@ main_v1_api_router.include_router(
 )
 
 main_v1_api_router.include_router(
-    router=arpakitlib_project_template_info.api_router,
-    prefix="/arpakitlib_project_template_info",
-    tags=["arpakitlib"]
+    router=get_arpakitlib_project_template_info.api_router,
+    prefix="/get_arpakitlib_project_template_info",
+    tags=["arpakitlib project template info"]
 )
 
 main_v1_api_router.include_router(

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/v1/now_utc_datetime.py

@@ -1,8 +1,8 @@
 import fastapi
 from fastapi import APIRouter
 
-from api.schema.common.out import ErrorCommonSO, DatetimeCommonSO
 from arpakitlib.ar_datetime_util import now_utc_dt
+from project.api.schema.common.out import ErrorCommonSO, DatetimeCommonSO
 
 api_router = APIRouter()
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/v1/raise_fake_error.py

@@ -2,8 +2,8 @@ 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
-from api.schema.common.out import ErrorCommonSO
+from project.api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func
+from project.api.schema.common.out import ErrorCommonSO
 
 api_router = APIRouter()
 

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/router/v1/reinit_sqlalchemy_db.py

@@ -1,10 +1,10 @@
 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
+from project.api.auth import APIAuthData, api_auth
+from project.api.schema.common.out import ErrorCommonSO, RawDataCommonSO
+from project.core.settings import ModeTypes
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 api_router = APIRouter()
 
@@ -30,4 +30,4 @@ async def _(
         ))
 ):
     get_cached_sqlalchemy_db().reinit()
-    return RawDataCommonSO(data={"sqlalchemy_was_reinited": True})
+    return RawDataCommonSO(data={"sqlalchemy_db_was_reinited": True})

arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project/api/schema/common/in_.py

@@ -0,0 +1,5 @@
+from project.api.schema.base_schema import BaseSI
+
+
+class BaseCommonSI(BaseSI):
+    pass

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/schema/common/out.py

@@ -1,7 +1,7 @@
 import datetime as dt
 from typing import Any
 
-from api.schema.base_schema import BaseSO
+from project.api.schema.base_schema import BaseSO
 
 
 class BaseCommonSO(BaseSO):

arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project/api/schema/v1/in_.py

@@ -0,0 +1,5 @@
+from project.api.schema.base_schema import BaseSI
+
+
+class BaseV1SI(BaseSI):
+    pass

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/api/schema/v1/out.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 import datetime as dt
 from typing import Any
 
-from api.schema.base_schema import BaseSO
-from sqlalchemy_db_.sqlalchemy_model import OperationDBM, StoryLogDBM
+from project.api.schema.base_schema import BaseSO
+from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM, OperationDBM
 
 
 class BaseV1SO(BaseSO):

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/business_service/hello_world.py

@@ -1,6 +1,6 @@
 import logging
 
-from core.util import setup_logging
+from project.core.util import setup_logging
 
 _logger = logging.getLogger(__name__)
 
@@ -10,6 +10,6 @@ def hello_world() -> str:
     return "Hello world"
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     setup_logging()
     hello_world()

{arpakitlib-1.8.5/arpakitlib/_arpakit_project_template_v_1 → arpakitlib-1.8.6/arpakitlib/_arpakit_project_template_v_2/project}/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 project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
 def remove_operations(