fix comfig.yaml

Author: yaozheng-fang

config.yaml.full

@@ -5,8 +5,9 @@ model:
     name: doubao-seed-1-6-250615
     api_base: https://ark.cn-beijing.volces.com/api/v3/
     api_key: 
-    extra_headers: '{"x-is-encrypted": "true"}'
-    extra_body: '{"caching": {"type": "enabled"}, "thinking": {"type": "disabled"}, "expire_at": 1}' # expire after 1 hour
+    encrypted: true # true | false
+    caching: enabled # enabled | disabled
+    max_llm_calls: 100
   # [optional] for llm-as-a-judge a evaluation
   judge:  
     name: doubao-seed-1-6-250615

config.yaml.simple

@@ -4,5 +4,6 @@ model:
     name: doubao-seed-1-6-250615
     api_base: https://ark.cn-beijing.volces.com/api/v3/
     api_key: 
-    extra_headers: '{"x-is-encrypted": "true"}'
-    extra_body: '{"caching": {"type": "enabled"}, "thinking": {"type": "disabled"}, "expire_at": 1}' # expire after 1 hour
+    encrypted: true # true | false
+    caching: enabled # enabled | disabled
+    max_llm_calls: 100

veadk/agent.py

@@ -47,29 +47,6 @@
 logger = get_logger(__name__)
 
 
-def _parse_user_model_extra_config() -> dict:
-    import json
-
-    extra_headers = getenv("MODEL_AGENT_EXTRA_HEADERS", {}, allow_false_values=True)
-    extra_body = getenv("MODEL_AGENT_EXTRA_BODY", {}, allow_false_values=True)
-
-    if extra_headers:
-        extra_headers = json.loads(extra_headers)
-    if extra_body:
-        extra_body = json.loads(extra_body)
-        if extra_body.get("expire_at", 0):
-            import time
-
-            extra_body["expire_at"] = (
-                int(time.time()) + int(extra_body["expire_at"]) * 3600
-            )
-
-    return {
-        "extra_headers": extra_headers,
-        "extra_body": extra_body,
-    }
-
-
 class Agent(LlmAgent):
     """LLM-based Agent with Volcengine capabilities."""
 
@@ -97,7 +74,7 @@ class Agent(LlmAgent):
     model_api_key: str = Field(default_factory=lambda: getenv("MODEL_AGENT_API_KEY"))
     """The api key of the model for agent running."""
 
-    model_extra_config: dict = Field(default_factory=_parse_user_model_extra_config)
+    model_extra_config: dict = Field(default_factory=dict)
     """The extra config to include in the model requests."""
 
     tools: list[ToolUnion] = []
@@ -140,6 +117,8 @@ def model_post_init(self, __context: Any) -> None:
             "extra_body": body,
         }
 
+        logger.info(f"Model extra config: {self.model_extra_config}")
+
         if not self.model:
             self.model = LiteLlm(
                 model=f"{self.model_provider}/{self.model_name}",

veadk/consts.py

@@ -14,20 +14,22 @@
 
 import time
 
+from veadk.config import getenv
 from veadk.version import VERSION
 
 DEFAULT_MODEL_AGENT_NAME = "doubao-seed-1-6-250615"
 DEFAULT_MODEL_AGENT_PROVIDER = "openai"
 DEFAULT_MODEL_AGENT_API_BASE = "https://ark.cn-beijing.volces.com/api/v3/"
 DEFAULT_MODEL_EXTRA_CONFIG = {
     "extra_headers": {
-        "x-is-encrypted": "true",
+        "x-is-encrypted": getenv("MODEL_AGENT_ENCRYPTED", "true"),
         "veadk-source": "veadk",
         "veadk-version": VERSION,
     },
     "extra_body": {
-        "caching": {"type": "enabled"},
-        "thinking": {"type": "disabled"},
+        "caching": {
+            "type": getenv("MODEL_AGENT_CACHING", "enabled"),
+        },
         "expire_at": int(time.time()) + 3600,  # expire after 1 hour
     },
 }

veadk/runner.py

@@ -27,12 +27,13 @@
 from veadk.agents.loop_agent import LoopAgent
 from veadk.agents.parallel_agent import ParallelAgent
 from veadk.agents.sequential_agent import SequentialAgent
+from veadk.config import getenv
 from veadk.evaluation import EvalSetRecorder
+from veadk.integrations.ve_tos.ve_tos import VeTOS
 from veadk.memory.short_term_memory import ShortTermMemory
 from veadk.types import MediaMessage
 from veadk.utils.logger import get_logger
 from veadk.utils.misc import read_png_to_bytes
-from veadk.integrations.ve_tos.ve_tos import VeTOS
 
 logger = get_logger(__name__)
 
@@ -142,7 +143,13 @@ async def _run(
         if run_config is not None:
             stream_mode = run_config.streaming_mode
         else:
-            run_config = RunConfig(streaming_mode=stream_mode)
+            run_config = RunConfig(
+                streaming_mode=stream_mode,
+                max_llm_calls=int(getenv("MODEL_AGENT_MAX_LLM_CALLS", 100)),
+            )
+
+        logger.info(f"Run config: {run_config}")
+
         try:
 
             async def event_generator():
@@ -231,7 +238,13 @@ async def run_with_raw_message(
         session_id: str,
         run_config: RunConfig | None = None,
     ):
-        run_config = RunConfig() if not run_config else run_config
+        run_config = (
+            RunConfig(max_llm_calls=int(getenv("MODEL_AGENT_MAX_LLM_CALLS", 100)))
+            if not run_config
+            else run_config
+        )
+
+        logger.info(f"Run config: {run_config}")
 
         await self.short_term_memory.create_session(
             app_name=self.app_name, user_id=self.user_id, session_id=session_id