xinyin025/LangBot
1
0
Fork 0
mirror of https://github.com/langbot-app/LangBot.git synced 2026-06-26 23:44:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): ruff/prettier format, fix test_importutil assertion

Browse Source
This commit is contained in:
dadachann
2026-06-26 12:50:26 -04:00
parent 2ef3aebe16
commit 6c5b01fa3c
8 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/langbot/pkg/api/http/controller/groups/platform/bots.py
+4 -1
View File
@@ -59,6 +59,7 @@ class BotsRouterGroup(group.RouterGroup):
return self.success(data={'sent': True})
except Exception as e:
import traceback
traceback.print_exc()
return self.http_status(500, -1, f'Failed to send message: {str(e)}')
@@ -81,7 +82,9 @@ class BotsRouterGroup(group.RouterGroup):
except Exception as e:
return self.http_status(409, -1, str(e))
@self.route('/<bot_uuid>/admins/<int:admin_id>', methods=['DELETE'], auth_type=group.AuthType.USER_TOKEN_OR_API_KEY)
@self.route(
'/<bot_uuid>/admins/<int:admin_id>', methods=['DELETE'], auth_type=group.AuthType.USER_TOKEN_OR_API_KEY
)
async def _(bot_uuid: str, admin_id: int) -> str:
await self.ap.bot_service.delete_bot_admin(bot_uuid, admin_id)
return self.success()
src/langbot/pkg/api/http/service/bot.py
+5 -7
View File
@@ -204,18 +204,15 @@ class BotService:
async def get_bot_admins(self, bot_uuid: str) -> list[dict]:
from ....entity.persistence import bot as persistence_bot
result = await self.ap.persistence_mgr.execute_async(
sqlalchemy.select(persistence_bot.BotAdmin).where(
persistence_bot.BotAdmin.bot_uuid == bot_uuid
)
sqlalchemy.select(persistence_bot.BotAdmin).where(persistence_bot.BotAdmin.bot_uuid == bot_uuid)
)
return [
{'id': r.id, 'launcher_type': r.launcher_type, 'launcher_id': r.launcher_id}
for r in result.all()
]
return [{'id': r.id, 'launcher_type': r.launcher_type, 'launcher_id': r.launcher_id} for r in result.all()]
async def add_bot_admin(self, bot_uuid: str, launcher_type: str, launcher_id: str) -> int:
from ....entity.persistence import bot as persistence_bot
result = await self.ap.persistence_mgr.execute_async(
sqlalchemy.insert(persistence_bot.BotAdmin).values(
bot_uuid=bot_uuid,
@@ -227,6 +224,7 @@ class BotService:
async def delete_bot_admin(self, bot_uuid: str, admin_id: int) -> None:
from ....entity.persistence import bot as persistence_bot
await self.ap.persistence_mgr.execute_async(
sqlalchemy.delete(persistence_bot.BotAdmin).where(
persistence_bot.BotAdmin.bot_uuid == bot_uuid,
src/langbot/pkg/command/cmdmgr.py
+1
View File
@@ -86,6 +86,7 @@ class CommandManager:
import sqlalchemy as _sa
from ..entity.persistence.bot import BotAdmin as _BotAdmin
_admins = await self.ap.persistence_mgr.execute_async(
_sa.select(_BotAdmin).where(
_BotAdmin.bot_uuid == (query.bot_uuid or ''),
src/langbot/pkg/entity/persistence/bot.py
+1 -3
View File
@@ -14,9 +14,7 @@ class BotAdmin(Base):
launcher_id = sqlalchemy.Column(sqlalchemy.String(255), nullable=False)
created_at = sqlalchemy.Column(sqlalchemy.DateTime, nullable=False, server_default=sqlalchemy.func.now())
__table_args__ = (
sqlalchemy.UniqueConstraint('bot_uuid', 'launcher_type', 'launcher_id', name='uq_bot_admin'),
)
__table_args__ = (sqlalchemy.UniqueConstraint('bot_uuid', 'launcher_type', 'launcher_id', name='uq_bot_admin'),)
class Bot(Base):
src/langbot/pkg/persistence/alembic/versions/0007_add_bot_admins.py
+3 -5
View File
@@ -44,13 +44,12 @@ def upgrade() -> None:
# Read instance_config metadata key that holds the admins list
if 'metadata' not in tables:
return
meta_row = conn.execute(
sa.text("SELECT value FROM metadata WHERE key = 'instance_config'")
).first()
meta_row = conn.execute(sa.text("SELECT value FROM metadata WHERE key = 'instance_config'")).first()
if meta_row is None:
return
import json
try:
cfg = json.loads(meta_row[0])
except Exception:
@@ -65,8 +64,7 @@ def upgrade() -> None:
try:
conn.execute(
sa.text(
'INSERT OR IGNORE INTO bot_admins (bot_uuid, launcher_type, launcher_id)'
' VALUES (:bu, :lt, :li)'
'INSERT OR IGNORE INTO bot_admins (bot_uuid, launcher_type, launcher_id) VALUES (:bu, :lt, :li)'
),
{'bu': first_bot_uuid, 'lt': launcher_type, 'li': launcher_id},
)
tests/unit_tests/utils/test_importutil.py
+2 -2
View File
@@ -138,7 +138,7 @@ class TestReadResourceFile:
from langbot.pkg.utils import importutil
content = importutil.read_resource_file('templates/config.yaml')
assert 'admins:' in content
assert 'api:' in content
assert 'edition: community' in content
def test_raises_for_nonexistent_file(self):
@@ -157,7 +157,7 @@ class TestReadResourceFileBytes:
from langbot.pkg.utils import importutil
content = importutil.read_resource_file_bytes('templates/config.yaml')
assert b'admins:' in content
assert b'api:' in content
assert b'edition: community' in content
def test_raises_for_nonexistent_file_bytes(self):
web/src/app/home/bots/BotDetailContent.tsx
+12 -2
View File
@@ -27,7 +27,14 @@ import type { BotSessionMonitorHandle } from '@/app/home/bots/components/bot-ses
import { httpClient } from '@/app/infra/http/HttpClient';
import { useSidebarData } from '@/app/home/components/home-sidebar/SidebarDataContext';
import { useTranslation } from 'react-i18next';
import { Settings, FileText, Users, RefreshCw, Trash2, ShieldCheck } from 'lucide-react';
import {
Settings,
FileText,
Users,
RefreshCw,
Trash2,
ShieldCheck,
} from 'lucide-react';
import { cn } from '@/lib/utils';
import { toast } from 'sonner';
@@ -298,7 +305,10 @@ export default function BotDetailContent({ id }: { id: string }) {
</TabsContent>
{/* Tab: Admins */}
<TabsContent value="admins" className="flex-1 min-h-0 overflow-y-auto mt-4">
<TabsContent
value="admins"
className="flex-1 min-h-0 overflow-y-auto mt-4"
>
<div className="mx-auto max-w-3xl pb-8">
<BotAdminsPanel botId={id} />
</div>
web/src/app/home/bots/components/bot-admins/BotAdminsPanel.tsx
+30 -9
View File
@@ -37,7 +37,9 @@ export default function BotAdminsPanel({ botId }: { botId: string }) {
}
}, [botId]);
useEffect(() => { load(); }, [load]);
useEffect(() => {
load();
}, [load]);
async function handleAdd() {
if (!newId.trim()) return;
@@ -72,7 +74,9 @@ export default function BotAdminsPanel({ botId }: { botId: string }) {
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="person">{t('bots.admins.typePerson')}</SelectItem>
<SelectItem value="person">
{t('bots.admins.typePerson')}
</SelectItem>
<SelectItem value="group">{t('bots.admins.typeGroup')}</SelectItem>
</SelectContent>
</Select>
@@ -83,32 +87,49 @@ export default function BotAdminsPanel({ botId }: { botId: string }) {
onChange={(e) => setNewId(e.target.value)}
onKeyDown={(e) => e.key === 'Enter' && handleAdd()}
/>
<Button size="sm" onClick={handleAdd} disabled={adding || !newId.trim()}>
<Button
size="sm"
onClick={handleAdd}
disabled={adding || !newId.trim()}
>
<Plus className="size-4 mr-1" />
{t('bots.admins.addAdmin')}
</Button>
</div>
{loading ? (
<div className="text-sm text-muted-foreground py-4 text-center">{t('bots.sessionMonitor.loading')}</div>
<div className="text-sm text-muted-foreground py-4 text-center">
{t('bots.sessionMonitor.loading')}
</div>
) : admins.length === 0 ? (
<div className="text-sm text-muted-foreground py-4 text-center">{t('bots.admins.noAdmins')}</div>
<div className="text-sm text-muted-foreground py-4 text-center">
{t('bots.admins.noAdmins')}
</div>
) : (
<div className="border rounded-md overflow-hidden">
<table className="w-full text-sm">
<thead>
<tr className="border-b bg-muted/40">
<th className="text-left px-3 py-2 font-medium text-muted-foreground w-28">{t('bots.admins.launcherType')}</th>
<th className="text-left px-3 py-2 font-medium text-muted-foreground">{t('bots.admins.launcherId')}</th>
<th className="text-left px-3 py-2 font-medium text-muted-foreground w-28">
{t('bots.admins.launcherType')}
</th>
<th className="text-left px-3 py-2 font-medium text-muted-foreground">
{t('bots.admins.launcherId')}
</th>
<th className="w-10" />
</tr>
</thead>
<tbody>
{admins.map((admin) => (
<tr key={admin.id} className="border-b last:border-0 hover:bg-muted/30">
<tr
key={admin.id}
className="border-b last:border-0 hover:bg-muted/30"
>
<td className="px-3 py-2">
<span className="px-1.5 py-0.5 rounded bg-muted text-xs">
{admin.launcher_type === 'person' ? t('bots.admins.typePerson') : t('bots.admins.typeGroup')}
{admin.launcher_type === 'person'
? t('bots.admins.typePerson')
: t('bots.admins.typeGroup')}
</span>
</td>
<td className="px-3 py-2 font-mono">{admin.launcher_id}</td>