arpakitlib 1.7.104__tar.gz → 1.7.106__tar.gz

{arpakitlib-1.7.104 → arpakitlib-1.7.106}/PKG-INFO

@@ -1,21 +1,21 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.7.104
+Version: 1.7.106
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company
 Author: arpakit
 Author-email: arpakit@gmail.com
-Requires-Python: >=3.12,<4.0
+Requires-Python: >=3.12.4,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Requires-Dist: aiogram (>=3.15.0,<4.0.0)
 Requires-Dist: aiohttp-socks (>=0.9.1,<0.10.0)
@@ -46,7 +46,7 @@ Requires-Dist: pytz (>=2024.2,<2025.0)
 Requires-Dist: pyzabbix (>=1.3.1,<2.0.0)
 Requires-Dist: redis (>=5.2.0,<6.0.0)
 Requires-Dist: requests[socks] (>=2.32.3,<3.0.0)
-Requires-Dist: sqladmin (>=0.20.1,<0.21.0)
+Requires-Dist: sqladmin[full] (>=0.20.1,<0.21.0)
 Requires-Dist: sqlalchemy (>=2.0.36,<3.0.0)
 Requires-Dist: twine (>=6.0.1,<7.0.0)
 Requires-Dist: uvicorn (>=0.32.1,<0.33.0)
@@ -80,6 +80,13 @@ poetry add arpakitlib
 pip install arpakitlib
 ```
 
+### Init template
+
+```
+# 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)
+```
+
 ---
 
 ### Links

{arpakitlib-1.7.104 → arpakitlib-1.7.106}/README.md

@@ -25,6 +25,13 @@ poetry add arpakitlib
 pip install arpakitlib
 ```
 
+### Init template
+
+```
+# 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)
+```
+
 ---
 
 ### Links

arpakitlib-1.7.106/arpakitlib/_arpakit_project_template/src/admin1/add_admin_in_app.py

@@ -0,0 +1,23 @@
+from fastapi import FastAPI
+from sqladmin import Admin
+
+from src.admin1.admin_auth import AdminAuth
+from src.api.transmitted_api_data import TransmittedAPIData
+
+
+def add_admin1_in_app(*, app: FastAPI) -> FastAPI:
+    transmitted_api_data: TransmittedAPIData = app.state.transmitted_api_data
+
+    authentication_backend = AdminAuth()
+
+    admin = Admin(
+        app=app,
+        engine=transmitted_api_data.sqlalchemy_db.engine,
+        base_url="/admin1",
+        authentication_backend=authentication_backend,
+        title="{PROJECT_NAME}"
+    )
+
+    # admin.add_model_view(CurrentSemesterMV)
+
+    return app

arpakitlib-1.7.106/arpakitlib/_arpakit_project_template/src/admin1/admin_auth.py

@@ -0,0 +1,32 @@
+import logging
+
+from sqladmin.authentication import AuthenticationBackend
+from starlette.requests import Request
+
+from src.core.settings import get_cached_settings
+
+
+class AdminAuth(AuthenticationBackend):
+    def __init__(self):
+        self._logger = logging.getLogger(self.__class__.__name__)
+        super().__init__(secret_key=get_cached_settings().sec)
+
+    async def login(self, request: Request) -> bool:
+        form = await request.form()
+
+        # ...
+
+        # request.session.update(...)
+
+        return True
+
+    async def logout(self, request: Request) -> bool:
+        request.session.clear()
+        return True
+
+    async def authenticate(self, request: Request) -> bool:
+        # request.session.get("...")
+
+        # ...
+
+        return True

arpakitlib-1.7.106/arpakitlib/_arpakit_project_template/src/admin1/model_view.py

@@ -0,0 +1,14 @@
+from sqladmin import ModelView
+
+
+class BaseModelView(ModelView):
+    can_create = True
+    can_edit = True
+    can_delete = True
+    can_view_details = True
+    can_export = True
+    page_size = 50
+    page_size_options = [25, 50, 100, 200]
+    save_as = True
+    save_as_continue = True
+    export_types = ["xlsx", "csv", "json"]

{arpakitlib-1.7.104 → arpakitlib-1.7.106}/arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -2,7 +2,7 @@ from fastapi import FastAPI
 
 from arpakitlib.ar_base_worker_util import SafeRunInBackgroundModes
 from arpakitlib.ar_fastapi_util import create_fastapi_app, InitSqlalchemyDBStartupAPIEvent, InitFileStoragesInDir, \
-    create_handle_exception, create_story_log_before_response_in_handle_exception, DEFAULT_CONTACT, \
+    create_handle_exception, create_story_log_before_response_in_handle_exception, \
     SafeRunWorkerStartupAPIEvent
 from arpakitlib.ar_operation_execution_util import OperationExecutorWorker, ScheduledOperationCreatorWorker
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
@@ -105,11 +105,14 @@ def create_api_app() -> FastAPI:
         shutdown_api_events=shutdown_api_events,
         transmitted_api_data=transmitted_api_data,
         main_api_router=main_api_router,
-        contact=DEFAULT_CONTACT,
         media_dirpath=settings.media_dirpath,
         static_dirpath=STATIC_DIRPATH
     )
 
+    if settings.api_enable_admin1:
+        from src.admin1.add_admin_in_app import add_admin1_in_app
+        add_admin1_in_app(app=api_app)
+
     return api_app
 
 

{arpakitlib-1.7.104 → arpakitlib-1.7.106}/arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -37,6 +37,8 @@ class Settings(SimpleSettings):
 
     api_correct_token: str | None = "1"
 
+    api_enable_admin1: bool = True
+
     var_dirname: str | None = "var"
 
     var_dirpath: str | None = os.path.join(BASE_DIRPATH, var_dirname)
@@ -63,6 +65,8 @@ class Settings(SimpleSettings):
     def local_timezone_as_pytz(self) -> Any:
         return pytz.timezone(self.local_timezone)
 
+    admin1_secret_key: str | None = "85a9583cb91c4de7a78d7eb1e5306a04418c9c43014c447ea8ec8dd5deb4cf71"
+
     # ...
 
 

{arpakitlib-1.7.104 → arpakitlib-1.7.106}/arpakitlib/_arpakit_project_template/src/operation_execution/operation_executor.py

@@ -1,14 +1,16 @@
+from sqlalchemy.orm import Session
+
 from arpakitlib.ar_operation_execution_util import BaseOperationExecutor
 from arpakitlib.ar_sqlalchemy_model_util import OperationDBM
 
 
 class OperationExecutor(BaseOperationExecutor):
-    def sync_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
+    def sync_execute_operation(self, operation_dbm: OperationDBM, session: Session) -> OperationDBM:
         # ...
-        operation_dbm = super().sync_execute_operation(operation_dbm=operation_dbm)
+        operation_dbm = super().sync_execute_operation(operation_dbm=operation_dbm, session=session)
         return operation_dbm
 
-    async def async_execute_operation(self, operation_dbm: OperationDBM) -> OperationDBM:
+    async def async_execute_operation(self, operation_dbm: OperationDBM, session: Session) -> OperationDBM:
         # ...
-        operation_dbm = await super().async_execute_operation(operation_dbm=operation_dbm)
+        operation_dbm = await super().async_execute_operation(operation_dbm=operation_dbm, session=session)
         return operation_dbm

{arpakitlib-1.7.104 → arpakitlib-1.7.106}/arpakitlib/_arpakit_project_template/src/operation_execution/util.py

@@ -9,9 +9,7 @@ def create_scheduled_operation_creator_worker() -> ScheduledOperationCreatorWork
     from src.operation_execution.scheduled_operations import ALL_SCHEDULED_OPERATIONS
     scheduled_operation_creator_worker = ScheduledOperationCreatorWorker(
         sqlalchemy_db=get_cached_sqlalchemy_db(),
-        scheduled_operations=ALL_SCHEDULED_OPERATIONS,
-        timeout_after_run=timedelta(seconds=0.1).total_seconds(),
-        timeout_after_err_in_run=timedelta(seconds=1).total_seconds()
+        scheduled_operations=ALL_SCHEDULED_OPERATIONS
     )
     return scheduled_operation_creator_worker
 

{arpakitlib-1.7.104 → arpakitlib-1.7.106}/arpakitlib/ar_settings_util.py

@@ -33,7 +33,7 @@ class SimpleSettings(BaseSettings):
     @field_validator("mode_type")
     @classmethod
     def validate_mode_type(cls, v: str):
-        cls.ModeTypes.parse_and_validate_values(v)
+        cls.ModeTypes.parse_and_validate_values(v.lower().strip())
         return v
 
     @property

{arpakitlib-1.7.104 → arpakitlib-1.7.106}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.7.104"
+version = "1.7.106"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"
@@ -20,7 +20,7 @@ classifiers = [
 repository = "https://github.com/ARPAKIT-Company/arpakitlib"
 
 [tool.poetry.dependencies]
-python = "^3.12"
+python = ">=3.12.4,<4.0"
 aiogram = "^3.15.0"
 fastapi = "^0.115.5"
 sqlalchemy = "^2.0.36"
@@ -40,7 +40,7 @@ asyncssh = "^2.18.0"
 aiohttp-socks = "^0.9.1"
 uvicorn = "^0.32.1"
 gunicorn = "^23.0.0"
-sqladmin = "^0.20.1"
+sqladmin = {extras = ["full"], version = "^0.20.1"}
 asyncpg = "^0.30.0"
 celery = "^5.4.0"
 redis = "^5.2.0"