hz/ebiz-dify-ai
1
0
Fork 0
mirror of http://112.124.100.131/huang.ze/ebiz-dify-ai.git synced 2025-12-08 18:36:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: count down thread in completion db not commit (#1267)

Browse Source
This commit is contained in:
takatost
2023-10-02 10:19:26 +08:00
committed by GitHub
parent 86a9dea428
commit 41d4c5b424
3 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/core/conversation_message_task.py
View File

@@ -94,7 +94,7 @@ class ConversationMessageTask:
if not self.conversation:
self.is_new_conversation = True
self.conversation = Conversation(
app_id=self.app_model_config.app_id,
app_id=self.app.id,
app_model_config_id=self.app_model_config.id,
model_provider=self.provider_name,
model_id=self.model_name,
@@ -115,7 +115,7 @@ class ConversationMessageTask:
db.session.commit()
self.message = Message(
app_id=self.app_model_config.app_id,
app_id=self.app.id,
model_provider=self.provider_name,
model_id=self.model_name,
override_model_configs=json.dumps(override_model_configs) if override_model_configs else None,

8
api/core/model_providers/models/llm/openai_model.py
View File

@@ -106,13 +106,7 @@ class OpenAIModel(BaseLLM):
raise ModelCurrentlyNotSupportError("Dify Hosted OpenAI GPT-4 currently not support.")
prompts = self._get_prompt_from_messages(messages)
try:
return self._client.generate([prompts], stop, callbacks)
finally:
thread_context = api_requestor._thread_context
if hasattr(thread_context, "session") and thread_context.session:
thread_context.session.close()
return self._client.generate([prompts], stop, callbacks)
def get_num_tokens(self, messages: List[PromptMessage]) -> int:
"""