botrun-flow-lang 6.2.21__py3-none-any.whl → 6.2.61__py3-none-any.whl

botrun_flow_lang/langgraph_agents/agents/langgraph_react_agent.py

@@ -86,9 +86,11 @@ from langchain_mcp_adapters.client import MultiServerMCPClient
 # ========
 # for Vertex AI
 from google.oauth2 import service_account
-# 重型 import 改為延遲載入，避免啟動時載入 google-cloud-aiplatform（約 26 秒）
-# ChatVertexAI 已遷移至 ChatGoogleGenerativeAI(vertexai=True)
-# ChatAnthropicVertex 在需要時才 import（見 get_react_agent_model 函數內）
+# 使用自製的 ChatVertexAIClaude 取代 ChatAnthropicVertex，
+# 透過 rawPredict REST API 直接呼叫 Claude，避免載入 google-cloud-aiplatform（約 26 秒）
+from botrun_flow_lang.langgraph_agents.agents.util.custom_vertex_claude import (
+    ChatVertexAIClaude,
+)
 
 load_dotenv()
 
@@ -251,18 +253,17 @@ def get_react_agent_model(model_name: str = ""):
 
             elif "claude" in vertex_model_name.lower() or vertex_model_name.startswith("maison/"):
                 # Anthropic Claude (model garden)
-                # 延遲載入 ChatAnthropicVertex，只有在需要時才觸發 langchain_google_vertexai
-                from langchain_google_vertexai.model_garden import ChatAnthropicVertex
-                model = ChatAnthropicVertex(
+                # 使用自製的 ChatVertexAIClaude，避免載入 google-cloud-aiplatform
+                model = ChatVertexAIClaude(
                     model=vertex_model_name,
                     location=vertex_region,
-                    project=vertex_project,
+                    project_id=vertex_project,
                     credentials=credentials,
                     temperature=0,
                     max_tokens=ANTHROPIC_MAX_TOKENS,
                 )
                 logger.info(
-                    f"model ChatAnthropicVertex {vertex_model_name} @ {vertex_region} (project: {vertex_project})"
+                    f"model ChatVertexAIClaude {vertex_model_name} @ {vertex_region} (project: {vertex_project})"
                 )
 
             else:
@@ -306,11 +307,9 @@ def get_react_agent_model(model_name: str = ""):
                     "VERTEX_AI_GOOGLE_APPLICATION_CREDENTIALS not set or file not found. Using ADC if available."
                 )
 
-            # 初始化 ChatAnthropicVertex
-            # 延遲載入，只有在需要時才觸發 langchain_google_vertexai
-            from langchain_google_vertexai.model_garden import ChatAnthropicVertex
-            model = ChatAnthropicVertex(
-                project=vertex_project,
+            # 使用自製的 ChatVertexAIClaude，避免載入 google-cloud-aiplatform
+            model = ChatVertexAIClaude(
+                project_id=vertex_project,
                 model=vertex_model,
                 location=vertex_location,
                 credentials=credentials,
@@ -318,7 +317,7 @@ def get_react_agent_model(model_name: str = ""):
                 max_tokens=ANTHROPIC_MAX_TOKENS,
             )
             logger.info(
-                f"model ChatAnthropicVertex {vertex_project} @ {vertex_model} @ {vertex_location}"
+                f"model ChatVertexAIClaude {vertex_project} @ {vertex_model} @ {vertex_location}"
             )
 
         else:

botrun_flow_lang/langgraph_agents/agents/util/custom_vertex_claude.py

@@ -0,0 +1,406 @@
+"""
+Custom Vertex AI Claude chat model for LangGraph.
+
+Lightweight BaseChatModel that calls Claude via Vertex AI's rawPredict REST API,
+avoiding the heavy google-cloud-aiplatform dependency (~26s import time).
+
+Supports tool calling for LangGraph react agent compatibility.
+"""
+
+import json
+from typing import Any, Dict, List, Optional, Tuple, Union
+
+import httpx
+
+from google.auth.transport.requests import Request
+from google.oauth2 import service_account
+from langchain_core.callbacks import CallbackManagerForLLMRun
+from langchain_core.language_models.chat_models import BaseChatModel
+from langchain_core.messages import (
+    AIMessage,
+    BaseMessage,
+    HumanMessage,
+    SystemMessage,
+    ToolMessage,
+)
+from langchain_core.outputs import ChatGeneration, ChatResult
+from pydantic import ConfigDict
+
+from botrun_flow_lang.utils.botrun_logger import get_default_botrun_logger
+
+logger = get_default_botrun_logger()
+
+
+class ChatVertexAIClaude(BaseChatModel):
+    """
+    Lightweight Vertex AI Claude chat model using rawPredict REST API.
+
+    Replaces ChatAnthropicVertex without importing google-cloud-aiplatform.
+    Supports tool calling for LangGraph react agent.
+
+    Usage:
+        model = ChatVertexAIClaude(
+            model="claude-sonnet-4-5-20250929",
+            project_id="my-project",
+            location="asia-east1",
+            credentials=my_credentials,  # or service_account_file="path/to/sa.json"
+        )
+    """
+
+    model: str = "claude-sonnet-4-5-20250929"
+    max_tokens: int = 64000
+    temperature: float = 0
+    project_id: str = ""
+    location: str = "asia-east1"
+    credentials: Any = None
+    service_account_file: str = ""
+
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    @property
+    def _llm_type(self) -> str:
+        return "vertex-ai-claude-custom"
+
+    @property
+    def _identifying_params(self) -> Dict[str, Any]:
+        return {
+            "model": self.model,
+            "max_tokens": self.max_tokens,
+            "temperature": self.temperature,
+            "project_id": self.project_id,
+            "location": self.location,
+        }
+
+    def bind_tools(
+        self,
+        tools: List[Any],
+        *,
+        tool_choice: Optional[Union[str, Dict]] = None,
+        **kwargs,
+    ):
+        """Convert tools to Anthropic format and bind via Runnable.bind()."""
+        formatted_tools = _convert_tools_to_anthropic(tools)
+        bind_kwargs: Dict[str, Any] = {"tools": formatted_tools, **kwargs}
+        if tool_choice is not None:
+            bind_kwargs["tool_choice"] = tool_choice
+        return self.bind(**bind_kwargs)
+
+    def _get_access_token(self) -> str:
+        """Get OAuth2 access token for Vertex AI API."""
+        if self.credentials:
+            creds = self.credentials
+        elif self.service_account_file:
+            creds = service_account.Credentials.from_service_account_file(
+                self.service_account_file,
+                scopes=["https://www.googleapis.com/auth/cloud-platform"],
+            )
+        else:
+            raise ValueError(
+                "ChatVertexAIClaude requires either 'credentials' or 'service_account_file'"
+            )
+
+        if not creds.valid or creds.expired:
+            creds.refresh(Request())
+        return creds.token
+
+    def _convert_messages(
+        self, messages: List[BaseMessage]
+    ) -> Tuple[Union[str, List[Dict]], List[Dict]]:
+        """Convert LangChain messages to Anthropic API format.
+
+        Returns:
+            (system, api_messages) tuple.
+            system: str or list of content blocks (preserves cache_control).
+            api_messages: list of Anthropic-format message dicts.
+        """
+        system_blocks: List[Any] = []
+        raw_messages: List[Dict] = []
+
+        for msg in messages:
+            if isinstance(msg, SystemMessage):
+                if isinstance(msg.content, str):
+                    system_blocks.append({"type": "text", "text": msg.content})
+                elif isinstance(msg.content, list):
+                    for block in msg.content:
+                        if isinstance(block, dict):
+                            system_blocks.append(block)
+                        elif isinstance(block, str):
+                            system_blocks.append({"type": "text", "text": block})
+
+            elif isinstance(msg, HumanMessage):
+                raw_messages.append({"role": "user", "content": msg.content})
+
+            elif isinstance(msg, AIMessage):
+                content_blocks = []
+                if msg.content:
+                    if isinstance(msg.content, str):
+                        content_blocks.append(
+                            {"type": "text", "text": msg.content}
+                        )
+                    elif isinstance(msg.content, list):
+                        for block in msg.content:
+                            if isinstance(block, str):
+                                content_blocks.append(
+                                    {"type": "text", "text": block}
+                                )
+                            elif isinstance(block, dict):
+                                content_blocks.append(block)
+                for tc in msg.tool_calls or []:
+                    content_blocks.append(
+                        {
+                            "type": "tool_use",
+                            "id": tc["id"],
+                            "name": tc["name"],
+                            "input": tc["args"],
+                        }
+                    )
+                raw_messages.append(
+                    {
+                        "role": "assistant",
+                        "content": content_blocks if content_blocks else "",
+                    }
+                )
+
+            elif isinstance(msg, ToolMessage):
+                tool_content = msg.content
+                if not isinstance(tool_content, str):
+                    tool_content = json.dumps(tool_content, ensure_ascii=False)
+                raw_messages.append(
+                    {
+                        "role": "user",
+                        "content": [
+                            {
+                                "type": "tool_result",
+                                "tool_use_id": msg.tool_call_id,
+                                "content": tool_content,
+                            }
+                        ],
+                    }
+                )
+
+        merged = _merge_consecutive_messages(raw_messages)
+
+        # Return system as string (simple) or list (structured with cache_control)
+        has_cache_control = any(
+            isinstance(b, dict) and "cache_control" in b for b in system_blocks
+        )
+        if len(system_blocks) == 1 and not has_cache_control:
+            system: Union[str, List[Dict]] = system_blocks[0].get("text", "")
+        elif system_blocks:
+            system = system_blocks
+        else:
+            system = ""
+
+        return system, merged
+
+    def _generate(
+        self,
+        messages: List[BaseMessage],
+        stop: Optional[List[str]] = None,
+        run_manager: Optional[CallbackManagerForLLMRun] = None,
+        **kwargs,
+    ) -> ChatResult:
+        """Call Vertex AI Claude via rawPredict (non-streaming)."""
+        system, api_messages = self._convert_messages(messages)
+        access_token = self._get_access_token()
+
+        url = (
+            f"https://{self.location}-aiplatform.googleapis.com/v1/"
+            f"projects/{self.project_id}/locations/{self.location}/"
+            f"publishers/anthropic/models/{self.model}:rawPredict"
+        )
+
+        payload: Dict[str, Any] = {
+            "anthropic_version": "vertex-2023-10-16",
+            "messages": api_messages,
+            "max_tokens": self.max_tokens,
+            "temperature": self.temperature,
+        }
+        if system:
+            payload["system"] = system
+        if stop:
+            payload["stop_sequences"] = stop
+
+        # Tools from bind_tools()
+        tools = kwargs.get("tools", [])
+        if tools:
+            payload["tools"] = tools
+
+        # Tool choice
+        tool_choice = kwargs.get("tool_choice")
+        if tool_choice:
+            if isinstance(tool_choice, str):
+                if tool_choice == "auto":
+                    payload["tool_choice"] = {"type": "auto"}
+                elif tool_choice == "any":
+                    payload["tool_choice"] = {"type": "any"}
+                elif tool_choice == "none":
+                    payload.pop("tools", None)
+                else:
+                    payload["tool_choice"] = {
+                        "type": "tool",
+                        "name": tool_choice,
+                    }
+            elif isinstance(tool_choice, dict):
+                payload["tool_choice"] = tool_choice
+
+        logger.info(
+            f"[ChatVertexAIClaude] rawPredict: model={self.model}, "
+            f"location={self.location}, messages={len(api_messages)}, "
+            f"tools={len(tools)}"
+        )
+
+        # Make API call via httpx
+        data = _http_post_json(url, payload, access_token)
+
+        # Parse response
+        text_parts = []
+        tool_calls = []
+        for block in data.get("content", []):
+            block_type = block.get("type", "")
+            if block_type == "text":
+                text_parts.append(block.get("text", ""))
+            elif block_type == "tool_use":
+                tool_calls.append(
+                    {
+                        "id": block["id"],
+                        "name": block["name"],
+                        "args": block.get("input", {}),
+                    }
+                )
+
+        usage = data.get("usage", {})
+        input_tokens = usage.get("input_tokens", 0)
+        output_tokens = usage.get("output_tokens", 0)
+
+        ai_message = AIMessage(
+            content="".join(text_parts),
+            tool_calls=tool_calls,
+            usage_metadata={
+                "input_tokens": input_tokens,
+                "output_tokens": output_tokens,
+                "total_tokens": input_tokens + output_tokens,
+            },
+            response_metadata={
+                "model": self.model,
+                "stop_reason": data.get("stop_reason", ""),
+            },
+        )
+
+        logger.info(
+            f"[ChatVertexAIClaude] Response: "
+            f"text_len={len(ai_message.content)}, "
+            f"tool_calls={len(tool_calls)}, "
+            f"tokens=({input_tokens}+{output_tokens}={input_tokens + output_tokens})"
+        )
+
+        return ChatResult(
+            generations=[ChatGeneration(message=ai_message)],
+            llm_output={
+                "model": self.model,
+                "usage": {
+                    "input_tokens": input_tokens,
+                    "output_tokens": output_tokens,
+                },
+            },
+        )
+
+
+def _http_post_json(
+    url: str, payload: Dict[str, Any], access_token: str
+) -> Dict[str, Any]:
+    """POST JSON to URL with Bearer auth. Returns parsed JSON response."""
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": f"Bearer {access_token}",
+    }
+    try:
+        with httpx.Client(timeout=300.0) as client:
+            response = client.post(url, headers=headers, json=payload)
+            if response.status_code != 200:
+                error_msg = (
+                    f"Vertex AI API error: {response.status_code} - {response.text}"
+                )
+                logger.error(f"[ChatVertexAIClaude] {error_msg}")
+                raise Exception(error_msg)
+            return response.json()
+    except httpx.HTTPStatusError as e:
+        error_body = e.response.text if e.response else ""
+        error_msg = f"Vertex AI API error: {e.response.status_code} - {error_body}"
+        logger.error(f"[ChatVertexAIClaude] {error_msg}")
+        raise Exception(error_msg) from e
+
+
+def _convert_tools_to_anthropic(tools: List[Any]) -> List[Dict]:
+    """Convert LangChain tools to Anthropic tool format."""
+    from langchain_core.utils.function_calling import convert_to_openai_tool
+
+    anthropic_tools = []
+    for tool in tools:
+        if isinstance(tool, dict):
+            if "input_schema" in tool:
+                anthropic_tools.append(tool)
+            elif "function" in tool:
+                func = tool["function"]
+                anthropic_tools.append(
+                    {
+                        "name": func["name"],
+                        "description": func.get("description", ""),
+                        "input_schema": func.get(
+                            "parameters",
+                            {"type": "object", "properties": {}},
+                        ),
+                    }
+                )
+            else:
+                anthropic_tools.append(tool)
+        else:
+            try:
+                oai_tool = convert_to_openai_tool(tool)
+                func = oai_tool["function"]
+                anthropic_tools.append(
+                    {
+                        "name": func["name"],
+                        "description": func.get("description", ""),
+                        "input_schema": func.get(
+                            "parameters",
+                            {"type": "object", "properties": {}},
+                        ),
+                    }
+                )
+            except Exception as e:
+                logger.warning(
+                    f"[ChatVertexAIClaude] Failed to convert tool "
+                    f"{getattr(tool, 'name', tool)}: {e}"
+                )
+
+    return anthropic_tools
+
+
+def _merge_consecutive_messages(messages: List[Dict]) -> List[Dict]:
+    """Merge consecutive messages with the same role (required by Anthropic API)."""
+    if not messages:
+        return []
+
+    merged: List[Dict] = []
+    for msg in messages:
+        if merged and merged[-1]["role"] == msg["role"]:
+            prev_content = merged[-1]["content"]
+            curr_content = msg["content"]
+
+            # Normalize to list of content blocks
+            if isinstance(prev_content, str):
+                prev_content = [{"type": "text", "text": prev_content}]
+            elif not isinstance(prev_content, list):
+                prev_content = [prev_content]
+
+            if isinstance(curr_content, str):
+                curr_content = [{"type": "text", "text": curr_content}]
+            elif not isinstance(curr_content, list):
+                curr_content = [curr_content]
+
+            merged[-1]["content"] = prev_content + curr_content
+        else:
+            merged.append(msg)
+
+    return merged

{botrun_flow_lang-6.2.21.dist-info → botrun_flow_lang-6.2.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: botrun-flow-lang
-Version: 6.2.21
+Version: 6.2.61
 Summary: A flow language for botrun
 Author-email: sebastian-hsu <sebastian.hsu@gmail.com>
 License: MIT
@@ -32,7 +32,6 @@ Requires-Dist: langchain-community>=0.3.27
 Requires-Dist: langchain-core>=1.1.2
 Requires-Dist: langchain-google-community>=2.0.3
 Requires-Dist: langchain-google-genai>=4.0.0
-Requires-Dist: langchain-google-vertexai<4.0.0,>=3.2.0
 Requires-Dist: langchain-mcp-adapters>=0.1.7
 Requires-Dist: langchain-openai>=0.3.28
 Requires-Dist: langchain>=0.3.27

{botrun_flow_lang-6.2.21.dist-info → botrun_flow_lang-6.2.61.dist-info}/RECORD

@@ -25,7 +25,7 @@ botrun_flow_lang/api/youtube_api.py,sha256=9eGr--gR2OoM9JZ6Nf9KqPiE-FeXEx8R-QeJv
 botrun_flow_lang/langgraph_agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 botrun_flow_lang/langgraph_agents/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 botrun_flow_lang/langgraph_agents/agents/agent_runner.py,sha256=tiuPIqAcM8rIWBTjo8NS4owTepCsX3QkIHaUEDakOTc,6673
-botrun_flow_lang/langgraph_agents/agents/langgraph_react_agent.py,sha256=hTQf2lzlQy5n64i32e3iQTPwx7dXS3GMwaZqYt21zMc,31352
+botrun_flow_lang/langgraph_agents/agents/langgraph_react_agent.py,sha256=-4ejdM9SiocZyV92wCg1DOKNMBUTO6-wanj-D73RG7k,31156
 botrun_flow_lang/langgraph_agents/agents/search_agent_graph.py,sha256=hWDPt0U09Gj-3-NNWhsn9xaakYbOcHExIXqcL8TeZxw,32046
 botrun_flow_lang/langgraph_agents/agents/agent_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 botrun_flow_lang/langgraph_agents/agents/agent_tools/step_planner.py,sha256=S4TYt0ZhgdAZ-2ndH8hJoEaIyDKdNJdWHjEZ49Lg_NQ,2427
@@ -39,6 +39,7 @@ botrun_flow_lang/langgraph_agents/agents/gov_researcher/gov_researcher_graph.py,
 botrun_flow_lang/langgraph_agents/agents/tools/__init__.py,sha256=-z1uuC3IET02q8kPhPlr-L9eTGJqgHjEJlC__cG16H0,105
 botrun_flow_lang/langgraph_agents/agents/tools/gemini_code_execution.py,sha256=EEp8xhVU-Kj1Nk5qV8ObqdVZ8gT6GITrE4VyjIc2InA,14238
 botrun_flow_lang/langgraph_agents/agents/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+botrun_flow_lang/langgraph_agents/agents/util/custom_vertex_claude.py,sha256=RDj1-PnoR36xdOUu7r6yMQrxAe-CXyGcSZEKiOlPxJY,14951
 botrun_flow_lang/langgraph_agents/agents/util/gemini_grounding.py,sha256=JTfH9WJNDlpvMvfzXyZy3bHeCN58MTnEOiamQGMsqh0,2884
 botrun_flow_lang/langgraph_agents/agents/util/html_util.py,sha256=g5yJO0qTqRq_kb-xhSnWX3WAbHDIjNQYl7ErRBPQwHs,13230
 botrun_flow_lang/langgraph_agents/agents/util/img_util.py,sha256=6OERtpGGimlev4Pb_O1UbMNaT_DMBHSmAgo9gB-R8xk,12385
@@ -99,6 +100,6 @@ botrun_flow_lang/utils/yaml_utils.py,sha256=dPlabIol-Clhnwc7N5nuffCaLSq8dyvmvjRw
 botrun_flow_lang/utils/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 botrun_flow_lang/utils/clients/rate_limit_client.py,sha256=96NNCHB9I5C5bpVFF6sfPhmh4oAx3UdOLb-Z4PAXLdg,8558
 botrun_flow_lang/utils/clients/token_verify_client.py,sha256=-AnYApJ9CvxVn-RhCCZZ2LCrf065fgskhwLKAm-aiN0,5893
-botrun_flow_lang-6.2.21.dist-info/METADATA,sha256=oF4wNjTpal4vp58e5a0le51qAekPxomZJwOrzR-2uXs,6219
-botrun_flow_lang-6.2.21.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-botrun_flow_lang-6.2.21.dist-info/RECORD,,
+botrun_flow_lang-6.2.61.dist-info/METADATA,sha256=7mfsw0_BTSzWq5fSeKqCg0RmuOEyMfdKwItnzlRA0p8,6164
+botrun_flow_lang-6.2.61.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+botrun_flow_lang-6.2.61.dist-info/RECORD,,