arpakitlib 1.8.112__tar.gz → 1.8.113__tar.gz

{arpakitlib-1.8.112 → arpakitlib-1.8.113}/PKG-INFO

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

arpakitlib-1.8.113/arpakitlib/_arpakit_project_template_v_5/project/api/create_first_data.py

@@ -0,0 +1,64 @@
+import logging
+
+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 UserDBM, ApiKeyDBM, UserTokenDBM
+
+_logger = logging.getLogger(__name__)
+
+
+def create_first_data_for_api():
+    with get_cached_sqlalchemy_db().new_session() as session:
+        user_dbm = (
+            session
+            .query(UserDBM)
+            .filter(UserDBM.roles.any(UserDBM.Roles.admin))
+            .first()
+        )
+        if user_dbm is None:
+            user_dbm = UserDBM(
+                username="admin",
+                roles=[UserDBM.Roles.client, UserDBM.Roles.admin],
+                password="admin",
+            )
+            session.add(user_dbm)
+            session.commit()
+            _logger.info("admin was created")
+
+            user_token_dbm = (
+                session
+                .query(UserTokenDBM)
+                .filter(UserTokenDBM.user_id == user_dbm.id)
+                .first()
+            )
+            if user_token_dbm is None:
+                user_token_dbm = UserTokenDBM(
+                    value="1",
+                    user_id=user_dbm.id
+                )
+                session.add(user_token_dbm)
+                session.commit()
+                _logger.info("admin token was created")
+
+        api_key_dbm = (
+            session
+            .query(ApiKeyDBM)
+            .first()
+        )
+        if api_key_dbm is None:
+            api_key_dbm = ApiKeyDBM(
+                value="1",
+                title="First api key"
+            )
+            session.add(api_key_dbm)
+            session.commit()
+            _logger.info("api key was created")
+
+
+def command():
+    setup_logging()
+    create_first_data_for_api()
+
+
+if __name__ == '__main__':
+    command()

{arpakitlib-1.8.112 → arpakitlib-1.8.113}/arpakitlib/_arpakit_project_template_v_5/project/api/event.py

@@ -2,6 +2,7 @@ import logging
 from typing import Callable
 
 from arpakitlib.ar_base_worker_util import safe_run_worker_in_background, SafeRunInBackgroundModes
+from project.api.create_first_data import create_first_data_for_api
 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
@@ -41,6 +42,9 @@ async def async_startup_api_event():
     ):
         get_cached_json_db().init()
 
+    if get_cached_sqlalchemy_db() is not None:
+        create_first_data_for_api()
+
     if get_cached_settings().api_start_operation_executor_worker:
         _ = safe_run_worker_in_background(
             worker=create_operation_executor_worker(),

arpakitlib-1.8.113/arpakitlib/_arpakit_project_template_v_5/project/api/start_api.py

@@ -0,0 +1,26 @@
+import uvicorn
+
+from arpakitlib.ar_base_worker_util import safe_run_worker_in_background, SafeRunInBackgroundModes
+from project.core.settings import get_cached_settings
+from project.core.util import setup_logging
+from project.operation_execution.scheduled_operation_creator_worker import create_scheduled_operation_creator_worker
+
+
+def __command():
+    setup_logging()
+    if get_cached_settings().api_start_scheduled_operation_creator_worker:
+        _ = safe_run_worker_in_background(
+            worker=create_scheduled_operation_creator_worker(),
+            mode=SafeRunInBackgroundModes.thread
+        )
+    uvicorn.run(
+        "project.api.asgi:app",
+        port=get_cached_settings().api_port,
+        host="localhost",
+        workers=1,
+        reload=False
+    )
+
+
+if __name__ == '__main__':
+    __command()

{arpakitlib-1.8.112 → arpakitlib-1.8.113}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/event.py

@@ -1,6 +1,7 @@
 import logging
 from typing import Callable
 
+from project.business_service.create_first_data import create_first_admin_with_api_key
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 

arpakitlib-1.8.113/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/start_sqladmin.py

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

{arpakitlib-1.8.112 → arpakitlib-1.8.113}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.112"
+version = "1.8.113"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }

arpakitlib-1.8.112/arpakitlib/_arpakit_project_template_v_5/project/business_service/create_first_admin.py

@@ -1,37 +0,0 @@
-import logging
-
-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 UserDBM
-
-_logger = logging.getLogger(__name__)
-
-
-def create_first_admin():
-    with get_cached_sqlalchemy_db().new_session() as session:
-        user_dbm = (
-            session
-            .query(UserDBM)
-            .filter(UserDBM.roles.any(UserDBM.Roles.admin))
-            .first()
-        )
-        if user_dbm is not None:
-            _logger.info("first admin already exists")
-            return
-        user_dbm = UserDBM(
-            username="admin",
-            roles=[UserDBM.Roles.client, UserDBM.Roles.admin],
-            password="admin",
-        )
-        session.add(user_dbm)
-        session.commit()
-        _logger.info("first admin was created")
-
-
-def command():
-    setup_logging()
-    create_first_admin()
-
-
-if __name__ == '__main__':
-    command()