Merge pull request #5163 from Pollo3470/feat/ai-proxy

- google在检测到配置代理时，使用gemini openai兼容API

app/agent/__init__.py

@@ -73,15 +73,29 @@ class MoviePilotAgent:
             raise ValueError("未配置 LLM_API_KEY")
 
         if provider == "google":
-            from langchain_google_genai import ChatGoogleGenerativeAI
-            return ChatGoogleGenerativeAI(
-                model=settings.LLM_MODEL,
-                google_api_key=api_key,
-                max_retries=3,
-                temperature=settings.LLM_TEMPERATURE,
-                streaming=True,
-                callbacks=[self.callback_handler]
-            )
+            if settings.PROXY_HOST:
+                from langchain_openai import ChatOpenAI
+                return ChatOpenAI(
+                    model=settings.LLM_MODEL,
+                    api_key=api_key,
+                    max_retries=3,
+                    base_url="https://generativelanguage.googleapis.com/v1beta/openai",
+                    temperature=settings.LLM_TEMPERATURE,
+                    streaming=True,
+                    callbacks=[self.callback_handler],
+                    stream_usage=True,
+                    openai_proxy=settings.PROXY_HOST
+                )
+            else:
+                from langchain_google_genai import ChatGoogleGenerativeAI
+                return ChatGoogleGenerativeAI(
+                    model=settings.LLM_MODEL,
+                    google_api_key=api_key,
+                    max_retries=3,
+                    temperature=settings.LLM_TEMPERATURE,
+                    streaming=True,
+                    callbacks=[self.callback_handler]
+                )
         elif provider == "deepseek":
             from langchain_deepseek import ChatDeepSeek
             return ChatDeepSeek(
@@ -103,7 +117,8 @@ class MoviePilotAgent:
                 temperature=settings.LLM_TEMPERATURE,
                 streaming=True,
                 callbacks=[self.callback_handler],
-                stream_usage=True
+                stream_usage=True,
+                openai_proxy=settings.PROXY_HOST
             )
 
     def _initialize_tools(self) -> List:

app/agent/tools/factory.py

@@ -25,6 +25,7 @@ from app.agent.tools.impl.recognize_media import RecognizeMediaTool
 from app.agent.tools.impl.scrape_metadata import ScrapeMetadataTool
 from app.agent.tools.impl.query_episode_schedule import QueryEpisodeScheduleTool
 from app.agent.tools.impl.search_torrents import SearchTorrentsTool
+from app.agent.tools.impl.search_web import SearchWebTool
 from app.agent.tools.impl.send_message import SendMessageTool
 from app.agent.tools.impl.query_schedulers import QuerySchedulersTool
 from app.agent.tools.impl.run_scheduler import RunSchedulerTool
@@ -59,6 +60,7 @@ class MoviePilotToolFactory:
             UpdateSubscribeTool,
             SearchSubscribeTool,
             SearchTorrentsTool,
+            SearchWebTool,
             AddDownloadTool,
             QuerySubscribesTool,
             QuerySubscribeSharesTool,

app/agent/tools/impl/search_web.py

@@ -0,0 +1,191 @@
+"""搜索网络内容工具"""
+
+import json
+import re
+from typing import Optional, Type
+
+from pydantic import BaseModel, Field
+
+from app.agent.tools.base import MoviePilotTool
+from app.core.config import settings
+from app.log import logger
+from app.utils.http import AsyncRequestUtils
+
+
+class SearchWebInput(BaseModel):
+    """搜索网络内容工具的输入参数模型"""
+    explanation: str = Field(..., description="Clear explanation of why this tool is being used in the current context")
+    query: str = Field(..., description="The search query string to search for on the web")
+    max_results: Optional[int] = Field(5, description="Maximum number of search results to return (default: 5, max: 10)")
+
+
+class SearchWebTool(MoviePilotTool):
+    name: str = "search_web"
+    description: str = "Search the web for information when you need to find current information, facts, or references that you're uncertain about. Returns search results with titles, snippets, and URLs. Use this tool to get up-to-date information from the internet."
+    args_schema: Type[BaseModel] = SearchWebInput
+
+    def get_tool_message(self, **kwargs) -> Optional[str]:
+        """根据搜索参数生成友好的提示消息"""
+        query = kwargs.get("query", "")
+        max_results = kwargs.get("max_results", 5)
+        return f"正在搜索网络内容: {query} (最多返回 {max_results} 条结果)"
+
+    async def run(self, query: str, max_results: Optional[int] = 5, **kwargs) -> str:
+        """
+        执行网络搜索
+        
+        Args:
+            query: 搜索查询字符串
+            max_results: 最大返回结果数（默认5，最大10）
+            
+        Returns:
+            格式化的搜索结果JSON字符串
+        """
+        logger.info(f"执行工具: {self.name}, 参数: query={query}, max_results={max_results}")
+
+        try:
+            # 限制最大结果数
+            max_results = min(max(1, max_results or 5), 10)
+            
+            # 使用DuckDuckGo API进行搜索
+            search_results = await self._search_duckduckgo_api(query, max_results)
+            
+            if not search_results:
+                return f"未找到与 '{query}' 相关的搜索结果"
+            
+            # 裁剪结果以避免占用过多上下文
+            formatted_results = self._format_and_truncate_results(search_results, max_results)
+            
+            result_json = json.dumps(formatted_results, ensure_ascii=False, indent=2)
+            return result_json
+            
+        except Exception as e:
+            error_message = f"搜索网络内容失败: {str(e)}"
+            logger.error(f"搜索网络内容失败: {e}", exc_info=True)
+            return error_message
+
+    async def _search_duckduckgo_api(self, query: str, max_results: int) -> list:
+        """
+        使用DuckDuckGo API进行搜索
+        
+        Args:
+            query: 搜索查询
+            max_results: 最大结果数
+            
+        Returns:
+            搜索结果列表
+        """
+        try:
+            # DuckDuckGo Instant Answer API
+            api_url = "https://api.duckduckgo.com/"
+            params = {
+                "q": query,
+                "format": "json",
+                "no_html": "1",
+                "skip_disambig": "1"
+            }
+            
+            # 使用代理（如果配置了）
+            http_utils = AsyncRequestUtils(
+                proxies=settings.PROXY,
+                timeout=10
+            )
+            
+            data = await http_utils.get_json(api_url, params=params)
+            
+            results = []
+            
+            if data:
+                # 处理AbstractText（摘要）
+                if data.get("AbstractText"):
+                    results.append({
+                        "title": data.get("Heading", query),
+                        "snippet": data.get("AbstractText", ""),
+                        "url": data.get("AbstractURL", ""),
+                        "source": "DuckDuckGo Abstract"
+                    })
+                
+                # 处理RelatedTopics（相关主题）
+                related_topics = data.get("RelatedTopics", [])
+                for topic in related_topics[:max_results - len(results)]:
+                    if isinstance(topic, dict):
+                        text = topic.get("Text", "")
+                        first_url = topic.get("FirstURL", "")
+                        if text and first_url:
+                            # 提取标题（通常在" - "之前）
+                            title = text.split(" - ")[0] if " - " in text else text[:100]
+                            snippet = text
+                            
+                            results.append({
+                                "title": title.strip(),
+                                "snippet": snippet,
+                                "url": first_url,
+                                "source": "DuckDuckGo Related"
+                            })
+                
+                # 处理Results（搜索结果）
+                api_results = data.get("Results", [])
+                for result in api_results[:max_results - len(results)]:
+                    if isinstance(result, dict):
+                        title = result.get("Text", "")
+                        url = result.get("FirstURL", "")
+                        if title and url:
+                            results.append({
+                                "title": title,
+                                "snippet": result.get("Text", ""),
+                                "url": url,
+                                "source": "DuckDuckGo Results"
+                            })
+            
+            return results[:max_results]
+            
+        except Exception as e:
+            logger.warning(f"DuckDuckGo API搜索失败: {e}")
+            return []
+
+    def _format_and_truncate_results(self, results: list, max_results: int) -> dict:
+        """
+        格式化并裁剪搜索结果以避免占用过多上下文
+        
+        Args:
+            results: 原始搜索结果列表
+            max_results: 最大结果数
+            
+        Returns:
+            格式化后的结果字典
+        """
+        formatted = {
+            "total_results": len(results),
+            "results": []
+        }
+        
+        # 限制结果数量
+        limited_results = results[:max_results]
+        
+        for idx, result in enumerate(limited_results, 1):
+            title = result.get("title", "")[:200]  # 限制标题长度
+            snippet = result.get("snippet", "")
+            url = result.get("url", "")
+            source = result.get("source", "Unknown")
+            
+            # 裁剪摘要，避免过长
+            max_snippet_length = 300  # 每个摘要最多300字符
+            if len(snippet) > max_snippet_length:
+                snippet = snippet[:max_snippet_length] + "..."
+            
+            # 清理文本，移除多余的空白字符
+            snippet = re.sub(r'\s+', ' ', snippet).strip()
+            
+            formatted["results"].append({
+                "rank": idx,
+                "title": title,
+                "snippet": snippet,
+                "url": url,
+                "source": source
+            })
+        
+        # 添加提示信息
+        if len(results) > max_results:
+            formatted["note"] = f"注意：共找到 {len(results)} 条结果，为节省上下文空间，仅显示前 {max_results} 条结果。"
+        
+        return formatted

app/api/endpoints/download.py

@@ -66,7 +66,6 @@ def add(
         torrent_in: schemas.TorrentInfo,
         tmdbid: Annotated[int | None, Body()] = None,
         doubanid: Annotated[str | None, Body()] = None,
-        bangumiid: Annotated[int | None, Body()] = None,
         downloader: Annotated[str | None, Body()] = None,
         save_path: Annotated[str | None, Body()] = None,
         current_user: User = Depends(get_current_active_user)) -> Any:
@@ -76,7 +75,7 @@ def add(
     # 元数据
     metainfo = MetaInfo(title=torrent_in.title, subtitle=torrent_in.description)
     # 媒体信息
-    mediainfo = MediaChain().recognize_media(meta=metainfo, tmdbid=tmdbid, doubanid=doubanid, bangumiid=bangumiid)
+    mediainfo = MediaChain().recognize_media(meta=metainfo, tmdbid=tmdbid, doubanid=doubanid)
     if not mediainfo:
         return schemas.Response(success=False, message="无法识别媒体信息")
     # 种子信息

app/api/endpoints/system.py

@@ -44,6 +44,7 @@ from app.utils.http import RequestUtils, AsyncRequestUtils
 from app.utils.security import SecurityUtils
 from app.utils.url import UrlUtils
 from version import APP_VERSION
+from app.helper.llm import LLMHelper
 
 router = APIRouter()
 
@@ -338,6 +339,18 @@ async def set_setting(
         return schemas.Response(success=False, message=f"配置项 '{key}' 不存在")
 
 
+@router.get("/llm-models", summary="获取LLM模型列表", response_model=schemas.Response)
+async def get_llm_models(provider: str, api_key: str, base_url: Optional[str] = None, _: User = Depends(get_current_active_user_async)):
+    """
+    获取LLM模型列表
+    """
+    try:
+        models = LLMHelper().get_models(provider, api_key, base_url)
+        return schemas.Response(success=True, data=models)
+    except Exception as e:
+        return schemas.Response(success=False, message=str(e))
+
+
 @router.get("/message", summary="实时消息")
 async def get_message(request: Request, role: Optional[str] = "system",
                       _: schemas.TokenPayload = Depends(verify_resource_token)):

app/helper/llm.py

@@ -0,0 +1,44 @@
+"""LLM模型相关辅助功能"""
+from typing import List
+
+from app.log import logger
+
+
+class LLMHelper:
+    """LLM模型相关辅助功能"""
+
+    def get_models(self, provider: str, api_key: str, base_url: str = None) -> List[str]:
+        """获取模型列表"""
+        logger.info(f"获取 {provider} 模型列表...")
+        if provider == "google":
+            return self._get_google_models(api_key)
+        else:
+            return self._get_openai_compatible_models(provider, api_key, base_url)
+
+    @staticmethod
+    def _get_google_models(api_key: str) -> List[str]:
+        """获取Google模型列表"""
+        try:
+            import google.generativeai as genai
+            genai.configure(api_key=api_key)
+            models = genai.list_models()
+            return [m.name for m in models if 'generateContent' in m.supported_generation_methods]
+        except Exception as e:
+            logger.error(f"获取Google模型列表失败：{e}")
+            raise e
+
+    @staticmethod
+    def _get_openai_compatible_models(provider: str, api_key: str, base_url: str = None) -> List[str]:
+        """获取OpenAI兼容模型列表"""
+        try:
+            from openai import OpenAI
+
+            if provider == "deepseek":
+                base_url = base_url or "https://api.deepseek.com"
+
+            client = OpenAI(api_key=api_key, base_url=base_url)
+            models = client.models.list()
+            return [model.id for model in models.data]
+        except Exception as e:
+            logger.error(f"获取 {provider} 模型列表失败：{e}")
+            raise e

app/modules/wechat/wechat.py

@@ -169,8 +169,8 @@ class WeChat:
         :param link: 跳转链接
         :return: 发送状态，错误信息
         """
-        if not title:
-            logger.error("消息标题不能为空")
+        if not title and not text:
+            logger.error("消息标题和内容不能都为空")
             return False
         if text:
             formatted_text = text.replace("\n\n", "\n")

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "MoviePilot",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}

version.py

@@ -1,2 +1,2 @@
-APP_VERSION = 'v2.8.4-1'
-FRONTEND_VERSION = 'v2.8.3'
+APP_VERSION = 'v2.8.5'
+FRONTEND_VERSION = 'v2.8.5'