ticket #74 attempt 1

devplacepy/cli/jobs.py

@@ -7,12 +7,12 @@ from devplacepy.cli._shared import _audit_cli
 def _remove_zip_artifacts(job):
     import shutil
     from pathlib import Path
-    from devplacepy.config import ZIP_STAGING_DIR
+    from devplacepy.services.jobs.zip_service import STAGING_DIR
 
     local_path = (job.get("result") or {}).get("local_path")
     if local_path:
         Path(local_path).unlink(missing_ok=True)
-    shutil.rmtree(ZIP_STAGING_DIR / job["uid"], ignore_errors=True)
+    shutil.rmtree(STAGING_DIR / job["uid"], ignore_errors=True)
 
 
 def cmd_zips_prune(args):

devplacepy/database/notifications.py

@@ -18,6 +18,7 @@ NOTIFICATION_TYPES = [
     {"key": "reminder", "label": "Reminders", "description": "A reminder or scheduled task you asked Devii to run fires"},
     {"key": "harvest_stolen", "label": "Farm raids", "description": "Someone steals a ready build from your Code Farm"},
     {"key": "award", "label": "Awards", "description": "Someone gives you an award on your profile"},
+    {"key": "admin_alert", "label": "Admin alerts", "description": "System alerts requiring admin attention"},
 ]
 
 

devplacepy/project_files.py

@@ -685,6 +685,7 @@ def import_from_dir(project_uid: str, src_dir, user: dict, *, skip_names=None) -
 
 
 def export_to_dir(project_uid: str, subpath: str, dest_dir) -> int:
+    _guard_writable(project_uid)
     dest = Path(dest_dir).resolve()
     dest.mkdir(parents=True, exist_ok=True)
     if subpath:

devplacepy/routers/devii.py

@@ -23,6 +23,7 @@ from devplacepy.utils import (
     require_user,
 )
 from devplacepy.services.audit import record as audit
+from devplacepy.services.devii.quota import notify_admins_quota_blocked
 
 logger = logging.getLogger("devii.router")
 
@@ -279,6 +280,7 @@ async def devii_ws(websocket: WebSocket):
                         summary=f"AI request by {username or owner_id} blocked - 24h quota reached",
                         metadata={"limit_usd": limit, "owner_kind": owner_kind},
                     )
+                    notify_admins_quota_blocked(owner_kind, owner_id, username)
                     await websocket.send_json(
                         {
                             "type": "error",

devplacepy/services/devii/quota.py

@@ -0,0 +1,26 @@
+# retoor <retoor@molodetz.nl>
+
+import logging
+
+from devplacepy.database import get_table
+from devplacepy.utils.notifications import create_notification
+
+logger = logging.getLogger("devii.quota")
+
+ADMIN_ALERT_TYPE = "admin_alert"
+
+
+def notify_admins_quota_blocked(owner_kind: str, owner_id: str, username: str) -> None:
+    if owner_kind != "user":
+        return
+    admins = get_table("users").find(role="Admin")
+    for admin in admins:
+        if admin["uid"] == owner_id:
+            continue
+        create_notification(
+            admin["uid"],
+            ADMIN_ALERT_TYPE,
+            f"User {username} blocked - 24h AI quota reached",
+            owner_id,
+            "/admin/users",
+        )

devplacepy/services/telegram/bridge.py

@@ -10,6 +10,7 @@ from typing import Any
 
 from devplacepy.database import get_table
 from devplacepy.services.audit import record as audit
+from devplacepy.services.devii.quota import notify_admins_quota_blocked
 from devplacepy.services.manager import service_manager
 from devplacepy.utils import is_admin, is_primary_admin
 
@@ -400,6 +401,7 @@ class TelegramBridge:
                 summary=f"Telegram AI request by {user.get('username', owner_id)} blocked - 24h quota reached",
                 metadata={"limit_usd": limit},
             )
+            notify_admins_quota_blocked("user", owner_id, user.get("username", ""))
             await self._service.send(
                 chat_id, "Your daily AI quota is reached (100%). Please try again later."
             )

tests/api/forks.py

@@ -16,7 +16,7 @@ def _init_db_fork_jobs():
 @pytest.fixture
 def fork_env(tmp_path, monkeypatch):
     monkeypatch.setattr(
-        "devplacepy.services.jobs.fork_service.FORK_STAGING_DIR", tmp_path / "staging"
+        "devplacepy.services.jobs.fork_service.STAGING_DIR", tmp_path / "staging"
     )
     monkeypatch.setattr("devplacepy.project_files.PROJECT_FILES_DIR", tmp_path / "pf")
     yield tmp_path