diff --git a/backend/app/api/skills.py b/backend/app/api/skills.py index 7c984a4..4bd4f3b 100644 --- a/backend/app/api/skills.py +++ b/backend/app/api/skills.py @@ -1,12 +1,22 @@ import json import os +import shutil +import zipfile +import tarfile +import yaml from typing import List, Optional, Dict, Any -from fastapi import APIRouter, HTTPException +from datetime import datetime +from fastapi import APIRouter, HTTPException, UploadFile, File, Form from pydantic import BaseModel, Field router = APIRouter() -DATA_FILE = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "data", "skills.json") +BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) +DATA_FILE = os.path.join(BASE_DIR, "data", "skills.json") +SKILL_HUB_DIR = os.path.join(BASE_DIR, "data", "skill-hub") + +# Ensure skill-hub directory exists +os.makedirs(SKILL_HUB_DIR, exist_ok=True) class Skill(BaseModel): id: str = Field(..., description="Unique identifier for the skill") @@ -15,6 +25,10 @@ class Skill(BaseModel): content: str = Field(..., description="The content/prompt/logic of the skill") type: str = Field("python", description="Type of the skill (python, sql, api)") project_id: Optional[int] = Field(None, description="The ID of the project this skill belongs to") + source: str = Field("本地导入", description="Source of the skill (e.g., 本地导入, GitHub 导入)") + installation_time: str = Field(default_factory=lambda: datetime.now().strftime("%Y年%m月%d日"), description="Time when the skill was installed") + status: str = Field("安全", description="Security status of the skill (e.g., 安全, 低风险)") + file_path: Optional[str] = Field(None, description="Path to the skill folder in skill-hub") class SkillCreate(BaseModel): id: str @@ -23,6 +37,10 @@ class SkillCreate(BaseModel): content: str type: str = "python" project_id: Optional[int] = None + source: str = "本地导入" + installation_time: Optional[str] = None + status: str = "安全" + file_path: Optional[str] = None class SkillUpdate(BaseModel): name: Optional[str] = None @@ -30,6 +48,54 @@ class SkillUpdate(BaseModel): content: Optional[str] = None type: Optional[str] = None project_id: Optional[int] = None + source: Optional[str] = None + installation_time: Optional[str] = None + status: Optional[str] = None + file_path: Optional[str] = None + +def _parse_skill_md(file_path: str) -> Dict[str, Any]: + """Parse SKILL.md for metadata and content according to agentskills.io standard.""" + if not os.path.exists(file_path): + return {} + + try: + with open(file_path, 'r', encoding='utf-8') as f: + content = f.read() + except Exception as e: + print(f"Error reading {file_path}: {e}") + return {} + + # Split YAML frontmatter and Markdown body + # Support both --- and +++ for frontmatter + metadata = {} + body = content + + if content.startswith('---'): + parts = content.split('---', 2) + if len(parts) >= 3: + try: + metadata = yaml.safe_load(parts[1]) or {} + body = parts[2].strip() + except Exception as e: + print(f"Error parsing YAML frontmatter: {e}") + + # Extract name and description, fallback to some defaults + name = metadata.get("name") + description = metadata.get("description") + + # If name not in metadata, try to find the first H1 in markdown body + if not name: + for line in body.split('\n'): + if line.startswith('# '): + name = line[2:].strip() + break + + return { + "name": name, + "description": description, + "content": body, + "metadata": metadata + } def _load_data() -> List[Dict[str, Any]]: if not os.path.exists(DATA_FILE): @@ -37,13 +103,13 @@ def _load_data() -> List[Dict[str, Any]]: try: with open(DATA_FILE, "r") as f: return json.load(f) - except json.JSONDecodeError: + except (json.JSONDecodeError, FileNotFoundError): return [] def _save_data(data: List[Dict[str, Any]]): os.makedirs(os.path.dirname(DATA_FILE), exist_ok=True) with open(DATA_FILE, "w") as f: - json.dump(data, f, indent=2) + json.dump(data, f, indent=2, ensure_ascii=False) def load_skills(project_id: Optional[int] = None) -> List[Dict[str, Any]]: data = _load_data() @@ -66,16 +132,142 @@ def get_skill(skill_id: str, project_id: Optional[int] = None): return Skill(**item) raise HTTPException(status_code=404, detail="Skill not found") +@router.post("/skills/upload") +async def upload_skill( + file: UploadFile = File(...), + project_id: Optional[int] = Form(None) +): + """Upload a skill file (SKILL.md) or a packaged skill (zip/tar.gz).""" + filename = file.filename + print(f"Uploading skill: {filename}, project_id: {project_id}") + + # Create a unique temp directory + temp_dir_name = f"temp_{datetime.now().timestamp()}_{os.urandom(4).hex()}" + temp_dir = os.path.join(SKILL_HUB_DIR, temp_dir_name) + os.makedirs(temp_dir, exist_ok=True) + + try: + file_path = os.path.join(temp_dir, filename) + with open(file_path, "wb") as buffer: + shutil.copyfileobj(file.file, buffer) + + skill_source_dir = None + + # Handle different file types + if filename.endswith(".zip"): + try: + with zipfile.ZipFile(file_path, 'r') as zip_ref: + zip_ref.extractall(temp_dir) + os.remove(file_path) + # Find the directory containing SKILL.md + for root, dirs, files in os.walk(temp_dir): + if "SKILL.md" in files: + skill_source_dir = root + break + except Exception as e: + print(f"Zip extraction failed: {e}") + raise HTTPException(status_code=400, detail=f"Failed to extract zip: {str(e)}") + + elif filename.endswith((".tar.gz", ".tgz")): + try: + with tarfile.open(file_path, 'r:gz') as tar_ref: + tar_ref.extractall(temp_dir) + os.remove(file_path) + for root, dirs, files in os.walk(temp_dir): + if "SKILL.md" in files: + skill_source_dir = root + break + except Exception as e: + print(f"Tarball extraction failed: {e}") + raise HTTPException(status_code=400, detail=f"Failed to extract tarball: {str(e)}") + + elif filename == "SKILL.md": + skill_source_dir = temp_dir + else: + print(f"Unsupported file type: {filename}") + raise HTTPException(status_code=400, detail="Only SKILL.md or packaged skills (zip/tar.gz) are supported") + + if not skill_source_dir or not os.path.exists(os.path.join(skill_source_dir, "SKILL.md")): + print(f"SKILL.md not found in {filename}") + raise HTTPException(status_code=400, detail="SKILL.md not found in the uploaded file") + + # Parse metadata + skill_md_path = os.path.join(skill_source_dir, "SKILL.md") + metadata_res = _parse_skill_md(skill_md_path) + + # Use metadata name, or fallback to folder name or filename + skill_name = metadata_res.get("name") + if not skill_name: + if filename == "SKILL.md": + skill_name = "unnamed_skill" + else: + # Use filename without extension + skill_name = os.path.splitext(filename)[0] + + # Create a safe directory name for the skill + import re + safe_name = re.sub(r'[^a-zA-Z0-9_\-]', '_', skill_name).lower() + if not safe_name: safe_name = "skill" + final_skill_id = f"{safe_name}_{datetime.now().strftime('%Y%m%d%H%M%S')}" + final_skill_dir = os.path.join(SKILL_HUB_DIR, final_skill_id) + + print(f"Finalizing skill: {skill_name} -> {final_skill_dir}") + + # Move the skill content to final destination + os.makedirs(final_skill_dir, exist_ok=True) + for item in os.listdir(skill_source_dir): + s = os.path.join(skill_source_dir, item) + d = os.path.join(final_skill_dir, item) + if os.path.isdir(s): + shutil.copytree(s, d, dirs_exist_ok=True) + else: + shutil.copy2(s, d) + + # Register in skills.json + data = _load_data() + new_skill = { + "id": final_skill_id, + "name": skill_name, + "description": metadata_res.get("description") or "No description provided", + "content": metadata_res.get("content") or "", + "type": "agentskill", + "project_id": project_id, + "source": "文件上传", + "installation_time": datetime.now().strftime("%Y年%m月%d日"), + "status": "安全", + "file_path": final_skill_dir + } + + data.append(new_skill) + _save_data(data) + print(f"Skill registered successfully: {final_skill_id}") + + return new_skill + + except HTTPException: + raise + except Exception as e: + import traceback + traceback.print_exc() + raise HTTPException(status_code=500, detail=f"An unexpected error occurred: {str(e)}") + finally: + # Cleanup temp directory + if os.path.exists(temp_dir): + shutil.rmtree(temp_dir) + @router.post("/skills", response_model=Skill) def create_skill(skill: SkillCreate): data = _load_data() if any(item["id"] == skill.id for item in data): raise HTTPException(status_code=400, detail="Skill with this ID already exists") - new_skill = skill.dict() - data.append(new_skill) + new_skill_dict = skill.dict() + if not new_skill_dict.get("installation_time"): + new_skill_dict["installation_time"] = datetime.now().strftime("%Y年%m月%d日") + + data.append(new_skill_dict) _save_data(data) - return Skill(**new_skill) + return Skill(**new_skill_dict) @router.put("/skills/{skill_id}", response_model=Skill) def update_skill(skill_id: str, skill: SkillUpdate, project_id: Optional[int] = None): @@ -100,17 +292,32 @@ def delete_skill(skill_id: str, project_id: Optional[int] = None): # If project_id is provided, we only delete if it matches new_data = [] found = False + skill_to_delete = None + for item in data: if item["id"] == skill_id: if project_id is not None and item.get("project_id") != project_id: new_data.append(item) continue found = True + skill_to_delete = item else: new_data.append(item) if not found: raise HTTPException(status_code=404, detail="Skill not found") + + # Clean up file_path if it exists + if skill_to_delete and skill_to_delete.get("file_path"): + file_path = skill_to_delete["file_path"] + if os.path.exists(file_path): + try: + if os.path.isdir(file_path): + shutil.rmtree(file_path) + else: + os.remove(file_path) + except Exception as e: + print(f"Error deleting skill files at {file_path}: {e}") _save_data(new_data) return {"message": "Skill deleted successfully"} diff --git a/backend/pyproject.toml b/backend/pyproject.toml index c3f9010..0ae109e 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -34,6 +34,7 @@ dependencies = [ "python-socketio>=5.16.0,<6.0.0", "python-socks[asyncio]>=2.8.0,<3.0.0", "python-telegram-bot[socks]>=22.6,<23.0", + "pyyaml>=6.0.3", "qq-botpy>=1.2.0,<2.0.0", "readability-lxml>=0.8.4,<1.0.0", "rich>=14.0.0,<15.0.0", diff --git a/backend/uv.lock b/backend/uv.lock index e22a7d7..ea0d963 100644 --- a/backend/uv.lock +++ b/backend/uv.lock @@ -220,6 +220,7 @@ dependencies = [ { name = "python-socketio" }, { name = "python-socks" }, { name = "python-telegram-bot", extra = ["socks"] }, + { name = "pyyaml" }, { name = "qq-botpy" }, { name = "readability-lxml" }, { name = "rich" }, @@ -264,6 +265,7 @@ requires-dist = [ { name = "python-socketio", specifier = ">=5.16.0,<6.0.0" }, { name = "python-socks", extras = ["asyncio"], specifier = ">=2.8.0,<3.0.0" }, { name = "python-telegram-bot", extras = ["socks"], specifier = ">=22.6,<23.0" }, + { name = "pyyaml", specifier = ">=6.0.3" }, { name = "qq-botpy", specifier = ">=1.2.0,<2.0.0" }, { name = "readability-lxml", specifier = ">=0.8.4,<1.0.0" }, { name = "rich", specifier = ">=14.0.0,<15.0.0" }, diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx index 1cfe980..246168d 100644 --- a/frontend/src/components/Sidebar.tsx +++ b/frontend/src/components/Sidebar.tsx @@ -547,7 +547,10 @@ function SidebarBody() { - diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 423d67a..cdbffb7 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -7,11 +7,15 @@ interface RequestOptions extends RequestInit { async function request(url: string, options: RequestOptions = {}): Promise { const token = localStorage.getItem('token'); - const defaultHeaders = { - 'Content-Type': 'application/json', + const defaultHeaders: Record = { ...(token ? { 'Authorization': `Bearer ${token}` } : {}), }; + // Only set Content-Type to application/json if data is not FormData + if (!(options.body instanceof FormData)) { + defaultHeaders['Content-Type'] = 'application/json'; + } + const config: RequestInit = { ...options, headers: { @@ -50,10 +54,10 @@ async function request(url: string, options: RequestOptions = {}): Promise export const api = { get: (url: string, options?: RequestOptions) => request(url, { ...options, method: 'GET' }), post: (url: string, data: any, options?: RequestOptions) => - request(url, { ...options, method: 'POST', body: JSON.stringify(data) }), + request(url, { ...options, method: 'POST', body: data instanceof FormData ? data : JSON.stringify(data) }), put: (url: string, data: any, options?: RequestOptions) => - request(url, { ...options, method: 'PUT', body: JSON.stringify(data) }), + request(url, { ...options, method: 'PUT', body: data instanceof FormData ? data : JSON.stringify(data) }), delete: (url: string, options?: RequestOptions) => request(url, { ...options, method: 'DELETE' }), patch: (url: string, data: any, options?: RequestOptions) => - request(url, { ...options, method: 'PATCH', body: JSON.stringify(data) }), + request(url, { ...options, method: 'PATCH', body: data instanceof FormData ? data : JSON.stringify(data) }), }; diff --git a/frontend/src/pages/Skills.tsx b/frontend/src/pages/Skills.tsx index 6b91570..42e51f2 100644 --- a/frontend/src/pages/Skills.tsx +++ b/frontend/src/pages/Skills.tsx @@ -2,22 +2,28 @@ import { useState, useEffect } from 'react'; import { Button } from "@/components/ui/button"; import { Input } from "@/components/ui/input"; import { Card, CardContent, CardHeader, CardTitle, CardDescription } from "@/components/ui/card"; -import { Trash2, Edit2, Plus, Terminal, Loader2, FolderOpen } from "lucide-react"; +import { Trash2, Edit2, Plus, Terminal, Loader2, FolderOpen, Share2, Download, Eye, ShieldCheck, AlertCircle, Wand2, Upload } from "lucide-react"; import { ScrollArea } from "@/components/ui/scroll-area"; import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger, DialogFooter } from "@/components/ui/dialog"; import { Label } from "@/components/ui/label"; import { Textarea } from "@/components/ui/textarea"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select"; +import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table"; import { api } from "@/lib/api"; import { useProjectStore } from "@/store/projectStore"; +import { useRef } from 'react'; interface Skill { id: string; name: string; description: string; content: string; - type: 'python' | 'sql' | 'api'; + type: string; project_id?: number; + source: string; + installation_time: string; + status: string; + file_path?: string; } export function Skills() { @@ -25,8 +31,9 @@ export function Skills() { const [isLoading, setIsLoading] = useState(false); const [isDialogOpen, setIsDialogOpen] = useState(false); const [editingSkill, setEditingSkill] = useState(null); - const [newSkill, setNewSkill] = useState>({ type: 'python', content: '' }); + const [newSkill, setNewSkill] = useState>({ type: 'python', content: '', source: '本地导入', status: '安全' }); const { currentProject } = useProjectStore(); + const fileInputRef = useRef(null); useEffect(() => { if (currentProject) { @@ -47,26 +54,47 @@ export function Skills() { } }; + const handleFileUpload = async (event: React.ChangeEvent) => { + const file = event.target.files?.[0]; + if (!file || !currentProject) return; + + const formData = new FormData(); + formData.append('file', file); + formData.append('project_id', currentProject.id.toString()); + + setIsLoading(true); + try { + await api.post('/api/v1/skills/upload', formData); + await fetchSkills(); + } catch (error: any) { + console.error("Failed to upload skill", error); + const errorMessage = error.response?.data?.detail || error.message || "未知错误"; + alert("上传失败: " + errorMessage); + } finally { + setIsLoading(false); + if (fileInputRef.current) fileInputRef.current.value = ''; + } + }; + const handleAddSkill = async () => { if (!currentProject) return; if (newSkill.name && newSkill.description && newSkill.content) { try { if (editingSkill) { - const updatedSkill = await api.put(`/api/v1/skills/${editingSkill.id}?project_id=${currentProject.id}`, { + await api.put(`/api/v1/skills/${editingSkill.id}?project_id=${currentProject.id}`, { ...newSkill, project_id: currentProject.id }); - setSkills(skills.map(s => s.id === editingSkill.id ? updatedSkill : s)); } else { const skillToCreate = { ...newSkill, id: Date.now().toString(), project_id: currentProject.id }; - const createdSkill = await api.post('/api/v1/skills', skillToCreate); - setSkills([...skills, createdSkill]); + await api.post('/api/v1/skills', skillToCreate); } - setNewSkill({ type: 'python', content: '' }); + await fetchSkills(); + setNewSkill({ type: 'python', content: '', source: '本地导入', status: '安全' }); setEditingSkill(null); setIsDialogOpen(false); } catch (error) { @@ -102,136 +130,228 @@ export function Skills() { } return ( -
-
+
+
-

技能管理 - {currentProject.name}

-

管理该项目的 AI 技能和工具

+

+ < Wand2 className="h-6 w-6 text-indigo-500" /> + Skills 仓库 - {currentProject.name} +

+

管理该项目的 AI 技能和工具，支持符合 agentskills.io 标准的文件上传

- { - setIsDialogOpen(open); - if (!open) { - setEditingSkill(null); - setNewSkill({ type: 'python', content: '' }); - } - }}> - { - setEditingSkill(null); - setNewSkill({ type: 'python', content: '' }); - setIsDialogOpen(true); - }}> - - 添加技能 - - } /> - - - {editingSkill ? '编辑技能' : '添加新技能'} - -
-
- +
+ + +
+
+ +
+
+ + + + 名称 + 来源 + 安装时间 + 状态 + 操作 + + + + {isLoading ? ( + + +
+ +
+ + + ) : ( + <> + {skills.map((skill) => ( + + +
+
+ +
+
+
+

{skill.name}

+ {skill.type === 'agentskill' && ( + + Agent + + )} +
+

+ {skill.description} +

+
+
+ + +
{skill.source}
+ + +
{skill.installation_time}
+ + +
+ {skill.status === '安全' ? ( + + ) : ( + + )} + {skill.status} +
+ + +
+ + +
+ + + ))} + {skills.length === 0 && ( + + +
+
+ +
+

该项目尚无技能，点击“导入 Skill”开始

+
+ + + )} + + )} + +
+
+
+ + { + setIsDialogOpen(open); + if (!open) { + setEditingSkill(null); + setNewSkill({ type: 'python', content: '', source: '本地导入', status: '安全' }); + } + }}> + + + {editingSkill ? '编辑技能' : '添加新技能'} + +
+
+
+ setNewSkill({...newSkill, name: e.target.value})} - className="col-span-3" + className="rounded-lg border-zinc-200 h-10" />
-
- - +
+
+ + +
+
+ + +
-
- +
+