botrun-flow-lang 5.10.82__tar.gz → 5.10.131__tar.gz

{botrun_flow_lang-5.10.82 → botrun_flow_lang-5.10.131}/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [5.10.131]
+### Updated
+- gemini output max_tokens 設成 32000
+
 ## [5.10.82]
 ### Updated
 - claude 原本使用 4 的模型都改成 4.5

{botrun_flow_lang-5.10.82 → botrun_flow_lang-5.10.131}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: botrun-flow-lang
-Version: 5.10.82
+Version: 5.10.131
 Summary: A flow language for botrun
 Author-email: sebastian-hsu <sebastian.hsu@gmail.com>
 License: MIT
@@ -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.82 → botrun_flow_lang-5.10.131}/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
@@ -135,61 +140,105 @@ def get_react_agent_model_name(model_name: str = ""):
 
 
 ANTHROPIC_MAX_TOKENS = 64000
+GEMINI_MAX_TOKENS = 32000
 
 
 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)
+        model = ChatGoogleGenerativeAI(
+            model=final_model_name, temperature=0, max_tokens=GEMINI_MAX_TOKENS
+        )
         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:
+        # use_vertex_ai = os.getenv("USE_VERTEX_AI", "false").lower() in ("true", "1", "yes")
+        vertex_location = os.getenv("VERTEX_AI_LANGCHAIN_LOCATION", "")
+        vertex_model = os.getenv("VERTEX_AI_LANGCHAIN_MODEL", "")
+        vertex_sa_path = os.getenv(
+            "VERTEX_AI_LANGCHAIN_GOOGLE_APPLICATION_CREDENTIALS", ""
+        )
 
-            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,
+        if vertex_location and vertex_model and vertex_sa_path:
+            # 從環境變數讀取設定
+
+            # 驗證 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,
                 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}")
+            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