forked from retoor/devplacepy
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": "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": "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": "award", "label": "Awards", "description": "Someone gives you an award on your profile"},
|
||||||
|
{"key": "admin_alert", "label": "Admin alerts", "description": "System alerts requiring admin attention"},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ from devplacepy.utils import (
|
|||||||
require_user,
|
require_user,
|
||||||
)
|
)
|
||||||
from devplacepy.services.audit import record as audit
|
from devplacepy.services.audit import record as audit
|
||||||
|
from devplacepy.services.devii.quota import notify_admins_quota_blocked
|
||||||
|
|
||||||
logger = logging.getLogger("devii.router")
|
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",
|
summary=f"AI request by {username or owner_id} blocked - 24h quota reached",
|
||||||
metadata={"limit_usd": limit, "owner_kind": owner_kind},
|
metadata={"limit_usd": limit, "owner_kind": owner_kind},
|
||||||
)
|
)
|
||||||
|
notify_admins_quota_blocked(owner_kind, owner_id, username)
|
||||||
await websocket.send_json(
|
await websocket.send_json(
|
||||||
{
|
{
|
||||||
"type": "error",
|
"type": "error",
|
||||||
|
|||||||
@@ -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.database import get_table
|
||||||
from devplacepy.services.audit import record as audit
|
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.services.manager import service_manager
|
||||||
from devplacepy.utils import is_admin, is_primary_admin
|
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",
|
summary=f"Telegram AI request by {user.get('username', owner_id)} blocked - 24h quota reached",
|
||||||
metadata={"limit_usd": limit},
|
metadata={"limit_usd": limit},
|
||||||
)
|
)
|
||||||
|
notify_admins_quota_blocked("user", owner_id, user.get("username", ""))
|
||||||
await self._service.send(
|
await self._service.send(
|
||||||
chat_id, "Your daily AI quota is reached (100%). Please try again later."
|
chat_id, "Your daily AI quota is reached (100%). Please try again later."
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -328,44 +328,3 @@
|
|||||||
padding: 0.75rem;
|
padding: 0.75rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---- Markdown source/preview toggle ---- */
|
|
||||||
.gist-markdown-toggle .gist-md-tabbar {
|
|
||||||
display: flex;
|
|
||||||
gap: 0;
|
|
||||||
border-bottom: 1px solid var(--border);
|
|
||||||
margin-bottom: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gist-markdown-toggle .gist-md-tab {
|
|
||||||
padding: 0.5em 1em;
|
|
||||||
cursor: pointer;
|
|
||||||
color: var(--text-muted);
|
|
||||||
border: 1px solid transparent;
|
|
||||||
border-bottom: none;
|
|
||||||
border-radius: var(--radius) var(--radius) 0 0;
|
|
||||||
background: transparent;
|
|
||||||
font-size: 0.875rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gist-markdown-toggle .gist-md-tab.active {
|
|
||||||
color: var(--text-primary);
|
|
||||||
background: var(--bg-card);
|
|
||||||
border-color: var(--border) var(--border) transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gist-markdown-toggle .tab-pane {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gist-markdown-toggle .tab-pane.active {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
.gist-markdown-toggle .gist-markdown-preview {
|
|
||||||
padding: 1em;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: 0 0 var(--radius) var(--radius);
|
|
||||||
min-height: 4em;
|
|
||||||
background: var(--bg-card);
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -35,23 +35,6 @@
|
|||||||
|
|
||||||
{% if gist['language'] == 'markdown_rendered' %}
|
{% if gist['language'] == 'markdown_rendered' %}
|
||||||
<div class="gist-rendered-content rendered-content">{{ render_content(gist['source_code'], author_is_admin=is_admin(author)) }}</div>
|
<div class="gist-rendered-content rendered-content">{{ render_content(gist['source_code'], author_is_admin=is_admin(author)) }}</div>
|
||||||
{% elif gist['language'] == 'markdown' %}
|
|
||||||
<div class="gist-code-block gist-markdown-toggle" data-tabs>
|
|
||||||
<nav class="gist-md-tabbar" role="tablist">
|
|
||||||
<button type="button" class="gist-md-tab" data-tab="source" role="tab">Source</button>
|
|
||||||
<button type="button" class="gist-md-tab" data-tab="preview" role="tab">Preview</button>
|
|
||||||
</nav>
|
|
||||||
<div data-tab-pane="source" class="tab-pane active" role="tabpanel">
|
|
||||||
<div class="gist-code-header">
|
|
||||||
<span class="gist-language-name">{{ language_name(gist['language']) }}</span>
|
|
||||||
<button type="button" class="gist-copy-btn" data-copy="gist-code-content">Copy</button>
|
|
||||||
</div>
|
|
||||||
<pre><code id="gist-code-content" class="language-markdown">{{ gist['source_code'] }}</code></pre>
|
|
||||||
</div>
|
|
||||||
<div data-tab-pane="preview" class="tab-pane gist-markdown-preview rendered-content" role="tabpanel">
|
|
||||||
{{ render_content(gist['source_code'], author_is_admin=is_admin(author)) }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="gist-code-block">
|
<div class="gist-code-block">
|
||||||
<div class="gist-code-header">
|
<div class="gist-code-header">
|
||||||
|
|||||||
Reference in New Issue
Block a user