botrun-flow-lang 5.10.32__tar.gz → 5.10.83__tar.gz

{botrun_flow_lang-5.10.32 → botrun_flow_lang-5.10.83}/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [5.10.82]
+### Updated
+- claude 原本使用 4 的模型都改成 4.5
+- botrun-hatch 升級
+
+## [5.10.32]
+### Updated
+- 修正 default_mcp 要回傳給使用者 URL 的 prompt，拿掉負面表述，加入 one shot
+- claude openrouter 預設模型改為 anthropic/claude-sonnet-4.5
+
 ## [5.9.301]
 ### Updated
 - 修正 default_mcp 要回傳給使用者 URL 的 prompt，讓語氣更明確，並直接提供 markdown 格式

{botrun_flow_lang-5.10.32 → botrun_flow_lang-5.10.83}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: botrun-flow-lang
-Version: 5.10.32
+Version: 5.10.83
 Summary: A flow language for botrun
 Author-email: sebastian-hsu <sebastian.hsu@gmail.com>
 License: MIT
@@ -13,7 +13,7 @@ Requires-Python: <3.13,>=3.11
 Requires-Dist: aiohttp>=3.10.8
 Requires-Dist: anthropic>=0.61.0
 Requires-Dist: boto3>=1.40.3
-Requires-Dist: botrun-hatch>=5.6.101
+Requires-Dist: botrun-hatch>=5.10.82
 Requires-Dist: botrun-log>=0.3.0
 Requires-Dist: cachetools>=5.5.2
 Requires-Dist: chardet>=5.2.0
@@ -23,7 +23,7 @@ Requires-Dist: google-auth>=2.40.3
 Requires-Dist: google-cloud-discoveryengine>=0.13.3
 Requires-Dist: google-cloud-firestore>=2.21.0
 Requires-Dist: google-cloud-logging>=3.11.4
-Requires-Dist: google-cloud-storage>=3.2.0
+Requires-Dist: google-cloud-storage<3,>=2.18
 Requires-Dist: google-genai>=1.28.0
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: langchain-anthropic>=0.3.10
@@ -32,6 +32,7 @@ Requires-Dist: langchain-community>=0.3.27
 Requires-Dist: langchain-core>=0.3.72
 Requires-Dist: langchain-google-community>=2.0.3
 Requires-Dist: langchain-google-genai>=2.0.9
+Requires-Dist: langchain-google-vertexai<3.0.0,>=2.1.2
 Requires-Dist: langchain-mcp-adapters>=0.1.7
 Requires-Dist: langchain-openai>=0.3.28
 Requires-Dist: langchain>=0.3.27

{botrun_flow_lang-5.10.32 → botrun_flow_lang-5.10.83}/botrun_flow_lang/api/model_api.py

@@ -155,8 +155,8 @@ DEFAULT_SUPPORTED_MODELS = [
         provider="gemini",
     ),
     ModelInfo(
-        display_name="claude-sonnet-4-20250514",
-        model_name="claude-sonnet-4-20250514",
+        display_name="claude-sonnet-4-5-20250929",
+        model_name="claude-sonnet-4-5-20250929",
         provider="anthropic",
     ),
     ModelInfo(
@@ -251,7 +251,7 @@ DEFAULT_SUPPORTED_MODELS = [
 
 # 定義支援 agent 的 LLM models
 DEFAULT_AGENT_MODELS = [
-    "claude-sonnet-4-20250514",
+    "claude-sonnet-4-5-20250929",
     "gemini-2.5-pro",
     "gemini-2.5-flash",
 ]

{botrun_flow_lang-5.10.32 → botrun_flow_lang-5.10.83}/botrun_flow_lang/langgraph_agents/agents/langgraph_react_agent.py

@@ -83,6 +83,11 @@ from langchain_anthropic import ChatAnthropic
 from langchain.tools import StructuredTool  # 或 langchain_core.tools
 from langchain_mcp_adapters.client import MultiServerMCPClient
 
+# ========
+# for Vertex AI
+from google.oauth2 import service_account
+from langchain_google_vertexai.model_garden import ChatAnthropicVertex
+
 load_dotenv()
 
 # logger = default_logger
@@ -129,7 +134,7 @@ logger = get_default_botrun_logger()
 def get_react_agent_model_name(model_name: str = ""):
     final_model_name = model_name
     if final_model_name == "":
-        final_model_name = "claude-sonnet-4-20250514"
+        final_model_name = "claude-sonnet-4-5-20250929"
     logger.info(f"final_model_name: {final_model_name}")
     return final_model_name
 
@@ -140,56 +145,94 @@ ANTHROPIC_MAX_TOKENS = 64000
 def get_react_agent_model(model_name: str = ""):
     final_model_name = get_react_agent_model_name(model_name)
     if final_model_name.startswith("gemini-"):
-
         model = ChatGoogleGenerativeAI(model=final_model_name, temperature=0)
         logger.info(f"model ChatGoogleGenerativeAI {final_model_name}")
     elif final_model_name.startswith("claude-"):
-        anthropic_api_keys_str = os.getenv("ANTHROPIC_API_KEYS", "")
-        anthropic_api_keys = [
-            key.strip() for key in anthropic_api_keys_str.split(",") if key.strip()
-        ]
-        if anthropic_api_keys:
-
-            model = RotatingChatAnthropic(
-                model_name=final_model_name,
-                keys=anthropic_api_keys,
-                temperature=0,
-                max_tokens=ANTHROPIC_MAX_TOKENS,
-            )
-            logger.info(f"model RotatingChatAnthropic {final_model_name}")
-        elif os.getenv("OPENROUTER_API_KEY") and os.getenv("OPENROUTER_BASE_URL"):
-
-            openrouter_model_name = "anthropic/claude-sonnet-4.5"
-            # openrouter_model_name = "openai/o4-mini-high"
-            # openrouter_model_name = "openai/gpt-4.1"
-            model = ChatOpenAI(
-                openai_api_key=os.getenv("OPENROUTER_API_KEY"),
-                openai_api_base=os.getenv("OPENROUTER_BASE_URL"),
-                model_name=openrouter_model_name,
-                temperature=0,
-                max_tokens=ANTHROPIC_MAX_TOKENS,
-                model_kwargs={
-                    # "headers": {
-                    #     "HTTP-Referer": getenv("YOUR_SITE_URL"),
-                    #     "X-Title": getenv("YOUR_SITE_NAME"),
-                    # }
-                },
+        use_vertex_ai = os.getenv("USE_VERTEX_AI", "false").lower() in ("true", "1", "yes")
+
+        if use_vertex_ai:
+            # 從環境變數讀取設定
+            vertex_location = os.getenv("VERTEX_AI_LANGCHAIN_LOCATION", "europe-west1")
+            vertex_model = os.getenv("VERTEX_AI_LANGCHAIN_MODEL", final_model_name)
+            vertex_sa_path = os.getenv("VERTEX_AI_LANGCHAIN_GOOGLE_APPLICATION_CREDENTIALS")
+
+            # 驗證 service account
+            credentials = None
+            if vertex_sa_path and os.path.exists(vertex_sa_path):
+                # 加入 Vertex AI 需要的 scopes
+                SCOPES = [
+                    'https://www.googleapis.com/auth/cloud-platform',
+                    'https://www.googleapis.com/auth/cloudplatformprojects.readonly',
+                ]
+                credentials = service_account.Credentials.from_service_account_file(
+                    vertex_sa_path,
+                    scopes=SCOPES
+                )
+                logger.info(f"Using Vertex AI service account from {vertex_sa_path}")
+            else:
+                logger.warning(
+                    "VERTEX_AI_GOOGLE_APPLICATION_CREDENTIALS not set or file not found. Using ADC if available.")
+
+            # 初始化 ChatAnthropicVertex
+            model = ChatAnthropicVertex(
+                model=vertex_model,
+                location=vertex_location,
+                credentials=credentials,
+                temperature=0
             )
-            logger.info(f"model OpenRouter {openrouter_model_name}")
+            logger.info(f"model ChatAnthropicVertex {vertex_model} @ {vertex_location}")
+
         else:
+            anthropic_api_keys_str = os.getenv("ANTHROPIC_API_KEYS", "")
+            anthropic_api_keys = [
+                key.strip() for key in anthropic_api_keys_str.split(",") if key.strip()
+            ]
+            if anthropic_api_keys:
+
+                model = RotatingChatAnthropic(
+                    model_name=final_model_name,
+                    keys=anthropic_api_keys,
+                    temperature=0,
+                    max_tokens=ANTHROPIC_MAX_TOKENS,
+                )
+                logger.info(f"model RotatingChatAnthropic {final_model_name}")
+            elif os.getenv("OPENROUTER_API_KEY") and os.getenv("OPENROUTER_BASE_URL"):
+
+                openrouter_model_name = "anthropic/claude-sonnet-4.5"
+                # openrouter_model_name = "openai/o4-mini-high"
+                # openrouter_model_name = "openai/gpt-4.1"
+                model = ChatOpenAI(
+                    openai_api_key=os.getenv("OPENROUTER_API_KEY"),
+                    openai_api_base=os.getenv("OPENROUTER_BASE_URL"),
+                    model_name=openrouter_model_name,
+                    temperature=0,
+                    max_tokens=ANTHROPIC_MAX_TOKENS,
+                    model_kwargs={
+                        # "headers": {
+                        #     "HTTP-Referer": getenv("YOUR_SITE_URL"),
+                        #     "X-Title": getenv("YOUR_SITE_NAME"),
+                        # }
+                    },
+                )
+                logger.info(f"model OpenRouter {openrouter_model_name}")
+            else:
+
+                model = ChatAnthropic(
+                    model=final_model_name,
+                    temperature=0,
+                    max_tokens=ANTHROPIC_MAX_TOKENS,
+                    # model_kwargs={
+                    # "extra_headers": {
+                    # "anthropic-beta": "token-efficient-tools-2025-02-19",
+                    # "anthropic-beta": "output-128k-2025-02-19",
+                    # }
+                    # },
+                )
+                logger.info(f"model ChatAnthropic {final_model_name}")
+
+    else:
+        raise ValueError(f"Unknown model name prefix: {final_model_name}")
 
-            model = ChatAnthropic(
-                model=final_model_name,
-                temperature=0,
-                max_tokens=ANTHROPIC_MAX_TOKENS,
-                # model_kwargs={
-                # "extra_headers": {
-                # "anthropic-beta": "token-efficient-tools-2025-02-19",
-                # "anthropic-beta": "output-128k-2025-02-19",
-                # }
-                # },
-            )
-            logger.info(f"model ChatAnthropic {final_model_name}")
     return model
 
 
@@ -419,7 +462,7 @@ async def create_react_agent_graph(
         system_prompt: The system prompt to use for the agent (used directly, no concatenation)
         botrun_flow_lang_url: URL for botrun flow lang service (reserved for future use)
         user_id: User identifier (reserved for future use)
-        model_name: AI model name to use (defaults to claude-sonnet-4-20250514)
+        model_name: AI model name to use (defaults to claude-sonnet-4-5-20250929)
         lang: Language code affecting language-specific tools (e.g., "en", "zh-TW")
         mcp_config: MCP servers configuration dict providing tools like scrape, chat_with_pdf, etc.
 

{botrun_flow_lang-5.10.32 → botrun_flow_lang-5.10.83}/botrun_flow_lang/langgraph_agents/agents/util/img_util.py

@@ -49,7 +49,7 @@ def get_img_content_type(file_path: str | Path) -> str:
 
 
 def analyze_imgs_with_claude(
-    img_urls: list[str], user_input: str, model_name: str = "claude-sonnet-4-20250514"
+    img_urls: list[str], user_input: str, model_name: str = "claude-sonnet-4-5-20250929"
 ) -> str:
     """
     Analyze multiple images using Claude Vision API

{botrun_flow_lang-5.10.32 → botrun_flow_lang-5.10.83}/botrun_flow_lang/langgraph_agents/agents/util/model_utils.py

@@ -9,15 +9,17 @@ from langchain_openai import ChatOpenAI
 from langchain_google_genai import ChatGoogleGenerativeAI
 
 
-def get_model_instance(model_name: str, temperature: float = 0, enable_code_execution: bool = False):
+def get_model_instance(
+    model_name: str, temperature: float = 0, enable_code_execution: bool = False
+):
     """
     統一的模型實例獲取函數
-    
+
     Args:
         model_name: 模型名稱
         temperature: 溫度參數
         enable_code_execution: 是否啟用代碼執行（僅 Gemini 2.5 支援）
-    
+
     Returns:
         對應的模型實例
     """
@@ -25,20 +27,18 @@ def get_model_instance(model_name: str, temperature: float = 0, enable_code_exec
         model_kwargs = {}
         if enable_code_execution and "2.5" in model_name:
             model_kwargs["enable_code_execution"] = True
-            
+
         return ChatGoogleGenerativeAI(
-            model=model_name,
-            temperature=temperature,
-            **model_kwargs
+            model=model_name, temperature=temperature, **model_kwargs
         )
-    
+
     elif model_name.startswith("claude-"):
         # 檢查是否有多個 Anthropic API keys
         anthropic_api_keys_str = os.getenv("ANTHROPIC_API_KEYS", "")
         anthropic_api_keys = [
             key.strip() for key in anthropic_api_keys_str.split(",") if key.strip()
         ]
-        
+
         if anthropic_api_keys:
             return RotatingChatAnthropic(
                 model_name=model_name,
@@ -47,7 +47,7 @@ def get_model_instance(model_name: str, temperature: float = 0, enable_code_exec
                 max_tokens=64000,
             )
         elif os.getenv("OPENROUTER_API_KEY") and os.getenv("OPENROUTER_BASE_URL"):
-            openrouter_model_name = "anthropic/claude-sonnet-4"
+            openrouter_model_name = "anthropic/claude-sonnet-4.5"
             return ChatOpenAI(
                 openai_api_key=os.getenv("OPENROUTER_API_KEY"),
                 openai_api_base=os.getenv("OPENROUTER_BASE_URL"),
@@ -61,7 +61,7 @@ def get_model_instance(model_name: str, temperature: float = 0, enable_code_exec
                 temperature=temperature,
                 max_tokens=64000,
             )
-    
+
     elif model_name.startswith("gpt-"):
         if os.getenv("OPENROUTER_API_KEY") and os.getenv("OPENROUTER_BASE_URL"):
             return ChatOpenAI(
@@ -77,7 +77,7 @@ def get_model_instance(model_name: str, temperature: float = 0, enable_code_exec
                 temperature=temperature,
                 max_tokens=8192,
             )
-    
+
     else:
         # 預設使用 Gemini
         return ChatGoogleGenerativeAI(

{botrun_flow_lang-5.10.32 → botrun_flow_lang-5.10.83}/botrun_flow_lang/langgraph_agents/agents/util/pdf_analyzer.py

@@ -11,7 +11,7 @@ load_dotenv()
 
 
 def analyze_pdf_with_claude(
-    pdf_data: str, user_input: str, model_name: str = "claude-sonnet-4-20250514"
+    pdf_data: str, user_input: str, model_name: str = "claude-sonnet-4-5-20250929"
 ):
     """
     Analyze a PDF file using Claude API