refactor: streamline parameter handling by replacing extra_body with unpacked optional_params in image.py and llm.py

Author: wxg0103

apps/models_provider/base_model_provider.py

@@ -107,10 +107,7 @@ def filter_optional_params(model_kwargs):
         optional_params = {}
         for key, value in model_kwargs.items():
             if key not in ['model_id', 'use_local', 'streaming', 'show_ref_label', 'stream']:
-                if key == 'extra_body' and isinstance(value, dict):
-                    optional_params = {**optional_params, **value}
-                else:
-                    optional_params[key] = value
+                optional_params[key] = value
         return optional_params
 
 

apps/models_provider/impl/aliyun_bai_lian_model_provider/model/image.py

@@ -28,6 +28,7 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             # stream_options={"include_usage": True},
             streaming=True,
             stream_usage=True,
+            **optional_params,
         )
         return chat_tong_yi
 

apps/models_provider/impl/aliyun_bai_lian_model_provider/model/llm.py

@@ -21,5 +21,5 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             openai_api_base=model_credential.get('api_base'),
             openai_api_key=model_credential.get('api_key'),
             streaming=True,
-            extra_body=optional_params
+            **optional_params,
         )

apps/models_provider/impl/deepseek_model_provider/model/llm.py

@@ -30,7 +30,7 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             model=model_name,
             openai_api_base=model_credential.get('api_base') or 'https://api.deepseek.com',
             openai_api_key=model_credential.get('api_key'),
-            extra_body=optional_params
+            **optional_params,
         )
         return deepseek_chat_open_ai
 

apps/models_provider/impl/docker_ai_model_provider/model/image.py

@@ -20,5 +20,5 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             # stream_options={"include_usage": True},
             streaming=True,
             stream_usage=True,
-            extra_body=optional_params
+            **optional_params,
         )

apps/models_provider/impl/docker_ai_model_provider/model/llm.py

@@ -36,9 +36,9 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             model=model_name,
             openai_api_base=model_credential.get('api_base'),
             openai_api_key=model_credential.get('api_key'),
-            extra_body=optional_params,
             streaming=streaming,
-            custom_get_token_ids=custom_get_token_ids
+            custom_get_token_ids=custom_get_token_ids,
+            **optional_params,
         )
         return chat_open_ai
 

apps/models_provider/impl/kimi_model_provider/model/llm.py

@@ -26,6 +26,6 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             openai_api_base=model_credential['api_base'],
             openai_api_key=model_credential['api_key'],
             model=model_name,
-            extra_body=optional_params,
+            **optional_params,
         )
         return kimi_chat_open_ai

apps/models_provider/impl/ollama_model_provider/model/image.py

@@ -32,5 +32,5 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             # stream_options={"include_usage": True},
             streaming=True,
             stream_usage=True,
-            extra_body=optional_params
+            **optional_params,
         )

apps/models_provider/impl/openai_model_provider/model/image.py

@@ -20,5 +20,5 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             # stream_options={"include_usage": True},
             streaming=True,
             stream_usage=True,
-            extra_body=optional_params
+            **optional_params,
         )

apps/models_provider/impl/openai_model_provider/model/llm.py

@@ -36,9 +36,9 @@ def new_instance(model_type, model_name, model_credential: Dict[str, object], **
             model=model_name,
             openai_api_base=model_credential.get('api_base'),
             openai_api_key=model_credential.get('api_key'),
-            extra_body=optional_params,
             streaming=streaming,
-            custom_get_token_ids=custom_get_token_ids
+            custom_get_token_ids=custom_get_token_ids,
+            **optional_params,
         )
         return chat_open_ai