merge v4.2.4

api/service/crawler/service.go

@@ -24,15 +24,15 @@ func NewService() (*Service, error) {
 	// 启动浏览器
 	path, _ := launcher.LookPath()
 	u := launcher.New().Bin(path).
-		Headless(true).                   // 无头模式
-		Set("disable-web-security", "").  // 禁用网络安全限制
-		Set("disable-gpu", "").           // 禁用 GPU 加速
-		Set("no-sandbox", "").            // 禁用沙箱模式
-		Set("disable-setuid-sandbox", "").// 禁用 setuid 沙箱
+		Headless(true).                    // 无头模式
+		Set("disable-web-security", "").   // 禁用网络安全限制
+		Set("disable-gpu", "").            // 禁用 GPU 加速
+		Set("no-sandbox", "").             // 禁用沙箱模式
+		Set("disable-setuid-sandbox", ""). // 禁用 setuid 沙箱
 		MustLaunch()
 
 	browser := rod.New().ControlURL(u).MustConnect()
-	
+
 	return &Service{
 		browser: browser,
 	}, nil
@@ -50,7 +50,7 @@ func (s *Service) WebSearch(keyword string, maxPages int) ([]SearchResult, error
 	if keyword == "" {
 		return nil, errors.New("搜索关键词不能为空")
 	}
-	
+
 	if maxPages <= 0 {
 		maxPages = 1
 	}
@@ -59,18 +59,18 @@ func (s *Service) WebSearch(keyword string, maxPages int) ([]SearchResult, error
 	}
 
 	results := make([]SearchResult, 0)
-	
+
 	// 使用百度搜索
 	searchURL := fmt.Sprintf("https://www.baidu.com/s?wd=%s", url.QueryEscape(keyword))
-	
+
 	// 设置页面超时
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
-	
+
 	// 创建页面
 	page := s.browser.MustPage()
 	defer page.MustClose()
-	
+
 	// 设置视口大小
 	err := page.SetViewport(&proto.EmulationSetDeviceMetricsOverride{
 		Width:  1280,
@@ -79,19 +79,19 @@ func (s *Service) WebSearch(keyword string, maxPages int) ([]SearchResult, error
 	if err != nil {
 		return nil, fmt.Errorf("设置视口失败: %v", err)
 	}
-	
+
 	// 导航到搜索页面
 	err = page.Context(ctx).Navigate(searchURL)
 	if err != nil {
 		return nil, fmt.Errorf("导航到搜索页面失败: %v", err)
 	}
-	
+
 	// 等待搜索结果加载完成
 	err = page.WaitLoad()
 	if err != nil {
 		return nil, fmt.Errorf("等待页面加载完成失败: %v", err)
 	}
-	
+
 	// 分析当前页面的搜索结果
 	for i := 0; i < maxPages; i++ {
 		if i > 0 {
@@ -100,52 +100,52 @@ func (s *Service) WebSearch(keyword string, maxPages int) ([]SearchResult, error
 			if err != nil || nextPage == nil {
 				break // 没有下一页
 			}
-			
+
 			err = nextPage.Click(proto.InputMouseButtonLeft, 1)
 			if err != nil {
 				break // 点击下一页失败
 			}
-			
+
 			// 等待新页面加载
 			err = page.WaitLoad()
 			if err != nil {
 				break
 			}
 		}
-		
+
 		// 提取搜索结果
 		resultElements, err := page.Elements(".result, .c-container")
 		if err != nil || resultElements == nil {
 			continue
 		}
-		
+
 		for _, result := range resultElements {
 			// 获取标题
 			titleElement, err := result.Element("h3, .t")
 			if err != nil || titleElement == nil {
 				continue
 			}
-			
+
 			title, err := titleElement.Text()
 			if err != nil {
 				continue
 			}
-			
+
 			// 获取 URL
 			linkElement, err := titleElement.Element("a")
 			if err != nil || linkElement == nil {
 				continue
 			}
-			
+
 			href, err := linkElement.Attribute("href")
 			if err != nil || href == nil {
 				continue
 			}
-			
+
 			// 获取内容摘要 - 尝试多个可能的选择器
 			var contentElement *rod.Element
 			var content string
-			
+
 			// 尝试多个可能的选择器来适应不同版本的百度搜索结果
 			selectors := []string{".content-right_8Zs40", ".c-abstract", ".content_LJ0WN", ".content"}
 			for _, selector := range selectors {
@@ -157,7 +157,7 @@ func (s *Service) WebSearch(keyword string, maxPages int) ([]SearchResult, error
 					}
 				}
 			}
-			
+
 			// 如果所有选择器都失败，尝试直接从结果块中提取文本
 			if content == "" {
 				// 获取结果元素的所有文本
@@ -173,21 +173,21 @@ func (s *Service) WebSearch(keyword string, maxPages int) ([]SearchResult, error
 					}
 				}
 			}
-			
+
 			// 添加到结果集
 			results = append(results, SearchResult{
 				Title:   title,
 				URL:     *href,
 				Content: content,
 			})
-			
+
 			// 限制结果数量，每页最多 10 条
 			if len(results) >= 10*maxPages {
 				break
 			}
 		}
 	}
-	
+
 	// 获取真实 URL（百度搜索结果中的 URL 是短链接，需要跳转获取真实 URL）
 	for i, result := range results {
 		realURL, err := s.getRedirectURL(result.URL)
@@ -195,7 +195,7 @@ func (s *Service) WebSearch(keyword string, maxPages int) ([]SearchResult, error
 			results[i].URL = realURL
 		}
 	}
-	
+
 	return results, nil
 }
 
@@ -209,22 +209,22 @@ func (s *Service) getRedirectURL(shortURL string) (string, error) {
 	defer func() {
 		_ = page.Close()
 	}()
-	
+
 	// 导航到短链接
 	err = page.Navigate(shortURL)
 	if err != nil {
 		return shortURL, err // 返回原始URL
 	}
-	
+
 	// 等待重定向完成
 	time.Sleep(2 * time.Second)
-	
+
 	// 获取当前 URL
 	info, err := page.Info()
 	if err != nil {
 		return shortURL, err // 返回原始URL
 	}
-	
+
 	return info.URL, nil
 }
 
@@ -247,21 +247,21 @@ func SearchWeb(keyword string, maxPages int) (string, error) {
 			log.Errorf("爬虫服务崩溃: %v", r)
 		}
 	}()
-	
+
 	service, err := NewService()
 	if err != nil {
 		return "", fmt.Errorf("创建爬虫服务失败: %v", err)
 	}
 	defer service.Close()
-	
+
 	// 设置超时上下文
 	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
 	defer cancel()
-	
+
 	// 使用goroutine和通道来处理超时
 	resultChan := make(chan []SearchResult, 1)
 	errChan := make(chan error, 1)
-	
+
 	go func() {
 		results, err := service.WebSearch(keyword, maxPages)
 		if err != nil {
@@ -270,7 +270,7 @@ func SearchWeb(keyword string, maxPages int) (string, error) {
 		}
 		resultChan <- results
 	}()
-	
+
 	// 等待结果或超时
 	select {
 	case <-ctx.Done():
@@ -281,32 +281,32 @@ func SearchWeb(keyword string, maxPages int) (string, error) {
 		if len(results) == 0 {
 			return "未找到关于 \"" + keyword + "\" 的相关搜索结果", nil
 		}
-		
+
 		// 格式化结果
 		var builder strings.Builder
 		builder.WriteString(fmt.Sprintf("为您找到关于 \"%s\" 的 %d 条搜索结果：\n\n", keyword, len(results)))
-		
+
 		for i, result := range results {
 			// // 尝试打开链接获取实际内容
 			// page := service.browser.MustPage()
 			// defer page.MustClose()
-			
+
 			// // 设置页面超时
 			// pageCtx, pageCancel := context.WithTimeout(context.Background(), 10*time.Second)
 			// defer pageCancel()
-			
+
 			// // 导航到目标页面
 			// err := page.Context(pageCtx).Navigate(result.URL)
 			// if err == nil {
 			// 	// 等待页面加载
 			// 	_ = page.WaitLoad()
-				
+
 			// 	// 获取页面标题
 			// 	title, err := page.Eval("() => document.title")
 			// 	if err == nil && title.Value.String() != "" {
 			// 		result.Title = title.Value.String()
 			// 	}
-				
+
 			// 	// 获取页面主要内容
 			// 	if content, err := page.Element("body"); err == nil {
 			// 		if text, err := content.Text(); err == nil {
@@ -315,11 +315,11 @@ func SearchWeb(keyword string, maxPages int) (string, error) {
 			// 			if len(text) > 200 {
 			// 				text = text[:200] + "..."
 			// 			}
-			// 			result.Content = text
+			// 			result.Prompt = text
 			// 		}
 			// 	}
 			// }
-			
+
 			builder.WriteString(fmt.Sprintf("%d. **%s**\n", i+1, result.Title))
 			builder.WriteString(fmt.Sprintf("   链接: %s\n", result.URL))
 			if result.Content != "" {
@@ -327,7 +327,7 @@ func SearchWeb(keyword string, maxPages int) (string, error) {
 			}
 			builder.WriteString("\n")
 		}
-		
+
 		return builder.String(), nil
 	}
-} 
+}

api/service/dalle/service.go

@@ -16,7 +16,6 @@ import (
 	"geekai/store"
 	"geekai/store/model"
 	"geekai/utils"
-	"io"
 	"time"
 
 	"github.com/go-redis/redis/v8"
@@ -182,9 +181,6 @@ func (s *Service) Image(task types.DallTask, sync bool) (string, error) {
 		return "", fmt.Errorf("error with send request, status: %s, %+v", r.Status, errRes.Error)
 	}
 
-	all, _ := io.ReadAll(r.Body)
-	logger.Debugf("response: %+v", string(all))
-
 	// update the api key last use time
 	s.db.Model(&apiKey).UpdateColumn("last_used_at", time.Now().Unix())
 	var imgURL string

api/service/suno/service.go

@@ -94,6 +94,8 @@ func (s *Service) Run() {
 				continue
 			}
 
+			logger.Infof("任务提交成功: %+v", r)
+
 			// 更新任务信息
 			s.db.Model(&model.SunoJob{Id: task.Id}).UpdateColumns(map[string]interface{}{
 				"task_id": r.Data,
@@ -127,6 +129,7 @@ func (s *Service) Create(task types.SunoTask) (RespVo, error) {
 		"continue_clip_id":  task.RefSongId,
 		"continue_at":       task.ExtendSecs,
 		"make_instrumental": task.Instrumental,
+		"mv":                task.Model,
 	}
 	// 灵感模式
 	if task.Type == 1 {
@@ -134,7 +137,6 @@ func (s *Service) Create(task types.SunoTask) (RespVo, error) {
 	} else { // 自定义模式
 		reqBody["prompt"] = task.Lyrics
 		reqBody["tags"] = task.Tags
-		reqBody["mv"] = task.Model
 		reqBody["title"] = task.Title
 	}
 

api/service/types.go

@@ -113,7 +113,7 @@ Please remember, the final output must be the same language with user’s input.
    - What kinds of examples may need to be included, how many, and whether they are complex enough to benefit from placeholders.
 - Clarity and Conciseness: Use clear, specific language. Avoid unnecessary instructions or bland statements.
 - Formatting: Use markdown features for readability. DO NOT USE  CODE BLOCKS UNLESS SPECIFICALLY REQUESTED.
-- Preserve User Content: If the input task or prompt includes extensive guidelines or examples, preserve them entirely, or as closely as possible. If they are vague, consider breaking down into sub-steps. Keep any details, guidelines, examples, variables, or placeholders provided by the user.
+- Preserve User Prompt: If the input task or prompt includes extensive guidelines or examples, preserve them entirely, or as closely as possible. If they are vague, consider breaking down into sub-steps. Keep any details, guidelines, examples, variables, or placeholders provided by the user.
 - Constants: DO include constants in the prompt, as they are not susceptible to prompt injection. Such as guides, rubrics, and examples.
 - Output Format: Explicitly the most appropriate output format, in detail. This should include length and syntax (e.g. short sentence, paragraph, JSON, etc.)
 - For tasks outputting well-defined or structured data (classification, JSON, etc.) bias toward outputting a JSON.

api/service/ws_service.go

@@ -1,13 +0,0 @@
-package service
-
-import "geekai/core/types"
-
-type WebsocketService struct {
-	Clients *types.LMap[string, *types.WsClient] // clientId => Client
-}
-
-func NewWebsocketService() *WebsocketService {
-	return &WebsocketService{
-		Clients: types.NewLMap[string, *types.WsClient](),
-	}
-}