Some admin extensions (#356)

* Adds exec for timed executions & alembic

* Alembic revision

* Adds endpoint changes

* Removes oidc identifier

* Submodule merge

Author: JWittmeyer

alembic/versions/199a0d8aefbe_new_org_column.py

@@ -0,0 +1,56 @@
+"""new org column
+
+Revision ID: 199a0d8aefbe
+Revises: c6d1cbcccb41
+Create Date: 2025-10-20 07:36:33.488523
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "199a0d8aefbe"
+down_revision = "c6d1cbcccb41"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "user", sa.Column("messages_created_this_month", sa.BigInteger(), nullable=True)
+    )
+
+    op.create_table(
+        "timed_executions",
+        sa.Column("time_key", sa.String(), nullable=False),
+        sa.Column("last_executed_at", sa.DateTime(), nullable=True),
+        sa.PrimaryKeyConstraint("time_key"),
+        sa.UniqueConstraint("time_key"),
+        schema="global",
+    )
+    connection = op.get_bind()
+
+    update_dataset_sql = """
+        UPDATE public.user
+        SET messages_created_this_month = 0
+        WHERE messages_created_this_month IS NULL
+    """
+    connection.execute(update_dataset_sql)
+    op.drop_column("user", "oidc_identifier")
+    op.create_unique_constraint(None, "timed_executions", ["time_key"], schema="global")
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("user", "messages_created_this_month")
+    op.drop_table("timed_executions", schema="global")
+    op.drop_constraint(None, "timed_executions", schema="global", type_="unique")
+    op.add_column(
+        "user",
+        sa.Column("oidc_identifier", sa.VARCHAR(), autoincrement=False, nullable=True),
+    )
+    # ### end Alembic commands ###

app.py

@@ -185,3 +185,4 @@
 session.start_session_cleanup_thread()
 log_storage.start_persist_thread()
 sums_table_manager.start_sums_table_thread()
+clean_up.start_timed_executions_thread()

controller/user/manager.py

@@ -1,4 +1,4 @@
-from typing import Dict, Optional, Any
+from typing import Dict, List, Optional, Any
 from submodules.model import User, daemon, enums
 from submodules.model.business_objects import user, general
 from controller.auth import kratos
@@ -118,7 +118,7 @@ def get_active_users_filtered(
     sort_direction: Optional[str] = None,
     offset: Optional[int] = None,
     limit: Optional[int] = None,
-) -> User:
+) -> List[User]:
     now = datetime.now()
     last_interaction_range = (now - timedelta(minutes=minutes)) if minutes > 0 else None
     return user.get_active_users_after_filter(
@@ -180,22 +180,4 @@ def __migrate_kratos_users():
         if user_database.sso_provider != sso_provider:
             user_database.sso_provider = sso_provider
 
-        if user_database.oidc_identifier is None:
-            user_search = kratos.__search_kratos_for_user_mail(
-                user_identity["traits"]["email"]
-            )
-            if user_search and user_search["credentials"]:
-                if user_search["credentials"].get("oidc", None):
-                    oidc = (
-                        user_search["credentials"]
-                        .get("oidc", {})
-                        .get("identifiers", None)[0]
-                    )
-                    if oidc:
-                        oidc = oidc.split(":")
-                        if len(oidc) > 1:
-                            user_database.oidc_identifier = oidc[1]
-                        else:
-                            user_database.oidc_identifier = None
-
     general.commit()

fast_api/routes/organization.py

@@ -280,6 +280,7 @@ def get_mapped_sorted_paginated_users(
             "created_at": user.created_at.isoformat() if user.created_at else None,
             "metadata_public": user.metadata_public,
             "sso_provider": user.sso_provider,
+            "messages_created_this_month": user.messages_created_this_month,
         }
         for user in active_users
     ]
@@ -302,7 +303,7 @@ def delete_user(request: Request, body: DeleteUserBody = Body(...)):
 
 
 # in use admin-dashboard (08.01.25)
-@router.post("/missing-users-interaction")
+@router.post("/missing-users-interaction-and-message-count")
 def get_missing_users_interaction(request: Request, body: MissingUsersBody = Body(...)):
     auth_manager.check_admin_access(request.state.info)
     data = user.get_missing_users(body.user_ids)

submodules/model

@@ -1,6 +1,9 @@
 from submodules.model.business_objects import upload_task
 import os
 import shutil
+from submodules.model.daemon import run_without_db_token
+from time import sleep
+from submodules.model.global_objects import timed_executions
 
 
 def clean_up_database() -> None:
@@ -21,3 +24,17 @@ def clean_up_disk() -> None:
                 shutil.rmtree(file_path)
         except Exception as e:
             print("Failed to delete %s. Reason: %s" % (file_path, e))
+
+
+def start_timed_executions_thread() -> None:
+    run_without_db_token(__run_timed_executions)
+
+
+def __run_timed_executions() -> None:
+    sleep(10)  # wait a bit until app is started
+    while True:
+        try:
+            timed_executions.execute_time_key_update(with_commit=True)
+        except Exception as e:
+            print(f"Error during timed executions: {e}")
+        sleep(3600)  # run every hour