瀏覽代碼

fix: pydantic2 error (#5172)

takatost 10 月之前
父節點
當前提交
415022aa14

+ 1 - 1
api/core/app/apps/agent_chat/app_generator.py

@@ -107,7 +107,7 @@ class AgentChatAppGenerator(MessageBasedAppGenerator):
         application_generate_entity = AgentChatAppGenerateEntity(
             task_id=str(uuid.uuid4()),
             app_config=app_config,
-            model_config=ModelConfigConverter.convert(app_config),
+            model_conf=ModelConfigConverter.convert(app_config),
             conversation_id=conversation.id if conversation else None,
             inputs=conversation.inputs if conversation else self._get_cleaned_inputs(inputs, app_config),
             query=query,

+ 1 - 1
api/core/app/apps/chat/app_generator.py

@@ -104,7 +104,7 @@ class ChatAppGenerator(MessageBasedAppGenerator):
         application_generate_entity = ChatAppGenerateEntity(
             task_id=str(uuid.uuid4()),
             app_config=app_config,
-            model_config=ModelConfigConverter.convert(app_config),
+            model_conf=ModelConfigConverter.convert(app_config),
             conversation_id=conversation.id if conversation else None,
             inputs=conversation.inputs if conversation else self._get_cleaned_inputs(inputs, app_config),
             query=query,

+ 2 - 2
api/core/app/apps/completion/app_generator.py

@@ -98,7 +98,7 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
         application_generate_entity = CompletionAppGenerateEntity(
             task_id=str(uuid.uuid4()),
             app_config=app_config,
-            model_config=ModelConfigConverter.convert(app_config),
+            model_conf=ModelConfigConverter.convert(app_config),
             inputs=self._get_cleaned_inputs(inputs, app_config),
             query=query,
             files=file_objs,
@@ -257,7 +257,7 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
         application_generate_entity = CompletionAppGenerateEntity(
             task_id=str(uuid.uuid4()),
             app_config=app_config,
-            model_config=ModelConfigConverter.convert(app_config),
+            model_conf=ModelConfigConverter.convert(app_config),
             inputs=message.inputs,
             query=message.query,
             files=file_objs,

+ 1 - 1
api/core/model_runtime/model_providers/google/llm/llm.py

@@ -313,7 +313,7 @@ class GoogleLargeLanguageModel(LargeLanguageModel):
                         delta=LLMResultChunkDelta(
                             index=index,
                             message=assistant_prompt_message,
-                            finish_reason=chunk.candidates[0].finish_reason,
+                            finish_reason=str(chunk.candidates[0].finish_reason),
                             usage=usage
                         )
                     )