arpakitlib 1.8.5__py3-none-any.whl → 1.8.7__py3-none-any.whl

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/core/const.py

@@ -7,20 +7,22 @@ from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 
 
 class ProjectPaths(Enumeration):
-    base_dirpath: str = str(pathlib.Path(__file__).parent.parent)
+    base_dirpath: str = str(pathlib.Path(__file__).parent.parent.parent)
 
     env_filepath: str = os.path.join(base_dirpath, ".env")
 
-    resource_dirpath: str = os.path.join(base_dirpath, "resource")
+    arpakit_lib_project_template_info_filepath: str = os.path.join(
+        base_dirpath, "arpakitlib_project_template_info.json"
+    )
+
+    project_dirpath: str = str(pathlib.Path(__file__).parent.parent)
+
+    resource_dirpath: str = os.path.join(project_dirpath, "resource")
 
     static_dirpath: str = os.path.join(resource_dirpath, "static")
 
     templates_dirpath: str = os.path.join(resource_dirpath, "templates")
 
-    arpakit_lib_project_template_info_filepath: str = os.path.join(
-        base_dirpath, "arpakitlib_project_template_info.json"
-    )
-
 
 def __example():
     print(safely_transfer_obj_to_json_str(ProjectPaths.key_to_value()))

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/core/dump_file_storage_in_dir.py

@@ -1,7 +1,7 @@
 from functools import lru_cache
 
 from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
-from core.settings import get_cached_settings
+from project.core.settings import get_cached_settings
 
 
 def create_dump_file_storage_in_dir() -> FileStorageInDir | None:

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/core/jinja2_templates.py

@@ -2,7 +2,7 @@ from functools import lru_cache
 
 from fastapi.templating import Jinja2Templates
 
-from core.const import ProjectPaths
+from project.core.const import ProjectPaths
 
 
 def create_jinja2_templates() -> Jinja2Templates:

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/core/media_file_storage_in_dir.py

@@ -1,7 +1,7 @@
 from functools import lru_cache
 
 from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
-from core.settings import get_cached_settings
+from project.core.settings import get_cached_settings
 
 
 def create_media_file_storage_in_dir() -> FileStorageInDir | None:

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/core/settings.py

@@ -10,7 +10,7 @@ from arpakitlib.ar_enumeration_util import Enumeration
 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 core.const import ProjectPaths
+from project.core.const import ProjectPaths
 
 
 class ModeTypes(Enumeration):

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/core/util.py

@@ -4,7 +4,7 @@ from datetime import datetime
 from arpakitlib.ar_datetime_util import now_dt
 from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_type_util import raise_if_none
-from core.settings import get_cached_settings
+from project.core.settings import get_cached_settings
 
 
 def setup_logging():

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/json_db/json_db.py

@@ -2,7 +2,7 @@ import os
 from functools import lru_cache
 
 from arpakitlib.ar_json_db_util import BaseJSONDb
-from core.settings import get_cached_settings
+from project.core.settings import get_cached_settings
 
 
 class JSONDb(BaseJSONDb):

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/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 project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM, StoryLogDBM
 
 
 class OperationExecutorWorker(BaseWorker):

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/operation_execution/scheduled_operation_creator_worker.py

@@ -5,9 +5,9 @@ from arpakitlib.ar_base_worker_util import BaseWorker
 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 project.operation_execution.scheduled_operations import ScheduledOperation, get_scheduled_operations
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
 class ScheduledOperationCreatorWorker(BaseWorker):

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/operation_execution/scheduled_operations.py

@@ -4,8 +4,8 @@ from typing import Any, Callable
 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 project.operation_execution.util import every_timedelta_is_time_func
+from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
 class ScheduledOperation(BaseModel):

arpakitlib/_arpakit_project_template_v_2/project/site/asgi.py

@@ -0,0 +1,3 @@
+from project.site.create_site_app import create_site_app
+
+app = create_site_app()

arpakitlib/_arpakit_project_template_v_2/project/site/create_site_app.py

@@ -0,0 +1,5 @@
+from project.core.util import setup_logging
+
+
+def create_site_app():
+    setup_logging()

arpakitlib/_arpakit_project_template_v_2/project/site/event.py

@@ -0,0 +1,19 @@
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+# STARTUP SITE EVENTS
+
+
+async def async_site_startup_event():
+    _logger.info("start")
+    _logger.info("finish")
+
+
+# SHUTDOWN SITE EVENTS
+
+
+async def async_site_shutdown_event():
+    _logger.info("start")
+    _logger.info("finish")

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/sqladmin_/add_admin_in_app.py

@@ -1,10 +1,10 @@
 from fastapi import FastAPI
 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 project.core.settings import get_cached_settings
+from project.sqladmin_.admin_auth import SQLAdminAuth
+from project.sqladmin_.model_view import get_simple_mv
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
 def add_sqladmin_in_app(*, app: FastAPI, base_url: str = "/sqladmin") -> FastAPI:

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/sqladmin_/admin_auth.py

@@ -3,7 +3,7 @@ import logging
 import fastapi
 from sqladmin.authentication import AuthenticationBackend
 
-from core.settings import get_cached_settings
+from project.core.settings import get_cached_settings
 
 
 class SQLAdminAuth(AuthenticationBackend):

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/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 project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM, OperationDBM
 
 
 class SimpleMV(ModelView):

arpakitlib/_arpakit_project_template_v_2/project/sqlalchemy_db_/const.py

@@ -0,0 +1 @@
+# ...

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/sqlalchemy_db_/sqlalchemy_db.py

@@ -1,8 +1,8 @@
 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 project.core.settings import get_cached_settings
+from project.sqlalchemy_db_.sqlalchemy_model import get_simple_dbm
 
 
 def create_sqlalchemy_db() -> SQLAlchemyDb | None:

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/sqlalchemy_db_/sqlalchemy_model.py

@@ -9,22 +9,25 @@ 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 project.sqlalchemy_db_.util import generate_default_long_id
 
 
 class SimpleDBM(BaseDBM):
     __abstract__ = True
 
     id: Mapped[int] = mapped_column(
-        sqlalchemy.INTEGER, primary_key=True, autoincrement=True, sort_order=-3, nullable=False
+        sqlalchemy.INTEGER, primary_key=True, autoincrement=True, sort_order=-13, nullable=False
     )
     long_id: Mapped[str] = mapped_column(
         sqlalchemy.TEXT, insert_default=generate_default_long_id, server_default=func.gen_random_uuid(),
-        unique=True, sort_order=-2, nullable=False
+        unique=True, sort_order=-12, nullable=False
+    )
+    slug: Mapped[str | None] = mapped_column(
+        sqlalchemy.TEXT, unique=True, sort_order=-11, nullable=True
     )
     creation_dt: Mapped[datetime] = mapped_column(
         sqlalchemy.TIMESTAMP(timezone=True), insert_default=now_utc_dt, server_default=func.now(),
-        index=True, sort_order=-1, nullable=False
+        index=True, sort_order=-10, nullable=False
     )
 
     def __repr__(self):

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/event.py

@@ -4,14 +4,14 @@ from typing import Callable
 from aiogram import Dispatcher
 
 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/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/filter_.py

@@ -4,7 +4,7 @@ import aiogram.types
 from aiogram.filters import Filter
 
 from arpakitlib.ar_type_util import raise_for_type
-from core.settings import get_cached_settings
+from project.core.settings import get_cached_settings
 
 
 class NotProdModeFilterTgBotFilter(Filter):

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/kb/inline_/common.py

@@ -1,7 +1,7 @@
 from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from tg_bot.blank.blank import get_cached_tg_bot_blank
+from project.tg_bot.blank.blank import get_cached_tg_bot_blank
 
 
 def groups_inline_kb() -> InlineKeyboardMarkup:

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/kb/static_/common.py

@@ -1,7 +1,7 @@
 from aiogram.types import ReplyKeyboardMarkup, KeyboardButton
 from aiogram.utils.keyboard import ReplyKeyboardBuilder
 
-from tg_bot.blank.blank import get_cached_tg_bot_blank
+from project.tg_bot.blank.blank import get_cached_tg_bot_blank
 
 
 def hello_world_static_kb() -> ReplyKeyboardMarkup:

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/middleware/middleware.py

@@ -1,6 +1,6 @@
 import aiogram
 
-from tg_bot.middleware.init_user import InitUserTgBotMiddleware
+from project.tg_bot.middleware.init_user import InitUserTgBotMiddleware
 
 
 def register_middlewares_to_tg_bot(

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/router/arpakitlib_project_template_info.py

@@ -1,8 +1,8 @@
 import aiogram.filters
 
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
-from tg_bot.const import TgBotCommands
-from util.read_arpakitlib_project_template_file import read_arpakitlib_project_template_file
+from project.tg_bot.const import TgBotCommands
+from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
 
 tg_bot_router = aiogram.Router()
 
@@ -10,5 +10,5 @@ tg_bot_router = aiogram.Router()
 @tg_bot_router.message(aiogram.filters.Command(TgBotCommands.arpakitlib_project_template_info))
 async def _(m: aiogram.types.Message, **kwargs):
     await m.answer(
-        text=safely_transfer_obj_to_json_str(data=read_arpakitlib_project_template_file())
+        text=safely_transfer_obj_to_json_str(data=get_arpakitlib_project_template_info())
     )

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/router/error.py

@@ -1,6 +1,10 @@
+import logging
+
 import aiogram
 from aiogram import Router
 
+_logger = logging.getLogger(__name__)
+
 tg_bot_router = Router()
 
 
@@ -9,4 +13,4 @@ async def _(
         event: aiogram.types.ErrorEvent,
         **kwargs
 ):
-    pass
+    _logger.exception(event.exception)

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/router/healthcheck.py

@@ -1,7 +1,7 @@
 import aiogram.filters
 
-from tg_bot.blank.blank import get_cached_tg_bot_blank
-from tg_bot.const import TgBotCommands
+from project.tg_bot.blank.blank import get_cached_tg_bot_blank
+from project.tg_bot.const import TgBotCommands
 
 tg_bot_router = aiogram.Router()
 

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/router/main_router.py

@@ -1,18 +1,12 @@
 from aiogram import Router
 
-from tg_bot.router import error, arpakitlib_project_template_info
-from tg_bot.router import healthcheck
+from project.tg_bot.router import arpakitlib_project_template_info
+from project.tg_bot.router import error, healthcheck
 
 main_tg_bot_router = Router()
 
-# Error
-
 main_tg_bot_router.include_router(router=error.tg_bot_router)
 
-# Healthcheck
-
 main_tg_bot_router.include_router(router=healthcheck.tg_bot_router)
 
-# arpakit project template
-
 main_tg_bot_router.include_router(router=arpakitlib_project_template_info.tg_bot_router)

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/start_tg_bot.py

@@ -4,10 +4,10 @@ import aiohttp
 import aiohttp.web
 from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application
 
-from core.settings import get_cached_settings
-from core.util import setup_logging
-from tg_bot.tg_bot import create_tg_bot
-from tg_bot.tg_bot_dispatcher import create_tg_bot_dispatcher
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.tg_bot.tg_bot import create_tg_bot
+from project.tg_bot.tg_bot_dispatcher import create_tg_bot_dispatcher
 
 
 def start_tg_bot():

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/tg_bot.py

@@ -3,7 +3,7 @@ from aiogram.client.default import DefaultBotProperties
 from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.enums import ParseMode
 
-from core.settings import get_cached_settings
+from project.core.settings import get_cached_settings
 
 
 def create_tg_bot() -> aiogram.Bot:

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/tg_bot_dispatcher.py

@@ -1,9 +1,9 @@
 import aiogram
 from aiogram.fsm.storage.memory import MemoryStorage
 
-from tg_bot.event import add_events_to_tg_bot_dispatcher
-from tg_bot.middleware.middleware import register_middlewares_to_tg_bot
-from tg_bot.router.main_router import main_tg_bot_router
+from project.tg_bot.event import add_events_to_tg_bot_dispatcher
+from project.tg_bot.middleware.middleware import register_middlewares_to_tg_bot
+from project.tg_bot.router.main_router import main_tg_bot_router
 
 
 def create_tg_bot_dispatcher() -> aiogram.Dispatcher:

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/util.py

@@ -0,0 +1 @@
+# ...

arpakitlib/{_arpakit_project_template_v_1/util/read_arpakitlib_project_template_file.py → _arpakit_project_template_v_2/project/util/arpakitlib_project_template.py}

@@ -1,16 +1,16 @@
 import json
 from typing import Any
 
-from core.const import ProjectPaths
+from project.core.const import ProjectPaths
 
 
-def read_arpakitlib_project_template_file() -> dict[str, Any]:
+def get_arpakitlib_project_template_info() -> dict[str, Any]:
     with open(ProjectPaths.arpakit_lib_project_template_info_filepath, mode="r", encoding="utf-8") as fr:
         return json.load(fp=fr)
 
 
 def __example():
-    print(read_arpakitlib_project_template_file())
+    print(get_arpakitlib_project_template_info())
 
 
 if __name__ == '__main__':

{arpakitlib-1.8.5.dist-info → arpakitlib-1.8.7.dist-info}/METADATA

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