Merge branch 'main' of https://github.com/doraemonlove/veadk-python into fix/builtintooltrace

Author: wangjiaju.716

tests/test_cloud.py

@@ -115,9 +115,12 @@ async def test_cloud():
                         mock_vefaas_client = Mock()
                         mock_vefaas_in_app.return_value = mock_vefaas_client
                         mock_vefaas_client.delete.return_value = None
-
-                        cloud_app.delete_self()
-                        mock_vefaas_client.delete.assert_called_with("app-123")
+                        with patch.object(
+                            cloud_app, "_get_vefaas_application_id_by_name"
+                        ) as mock_get_id_by_name:
+                            mock_get_id_by_name.return_value = None
+                            cloud_app.delete_self()
+                            mock_vefaas_client.delete.assert_called_with("app-123")
 
                 # Verify all mocks were called as expected
                 mock_vefaas_service.deploy.assert_called_once()

veadk/agent.py

@@ -28,7 +28,7 @@
 
 from veadk.config import getenv
 from veadk.consts import (
-    DEFALUT_MODEL_AGENT_PROVIDER,
+    DEFAULT_MODEL_AGENT_PROVIDER,
     DEFAULT_MODEL_AGENT_API_BASE,
     DEFAULT_MODEL_AGENT_NAME,
     DEFAULT_MODEL_EXTRA_HEADERS,
@@ -65,7 +65,7 @@ class Agent(LlmAgent):
     model_name: str = getenv("MODEL_AGENT_NAME", DEFAULT_MODEL_AGENT_NAME)
     """The name of the model for agent running."""
 
-    model_provider: str = getenv("MODEL_AGENT_PROVIDER", DEFALUT_MODEL_AGENT_PROVIDER)
+    model_provider: str = getenv("MODEL_AGENT_PROVIDER", DEFAULT_MODEL_AGENT_PROVIDER)
     """The provider of the model for agent running."""
 
     model_api_base: str = getenv("MODEL_AGENT_API_BASE", DEFAULT_MODEL_AGENT_API_BASE)

veadk/cloud/cloud_app.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import time
 from typing import Any
 from uuid import uuid4
 
@@ -60,9 +61,11 @@ def __init__(
         if not vefaas_endpoint:
             self.vefaas_endpoint = self._get_vefaas_endpoint()
 
-        if not self.vefaas_endpoint.startswith(
-            "http"
-        ) and not self.vefaas_endpoint.startswith("https"):
+        if (
+            self.vefaas_endpoint
+            and not self.vefaas_endpoint.startswith("http")
+            and not self.vefaas_endpoint.startswith("https")
+        ):
             raise ValueError(
                 f"Invalid endpoint: {vefaas_endpoint}. The endpoint must start with `http` or `https`."
             )
@@ -92,12 +95,13 @@ def _get_vefaas_endpoint(
             raise ValueError(
                 f"VeFaaS CloudAPP with application_id `{self.vefaas_application_id}` or application_name `{self.vefaas_application_name}` not found."
             )
-        cloud_resource = json.loads(app["CloudResource"])
 
         try:
+            cloud_resource = json.loads(app["CloudResource"])
             vefaas_endpoint = cloud_resource["framework"]["url"]["system_url"]
         except Exception as e:
-            raise ValueError(f"VeFaaS cloudAPP could not get endpoint. Error: {e}")
+            logger.warning(f"VeFaaS cloudAPP could not get endpoint. Error: {e}")
+            vefaas_endpoint = ""
         return vefaas_endpoint
 
     def _get_vefaas_application_id_by_name(self) -> str:
@@ -167,7 +171,18 @@ def delete_self(
 
             vefaas_client = VeFaaS(access_key=volcengine_ak, secret_key=volcengine_sk)
             vefaas_client.delete(self.vefaas_application_id)
-            print(f"Cloud app {self.vefaas_application_id} is deleting...")
+            print(
+                f"Cloud app {self.vefaas_application_id} delete request has been sent to VeFaaS"
+            )
+            while True:
+                try:
+                    id = self._get_vefaas_application_id_by_name()
+                    if not id:
+                        break
+                    time.sleep(3)
+                except Exception as _:
+                    break
+            print("Delete application done.")
 
     async def message_send(
         self, message: str, session_id: str, user_id: str, timeout: float = 600.0

veadk/consts.py

@@ -15,6 +15,16 @@
 from veadk.version import VERSION
 
 DEFAULT_MODEL_AGENT_NAME = "doubao-seed-1-6-250615"
-DEFALUT_MODEL_AGENT_PROVIDER = "openai"
+DEFAULT_MODEL_AGENT_PROVIDER = "openai"
 DEFAULT_MODEL_AGENT_API_BASE = "https://ark.cn-beijing.volces.com/api/v3/"
 DEFAULT_MODEL_EXTRA_HEADERS = {"veadk-source": "veadk", "veadk-version": VERSION}
+
+DEFAULT_APMPLUS_OTEL_EXPORTER_ENDPOINT = "http://apmplus-cn-beijing.volces.com:4317"
+DEFAULT_APMPLUS_OTEL_EXPORTER_SERVICE_NAME = "veadk_tracing"
+
+DEFAULT_COZELOOP_OTEL_EXPORTER_ENDPOINT = (
+    "https://api.coze.cn/v1/loop/opentelemetry/v1/traces"
+)
+
+DEFAULT_TLS_OTEL_EXPORTER_ENDPOINT = "https://tls-cn-beijing.volces.com:4318/v1/traces"
+DEFAULT_TLS_OTEL_EXPORTER_REGION = "cn-beijing"

veadk/integrations/ve_faas/template/{{cookiecutter.local_dir_name}}/clean.py

@@ -0,0 +1,23 @@
+# Copyright (c) 2025 Beijing Volcano Engine Technology Co., Ltd. and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from veadk.cloud.cloud_app import CloudApp
+
+def main() -> None:
+    cloud_app = CloudApp(vefaas_application_name="{{cookiecutter.vefaas_application_name}}")
+    cloud_app.delete_self()
+
+
+if __name__ == "__main__":
+    main()

veadk/integrations/ve_faas/template/{{cookiecutter.local_dir_name}}/src/app.py

@@ -26,6 +26,7 @@
 from starlette.routing import Route
 
 from google.adk.a2a.utils.agent_card_builder import AgentCardBuilder
+from a2a.types import AgentProvider
 
 from veadk.a2a.ve_a2a_server import init_app
 from veadk.runner import Runner
@@ -46,7 +47,9 @@
 agent = agent_run_config.agent
 short_term_memory = agent_run_config.short_term_memory
 
-agent_card_builder = AgentCardBuilder(agent=agent)
+VEFAAS_REGION = os.getenv("APP_REGION", "cn-beijing")
+VEFAAS_FUNC_ID = os.getenv("_FAAS_FUNC_ID", "")
+agent_card_builder = AgentCardBuilder(agent=agent, provider=AgentProvider(organization="Volcengine Agent Development Kit (VeADK)", url=f"https://console.volcengine.com/vefaas/region:vefaas+{VEFAAS_REGION}/function/detail/{VEFAAS_FUNC_ID}"))
 
 
 def load_tracer() -> None:

veadk/tools/sandbox/computer_sandbox.py

@@ -12,16 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-computer_sandbox = ...
+from google.adk.tools.mcp_tool.mcp_toolset import MCPToolset
 
+from veadk.config import getenv
+from veadk.utils.mcp_utils import get_mcp_params
 
-def computer_use(prompt: str) -> str:
-    """Using the remote computer sandbox to according to the prompt.
+url = getenv("TOOL_COMPUTER_SANDBOX_URL")
 
-    Args:
-        prompt (str): The prompt to be used.
 
-    Returns:
-        str: The response from the sandbox.
-    """
-    ...
+computer_sandbox = MCPToolset(connection_params=get_mcp_params(url=url))
+
+# def computer_use(prompt: str) -> str:
+#     """Using the remote computer sandbox to according to the prompt.
+
+#     Args:
+#         prompt (str): The prompt to be used.
+
+#     Returns:
+#         str: The response from the sandbox.
+#     """
+#     ...

veadk/tracing/telemetry/attributes/extractors/llm_attributes_extractors.py

@@ -18,6 +18,7 @@
     ExtractorResponse,
     LLMAttributesParams,
 )
+from veadk.utils.misc import safe_json_serialize
 
 
 def llm_gen_ai_request_model(params: LLMAttributesParams) -> ExtractorResponse:
@@ -133,7 +134,7 @@ def llm_gen_ai_prompt(params: LLMAttributesParams) -> ExtractorResponse:
                         else "<unknown_function_name>"
                     )
                     message[f"gen_ai.prompt.{idx}.tool_calls.0.function.arguments"] = (
-                        json.dumps(part.function_call.args)
+                        safe_json_serialize(part.function_call.args)
                         if part.function_call.args
                         else json.dumps({})
                     )
@@ -168,7 +169,7 @@ def llm_gen_ai_completion(params: LLMAttributesParams) -> ExtractorResponse:
                     else "<unknown_function_name>"
                 )
                 message[f"gen_ai.completion.{idx}.tool_calls.0.function.arguments"] = (
-                    json.dumps(part.function_call.args)
+                    safe_json_serialize(part.function_call.args)
                     if part.function_call.args
                     else json.dumps({})
                 )
@@ -289,7 +290,7 @@ def llm_gen_ai_assistant_message(params: LLMAttributesParams) -> ExtractorRespon
                                 else "<unknown_function_name>"
                             )
                             message_part["tool_calls.0.function.arguments"] = (
-                                json.dumps(part.function_call.args)
+                                safe_json_serialize(part.function_call.args)
                                 if part.function_call.args
                                 else json.dumps({})
                             )
@@ -326,7 +327,7 @@ def llm_gen_ai_choice(params: LLMAttributesParams) -> ExtractorResponse:
                     else "<unknown_function_name>"
                 )
                 message["message.tool_calls.0.function.arguments"] = (
-                    json.dumps(part.function_call.args)
+                    safe_json_serialize(part.function_call.args)
                     if part.function_call.args
                     else json.dumps({})
                 )
@@ -351,7 +352,7 @@ def llm_gen_ai_choice(params: LLMAttributesParams) -> ExtractorResponse:
                         else "<unknown_function_name>"
                     )
                     message["message.tool_calls.0.function.arguments"] = (
-                        json.dumps(part.function_call.args)
+                        safe_json_serialize(part.function_call.args)
                         if part.function_call.args
                         else json.dumps({})
                     )

veadk/tracing/telemetry/attributes/extractors/tool_attributes_extractors.py

@@ -12,12 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import json
-
 from veadk.tracing.telemetry.attributes.extractors.types import (
     ExtractorResponse,
     ToolAttributesParams,
 )
+from veadk.utils.misc import safe_json_serialize
 
 
 def tool_gen_ai_operation_name(params: ToolAttributesParams) -> ExtractorResponse:
@@ -27,7 +26,7 @@ def tool_gen_ai_operation_name(params: ToolAttributesParams) -> ExtractorRespons
 def tool_gen_ai_tool_message(params: ToolAttributesParams) -> ExtractorResponse:
     tool_input = {
         "role": "tool",
-        "content": json.dumps(
+        "content": safe_json_serialize(
             {
                 "name": params.tool.name,
                 "description": params.tool.description,
@@ -45,7 +44,7 @@ def tool_gen_ai_tool_input(params: ToolAttributesParams) -> ExtractorResponse:
         "parameters": params.args,
     }
     return ExtractorResponse(
-        content=json.dumps(tool_input, ensure_ascii=False) or "<unknown_tool_input>"
+        content=safe_json_serialize(tool_input) or "<unknown_tool_input>"
     )
 
 
@@ -63,7 +62,7 @@ def tool_gen_ai_tool_output(params: ToolAttributesParams) -> ExtractorResponse:
         "response": function_response["response"],
     }
     return ExtractorResponse(
-        content=json.dumps(tool_output, ensure_ascii=False) or "<unknown_tool_output>"
+        content=safe_json_serialize(tool_output) or "<unknown_tool_output>"
     )
 
 

veadk/utils/misc.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import importlib.util
+import json
 import sys
 import time
 import types
@@ -81,3 +82,21 @@ def flatten_dict(
         else:
             items.append((new_key, v))
     return dict(items)
+
+
+def safe_json_serialize(obj) -> str:
+    """Convert any Python object to a JSON-serializable type or string.
+
+    Args:
+      obj: The object to serialize.
+
+    Returns:
+      The JSON-serialized object string or <non-serializable> if the object cannot be serialized.
+    """
+
+    try:
+        return json.dumps(
+            obj, ensure_ascii=False, default=lambda o: "<not serializable>"
+        )
+    except (TypeError, OverflowError):
+        return "<not serializable>"