Feature/dynamic tasks

.gitignore

@@ -107,6 +107,7 @@ celerybeat.pid
 # Environments
 .env
 .venv
+.linvenv
 env/
 venv/
 ENV/
@@ -147,5 +148,10 @@ cython_debug/
 
 logs/
 
+yatb_prod
+
 # env
 yatb.env
+k3s.yaml
+dynamic_tasks_app/wtf
+yatb_state.json

app/__init__.py

@@ -1,17 +1,32 @@
 import logging
+from contextlib import asynccontextmanager
 from pathlib import Path
 
 from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
 
-from . import utils
+from . import api, main, utils, view
+from .api.api_dynamic_tasks import __client
 from .config import settings
+from .db import beanie
+
+
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    await beanie.db.init()
+    async with __client:
+        try:
+            yield
+        finally:
+            await beanie.db.close()
+
 
 app = FastAPI(
     docs_url=settings.FASTAPI_DOCS_URL,
     redoc_url=settings.FASTAPI_REDOC_URL,
     openapi_url=settings.FASTAPI_OPENAPI_URL,
+    lifespan=lifespan,
 )
 
 _base_path = Path(__file__).resolve().parent
@@ -25,12 +40,10 @@
 # for i in loggers:
 #     print(f"LOGGER: {i}")
 
-from . import api  # noqa
-from . import main  # noqa
-from . import view  # noqa
-
+main.setup_utils(app)
 app.include_router(api.router)
 app.include_router(view.router)
+app.include_router(view.admin.api_rotuer)
 
 # prometheus
 from prometheus_fastapi_instrumentator import Instrumentator  # noqa
@@ -43,15 +56,3 @@
     env_var_name="ENABLE_METRICS",
 )
 instrumentator.instrument(app).expose(app, endpoint=expose_url)
-# utils.metrics.bad_solves_per_user
-
-"""
-@app.on_event("startup")
-def startup_event():
-    metrics.load_all_metrics()
-
-
-@app.on_event("shutdown")
-def shutdown_event():
-    metrics.save_all_metrics()
-"""

app/api/__init__.py

@@ -13,8 +13,10 @@
 from . import api_auth  # noqa
 from . import api_tasks  # noqa
 from . import api_users  # noqa
+from . import api_dynamic_tasks  # noqa
 
 api_users.router.include_router(api_auth.router)
 router.include_router(api_users.router)
 router.include_router(api_tasks.router)
+router.include_router(api_dynamic_tasks.router)
 router.include_router(admin.router)

app/api/admin/__init__.py

@@ -18,22 +18,22 @@ async def admin_checker(
     user: auth.CURR_USER_SAFE,
     token_header: str | None = Header(None, alias="X-Token"),
     token_query: str | None = Query(None, alias="token"),
-) -> schema.User:
+) -> UserDB:
     if user and user.is_admin:
         return user
 
     if token_header and token_header == settings.API_TOKEN:
-        return _fake_admin_user
+        return _fake_admin_user  # type: ignore
     if token_query and token_query == settings.API_TOKEN:
-        return _fake_admin_user
+        return _fake_admin_user  # type: ignore
 
     raise HTTPException(
         status_code=status.HTTP_403_FORBIDDEN,
         detail="No.",
     )
 
 
-CURR_ADMIN = Annotated[schema.User, Depends(admin_checker)]
+CURR_ADMIN = Annotated[UserDB, Depends(admin_checker)]
 
 logger = get_logger("api.admin")
 router = APIRouter(

app/api/admin/admin_tasks.py

@@ -1,5 +1,6 @@
 import uuid
-from typing import Annotated, Mapping
+from collections.abc import Mapping
+from typing import Annotated
 
 from beanie import BulkWriter
 from beanie.operators import Set

app/api/admin/admin_users.py

@@ -16,7 +16,7 @@ async def api_admin_users_internal() -> Mapping[uuid.UUID, schema.User]:
     return all_users
 
 
-async def api_admin_user_get_internal(user_id: uuid.UUID) -> UserDB:
+async def get_user(user_id: uuid.UUID) -> UserDB:
     user = await UserDB.find_by_user_uuid(user_id)
     if not user:
         raise HTTPException(
@@ -27,29 +27,33 @@ async def api_admin_user_get_internal(user_id: uuid.UUID) -> UserDB:
     return user
 
 
+CURR_USER = Annotated[UserDB, Depends(get_user)]
+
+
 class PasswordChangeForm(BaseModel):
     new_password: str
 
 
 @router.get("/user/{user_id}")
-async def api_admin_user(user_id: uuid.UUID, user: CURR_ADMIN) -> schema.User.admin_model:
-    ret_user = await api_admin_user_get_internal(user_id)
-    return ret_user
+async def api_admin_user(admin: CURR_ADMIN, user: CURR_USER) -> schema.User.admin_model:
+    return user
 
 
 @router.post("/user/{user_id}")
-async def api_admin_user_edit(new_user: schema.User, user_id: uuid.UUID, user: CURR_ADMIN) -> schema.User.admin_model:
-    new_user = await db.update_user_admin(user_id, new_user)
+async def api_admin_user_edit(new_user: schema.User, user_id: uuid.UUID, admin: CURR_ADMIN) -> schema.User.admin_model:
+    # new_user = await db.update_user_admin(user_id, new_user)
+    raise Exception
+
     return new_user
 
 
 @router.get("/users/me")
-async def api_admin_users_me(user: CURR_ADMIN) -> schema.User.admin_model:
-    return user
+async def api_admin_users_me(admin: CURR_ADMIN) -> schema.User.admin_model:
+    return admin
 
 
 @router.get("/users")
-async def api_admin_users(user: CURR_ADMIN) -> Mapping[uuid.UUID, schema.User.admin_model]:
+async def api_admin_users(admin: CURR_ADMIN) -> Mapping[uuid.UUID, schema.User.admin_model]:
     all_users = await api_admin_users_internal()
     return all_users
 
@@ -58,7 +62,7 @@ async def api_admin_users(user: CURR_ADMIN) -> Mapping[uuid.UUID, schema.User.ad
 async def api_admin_user_edit_password(
     new_password: PasswordChangeForm,
     admin: CURR_ADMIN,
-    user: schema.User = Depends(api_admin_user_get_internal),
+    user: CURR_USER,
 ) -> schema.User.admin_model:
     au = user.auth_source
     if not isinstance(au, schema.auth.SimpleAuth.AuthModel):
@@ -73,7 +77,7 @@ async def api_admin_user_edit_password(
 @router.get("/user/{user_id}/score")
 async def api_admin_user_recalc_score(
     admin: CURR_ADMIN,
-    user: UserDB = Depends(api_admin_user_get_internal),
+    user: CURR_USER,
 ) -> schema.User.admin_model:
     await user.recalc_score_one()
     return user
@@ -82,18 +86,14 @@ async def api_admin_user_recalc_score(
 @router.delete("/user/{user_id}")
 async def api_admin_user_delete(
     admin: CURR_ADMIN,
-    user: schema.User = Depends(api_admin_user_get_internal),
+    user: CURR_USER,
 ) -> str:
-    if not user:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="user not exist",
-        )
+    raise Exception
 
     if len(user.solved_tasks) > 0:
         raise HTTPException(
             status_code=status.HTTP_403_FORBIDDEN,
             detail="user have solved tasks",
         )
-    await db.delete_user(user)
+    # await db.delete_user(user)
     return "deleted"