Refactor model update methods (#18)

Co-authored-by: wangyuxin <[email protected]>

generate/chat_completion/models/azure.py

@@ -53,7 +53,7 @@ def _get_request_parameters(self, messages: Messages, parameters: OpenAIChatPara
     @override
     def generate(self, prompt: Prompt, **kwargs: Unpack[OpenAIChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = self.http_client.post(request_parameters)
         output = parse_openai_model_reponse(response.json())
@@ -63,7 +63,7 @@ def generate(self, prompt: Prompt, **kwargs: Unpack[OpenAIChatParametersDict]) -
     @override
     async def async_generate(self, prompt: Prompt, **kwargs: Unpack[OpenAIChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = await self.http_client.async_post(request_parameters=request_parameters)
         output = parse_openai_model_reponse(response.json())

generate/chat_completion/models/baichuan.py

@@ -119,15 +119,15 @@ def _get_request_parameters(self, messages: Messages, parameters: BaichuanChatPa
     @override
     def generate(self, prompt: Prompt, **kwargs: Unpack[BaichuanChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = self.http_client.post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
 
     @override
     async def async_generate(self, prompt: Prompt, **kwargs: Unpack[BaichuanChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = await self.http_client.async_post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
@@ -164,7 +164,7 @@ def stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[BaichuanChatParametersDict]
     ) -> Iterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         message = AssistantMessage(content='')
         is_start = True
@@ -178,7 +178,7 @@ async def async_stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[BaichuanChatParametersDict]
     ) -> AsyncIterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         message = AssistantMessage(content='')
         is_start = True

generate/chat_completion/models/bailian.py

@@ -137,15 +137,15 @@ def _get_request_parameters(self, messages: Messages, parameters: BailianChatPar
     @override
     def generate(self, prompt: Prompt, **kwargs: Unpack[BailianChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = self.http_client.post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
 
     @override
     async def async_generate(self, prompt: Prompt, **kwargs: Unpack[BailianChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = await self.http_client.async_post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
@@ -176,7 +176,7 @@ def stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[BailianChatParametersDict]
     ) -> Iterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         message = AssistantMessage(content='')
         is_start = True
@@ -195,7 +195,7 @@ async def async_stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[BailianChatParametersDict]
     ) -> AsyncIterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         message = AssistantMessage(content='')
         is_start = True

generate/chat_completion/models/hunyuan.py

@@ -93,15 +93,15 @@ def _get_request_parameters(self, messages: Messages, parameters: HunyuanChatPar
     @override
     def generate(self, prompt: Prompt, **kwargs: Unpack[HunyuanChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = self.http_client.post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
 
     @override
     async def async_generate(self, prompt: Prompt, **kwargs: Unpack[HunyuanChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = await self.http_client.async_post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
@@ -136,7 +136,7 @@ def stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[HunyuanChatParametersDict]
     ) -> Iterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         message = AssistantMessage(content='')
         is_start = True
@@ -150,7 +150,7 @@ async def async_stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[HunyuanChatParametersDict]
     ) -> AsyncIterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         message = AssistantMessage(content='')
         is_start = True

generate/chat_completion/models/minimax.py

@@ -130,15 +130,15 @@ def _get_request_parameters(self, messages: Messages, parameters: MinimaxChatPar
     @override
     def generate(self, prompt: Prompt, **kwargs: Unpack[MinimaxChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = self.http_client.post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
 
     @override
     async def async_generate(self, prompt: Prompt, **kwargs: Unpack[MinimaxChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = await self.http_client.async_post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
@@ -171,7 +171,7 @@ def stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[MinimaxChatParametersDict]
     ) -> Iterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         message = AssistantMessage(content='')
         is_start = True
@@ -185,7 +185,7 @@ async def async_stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[MinimaxChatParametersDict]
     ) -> AsyncIterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         message = AssistantMessage(content='')
         is_start = True

generate/chat_completion/models/minimax_pro.py

@@ -199,7 +199,7 @@ def process(self, response: ResponseValue) -> ChatCompletionStreamOutput:
                 model_info=self.model_info,
                 message=self.message,
                 finish_reason=response['choices'][0]['finish_reason'],
-                cost=calculate_cost(model_name=self.model_info.name , usage=response['usage']),
+                cost=calculate_cost(model_name=self.model_info.name, usage=response['usage']),
                 extra={
                     'input_sensitive': response['input_sensitive'],
                     'output_sensitive': response['output_sensitive'],
@@ -299,15 +299,15 @@ def _get_request_parameters(self, messages: Messages, parameters: MinimaxProChat
     @override
     def generate(self, prompt: Prompt, **kwargs: Unpack[MinimaxProChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = self.http_client.post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
 
     @override
     async def async_generate(self, prompt: Prompt, **kwargs: Unpack[MinimaxProChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = await self.http_client.async_post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
@@ -344,7 +344,7 @@ def stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[MinimaxProChatParametersDict]
     ) -> Iterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         stream_processor = _StreamResponseProcessor(model_info=self.model_info)
         for line in self.http_client.stream_post(request_parameters=request_parameters):
@@ -355,7 +355,7 @@ async def async_stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[MinimaxProChatParametersDict]
     ) -> AsyncIterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         stream_processor = _StreamResponseProcessor(model_info=self.model_info)
         async for line in self.http_client.async_stream_post(request_parameters=request_parameters):

generate/chat_completion/models/openai.py

@@ -375,15 +375,15 @@ def _get_request_parameters(self, messages: Messages, parameters: OpenAIChatPara
     @override
     def generate(self, prompt: Prompt, **kwargs: Unpack[OpenAIChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = self.http_client.post(request_parameters)
         return parse_openai_model_reponse(response.json())
 
     @override
     async def async_generate(self, prompt: Prompt, **kwargs: Unpack[OpenAIChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = await self.http_client.async_post(request_parameters=request_parameters)
         return parse_openai_model_reponse(response.json())
@@ -398,7 +398,7 @@ def stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[OpenAIChatParametersDict]
     ) -> Iterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         stream_processor = _StreamResponseProcessor()
         is_finish = False
@@ -417,7 +417,7 @@ async def async_stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[OpenAIChatParametersDict]
     ) -> AsyncIterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_stream_request_parameters(messages, parameters)
         stream_processor = _StreamResponseProcessor()
         is_finish = False

generate/chat_completion/models/wenxin.py

@@ -160,15 +160,15 @@ def _get_request_parameters(self, messages: Messages, parameters: WenxinChatPara
     @override
     def generate(self, prompt: Prompt, **kwargs: Unpack[WenxinChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = self.http_client.post(request_parameters)
         return self._parse_reponse(response.json())
 
     @override
     async def async_generate(self, prompt: Prompt, **kwargs: Unpack[WenxinChatParametersDict]) -> ChatCompletionOutput:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         request_parameters = self._get_request_parameters(messages, parameters)
         response = await self.http_client.async_post(request_parameters=request_parameters)
         return self._parse_reponse(response.json())
@@ -206,7 +206,7 @@ def stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[WenxinChatParametersDict]
     ) -> Iterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         if parameters.functions:
             raise ValueError('stream_generate does not support functions')
         request_parameters = self._get_stream_request_parameters(messages, parameters)
@@ -222,7 +222,7 @@ async def async_stream_generate(
         self, prompt: Prompt, **kwargs: Unpack[WenxinChatParametersDict]
     ) -> AsyncIterator[ChatCompletionStreamOutput]:
         messages = ensure_messages(prompt)
-        parameters = self.parameters.update_with_validate(**kwargs)
+        parameters = self.parameters.clone_with_changes(**kwargs)
         if parameters.functions:
             raise ValueError('stream_generate does not support functions')
         request_parameters = self._get_stream_request_parameters(messages, parameters)