estel/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: pydantic2 error (#5172)

Browse Source
This commit is contained in:
takatost
2024-06-14 03:05:04 +08:00
committed by GitHub
parent edf2047f04
commit 415022aa14
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/core/app/apps/agent_chat/app_generator.py
View File

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

2
api/core/app/apps/chat/app_generator.py
View File

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

4
api/core/app/apps/completion/app_generator.py
View File

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

2
api/core/model_runtime/model_providers/google/llm/llm.py
View File

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