Unverified Commit 86a9dea4 authored by takatost's avatar takatost Committed by GitHub

fix: db not commit when streaming output (#1266)

parent 8606d80c
...@@ -51,4 +51,5 @@ stripe~=5.5.0 ...@@ -51,4 +51,5 @@ stripe~=5.5.0
pandas==1.5.3 pandas==1.5.3
xinference==0.4.2 xinference==0.4.2
safetensors==0.3.2 safetensors==0.3.2
zhipuai==1.0.7 zhipuai==1.0.7
\ No newline at end of file werkzeug==2.3.7
\ No newline at end of file
...@@ -200,17 +200,14 @@ class CompletionService: ...@@ -200,17 +200,14 @@ class CompletionService:
except (LLMBadRequestError, LLMAPIConnectionError, LLMAPIUnavailableError, except (LLMBadRequestError, LLMAPIConnectionError, LLMAPIUnavailableError,
LLMRateLimitError, ProviderTokenNotInitError, QuotaExceededError, LLMRateLimitError, ProviderTokenNotInitError, QuotaExceededError,
ModelCurrentlyNotSupportError) as e: ModelCurrentlyNotSupportError) as e:
db.session.rollback()
PubHandler.pub_error(user, generate_task_id, e) PubHandler.pub_error(user, generate_task_id, e)
except LLMAuthorizationError: except LLMAuthorizationError:
db.session.rollback()
PubHandler.pub_error(user, generate_task_id, LLMAuthorizationError('Incorrect API key provided')) PubHandler.pub_error(user, generate_task_id, LLMAuthorizationError('Incorrect API key provided'))
except Exception as e: except Exception as e:
db.session.rollback()
logging.exception("Unknown Error in completion") logging.exception("Unknown Error in completion")
PubHandler.pub_error(user, generate_task_id, e) PubHandler.pub_error(user, generate_task_id, e)
finally: finally:
db.session.close() db.session.commit()
@classmethod @classmethod
def countdown_and_close(cls, worker_thread, pubsub, user, generate_task_id) -> threading.Thread: def countdown_and_close(cls, worker_thread, pubsub, user, generate_task_id) -> threading.Thread:
...@@ -388,6 +385,8 @@ class CompletionService: ...@@ -388,6 +385,8 @@ class CompletionService:
logging.exception(e) logging.exception(e)
raise raise
finally: finally:
db.session.commit()
try: try:
pubsub.unsubscribe(generate_channel) pubsub.unsubscribe(generate_channel)
except ConnectionError: except ConnectionError:
...@@ -425,6 +424,8 @@ class CompletionService: ...@@ -425,6 +424,8 @@ class CompletionService:
logging.exception(e) logging.exception(e)
raise raise
finally: finally:
db.session.commit()
try: try:
pubsub.unsubscribe(generate_channel) pubsub.unsubscribe(generate_channel)
except ConnectionError: except ConnectionError:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment