Phase 3: Skills & Context — skill system, personal context, context layering
Backend: - Skill model + migration (with FK on chats.skill_id) - Personal + general skill CRUD services with access isolation - Admin skill CRUD endpoints (POST/GET/PATCH/DELETE /admin/skills) - User skill CRUD endpoints (POST/GET/PATCH/DELETE /skills/) - Personal context GET/PUT at /users/me/context - Extended context assembly: primary + personal context + skill prompt - Chat creation/update now accepts skill_id with validation Frontend: - Skill selector dropdown in chat header (grouped: general + personal) - Reusable skill editor form component - Admin skills management page (/admin/skills) - Personal skills page (/skills) - Personal context editor page (/profile/context) - Updated sidebar: Skills, My Context nav items + admin skills link - English + Russian translations for all skill/context UI Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,17 +1,26 @@
|
||||
import uuid
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends
|
||||
from fastapi import APIRouter, Depends, status
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.api.deps import require_admin
|
||||
from app.database import get_db
|
||||
from app.models.user import User
|
||||
from app.schemas.chat import ContextFileResponse, UpdateContextRequest
|
||||
from app.services import context_service
|
||||
from app.schemas.skill import (
|
||||
CreateSkillRequest,
|
||||
SkillListResponse,
|
||||
SkillResponse,
|
||||
UpdateSkillRequest,
|
||||
)
|
||||
from app.services import context_service, skill_service
|
||||
|
||||
router = APIRouter(prefix="/admin", tags=["admin"])
|
||||
|
||||
|
||||
# --- Context ---
|
||||
|
||||
@router.get("/context", response_model=ContextFileResponse | None)
|
||||
async def get_primary_context(
|
||||
_admin: Annotated[User, Depends(require_admin)],
|
||||
@@ -31,3 +40,44 @@ async def update_primary_context(
|
||||
):
|
||||
ctx = await context_service.upsert_primary_context(db, data.content, admin.id)
|
||||
return ContextFileResponse.model_validate(ctx)
|
||||
|
||||
|
||||
# --- Skills ---
|
||||
|
||||
@router.get("/skills", response_model=SkillListResponse)
|
||||
async def list_general_skills(
|
||||
_admin: Annotated[User, Depends(require_admin)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
skills = await skill_service.get_general_skills(db)
|
||||
return SkillListResponse(skills=[SkillResponse.model_validate(s) for s in skills])
|
||||
|
||||
|
||||
@router.post("/skills", response_model=SkillResponse, status_code=status.HTTP_201_CREATED)
|
||||
async def create_general_skill(
|
||||
data: CreateSkillRequest,
|
||||
_admin: Annotated[User, Depends(require_admin)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
skill = await skill_service.create_general_skill(db, **data.model_dump())
|
||||
return SkillResponse.model_validate(skill)
|
||||
|
||||
|
||||
@router.patch("/skills/{skill_id}", response_model=SkillResponse)
|
||||
async def update_general_skill(
|
||||
skill_id: uuid.UUID,
|
||||
data: UpdateSkillRequest,
|
||||
_admin: Annotated[User, Depends(require_admin)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
skill = await skill_service.update_general_skill(db, skill_id, **data.model_dump(exclude_unset=True))
|
||||
return SkillResponse.model_validate(skill)
|
||||
|
||||
|
||||
@router.delete("/skills/{skill_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
async def delete_general_skill(
|
||||
skill_id: uuid.UUID,
|
||||
_admin: Annotated[User, Depends(require_admin)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
await skill_service.delete_general_skill(db, skill_id)
|
||||
|
||||
@@ -17,7 +17,7 @@ from app.schemas.chat import (
|
||||
SendMessageRequest,
|
||||
UpdateChatRequest,
|
||||
)
|
||||
from app.services import chat_service
|
||||
from app.services import chat_service, skill_service
|
||||
from app.services.ai_service import stream_ai_response
|
||||
|
||||
router = APIRouter(prefix="/chats", tags=["chats"])
|
||||
@@ -29,7 +29,9 @@ async def create_chat(
|
||||
user: Annotated[User, Depends(get_current_user)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
chat = await chat_service.create_chat(db, user, data.title)
|
||||
if data.skill_id:
|
||||
await skill_service.validate_skill_accessible(db, data.skill_id, user.id)
|
||||
chat = await chat_service.create_chat(db, user, data.title, data.skill_id)
|
||||
return ChatResponse.model_validate(chat)
|
||||
|
||||
|
||||
@@ -60,7 +62,9 @@ async def update_chat(
|
||||
user: Annotated[User, Depends(get_current_user)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
chat = await chat_service.update_chat(db, chat_id, user.id, data.title, data.is_archived)
|
||||
if data.skill_id:
|
||||
await skill_service.validate_skill_accessible(db, data.skill_id, user.id)
|
||||
chat = await chat_service.update_chat(db, chat_id, user.id, data.title, data.is_archived, data.skill_id)
|
||||
return ChatResponse.model_validate(chat)
|
||||
|
||||
|
||||
|
||||
@@ -3,12 +3,16 @@ from fastapi import APIRouter
|
||||
from app.api.v1.auth import router as auth_router
|
||||
from app.api.v1.chats import router as chats_router
|
||||
from app.api.v1.admin import router as admin_router
|
||||
from app.api.v1.skills import router as skills_router
|
||||
from app.api.v1.users import router as users_router
|
||||
|
||||
api_v1_router = APIRouter(prefix="/api/v1")
|
||||
|
||||
api_v1_router.include_router(auth_router)
|
||||
api_v1_router.include_router(chats_router)
|
||||
api_v1_router.include_router(admin_router)
|
||||
api_v1_router.include_router(skills_router)
|
||||
api_v1_router.include_router(users_router)
|
||||
|
||||
|
||||
@api_v1_router.get("/health")
|
||||
|
||||
70
backend/app/api/v1/skills.py
Normal file
70
backend/app/api/v1/skills.py
Normal file
@@ -0,0 +1,70 @@
|
||||
import uuid
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Query, status
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.api.deps import get_current_user
|
||||
from app.database import get_db
|
||||
from app.models.user import User
|
||||
from app.schemas.skill import (
|
||||
CreateSkillRequest,
|
||||
SkillListResponse,
|
||||
SkillResponse,
|
||||
UpdateSkillRequest,
|
||||
)
|
||||
from app.services import skill_service
|
||||
|
||||
router = APIRouter(prefix="/skills", tags=["skills"])
|
||||
|
||||
|
||||
@router.get("/", response_model=SkillListResponse)
|
||||
async def list_skills(
|
||||
user: Annotated[User, Depends(get_current_user)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
include_general: bool = Query(default=True),
|
||||
):
|
||||
skills = await skill_service.get_accessible_skills(db, user.id, include_general)
|
||||
return SkillListResponse(skills=[SkillResponse.model_validate(s) for s in skills])
|
||||
|
||||
|
||||
@router.post("/", response_model=SkillResponse, status_code=status.HTTP_201_CREATED)
|
||||
async def create_skill(
|
||||
data: CreateSkillRequest,
|
||||
user: Annotated[User, Depends(get_current_user)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
skill = await skill_service.create_personal_skill(db, user.id, **data.model_dump())
|
||||
return SkillResponse.model_validate(skill)
|
||||
|
||||
|
||||
@router.get("/{skill_id}", response_model=SkillResponse)
|
||||
async def get_skill(
|
||||
skill_id: uuid.UUID,
|
||||
user: Annotated[User, Depends(get_current_user)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
skill = await skill_service.get_skill(db, skill_id, user.id)
|
||||
return SkillResponse.model_validate(skill)
|
||||
|
||||
|
||||
@router.patch("/{skill_id}", response_model=SkillResponse)
|
||||
async def update_skill(
|
||||
skill_id: uuid.UUID,
|
||||
data: UpdateSkillRequest,
|
||||
user: Annotated[User, Depends(get_current_user)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
skill = await skill_service.update_personal_skill(
|
||||
db, skill_id, user.id, **data.model_dump(exclude_unset=True)
|
||||
)
|
||||
return SkillResponse.model_validate(skill)
|
||||
|
||||
|
||||
@router.delete("/{skill_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
async def delete_skill(
|
||||
skill_id: uuid.UUID,
|
||||
user: Annotated[User, Depends(get_current_user)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
await skill_service.delete_personal_skill(db, skill_id, user.id)
|
||||
33
backend/app/api/v1/users.py
Normal file
33
backend/app/api/v1/users.py
Normal file
@@ -0,0 +1,33 @@
|
||||
from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.api.deps import get_current_user
|
||||
from app.database import get_db
|
||||
from app.models.user import User
|
||||
from app.schemas.chat import ContextFileResponse, UpdateContextRequest
|
||||
from app.services import context_service
|
||||
|
||||
router = APIRouter(prefix="/users", tags=["users"])
|
||||
|
||||
|
||||
@router.get("/me/context", response_model=ContextFileResponse | None)
|
||||
async def get_personal_context(
|
||||
user: Annotated[User, Depends(get_current_user)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
ctx = await context_service.get_personal_context(db, user.id)
|
||||
if not ctx:
|
||||
return None
|
||||
return ContextFileResponse.model_validate(ctx)
|
||||
|
||||
|
||||
@router.put("/me/context", response_model=ContextFileResponse)
|
||||
async def update_personal_context(
|
||||
data: UpdateContextRequest,
|
||||
user: Annotated[User, Depends(get_current_user)],
|
||||
db: Annotated[AsyncSession, Depends(get_db)],
|
||||
):
|
||||
ctx = await context_service.upsert_personal_context(db, user.id, data.content)
|
||||
return ContextFileResponse.model_validate(ctx)
|
||||
Reference in New Issue
Block a user