wangtinghu/agentUniverse
1
0
Fork 0
mirror of https://github.com/agentuniverse-ai/agentUniverse.git synced 2026-02-09 01:59:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #409 from agentuniverse-ai/dev_fix_params

Browse Source 
fix llm channel init extra params bug
This commit is contained in:
Jerry Z H
2025-06-16 11:09:36 +08:00
committed by GitHub
parent 79037b59e5 2896fcff26
commit 71bf7a7cb9
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
agentuniverse/llm/llm_channel/llm_channel.py
View File

@@ -70,9 +70,9 @@ class LLMChannel(ComponentBase):
self.model_support_max_tokens = component_configer.model_support_max_tokens
if hasattr(component_configer, "model_is_openai_protocol_compatible"):
self.model_is_openai_protocol_compatible = component_configer.model_is_openai_protocol_compatible
if component_configer.configer.value.get("ext_headers"):
if component_configer.configer.value.get("extra_headers"):
self.ext_headers = component_configer.configer.value.get("extra_headers", {})
if component_configer.configer.value.get("ext_params"):
if component_configer.configer.value.get("extra_params"):
self.ext_params = component_configer.configer.value.get("extra_params", {})
self.ext_params["stream_options"] = {
"include_usage": True
@@ -109,6 +109,10 @@ class LLMChannel(ComponentBase):
if self.model_support_max_context_length:
value = min(self.model_support_max_context_length,
value) if value else self.model_support_max_context_length
if key == 'ext_params' and value and isinstance(value, dict):
self.ext_params.update(value)
if key == 'ext_headers' and value and isinstance(value, dict):
self.ext_headers.update(value)
if not self.__dict__.get(key):
self.__dict__[key] = value
@@ -138,7 +142,7 @@ class LLMChannel(ComponentBase):
extra_body = kwargs.pop("extra_body", {})
ext_params = {**ext_params, **extra_body}
if not streaming:
ext_params.pop("stream_options", "")
ext_params.pop("stream_options", None)
self.client = self._new_client()
self.client.base_url = kwargs.pop('api_base') if kwargs.get('api_base') else self.channel_api_base
chat_completion = self.client.chat.completions.create(
@@ -174,7 +178,7 @@ class LLMChannel(ComponentBase):
extra_body = kwargs.pop("extra_body", {})
ext_params = {**ext_params, **extra_body}
if not streaming:
ext_params.pop("stream_options")
ext_params.pop("stream_options", None)
self.async_client = self._new_async_client()
self.async_client.base_url = kwargs.pop('api_base') if kwargs.get('api_base') else self.channel_api_base
chat_completion = await self.async_client.chat.completions.create(
@@ -263,7 +267,7 @@ class LLMChannel(ComponentBase):
"""Generate the result of the stream."""
chat_completion = chunk
if not isinstance(chunk, dict):
chunk = chunk.dict()
chunk = chunk.model_dump()
if len(chunk["choices"]) == 0:
return LLMOutput(text="", raw=chat_completion.model_dump())
choice = chunk["choices"][0]