|
32 | 32 | UserPromptPart,
|
33 | 33 | )
|
34 | 34 | from ..profiles import ModelProfile, ModelProfileSpec
|
35 |
| -from ..settings import ModelSettings |
| 35 | +from ..settings import ModelSettings, merge_model_settings |
36 | 36 | from ..tools import ToolDefinition
|
37 | 37 | from . import Model, ModelRequestParameters, StreamedResponse
|
38 | 38 |
|
@@ -125,6 +125,7 @@ async def request(
|
125 | 125 | model_settings: ModelSettings | None,
|
126 | 126 | model_request_parameters: ModelRequestParameters,
|
127 | 127 | ) -> ModelResponse:
|
| 128 | + model_settings = merge_model_settings(self.settings, model_settings) |
128 | 129 | agent_info = AgentInfo(
|
129 | 130 | function_tools=model_request_parameters.function_tools,
|
130 | 131 | allow_text_output=model_request_parameters.allow_text_output,
|
@@ -154,6 +155,7 @@ async def request_stream(
|
154 | 155 | model_request_parameters: ModelRequestParameters,
|
155 | 156 | run_context: RunContext[Any] | None = None,
|
156 | 157 | ) -> AsyncIterator[StreamedResponse]:
|
| 158 | + model_settings = merge_model_settings(self.settings, model_settings) |
157 | 159 | agent_info = AgentInfo(
|
158 | 160 | function_tools=model_request_parameters.function_tools,
|
159 | 161 | allow_text_output=model_request_parameters.allow_text_output,
|
|
0 commit comments