Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6970f8a270 |
File diff suppressed because one or more lines are too long
@@ -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"},
|
||||
]
|
||||
|
||||
|
||||
|
||||
@@ -258,13 +258,13 @@ class NotificationDefaultForm(BaseModel):
|
||||
class AiCorrectionForm(BaseModel):
|
||||
enabled: bool = False
|
||||
sync: bool = False
|
||||
prompt: str = Field(default=DEFAULT_CORRECTION_PROMPT)
|
||||
prompt: str = Field(default=DEFAULT_CORRECTION_PROMPT, max_length=20000)
|
||||
|
||||
|
||||
class AiModifierForm(BaseModel):
|
||||
enabled: bool = False
|
||||
sync: bool = False
|
||||
prompt: str = Field(default=DEFAULT_MODIFIER_PROMPT)
|
||||
prompt: str = Field(default=DEFAULT_MODIFIER_PROMPT, max_length=20000)
|
||||
|
||||
|
||||
class InteractionsForm(BaseModel):
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -61,7 +61,7 @@ AI_CORRECTION_ACTIONS: tuple[Action, ...] = (
|
||||
),
|
||||
arg(
|
||||
"prompt",
|
||||
"The correction instruction. Omit to keep the current one.",
|
||||
"The correction instruction (max 20000 chars). Omit to keep the current one.",
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -64,7 +64,7 @@ AI_MODIFIER_ACTIONS: tuple[Action, ...] = (
|
||||
),
|
||||
arg(
|
||||
"prompt",
|
||||
"The modifier instruction. Omit to keep the current one.",
|
||||
"The modifier instruction (max 20000 chars). Omit to keep the current one.",
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -70,7 +70,7 @@ class AiCorrectionController:
|
||||
if prompt_raw is None:
|
||||
prompt = user.get("ai_correction_prompt") or DEFAULT_CORRECTION_PROMPT
|
||||
else:
|
||||
prompt = str(prompt_raw).strip() or DEFAULT_CORRECTION_PROMPT
|
||||
prompt = str(prompt_raw).strip()[:20000] or DEFAULT_CORRECTION_PROMPT
|
||||
get_table("users").update(
|
||||
{
|
||||
"uid": self._owner_id,
|
||||
|
||||
@@ -70,7 +70,7 @@ class AiModifierController:
|
||||
if prompt_raw is None:
|
||||
prompt = user.get("ai_modifier_prompt") or DEFAULT_MODIFIER_PROMPT
|
||||
else:
|
||||
prompt = str(prompt_raw).strip() or DEFAULT_MODIFIER_PROMPT
|
||||
prompt = str(prompt_raw).strip()[:20000] or DEFAULT_MODIFIER_PROMPT
|
||||
get_table("users").update(
|
||||
{
|
||||
"uid": self._owner_id,
|
||||
|
||||
@@ -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",
|
||||
)
|
||||
@@ -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."
|
||||
)
|
||||
|
||||
@@ -226,7 +226,7 @@
|
||||
<option value="sync" {% if ai_correction_sync %}selected{% endif %}>Synchronously (wait while saving)</option>
|
||||
</select>
|
||||
</div>
|
||||
<textarea data-ai-correction-prompt class="input-sm ai-correction-prompt" rows="3" aria-label="AI content correction prompt">{{ ai_correction_prompt }}</textarea>
|
||||
<textarea data-ai-correction-prompt class="input-sm ai-correction-prompt" maxlength="20000" rows="3" aria-label="AI content correction prompt">{{ ai_correction_prompt }}</textarea>
|
||||
<div class="customization-row">
|
||||
<button type="button" class="btn btn-sm btn-primary" data-ai-correction-save>Save</button>
|
||||
<span class="ai-correction-status" data-ai-correction-status role="status" aria-live="polite"></span>
|
||||
@@ -251,7 +251,7 @@
|
||||
<option value="sync" {% if ai_modifier_sync %}selected{% endif %}>Synchronously (wait while saving)</option>
|
||||
</select>
|
||||
</div>
|
||||
<textarea data-ai-modifier-prompt class="input-sm ai-correction-prompt" rows="3" aria-label="AI modifier prompt">{{ ai_modifier_prompt }}</textarea>
|
||||
<textarea data-ai-modifier-prompt class="input-sm ai-correction-prompt" maxlength="20000" rows="3" aria-label="AI modifier prompt">{{ ai_modifier_prompt }}</textarea>
|
||||
<div class="customization-row">
|
||||
<button type="button" class="btn btn-sm btn-primary" data-ai-modifier-save>Save</button>
|
||||
<span class="ai-correction-status" data-ai-modifier-status role="status" aria-live="polite"></span>
|
||||
|
||||
Reference in New Issue
Block a user