Merge branch 'main' into feat/skills

Author: BhAem

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "veadk-python"
-version = "0.5.18"
+version = "0.5.19"
 description = "Volcengine agent development kit, integrations with Volcengine cloud services."
 readme = "README.md"
 requires-python = ">=3.10"

veadk/config.py

@@ -49,6 +49,15 @@
     env_from_dotenv = {}
     logger.info("No `.env` file found.")
 
+provider = (os.getenv("CLOUD_PROVIDER") or "").lower()
+if provider == "byteplus":
+    byteplus_access_key = os.getenv("BYTEPLUS_ACCESS_KEY")
+    if byteplus_access_key:
+        os.environ["VOLCENGINE_ACCESS_KEY"] = byteplus_access_key
+    byteplus_secret_key = os.getenv("BYTEPLUS_SECRET_KEY")
+    if byteplus_secret_key:
+        os.environ["VOLCENGINE_SECRET_KEY"] = byteplus_secret_key
+
 
 class VeADKConfig(BaseModel):
     model: ModelConfig = Field(default_factory=ModelConfig)
@@ -90,6 +99,20 @@ def getenv(
     """
     value = os.getenv(env_name, default_value)
 
+    if value == default_value or not value:
+        provider = (os.getenv("CLOUD_PROVIDER") or "").lower()
+        if provider == "byteplus":
+            if env_name == "VOLCENGINE_ACCESS_KEY":
+                byteplus_key = os.getenv("BYTEPLUS_ACCESS_KEY")
+                if byteplus_key:
+                    os.environ["VOLCENGINE_ACCESS_KEY"] = byteplus_key
+                    value = byteplus_key
+            elif env_name == "VOLCENGINE_SECRET_KEY":
+                byteplus_key = os.getenv("BYTEPLUS_SECRET_KEY")
+                if byteplus_key:
+                    os.environ["VOLCENGINE_SECRET_KEY"] = byteplus_key
+                    value = byteplus_key
+
     if allow_false_values:
         return value
 

veadk/models/ark_llm.py

@@ -37,6 +37,11 @@
     ResponseReasoningSummaryTextDeltaEvent,
     ResponseTextDeltaEvent,
     ResponseCompletedEvent,
+    ResponseIncompleteEvent,
+    ResponseError,
+)
+from volcenginesdkarkruntime.types.responses.response_incomplete_details import (
+    IncompleteDetails,
 )
 from volcenginesdkarkruntime.types.responses.response_input_message_content_list_param import (
     ResponseInputTextParam,
@@ -551,6 +556,26 @@ def request_reorganization_by_ark(request_data: Dict) -> Dict:
 
 # ---------------------------------------
 # output transfer -----------------------
+def record_logs(raw_response: ArkTypeResponse):
+    try:
+        if isinstance(raw_response, ArkTypeResponse):
+            error_message = ""
+            if raw_response.error and isinstance(raw_response.error, ResponseError):
+                error_message += f"The response with error code `{raw_response.error.code}`, error message is `{raw_response.error.message}`"
+
+            if raw_response.incomplete_details and isinstance(
+                raw_response.incomplete_details, IncompleteDetails
+            ):
+                error_message += f"The reason for the incomplete return is `{raw_response.incomplete_details.reason}`, content_filter: `{raw_response.incomplete_details.content_filter}`"
+            logger.debug(
+                f"Ark response: Received Response from model `{raw_response.model}` with id `{raw_response.id}`. "
+                f"Status: `{raw_response.status}`. "
+                f"{error_message}"
+            )
+    except Exception as e:
+        logger.error(f"Failed to record ark logs: {e}")
+
+
 def event_to_generate_content_response(
     event: Union[ArkTypeResponse, ResponseStreamEvent],
     *,
@@ -587,7 +612,9 @@ def event_to_generate_content_response(
             parts.append(types.Part(text=event.delta, thought=True))
         elif isinstance(event, ResponseTextDeltaEvent):
             parts.append(types.Part.from_text(text=event.delta))
-        elif isinstance(event, ResponseCompletedEvent):
+        elif isinstance(event, ResponseCompletedEvent) or isinstance(
+            event, ResponseIncompleteEvent
+        ):
             raw_response = event.response
             llm_response = ark_response_to_generate_content_response(raw_response)
             return llm_response
@@ -607,6 +634,7 @@ def ark_response_to_generate_content_response(
     ArkTypeResponse -> LlmResponse
     instead of `_model_response_to_generate_content_response`,
     """
+    record_logs(raw_response)
     outputs = raw_response.output
     status = raw_response.status
     incomplete_details = getattr(

veadk/tracing/telemetry/telemetry.py

@@ -305,6 +305,7 @@ def trace_tool_call(
     tool: BaseTool,
     args: dict[str, Any],
     function_response_event: Event,
+    **kwargs,
 ) -> None:
     """Trace a tool function call with comprehensive telemetry data.
 
@@ -344,6 +345,8 @@ def trace_call_llm(
     event_id: str,
     llm_request: LlmRequest,
     llm_response: LlmResponse,
+    *args,
+    **kwargs,
 ) -> None:
     """Trace a language model call with comprehensive telemetry data.
 
@@ -413,4 +416,4 @@ def trace_call_llm(
 
 
 # Do not modify this function
-def trace_send_data(): ...
+def trace_send_data(**kwargs): ...

veadk/utils/misc.py

@@ -152,6 +152,16 @@ def set_envs(config_yaml_path: str, env_from_dotenv: dict = None) -> tuple[dict,
             continue
         veadk_environments[k] = str(config_upper_map.get(k))
         os.environ[k] = str(config_upper_map.get(k))
+
+    provider = (os.getenv("CLOUD_PROVIDER") or "").lower()
+    if provider == "byteplus":
+        byteplus_access_key = veadk_environments.get("BYTEPLUS_ACCESS_KEY")
+        if byteplus_access_key:
+            os.environ["VOLCENGINE_ACCESS_KEY"] = byteplus_access_key
+        byteplus_secret_key = veadk_environments.get("BYTEPLUS_SECRET_KEY")
+        if byteplus_secret_key:
+            os.environ["VOLCENGINE_SECRET_KEY"] = byteplus_secret_key
+
     return config_dict, veadk_environments
 
 

veadk/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = "0.5.18"
+VERSION = "0.5.19"