feat: add deps page

This commit is contained in:
engigu
2025-12-23 23:02:47 +08:00
parent 08f42778a6
commit 07259ae00d
11 changed files with 546 additions and 918 deletions
@@ -0,0 +1,163 @@
package controllers
import (
"strconv"
"baihu/internal/models"
"baihu/internal/services"
"baihu/internal/utils"
"github.com/gin-gonic/gin"
)
type DependencyController struct {
service *services.DependencyService
}
func NewDependencyController() *DependencyController {
return &DependencyController{
service: services.NewDependencyService(),
}
}
// List 获取依赖列表
func (c *DependencyController) List(ctx *gin.Context) {
depType := ctx.Query("type")
deps, err := c.service.List(depType)
if err != nil {
utils.ServerError(ctx, "获取依赖列表失败")
return
}
utils.Success(ctx, deps)
}
// Create 添加依赖
func (c *DependencyController) Create(ctx *gin.Context) {
var req struct {
Name string `json:"name" binding:"required"`
Version string `json:"version"`
Type string `json:"type" binding:"required"`
Remark string `json:"remark"`
}
if err := ctx.ShouldBindJSON(&req); err != nil {
utils.BadRequest(ctx, "参数错误")
return
}
if req.Type != "py" && req.Type != "node" {
utils.BadRequest(ctx, "类型必须是 py 或 node")
return
}
dep := &models.Dependency{
Name: req.Name,
Version: req.Version,
Type: req.Type,
Remark: req.Remark,
}
if err := c.service.Create(dep); err != nil {
utils.BadRequest(ctx, err.Error())
return
}
utils.Success(ctx, dep)
}
// Delete 删除依赖
func (c *DependencyController) Delete(ctx *gin.Context) {
id, err := strconv.Atoi(ctx.Param("id"))
if err != nil {
utils.BadRequest(ctx, "无效的 ID")
return
}
if err := c.service.Delete(id); err != nil {
utils.ServerError(ctx, "删除失败")
return
}
utils.SuccessMsg(ctx, "删除成功")
}
// Install 安装依赖
func (c *DependencyController) Install(ctx *gin.Context) {
var req struct {
Name string `json:"name" binding:"required"`
Version string `json:"version"`
Type string `json:"type" binding:"required"`
}
if err := ctx.ShouldBindJSON(&req); err != nil {
utils.BadRequest(ctx, "参数错误")
return
}
dep := &models.Dependency{
Name: req.Name,
Version: req.Version,
Type: req.Type,
}
if err := c.service.Install(dep); err != nil {
utils.ServerError(ctx, err.Error())
return
}
// 安装成功后保存到数据库
c.service.Create(dep)
utils.SuccessMsg(ctx, "安装成功")
}
// Uninstall 卸载依赖
func (c *DependencyController) Uninstall(ctx *gin.Context) {
id, err := strconv.Atoi(ctx.Param("id"))
if err != nil {
utils.BadRequest(ctx, "无效的 ID")
return
}
// 获取依赖信息
deps, _ := c.service.List("")
var dep *models.Dependency
for _, d := range deps {
if d.ID == id {
dep = &d
break
}
}
if dep == nil {
utils.NotFound(ctx, "依赖不存在")
return
}
if err := c.service.Uninstall(dep); err != nil {
utils.ServerError(ctx, err.Error())
return
}
// 卸载成功后从数据库删除
c.service.Delete(id)
utils.SuccessMsg(ctx, "卸载成功")
}
// GetInstalled 获取已安装的包
func (c *DependencyController) GetInstalled(ctx *gin.Context) {
depType := ctx.Query("type")
if depType == "" {
utils.BadRequest(ctx, "缺少 type 参数")
return
}
packages, err := c.service.GetInstalledPackages(depType)
if err != nil {
utils.ServerError(ctx, "获取已安装包失败: "+err.Error())
return
}
utils.Success(ctx, packages)
}
-204
View File
@@ -1,204 +0,0 @@
package controllers
import (
"baihu/internal/services/deps_env"
"baihu/internal/utils"
"github.com/gin-gonic/gin"
)
type RuntimeController struct {
runtimeService *deps_env.RuntimeService
}
func NewRuntimeController() *RuntimeController {
return &RuntimeController{
runtimeService: deps_env.NewRuntimeService(),
}
}
// GetAvailableRuntimes 获取可用的运行时列表
func (rc *RuntimeController) GetAvailableRuntimes(c *gin.Context) {
runtimes := rc.runtimeService.GetAvailableRuntimes()
utils.Success(c, runtimes)
}
// ListEnvs 列出指定运行时的所有环境
func (rc *RuntimeController) ListEnvs(c *gin.Context) {
runtimeType := c.Query("type")
if runtimeType == "" {
utils.BadRequest(c, "缺少 type 参数")
return
}
manager := rc.runtimeService.GetManager(runtimeType)
if manager == nil {
utils.NotFound(c, "运行时类型不存在")
return
}
if !manager.IsAvailable() {
utils.BadRequest(c, "运行时不可用")
return
}
envs, err := manager.ListEnvs()
if err != nil {
utils.ServerError(c, "获取环境列表失败: "+err.Error())
return
}
utils.Success(c, envs)
}
// CreateEnv 创建环境
func (rc *RuntimeController) CreateEnv(c *gin.Context) {
runtimeType := c.Query("type")
if runtimeType == "" {
utils.BadRequest(c, "缺少 type 参数")
return
}
manager := rc.runtimeService.GetManager(runtimeType)
if manager == nil {
utils.NotFound(c, "运行时类型不存在")
return
}
var req struct {
Name string `json:"name" binding:"required"`
Version string `json:"version"`
}
if err := c.ShouldBindJSON(&req); err != nil {
utils.BadRequest(c, "参数错误")
return
}
if err := manager.CreateEnv(req.Name, req.Version); err != nil {
utils.ServerError(c, "创建环境失败: "+err.Error())
return
}
utils.SuccessMsg(c, "环境创建成功")
}
// DeleteEnv 删除环境
func (rc *RuntimeController) DeleteEnv(c *gin.Context) {
runtimeType := c.Query("type")
envName := c.Query("name")
if runtimeType == "" || envName == "" {
utils.BadRequest(c, "缺少 type 或 name 参数")
return
}
manager := rc.runtimeService.GetManager(runtimeType)
if manager == nil {
utils.NotFound(c, "运行时类型不存在")
return
}
if envName == "base" {
utils.BadRequest(c, "不能删除 base 环境")
return
}
if err := manager.DeleteEnv(envName); err != nil {
utils.ServerError(c, "删除环境失败: "+err.Error())
return
}
utils.SuccessMsg(c, "环境删除成功")
}
// ListPackages 列出环境中的包
func (rc *RuntimeController) ListPackages(c *gin.Context) {
runtimeType := c.Query("type")
envName := c.Query("env")
if runtimeType == "" || envName == "" {
utils.BadRequest(c, "缺少 type 或 env 参数")
return
}
manager := rc.runtimeService.GetManager(runtimeType)
if manager == nil {
utils.NotFound(c, "运行时类型不存在")
return
}
packages, err := manager.ListPackages(envName)
if err != nil {
utils.ServerError(c, "获取包列表失败: "+err.Error())
return
}
utils.Success(c, packages)
}
// InstallPackage 安装包
func (rc *RuntimeController) InstallPackage(c *gin.Context) {
runtimeType := c.Query("type")
envName := c.Query("env")
if runtimeType == "" || envName == "" {
utils.BadRequest(c, "缺少 type 或 env 参数")
return
}
manager := rc.runtimeService.GetManager(runtimeType)
if manager == nil {
utils.NotFound(c, "运行时类型不存在")
return
}
var req struct {
Package string `json:"package" binding:"required"`
}
if err := c.ShouldBindJSON(&req); err != nil {
utils.BadRequest(c, "参数错误")
return
}
if err := manager.InstallPackage(envName, req.Package); err != nil {
utils.ServerError(c, "安装包失败: "+err.Error())
return
}
utils.SuccessMsg(c, "包安装成功")
}
// UninstallPackage 卸载包
func (rc *RuntimeController) UninstallPackage(c *gin.Context) {
runtimeType := c.Query("type")
envName := c.Query("env")
if runtimeType == "" || envName == "" {
utils.BadRequest(c, "缺少 type 或 env 参数")
return
}
manager := rc.runtimeService.GetManager(runtimeType)
if manager == nil {
utils.NotFound(c, "运行时类型不存在")
return
}
var req struct {
Package string `json:"package" binding:"required"`
}
if err := c.ShouldBindJSON(&req); err != nil {
utils.BadRequest(c, "参数错误")
return
}
if err := manager.UninstallPackage(envName, req.Package); err != nil {
utils.ServerError(c, "卸载包失败: "+err.Error())
return
}
utils.SuccessMsg(c, "包卸载成功")
}
+1
View File
@@ -14,5 +14,6 @@ func Migrate() error {
&models.Setting{}, &models.Setting{},
&models.LoginLog{}, &models.LoginLog{},
&models.SendStats{}, &models.SendStats{},
&models.Dependency{},
) )
} }
+22
View File
@@ -0,0 +1,22 @@
package models
import (
"baihu/internal/constant"
"time"
)
// Dependency 依赖包模型
type Dependency struct {
ID int `json:"id" gorm:"primaryKey"`
Name string `json:"name" gorm:"size:100;not null"`
Version string `json:"version" gorm:"size:50"`
Type string `json:"type" gorm:"size:10;not null"` // py 或 node
Remark string `json:"remark" gorm:"size:255"`
Log string `json:"log" gorm:"type:text"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
}
func (Dependency) TableName() string {
return constant.TablePrefix + "deps"
}
+11 -11
View File
@@ -28,17 +28,17 @@ func RegisterControllers() *Controllers {
// Initialize and return controllers // Initialize and return controllers
return &Controllers{ return &Controllers{
Task: controllers.NewTaskController(taskService, cronService), Task: controllers.NewTaskController(taskService, cronService),
Auth: controllers.NewAuthController(userService, settingsService, loginLogService), Auth: controllers.NewAuthController(userService, settingsService, loginLogService),
Env: controllers.NewEnvController(envService), Env: controllers.NewEnvController(envService),
Script: controllers.NewScriptController(scriptService), Script: controllers.NewScriptController(scriptService),
Executor: controllers.NewExecutorController(executorService), Executor: controllers.NewExecutorController(executorService),
File: controllers.NewFileController(constant.ScriptsWorkDir), File: controllers.NewFileController(constant.ScriptsWorkDir),
Dashboard: controllers.NewDashboardController(cronService, executorService), Dashboard: controllers.NewDashboardController(cronService, executorService),
Log: controllers.NewLogController(), Log: controllers.NewLogController(),
Terminal: controllers.NewTerminalController(), Terminal: controllers.NewTerminalController(),
Settings: controllers.NewSettingsController(userService, loginLogService, executorService), Settings: controllers.NewSettingsController(userService, loginLogService, executorService),
Runtime: controllers.NewRuntimeController(), Dependency: controllers.NewDependencyController(),
} }
} }
+19 -20
View File
@@ -12,17 +12,17 @@ import (
) )
type Controllers struct { type Controllers struct {
Task *controllers.TaskController Task *controllers.TaskController
Auth *controllers.AuthController Auth *controllers.AuthController
Env *controllers.EnvController Env *controllers.EnvController
Script *controllers.ScriptController Script *controllers.ScriptController
Executor *controllers.ExecutorController Executor *controllers.ExecutorController
File *controllers.FileController File *controllers.FileController
Dashboard *controllers.DashboardController Dashboard *controllers.DashboardController
Log *controllers.LogController Log *controllers.LogController
Terminal *controllers.TerminalController Terminal *controllers.TerminalController
Settings *controllers.SettingsController Settings *controllers.SettingsController
Runtime *controllers.RuntimeController Dependency *controllers.DependencyController
} }
func mustSubFS(fsys fs.FS, dir string) fs.FS { func mustSubFS(fsys fs.FS, dir string) fs.FS {
@@ -185,16 +185,15 @@ func Setup(c *Controllers) *gin.Engine {
settings.POST("/restore", c.Settings.RestoreBackup) settings.POST("/restore", c.Settings.RestoreBackup)
} }
// Runtime routes (依赖管理) // Dependency routes (依赖管理)
runtime := authorized.Group("/runtime") deps := authorized.Group("/deps")
{ {
runtime.GET("", c.Runtime.GetAvailableRuntimes) deps.GET("", c.Dependency.List)
runtime.GET("/envs", c.Runtime.ListEnvs) deps.POST("", c.Dependency.Create)
runtime.POST("/envs", c.Runtime.CreateEnv) deps.DELETE("/:id", c.Dependency.Delete)
runtime.DELETE("/envs", c.Runtime.DeleteEnv) deps.POST("/install", c.Dependency.Install)
runtime.GET("/packages", c.Runtime.ListPackages) deps.POST("/uninstall/:id", c.Dependency.Uninstall)
runtime.POST("/packages", c.Runtime.InstallPackage) deps.GET("/installed", c.Dependency.GetInstalled)
runtime.DELETE("/packages", c.Runtime.UninstallPackage)
} }
} }
} }
+177
View File
@@ -0,0 +1,177 @@
package services
import (
"errors"
"os/exec"
"strings"
"baihu/internal/database"
"baihu/internal/logger"
"baihu/internal/models"
)
type DependencyService struct{}
func NewDependencyService() *DependencyService {
return &DependencyService{}
}
// List 获取依赖列表
func (s *DependencyService) List(depType string) ([]models.Dependency, error) {
var deps []models.Dependency
query := database.DB
if depType != "" {
query = query.Where("type = ?", depType)
}
err := query.Order("id desc").Find(&deps).Error
return deps, err
}
// Create 创建依赖记录
func (s *DependencyService) Create(dep *models.Dependency) error {
// 检查是否已存在
var existing models.Dependency
if err := database.DB.Where("name = ? AND type = ?", dep.Name, dep.Type).First(&existing).Error; err == nil {
return errors.New("依赖已存在")
}
return database.DB.Create(dep).Error
}
// Delete 删除依赖记录
func (s *DependencyService) Delete(id int) error {
return database.DB.Delete(&models.Dependency{}, id).Error
}
// Install 安装依赖
func (s *DependencyService) Install(dep *models.Dependency) error {
var cmd *exec.Cmd
var packageSpec string
if dep.Version != "" {
if dep.Type == "py" {
packageSpec = dep.Name + "==" + dep.Version
} else {
packageSpec = dep.Name + "@" + dep.Version
}
} else {
packageSpec = dep.Name
}
switch dep.Type {
case "py":
cmd = exec.Command("pip", "install", packageSpec)
case "node":
cmd = exec.Command("npm", "install", "-g", packageSpec)
default:
return errors.New("不支持的依赖类型")
}
logger.Infof("Installing %s package: %s", dep.Type, packageSpec)
output, err := cmd.CombinedOutput()
dep.Log = string(output)
if err != nil {
logger.Errorf("Install failed: %v, output: %s", err, string(output))
return errors.New("安装失败: " + string(output))
}
logger.Infof("Install success: %s", packageSpec)
return nil
}
// Uninstall 卸载依赖
func (s *DependencyService) Uninstall(dep *models.Dependency) error {
var cmd *exec.Cmd
switch dep.Type {
case "py":
cmd = exec.Command("pip", "uninstall", "-y", dep.Name)
case "node":
cmd = exec.Command("npm", "uninstall", "-g", dep.Name)
default:
return errors.New("不支持的依赖类型")
}
logger.Infof("Uninstalling %s package: %s", dep.Type, dep.Name)
output, err := cmd.CombinedOutput()
if err != nil {
logger.Errorf("Uninstall failed: %v, output: %s", err, string(output))
return errors.New("卸载失败: " + string(output))
}
return nil
}
// GetInstalledPackages 获取已安装的包列表
func (s *DependencyService) GetInstalledPackages(depType string) ([]models.Dependency, error) {
var packages []models.Dependency
switch depType {
case "py":
return s.getPipPackages()
case "node":
return s.getNpmPackages()
default:
return packages, errors.New("不支持的依赖类型")
}
}
// getPipPackages 获取 pip 已安装的包
func (s *DependencyService) getPipPackages() ([]models.Dependency, error) {
cmd := exec.Command("pip", "list", "--format=freeze")
output, err := cmd.Output()
if err != nil {
return nil, err
}
var packages []models.Dependency
lines := strings.Split(string(output), "\n")
for _, line := range lines {
line = strings.TrimSpace(line)
if line == "" {
continue
}
parts := strings.SplitN(line, "==", 2)
pkg := models.Dependency{
Name: parts[0],
Type: "py",
}
if len(parts) > 1 {
pkg.Version = parts[1]
}
packages = append(packages, pkg)
}
return packages, nil
}
// getNpmPackages 获取 npm 全局安装的包
func (s *DependencyService) getNpmPackages() ([]models.Dependency, error) {
cmd := exec.Command("npm", "list", "-g", "--depth=0", "--json")
output, err := cmd.Output()
if err != nil {
// npm list 在没有包时也会返回错误,忽略
}
var packages []models.Dependency
// 简单解析,不用 json 库
lines := strings.Split(string(output), "\n")
for _, line := range lines {
line = strings.TrimSpace(line)
if strings.Contains(line, `"version"`) {
continue
}
if strings.HasPrefix(line, `"`) && strings.Contains(line, ":") {
// 格式: "package-name": {
name := strings.Trim(strings.Split(line, ":")[0], `" `)
if name != "" && name != "dependencies" {
packages = append(packages, models.Dependency{
Name: name,
Type: "node",
})
}
}
}
return packages, nil
}
-302
View File
@@ -1,302 +0,0 @@
package deps_env
import (
"bufio"
"encoding/json"
"os"
"os/exec"
"path/filepath"
"strings"
"baihu/internal/constant"
"baihu/internal/logger"
)
// getEnvsDir 获取虚拟环境存储目录
func getEnvsDir() string {
return filepath.Join(constant.DataDir, "envs")
}
// CondaManager Conda 运行时管理器
type CondaManager struct {
condaPath string
}
// NewCondaManager 创建 Conda 管理器
func NewCondaManager() *CondaManager {
return &CondaManager{}
}
// GetType 获取运行时类型
func (cm *CondaManager) GetType() string {
return "conda"
}
// IsAvailable 检查 Conda 是否可用
func (cm *CondaManager) IsAvailable() bool {
path, err := cm.findCondaPath()
if err != nil {
return false
}
cm.condaPath = path
return true
}
// findCondaPath 查找 conda 可执行文件路径
func (cm *CondaManager) findCondaPath() (string, error) {
// 尝试常见的 conda 路径
paths := []string{"conda", "micromamba", "/opt/conda/bin/conda", "/root/miniconda3/bin/conda", "/root/anaconda3/bin/conda"}
for _, p := range paths {
if path, err := exec.LookPath(p); err == nil {
return path, nil
}
}
return "", exec.ErrNotFound
}
// getCondaPath 获取 conda 路径
func (cm *CondaManager) getCondaPath() string {
if cm.condaPath == "" {
cm.findCondaPath()
}
return cm.condaPath
}
// condaEnvDetail 环境详情
type condaEnvDetail struct {
Name string `json:"name"`
Active bool `json:"active"`
}
// condaEnvJSON conda env list --json 的输出结构
type condaEnvJSON struct {
Envs []string `json:"envs"`
EnvsDetails map[string]condaEnvDetail `json:"envs_details"`
}
// ListEnvs 列出所有 Conda 环境
func (cm *CondaManager) ListEnvs() ([]RuntimeEnv, error) {
condaPath := cm.getCondaPath()
if condaPath == "" {
return nil, exec.ErrNotFound
}
cmd := exec.Command(condaPath, "env", "list", "--json")
output, err := cmd.Output()
if err != nil {
logger.Errorf("Failed to list conda envs: %v", err)
return nil, err
}
var envJSON condaEnvJSON
if err := json.Unmarshal(output, &envJSON); err != nil {
return nil, err
}
var envs []RuntimeEnv
for _, envPath := range envJSON.Envs {
detail, ok := envJSON.EnvsDetails[envPath]
name := ""
active := false
if ok {
name = detail.Name
active = detail.Active
}
// 如果没有 name,使用路径
if name == "" {
name = envPath
}
envs = append(envs, RuntimeEnv{
Name: name,
Path: envPath,
Active: active,
})
}
return envs, nil
}
// CreateEnv 创建 Conda 环境
func (cm *CondaManager) CreateEnv(name string, version string) error {
condaPath := cm.getCondaPath()
if condaPath == "" {
return exec.ErrNotFound
}
envsDir := getEnvsDir()
// 确保目录存在
if err := os.MkdirAll(envsDir, 0755); err != nil {
return err
}
envPath := filepath.Join(envsDir, name)
args := []string{"create", "-p", envPath, "-y"}
if version != "" {
args = append(args, "python="+version)
}
logger.Infof("Creating conda env: %s %v", condaPath, args)
cmd := exec.Command(condaPath, args...)
output, err := cmd.CombinedOutput()
if err != nil {
logger.Errorf("Failed to create conda env: %v, output: %s", err, string(output))
return err
}
logger.Infof("Conda env created: %s", envPath)
// 写入 environments.txt
if err := cm.appendToEnvironmentsTxt(envPath); err != nil {
logger.Errorf("Failed to write environments.txt: %v", err)
}
return nil
}
// appendToEnvironmentsTxt 将环境路径追加到 environments.txt
func (cm *CondaManager) appendToEnvironmentsTxt(envPath string) error {
absPath, err := filepath.Abs(envPath)
if err != nil {
return err
}
envsDir := getEnvsDir()
envsTxtPath := filepath.Join(envsDir, "environments.txt")
// 读取现有内容,检查是否已存在
content, _ := os.ReadFile(envsTxtPath)
lines := strings.Split(string(content), "\n")
for _, line := range lines {
if strings.TrimSpace(line) == absPath {
return nil // 已存在
}
}
// 追加写入
f, err := os.OpenFile(envsTxtPath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
if err != nil {
return err
}
defer f.Close()
_, err = f.WriteString(absPath + "\n")
return err
}
// DeleteEnv 删除 Conda 环境
func (cm *CondaManager) DeleteEnv(name string) error {
condaPath := cm.getCondaPath()
if condaPath == "" {
return exec.ErrNotFound
}
if name == "base" {
return nil // 不允许删除 base 环境
}
cmd := exec.Command(condaPath, "env", "remove", "-n", name, "-y")
output, err := cmd.CombinedOutput()
if err != nil {
logger.Errorf("Failed to delete conda env: %v, output: %s", err, string(output))
return err
}
return nil
}
// ListPackages 列出环境中的包
func (cm *CondaManager) ListPackages(envName string) ([]RuntimePackage, error) {
condaPath := cm.getCondaPath()
if condaPath == "" {
return nil, exec.ErrNotFound
}
args := []string{"list"}
if envName != "" && envName != "base" {
args = append(args, "-n", envName)
}
cmd := exec.Command(condaPath, args...)
output, err := cmd.Output()
if err != nil {
logger.Errorf("Failed to list packages: %v", err)
return nil, err
}
return parseCondaList(string(output)), nil
}
// parseCondaList 解析 conda list 输出
func parseCondaList(output string) []RuntimePackage {
var packages []RuntimePackage
scanner := bufio.NewScanner(strings.NewReader(output))
for scanner.Scan() {
line := scanner.Text()
// 跳过注释和空行
if strings.HasPrefix(line, "#") || strings.TrimSpace(line) == "" {
continue
}
fields := strings.Fields(line)
if len(fields) >= 2 {
name := fields[0]
pkg := RuntimePackage{
Name: name,
Version: fields[1],
}
if len(fields) >= 4 {
pkg.Channel = fields[3]
}
packages = append(packages, pkg)
}
}
return packages
}
// InstallPackage 安装包
func (cm *CondaManager) InstallPackage(envName string, packageName string) error {
condaPath := cm.getCondaPath()
if condaPath == "" {
return exec.ErrNotFound
}
args := []string{"install", "-y"}
if envName != "" && envName != "base" {
args = append(args, "-n", envName)
}
args = append(args, packageName)
cmd := exec.Command(condaPath, args...)
output, err := cmd.CombinedOutput()
if err != nil {
logger.Errorf("Failed to install package: %v, output: %s", err, string(output))
return err
}
return nil
}
// UninstallPackage 卸载包
func (cm *CondaManager) UninstallPackage(envName string, packageName string) error {
condaPath := cm.getCondaPath()
if condaPath == "" {
return exec.ErrNotFound
}
args := []string{"remove", "-y"}
if envName != "" && envName != "base" {
args = append(args, "-n", envName)
}
args = append(args, packageName)
cmd := exec.Command(condaPath, args...)
output, err := cmd.CombinedOutput()
if err != nil {
logger.Errorf("Failed to uninstall package: %v, output: %s", err, string(output))
return err
}
return nil
}
@@ -1,72 +0,0 @@
package deps_env
// RuntimeEnv 运行时环境信息
type RuntimeEnv struct {
Name string `json:"name"`
Path string `json:"path"`
Version string `json:"version"`
Active bool `json:"active"`
}
// RuntimePackage 包信息
type RuntimePackage struct {
Name string `json:"name"`
Version string `json:"version"`
Channel string `json:"channel,omitempty"`
}
// RuntimeManager 运行时管理器接口
type RuntimeManager interface {
// GetType 获取运行时类型
GetType() string
// IsAvailable 检查运行时是否可用
IsAvailable() bool
// ListEnvs 列出所有环境
ListEnvs() ([]RuntimeEnv, error)
// CreateEnv 创建环境
CreateEnv(name string, version string) error
// DeleteEnv 删除环境
DeleteEnv(name string) error
// ListPackages 列出环境中的包
ListPackages(envName string) ([]RuntimePackage, error)
// InstallPackage 安装包
InstallPackage(envName string, packageName string) error
// UninstallPackage 卸载包
UninstallPackage(envName string, packageName string) error
}
// RuntimeService 运行时服务
type RuntimeService struct {
managers map[string]RuntimeManager
}
// NewRuntimeService 创建运行时服务
func NewRuntimeService() *RuntimeService {
rs := &RuntimeService{
managers: make(map[string]RuntimeManager),
}
// 注册 Conda 管理器
rs.RegisterManager(NewCondaManager())
return rs
}
// RegisterManager 注册运行时管理器
func (rs *RuntimeService) RegisterManager(manager RuntimeManager) {
rs.managers[manager.GetType()] = manager
}
// GetManager 获取指定类型的管理器
func (rs *RuntimeService) GetManager(runtimeType string) RuntimeManager {
return rs.managers[runtimeType]
}
// GetAvailableRuntimes 获取可用的运行时列表
func (rs *RuntimeService) GetAvailableRuntimes() []string {
var available []string
for name, manager := range rs.managers {
if manager.IsAvailable() {
available = append(available, name)
}
}
return available
}
+18 -22
View File
@@ -192,19 +192,18 @@ export const api = {
if (json.code !== 200) throw new Error(json.msg || '上传失败') if (json.code !== 200) throw new Error(json.msg || '上传失败')
} }
}, },
runtime: { deps: {
getAvailable: () => request<string[]>('/runtime'), list: (type?: string) => {
listEnvs: (type: string) => request<RuntimeEnv[]>(`/runtime/envs?type=${type}`), const query = type ? `?type=${type}` : ''
createEnv: (type: string, name: string, version?: string) => return request<Dependency[]>(`/deps${query}`)
request(`/runtime/envs?type=${type}`, { method: 'POST', body: JSON.stringify({ name, version }) }), },
deleteEnv: (type: string, name: string) => create: (data: { name: string; version?: string; type: string; remark?: string }) =>
request(`/runtime/envs?type=${type}&name=${encodeURIComponent(name)}`, { method: 'DELETE' }), request<Dependency>('/deps', { method: 'POST', body: JSON.stringify(data) }),
listPackages: (type: string, envName: string) => delete: (id: number) => request(`/deps/${id}`, { method: 'DELETE' }),
request<RuntimePackage[]>(`/runtime/packages?type=${type}&env=${encodeURIComponent(envName)}`), install: (data: { name: string; version?: string; type: string }) =>
installPackage: (type: string, envName: string, packageName: string) => request('/deps/install', { method: 'POST', body: JSON.stringify(data) }),
request(`/runtime/packages?type=${type}&env=${encodeURIComponent(envName)}`, { method: 'POST', body: JSON.stringify({ package: packageName }) }), uninstall: (id: number) => request(`/deps/uninstall/${id}`, { method: 'POST' }),
uninstallPackage: (type: string, envName: string, packageName: string) => getInstalled: (type: string) => request<Dependency[]>(`/deps/installed?type=${type}`)
request(`/runtime/packages?type=${type}&env=${encodeURIComponent(envName)}`, { method: 'DELETE', body: JSON.stringify({ package: packageName }) })
} }
} }
@@ -347,15 +346,12 @@ export interface TaskStatsItem {
count: number count: number
} }
export interface RuntimeEnv { export interface Dependency {
name: string id: number
path: string
version: string
active: boolean
}
export interface RuntimePackage {
name: string name: string
version: string version: string
channel?: string type: string
remark: string
created_at: string
updated_at: string
} }
+135 -287
View File
@@ -7,152 +7,66 @@ import { Badge } from '@/components/ui/badge'
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog' import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from '@/components/ui/dialog'
import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog' import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/components/ui/alert-dialog'
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs' import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
import { Plus, Trash2, Package, Search, RefreshCw, Loader2 } from 'lucide-vue-next' import { Plus, Trash2, Package, Search, RefreshCw, Loader2, Download } from 'lucide-vue-next'
import { api, type RuntimeEnv, type RuntimePackage } from '@/api' import { api, type Dependency } from '@/api'
import { toast } from 'vue-sonner' import { toast } from 'vue-sonner'
const availableRuntimes = ref<string[]>([]) const activeTab = ref('py')
const activeRuntime = ref('conda') const deps = ref<Dependency[]>([])
const envs = ref<RuntimeEnv[]>([])
const selectedEnv = ref<RuntimeEnv | null>(null)
const packages = ref<RuntimePackage[]>([])
const loading = ref(false) const loading = ref(false)
const packagesLoading = ref(false)
// 创建环境
const showCreateDialog = ref(false)
const newEnvName = ref('')
const newEnvVersion = ref('')
const creating = ref(false)
// 删除环境
const showDeleteDialog = ref(false)
const envToDelete = ref<RuntimeEnv | null>(null)
// 安装包
const showInstallDialog = ref(false)
const packageToInstall = ref('')
const installing = ref(false) const installing = ref(false)
// 搜索 // 安装对话框
const packageSearch = ref('') const showInstallDialog = ref(false)
const newPkgName = ref('')
const newPkgVersion = ref('')
const filteredPackages = computed(() => { // 删除确认
if (!packageSearch.value) return packages.value const showDeleteDialog = ref(false)
const q = packageSearch.value.toLowerCase() const depToDelete = ref<Dependency | null>(null)
return packages.value.filter(p => p.name.toLowerCase().includes(q))
// 搜索
const searchQuery = ref('')
const filteredDeps = computed(() => {
const list = deps.value.filter(d => d.type === activeTab.value)
if (!searchQuery.value) return list
const q = searchQuery.value.toLowerCase()
return list.filter(d => d.name.toLowerCase().includes(q))
}) })
async function loadRuntimes() { async function loadDeps() {
try {
availableRuntimes.value = await api.runtime.getAvailable()
if (availableRuntimes.value.length > 0 && !availableRuntimes.value.includes(activeRuntime.value)) {
activeRuntime.value = availableRuntimes.value[0] ?? 'conda'
}
} catch {
availableRuntimes.value = []
}
}
async function loadEnvs() {
if (!activeRuntime.value) return
loading.value = true loading.value = true
try { try {
envs.value = await api.runtime.listEnvs(activeRuntime.value) deps.value = await api.deps.list()
if (envs.value.length > 0 && !selectedEnv.value) {
const firstEnv = envs.value[0]
if (firstEnv) selectEnv(firstEnv)
}
} catch { } catch {
toast.error('加载环境列表失败') toast.error('加载依赖列表失败')
envs.value = []
} finally { } finally {
loading.value = false loading.value = false
} }
} }
async function selectEnv(env: RuntimeEnv) {
selectedEnv.value = env
await loadPackages()
}
async function loadPackages() {
if (!selectedEnv.value) return
packagesLoading.value = true
try {
packages.value = await api.runtime.listPackages(activeRuntime.value, selectedEnv.value.name)
} catch {
toast.error('加载包列表失败')
packages.value = []
} finally {
packagesLoading.value = false
}
}
function openCreateDialog() {
newEnvName.value = ''
newEnvVersion.value = ''
showCreateDialog.value = true
}
async function createEnv() {
if (!newEnvName.value.trim()) {
toast.error('请输入环境名称')
return
}
creating.value = true
try {
await api.runtime.createEnv(activeRuntime.value, newEnvName.value.trim(), newEnvVersion.value.trim() || undefined)
toast.success('环境创建成功')
showCreateDialog.value = false
await loadEnvs()
} catch (e: unknown) {
toast.error((e as Error).message || '创建失败')
} finally {
creating.value = false
}
}
function confirmDeleteEnv(env: RuntimeEnv) {
if (env.name === 'base') {
toast.error('不能删除 base 环境')
return
}
envToDelete.value = env
showDeleteDialog.value = true
}
async function deleteEnv() {
if (!envToDelete.value) return
try {
await api.runtime.deleteEnv(activeRuntime.value, envToDelete.value.name)
toast.success('环境删除成功')
if (selectedEnv.value?.name === envToDelete.value.name) {
selectedEnv.value = null
packages.value = []
}
await loadEnvs()
} catch (e: unknown) {
toast.error((e as Error).message || '删除失败')
} finally {
showDeleteDialog.value = false
envToDelete.value = null
}
}
function openInstallDialog() { function openInstallDialog() {
packageToInstall.value = '' newPkgName.value = ''
newPkgVersion.value = ''
showInstallDialog.value = true showInstallDialog.value = true
} }
async function installPackage() { async function installPackage() {
if (!packageToInstall.value.trim() || !selectedEnv.value) return if (!newPkgName.value.trim()) {
toast.error('请输入包名')
return
}
installing.value = true installing.value = true
try { try {
await api.runtime.installPackage(activeRuntime.value, selectedEnv.value.name, packageToInstall.value.trim()) await api.deps.install({
toast.success('包安装成功') name: newPkgName.value.trim(),
version: newPkgVersion.value.trim() || undefined,
type: activeTab.value
})
toast.success('安装成功')
showInstallDialog.value = false showInstallDialog.value = false
await loadPackages() await loadDeps()
} catch (e: unknown) { } catch (e: unknown) {
toast.error((e as Error).message || '安装失败') toast.error((e as Error).message || '安装失败')
} finally { } finally {
@@ -160,29 +74,30 @@ async function installPackage() {
} }
} }
async function uninstallPackage(pkg: RuntimePackage) { function confirmDelete(dep: Dependency) {
if (!selectedEnv.value) return depToDelete.value = dep
showDeleteDialog.value = true
}
async function uninstallPackage() {
if (!depToDelete.value) return
try { try {
await api.runtime.uninstallPackage(activeRuntime.value, selectedEnv.value.name, pkg.name) await api.deps.uninstall(depToDelete.value.id)
toast.success('卸载成功') toast.success('卸载成功')
await loadPackages() await loadDeps()
} catch (e: unknown) { } catch (e: unknown) {
toast.error((e as Error).message || '卸载失败') toast.error((e as Error).message || '卸载失败')
} finally {
showDeleteDialog.value = false
depToDelete.value = null
} }
} }
function getRuntimeLabel(type: string) { function getTypeLabel(type: string) {
const labels: Record<string, string> = { conda: 'Conda', node: 'Node.js' } return type === 'py' ? 'Python' : 'Node.js'
return labels[type] || type
} }
onMounted(async () => { onMounted(loadDeps)
await loadRuntimes()
if (availableRuntimes.value.includes('conda')) {
activeRuntime.value = 'conda'
await loadEnvs()
}
})
</script> </script>
<template> <template>
@@ -190,184 +105,117 @@ onMounted(async () => {
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<div> <div>
<h2 class="text-2xl font-bold tracking-tight">依赖管理</h2> <h2 class="text-2xl font-bold tracking-tight">依赖管理</h2>
<p class="text-muted-foreground">管理运行时环境和依赖包</p> <p class="text-muted-foreground">管理 Python Node.js 依赖包</p>
</div> </div>
</div> </div>
<div v-if="availableRuntimes.length === 0" class="text-center py-8 text-muted-foreground"> <Tabs v-model="activeTab">
<Package class="h-10 w-10 mx-auto mb-3 opacity-50" />
<p>未检测到可用的运行时环境</p>
<p class="text-sm mt-1">请确保已安装 Conda 或其他支持的运行时</p>
</div>
<Tabs v-else v-model="activeRuntime" @update:model-value="loadEnvs">
<TabsList> <TabsList>
<TabsTrigger v-for="rt in availableRuntimes" :key="rt" :value="rt"> <TabsTrigger value="py">Python</TabsTrigger>
{{ getRuntimeLabel(rt) }} <TabsTrigger value="node">Node.js</TabsTrigger>
</TabsTrigger>
</TabsList> </TabsList>
<TabsContent :value="activeRuntime" class="mt-4"> <TabsContent :value="activeTab" class="mt-4">
<div class="flex gap-4 min-h-[480px]"> <div class="rounded-lg border bg-card">
<!-- 环境列表 --> <!-- 工具栏 -->
<div class="w-52 shrink-0 border rounded-lg p-3 h-fit"> <div class="flex items-center justify-between px-4 py-3 border-b bg-muted/30">
<div class="flex items-center justify-between mb-2"> <div class="flex items-center gap-2">
<span class="text-sm font-medium">虚拟环境</span> <Badge variant="secondary">{{ filteredDeps.length }} 个包</Badge>
<Button variant="ghost" size="icon" class="h-6 w-6" @click="openCreateDialog">
<Plus class="h-3.5 w-3.5" />
</Button>
</div> </div>
<div class="space-y-0.5 min-h-[60px]"> <div class="flex items-center gap-2">
<div v-if="loading" class="text-sm text-muted-foreground text-center py-3"> <div class="relative">
<Loader2 class="h-4 w-4 animate-spin mx-auto" /> <Search class="absolute left-2.5 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground" />
</div> <Input v-model="searchQuery" placeholder="搜索包名..." class="h-9 pl-8 w-48 text-sm" />
<div
v-else
v-for="env in envs"
:key="env.name"
:class="[
'group flex items-center justify-between px-2 py-1.5 rounded cursor-pointer text-sm',
selectedEnv?.name === env.name ? 'bg-accent text-accent-foreground' : 'hover:bg-muted'
]"
@click="selectEnv(env)"
>
<span class="truncate text-xs">{{ env.name }}</span>
<Button
v-if="env.name !== 'base'"
variant="ghost"
size="icon"
class="h-5 w-5 shrink-0 opacity-0 group-hover:opacity-100"
@click.stop="confirmDeleteEnv(env)"
>
<Trash2 class="h-3 w-3 text-destructive" />
</Button>
</div> </div>
<Button variant="outline" size="icon" class="h-9 w-9" @click="loadDeps" :disabled="loading">
<RefreshCw class="h-4 w-4" :class="{ 'animate-spin': loading }" />
</Button>
<Button size="sm" class="h-9" @click="openInstallDialog">
<Download class="h-4 w-4 mr-1.5" /> 安装
</Button>
</div> </div>
</div> </div>
<!-- 包列 --> <!-- -->
<div class="flex-1 border rounded-lg flex flex-col h-[480px]"> <div class="flex items-center gap-4 px-4 py-2 border-b bg-muted/50 text-sm text-muted-foreground font-medium">
<div class="flex items-center justify-between px-3 py-2 border-b bg-muted/30 shrink-0"> <span class="flex-1">包名</span>
<div class="flex items-center gap-2"> <span class="w-32">版本</span>
<span class="text-sm font-medium">{{ selectedEnv?.name || '选择环境' }}</span> <span class="w-48">备注</span>
<Badge v-if="selectedEnv" variant="secondary" class="text-xs">{{ packages.length }} </Badge> <span class="w-20 text-center">操作</span>
</div> </div>
<div class="flex items-center gap-1.5">
<div class="relative"> <!-- 列表 -->
<Search class="absolute left-2 top-1/2 -translate-y-1/2 h-3.5 w-3.5 text-muted-foreground" /> <div class="divide-y max-h-[480px] overflow-y-auto">
<Input v-model="packageSearch" placeholder="搜索..." class="h-7 pl-7 w-36 text-xs" /> <div v-if="loading" class="text-center py-8 text-muted-foreground">
</div> <Loader2 class="h-5 w-5 animate-spin mx-auto mb-2" />
<Button variant="ghost" size="icon" class="h-7 w-7" @click="loadPackages" :disabled="!selectedEnv"> 加载中...
<RefreshCw class="h-3.5 w-3.5" />
</Button>
<Button size="sm" class="h-7 text-xs" @click="openInstallDialog" :disabled="!selectedEnv">
<Plus class="h-3.5 w-3.5 mr-1" /> 安装
</Button>
</div>
</div> </div>
<div class="flex-1 overflow-y-auto"> <div v-else-if="filteredDeps.length === 0" class="text-center py-8 text-muted-foreground">
<div v-if="!selectedEnv" class="text-center py-8 text-muted-foreground text-sm"> <Package class="h-8 w-8 mx-auto mb-2 opacity-50" />
请选择一个环境 {{ searchQuery ? '无匹配结果' : '暂无依赖包' }}
</div> </div>
<div v-else-if="packagesLoading" class="text-center py-8"> <div
<Loader2 class="h-5 w-5 animate-spin mx-auto text-muted-foreground" /> v-else
</div> v-for="dep in filteredDeps"
<div v-else-if="filteredPackages.length === 0" class="text-center py-8 text-muted-foreground text-sm"> :key="dep.id"
{{ packageSearch ? '无匹配结果' : '暂无包' }} class="flex items-center gap-4 px-4 py-2 hover:bg-muted/50 transition-colors"
</div> >
<table v-else class="w-full text-sm"> <span class="flex-1 font-mono text-sm">{{ dep.name }}</span>
<thead class="bg-muted/50 sticky top-0"> <span class="w-32 text-sm text-muted-foreground">{{ dep.version || '-' }}</span>
<tr class="text-xs text-muted-foreground"> <span class="w-48 text-sm text-muted-foreground truncate" :title="dep.remark">{{ dep.remark || '-' }}</span>
<th class="text-left px-3 py-1.5 font-medium">包名</th> <span class="w-20 flex justify-center">
<th class="text-left px-3 py-1.5 font-medium">版本</th> <Button variant="ghost" size="icon" class="h-7 w-7 text-destructive" @click="confirmDelete(dep)">
<th class="text-left px-3 py-1.5 font-medium">来源</th> <Trash2 class="h-4 w-4" />
<th class="text-center px-3 py-1.5 font-medium w-16">操作</th> </Button>
</tr> </span>
</thead>
<tbody class="divide-y">
<tr v-for="pkg in filteredPackages" :key="pkg.name" class="hover:bg-muted/50">
<td class="px-3 py-1.5 text-xs font-mono">{{ pkg.name }}</td>
<td class="px-3 py-1.5 text-xs text-muted-foreground">{{ pkg.version }}</td>
<td class="px-3 py-1.5 text-xs text-muted-foreground">{{ pkg.channel || '-' }}</td>
<td class="px-3 py-1.5 text-center">
<Button variant="ghost" size="icon" class="h-6 w-6 text-destructive" @click="uninstallPackage(pkg)">
<Trash2 class="h-3 w-3" />
</Button>
</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
</div> </div>
</TabsContent> </TabsContent>
</Tabs> </Tabs>
<!-- 创建环境对话框 --> <!-- 安装对话框 -->
<Dialog v-model:open="showCreateDialog">
<DialogContent class="sm:max-w-[380px]">
<DialogHeader>
<DialogTitle>创建虚拟环境</DialogTitle>
</DialogHeader>
<div class="grid gap-3 py-3">
<div class="grid grid-cols-4 items-center gap-3">
<Label class="text-right text-sm">环境名称</Label>
<Input v-model="newEnvName" placeholder="myenv" class="col-span-3 h-8" />
</div>
<div class="grid grid-cols-4 items-center gap-3">
<Label class="text-right text-sm">Python</Label>
<Input v-model="newEnvVersion" placeholder="3.10 (可选)" class="col-span-3 h-8" />
</div>
</div>
<DialogFooter>
<Button variant="outline" size="sm" @click="showCreateDialog = false">取消</Button>
<Button size="sm" @click="createEnv" :disabled="creating">
<Loader2 v-if="creating" class="h-3.5 w-3.5 mr-1.5 animate-spin" />
创建
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
<!-- 删除环境确认 -->
<AlertDialog v-model:open="showDeleteDialog">
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>确认删除</AlertDialogTitle>
<AlertDialogDescription>
确定要删除环境 "{{ envToDelete?.name }}" 此操作无法撤销
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>取消</AlertDialogCancel>
<AlertDialogAction class="bg-destructive text-white hover:bg-destructive/90" @click="deleteEnv">删除</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
<!-- 安装包对话框 -->
<Dialog v-model:open="showInstallDialog"> <Dialog v-model:open="showInstallDialog">
<DialogContent class="sm:max-w-[380px]"> <DialogContent class="sm:max-w-[400px]">
<DialogHeader> <DialogHeader>
<DialogTitle>安装包</DialogTitle> <DialogTitle>安装 {{ getTypeLabel(activeTab) }} </DialogTitle>
</DialogHeader> </DialogHeader>
<div class="grid gap-3 py-3"> <div class="grid gap-4 py-4">
<div class="grid grid-cols-4 items-center gap-3"> <div class="grid grid-cols-4 items-center gap-4">
<Label class="text-right text-sm">包名</Label> <Label class="text-right">包名</Label>
<Input v-model="packageToInstall" placeholder="numpy" class="col-span-3 h-8" /> <Input v-model="newPkgName" :placeholder="activeTab === 'py' ? 'requests' : 'lodash'" class="col-span-3" />
</div>
<div class="grid grid-cols-4 items-center gap-4">
<Label class="text-right">版本</Label>
<Input v-model="newPkgVersion" placeholder="可选,如 1.0.0" class="col-span-3" />
</div> </div>
<p class="text-xs text-muted-foreground ml-auto col-span-4">
支持版本指定: numpy==1.24.0
</p>
</div> </div>
<DialogFooter> <DialogFooter>
<Button variant="outline" size="sm" @click="showInstallDialog = false">取消</Button> <Button variant="outline" @click="showInstallDialog = false">取消</Button>
<Button size="sm" @click="installPackage" :disabled="installing"> <Button @click="installPackage" :disabled="installing">
<Loader2 v-if="installing" class="h-3.5 w-3.5 mr-1.5 animate-spin" /> <Loader2 v-if="installing" class="h-4 w-4 mr-2 animate-spin" />
安装 安装
</Button> </Button>
</DialogFooter> </DialogFooter>
</DialogContent> </DialogContent>
</Dialog> </Dialog>
<!-- 卸载确认 -->
<AlertDialog v-model:open="showDeleteDialog">
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>确认卸载</AlertDialogTitle>
<AlertDialogDescription>
确定要卸载 "{{ depToDelete?.name }}"
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>取消</AlertDialogCancel>
<AlertDialogAction class="bg-destructive text-white hover:bg-destructive/90" @click="uninstallPackage">
卸载
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
</div> </div>
</template> </template>