From cbac3e15f9c201d8f12b487895f19f17da3f0159 Mon Sep 17 00:00:00 2001 From: Yingchun Lai Date: Tue, 31 Dec 2024 11:23:46 +0800 Subject: [PATCH 1/3] feat: throw AppInvokeQuotaExceededError when rate limited --- api/controllers/console/app/workflow.py | 3 ++- api/controllers/console/explore/completion.py | 11 ++++++++--- api/controllers/console/explore/workflow.py | 9 +++++++-- api/controllers/web/completion.py | 11 ++++++++--- api/controllers/web/workflow.py | 9 +++++++-- 5 files changed, 32 insertions(+), 11 deletions(-) diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py index 6942ac6fbe62dd..9ca079bd382995 100644 --- a/api/controllers/console/app/workflow.py +++ b/api/controllers/console/app/workflow.py @@ -13,6 +13,7 @@ from controllers.console.wraps import account_initialization_required, setup_required from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom +from core.errors.error import AppInvokeQuotaExceededError from factories import variable_factory from fields.workflow_fields import workflow_fields, workflow_pagination_fields from fields.workflow_run_fields import workflow_run_node_execution_fields @@ -158,7 +159,7 @@ def post(self, app_model: App): raise NotFound("Conversation Not Exists.") except services.errors.conversation.ConversationCompletedError: raise ConversationCompletedError() - except ValueError as e: + except (ValueError, AppInvokeQuotaExceededError) as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/console/explore/completion.py b/api/controllers/console/explore/completion.py index 3331ded70f6620..ebad880d9ff26f 100644 --- a/api/controllers/console/explore/completion.py +++ b/api/controllers/console/explore/completion.py @@ -18,7 +18,12 @@ from controllers.console.explore.wraps import InstalledAppResource from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom -from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError +from core.errors.error import ( + AppInvokeQuotaExceededError, + ModelCurrentlyNotSupportError, + ProviderTokenNotInitError, + QuotaExceededError, +) from core.model_runtime.errors.invoke import InvokeError from extensions.ext_database import db from libs import helper @@ -69,7 +74,7 @@ def post(self, installed_app): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except ValueError as e: + except (ValueError, AppInvokeQuotaExceededError) as e: raise e except Exception as e: logging.exception("internal server error.") @@ -129,7 +134,7 @@ def post(self, installed_app): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except ValueError as e: + except (ValueError, AppInvokeQuotaExceededError) as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/console/explore/workflow.py b/api/controllers/console/explore/workflow.py index 76d30299cd84a7..162a1a4b015884 100644 --- a/api/controllers/console/explore/workflow.py +++ b/api/controllers/console/explore/workflow.py @@ -13,7 +13,12 @@ from controllers.console.explore.wraps import InstalledAppResource from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom -from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError +from core.errors.error import ( + AppInvokeQuotaExceededError, + ModelCurrentlyNotSupportError, + ProviderTokenNotInitError, + QuotaExceededError, +) from core.model_runtime.errors.invoke import InvokeError from libs import helper from libs.login import current_user @@ -52,7 +57,7 @@ def post(self, installed_app: InstalledApp): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except ValueError as e: + except (ValueError, AppInvokeQuotaExceededError) as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/web/completion.py b/api/controllers/web/completion.py index 761771a81a4bb3..d294e7e58095a1 100644 --- a/api/controllers/web/completion.py +++ b/api/controllers/web/completion.py @@ -19,7 +19,12 @@ from controllers.web.wraps import WebApiResource from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom -from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError +from core.errors.error import ( + AppInvokeQuotaExceededError, + ModelCurrentlyNotSupportError, + ProviderTokenNotInitError, + QuotaExceededError, +) from core.model_runtime.errors.invoke import InvokeError from libs import helper from libs.helper import uuid_value @@ -67,7 +72,7 @@ def post(self, app_model, end_user): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except ValueError as e: + except (ValueError, AppInvokeQuotaExceededError) as e: raise e except Exception as e: logging.exception("internal server error.") @@ -127,7 +132,7 @@ def post(self, app_model, end_user): raise InvokeRateLimitHttpError(ex.description) except InvokeError as e: raise CompletionRequestError(e.description) - except ValueError as e: + except (ValueError, AppInvokeQuotaExceededError) as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/web/workflow.py b/api/controllers/web/workflow.py index 48d25e720c10c3..9b906edf14dfa5 100644 --- a/api/controllers/web/workflow.py +++ b/api/controllers/web/workflow.py @@ -14,7 +14,12 @@ from controllers.web.wraps import WebApiResource from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom -from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError +from core.errors.error import ( + AppInvokeQuotaExceededError, + ModelCurrentlyNotSupportError, + ProviderTokenNotInitError, + QuotaExceededError, +) from core.model_runtime.errors.invoke import InvokeError from libs import helper from models.model import App, AppMode, EndUser @@ -51,7 +56,7 @@ def post(self, app_model: App, end_user: EndUser): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except ValueError as e: + except (ValueError, AppInvokeQuotaExceededError) as e: raise e except Exception as e: logging.exception("internal server error.") From fdc4c9f40f2d8c349072c1b1c828071103610d17 Mon Sep 17 00:00:00 2001 From: Yingchun Lai Date: Thu, 2 Jan 2025 11:04:30 +0800 Subject: [PATCH 2/3] refactor: simplify some exception catch code --- api/controllers/console/app/completion.py | 4 ++-- api/controllers/console/app/workflow.py | 2 +- api/controllers/console/explore/completion.py | 4 ++-- api/controllers/console/explore/workflow.py | 2 +- api/controllers/service_api/app/completion.py | 4 ++-- api/controllers/service_api/app/workflow.py | 2 +- api/controllers/web/completion.py | 4 ++-- api/controllers/web/workflow.py | 2 +- api/core/app/apps/advanced_chat/app_generator.py | 2 +- api/core/app/apps/agent_chat/app_generator.py | 2 +- api/core/app/apps/chat/app_generator.py | 2 +- api/core/app/apps/completion/app_generator.py | 2 +- api/core/app/apps/workflow/app_generator.py | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/api/controllers/console/app/completion.py b/api/controllers/console/app/completion.py index dba41e5c47d24f..5fb8a9e87bce26 100644 --- a/api/controllers/console/app/completion.py +++ b/api/controllers/console/app/completion.py @@ -76,7 +76,7 @@ def post(self, app_model): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") @@ -141,7 +141,7 @@ def post(self, app_model): raise InvokeRateLimitHttpError(ex.description) except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py index 9ca079bd382995..4de17d7be0b7d1 100644 --- a/api/controllers/console/app/workflow.py +++ b/api/controllers/console/app/workflow.py @@ -159,7 +159,7 @@ def post(self, app_model: App): raise NotFound("Conversation Not Exists.") except services.errors.conversation.ConversationCompletedError: raise ConversationCompletedError() - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/console/explore/completion.py b/api/controllers/console/explore/completion.py index ebad880d9ff26f..9f72f47cf7beb6 100644 --- a/api/controllers/console/explore/completion.py +++ b/api/controllers/console/explore/completion.py @@ -74,7 +74,7 @@ def post(self, installed_app): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") @@ -134,7 +134,7 @@ def post(self, installed_app): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/console/explore/workflow.py b/api/controllers/console/explore/workflow.py index 162a1a4b015884..0d0d51800417bf 100644 --- a/api/controllers/console/explore/workflow.py +++ b/api/controllers/console/explore/workflow.py @@ -57,7 +57,7 @@ def post(self, installed_app: InstalledApp): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/service_api/app/completion.py b/api/controllers/service_api/app/completion.py index 1be54b386bfe8c..7bcecb6d2f3586 100644 --- a/api/controllers/service_api/app/completion.py +++ b/api/controllers/service_api/app/completion.py @@ -74,7 +74,7 @@ def post(self, app_model: App, end_user: EndUser): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") @@ -133,7 +133,7 @@ def post(self, app_model: App, end_user: EndUser): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/service_api/app/workflow.py b/api/controllers/service_api/app/workflow.py index c7dd4de3452970..2f73240e8e8cbd 100644 --- a/api/controllers/service_api/app/workflow.py +++ b/api/controllers/service_api/app/workflow.py @@ -94,7 +94,7 @@ def post(self, app_model: App, end_user: EndUser): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/web/completion.py b/api/controllers/web/completion.py index d294e7e58095a1..82bfe07e2b44d7 100644 --- a/api/controllers/web/completion.py +++ b/api/controllers/web/completion.py @@ -72,7 +72,7 @@ def post(self, app_model, end_user): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") @@ -132,7 +132,7 @@ def post(self, app_model, end_user): raise InvokeRateLimitHttpError(ex.description) except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/controllers/web/workflow.py b/api/controllers/web/workflow.py index 9b906edf14dfa5..709505df43c461 100644 --- a/api/controllers/web/workflow.py +++ b/api/controllers/web/workflow.py @@ -56,7 +56,7 @@ def post(self, app_model: App, end_user: EndUser): raise ProviderModelCurrentlyNotSupportError() except InvokeError as e: raise CompletionRequestError(e.description) - except (ValueError, AppInvokeQuotaExceededError) as e: + except ValueError as e: raise e except Exception as e: logging.exception("internal server error.") diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py index b006de23699c1b..b2a2b3efd7d438 100644 --- a/api/core/app/apps/advanced_chat/app_generator.py +++ b/api/core/app/apps/advanced_chat/app_generator.py @@ -336,7 +336,7 @@ def _generate_worker( except ValidationError as e: logger.exception("Validation Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) - except (ValueError, InvokeError) as e: + except ValueError as e: if dify_config.DEBUG: logger.exception("Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) diff --git a/api/core/app/apps/agent_chat/app_generator.py b/api/core/app/apps/agent_chat/app_generator.py index 63e11bdaa27f74..007611a2ee6c4e 100644 --- a/api/core/app/apps/agent_chat/app_generator.py +++ b/api/core/app/apps/agent_chat/app_generator.py @@ -245,7 +245,7 @@ def _generate_worker( except ValidationError as e: logger.exception("Validation Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) - except (ValueError, InvokeError) as e: + except ValueError as e: if dify_config.DEBUG: logger.exception("Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) diff --git a/api/core/app/apps/chat/app_generator.py b/api/core/app/apps/chat/app_generator.py index 6ed71fcd843083..42b621813dad37 100644 --- a/api/core/app/apps/chat/app_generator.py +++ b/api/core/app/apps/chat/app_generator.py @@ -237,7 +237,7 @@ def _generate_worker( except ValidationError as e: logger.exception("Validation Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) - except (ValueError, InvokeError) as e: + except ValueError as e: if dify_config.DEBUG: logger.exception("Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) diff --git a/api/core/app/apps/completion/app_generator.py b/api/core/app/apps/completion/app_generator.py index 17d0d52497ceee..27ead85c16e66f 100644 --- a/api/core/app/apps/completion/app_generator.py +++ b/api/core/app/apps/completion/app_generator.py @@ -214,7 +214,7 @@ def _generate_worker( except ValidationError as e: logger.exception("Validation Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) - except (ValueError, InvokeError) as e: + except ValueError as e: if dify_config.DEBUG: logger.exception("Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) diff --git a/api/core/app/apps/workflow/app_generator.py b/api/core/app/apps/workflow/app_generator.py index 42bc17277fd7c5..06e6c7aceecc36 100644 --- a/api/core/app/apps/workflow/app_generator.py +++ b/api/core/app/apps/workflow/app_generator.py @@ -270,7 +270,7 @@ def _generate_worker( except ValidationError as e: logger.exception("Validation Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) - except (ValueError, InvokeError) as e: + except ValueError as e: if dify_config.DEBUG: logger.exception("Error when generating") queue_manager.publish_error(e, PublishFrom.APPLICATION_MANAGER) From f736efc6fae641428d01a6147d7df3cc552e3880 Mon Sep 17 00:00:00 2001 From: Yingchun Lai Date: Thu, 2 Jan 2025 11:05:44 +0800 Subject: [PATCH 3/3] format --- api/controllers/console/app/completion.py | 1 - api/controllers/console/app/workflow.py | 1 - api/controllers/console/explore/completion.py | 1 - api/controllers/console/explore/workflow.py | 1 - api/controllers/service_api/app/completion.py | 1 - api/controllers/service_api/app/workflow.py | 1 - api/controllers/web/completion.py | 1 - api/controllers/web/workflow.py | 1 - api/core/app/apps/advanced_chat/app_generator.py | 2 +- api/core/app/apps/agent_chat/app_generator.py | 2 +- api/core/app/apps/chat/app_generator.py | 2 +- api/core/app/apps/completion/app_generator.py | 2 +- api/core/app/apps/workflow/app_generator.py | 2 +- 13 files changed, 5 insertions(+), 13 deletions(-) diff --git a/api/controllers/console/app/completion.py b/api/controllers/console/app/completion.py index 5fb8a9e87bce26..c9820f70f71958 100644 --- a/api/controllers/console/app/completion.py +++ b/api/controllers/console/app/completion.py @@ -20,7 +20,6 @@ from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom from core.errors.error import ( - AppInvokeQuotaExceededError, ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError, diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py index 4de17d7be0b7d1..6942ac6fbe62dd 100644 --- a/api/controllers/console/app/workflow.py +++ b/api/controllers/console/app/workflow.py @@ -13,7 +13,6 @@ from controllers.console.wraps import account_initialization_required, setup_required from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom -from core.errors.error import AppInvokeQuotaExceededError from factories import variable_factory from fields.workflow_fields import workflow_fields, workflow_pagination_fields from fields.workflow_run_fields import workflow_run_node_execution_fields diff --git a/api/controllers/console/explore/completion.py b/api/controllers/console/explore/completion.py index 9f72f47cf7beb6..1af3cf21f7e77a 100644 --- a/api/controllers/console/explore/completion.py +++ b/api/controllers/console/explore/completion.py @@ -19,7 +19,6 @@ from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom from core.errors.error import ( - AppInvokeQuotaExceededError, ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError, diff --git a/api/controllers/console/explore/workflow.py b/api/controllers/console/explore/workflow.py index 0d0d51800417bf..bca837d66e6ef3 100644 --- a/api/controllers/console/explore/workflow.py +++ b/api/controllers/console/explore/workflow.py @@ -14,7 +14,6 @@ from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom from core.errors.error import ( - AppInvokeQuotaExceededError, ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError, diff --git a/api/controllers/service_api/app/completion.py b/api/controllers/service_api/app/completion.py index 7bcecb6d2f3586..647efc81496c8f 100644 --- a/api/controllers/service_api/app/completion.py +++ b/api/controllers/service_api/app/completion.py @@ -18,7 +18,6 @@ from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom from core.errors.error import ( - AppInvokeQuotaExceededError, ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError, diff --git a/api/controllers/service_api/app/workflow.py b/api/controllers/service_api/app/workflow.py index 2f73240e8e8cbd..df637b025fd65b 100644 --- a/api/controllers/service_api/app/workflow.py +++ b/api/controllers/service_api/app/workflow.py @@ -16,7 +16,6 @@ from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom from core.errors.error import ( - AppInvokeQuotaExceededError, ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError, diff --git a/api/controllers/web/completion.py b/api/controllers/web/completion.py index 82bfe07e2b44d7..9677401490daf6 100644 --- a/api/controllers/web/completion.py +++ b/api/controllers/web/completion.py @@ -20,7 +20,6 @@ from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom from core.errors.error import ( - AppInvokeQuotaExceededError, ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError, diff --git a/api/controllers/web/workflow.py b/api/controllers/web/workflow.py index 709505df43c461..59c5193b58be20 100644 --- a/api/controllers/web/workflow.py +++ b/api/controllers/web/workflow.py @@ -15,7 +15,6 @@ from core.app.apps.base_app_queue_manager import AppQueueManager from core.app.entities.app_invoke_entities import InvokeFrom from core.errors.error import ( - AppInvokeQuotaExceededError, ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError, diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py index b2a2b3efd7d438..36f71fd47879c9 100644 --- a/api/core/app/apps/advanced_chat/app_generator.py +++ b/api/core/app/apps/advanced_chat/app_generator.py @@ -21,7 +21,7 @@ from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, InvokeFrom from core.app.entities.task_entities import ChatbotAppBlockingResponse, ChatbotAppStreamResponse -from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError +from core.model_runtime.errors.invoke import InvokeAuthorizationError from core.ops.ops_trace_manager import TraceQueueManager from core.prompt.utils.get_thread_messages_length import get_thread_messages_length from extensions.ext_database import db diff --git a/api/core/app/apps/agent_chat/app_generator.py b/api/core/app/apps/agent_chat/app_generator.py index 007611a2ee6c4e..e7f622263eb084 100644 --- a/api/core/app/apps/agent_chat/app_generator.py +++ b/api/core/app/apps/agent_chat/app_generator.py @@ -18,7 +18,7 @@ from core.app.apps.message_based_app_generator import MessageBasedAppGenerator from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager from core.app.entities.app_invoke_entities import AgentChatAppGenerateEntity, InvokeFrom -from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError +from core.model_runtime.errors.invoke import InvokeAuthorizationError from core.ops.ops_trace_manager import TraceQueueManager from extensions.ext_database import db from factories import file_factory diff --git a/api/core/app/apps/chat/app_generator.py b/api/core/app/apps/chat/app_generator.py index 42b621813dad37..dc7cf3667a0175 100644 --- a/api/core/app/apps/chat/app_generator.py +++ b/api/core/app/apps/chat/app_generator.py @@ -18,7 +18,7 @@ from core.app.apps.message_based_app_generator import MessageBasedAppGenerator from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager from core.app.entities.app_invoke_entities import ChatAppGenerateEntity, InvokeFrom -from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError +from core.model_runtime.errors.invoke import InvokeAuthorizationError from core.ops.ops_trace_manager import TraceQueueManager from extensions.ext_database import db from factories import file_factory diff --git a/api/core/app/apps/completion/app_generator.py b/api/core/app/apps/completion/app_generator.py index 27ead85c16e66f..be50d496d23694 100644 --- a/api/core/app/apps/completion/app_generator.py +++ b/api/core/app/apps/completion/app_generator.py @@ -17,7 +17,7 @@ from core.app.apps.message_based_app_generator import MessageBasedAppGenerator from core.app.apps.message_based_app_queue_manager import MessageBasedAppQueueManager from core.app.entities.app_invoke_entities import CompletionAppGenerateEntity, InvokeFrom -from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError +from core.model_runtime.errors.invoke import InvokeAuthorizationError from core.ops.ops_trace_manager import TraceQueueManager from extensions.ext_database import db from factories import file_factory diff --git a/api/core/app/apps/workflow/app_generator.py b/api/core/app/apps/workflow/app_generator.py index 06e6c7aceecc36..aeedbb00560163 100644 --- a/api/core/app/apps/workflow/app_generator.py +++ b/api/core/app/apps/workflow/app_generator.py @@ -20,7 +20,7 @@ from core.app.apps.workflow.generate_task_pipeline import WorkflowAppGenerateTaskPipeline from core.app.entities.app_invoke_entities import InvokeFrom, WorkflowAppGenerateEntity from core.app.entities.task_entities import WorkflowAppBlockingResponse, WorkflowAppStreamResponse -from core.model_runtime.errors.invoke import InvokeAuthorizationError, InvokeError +from core.model_runtime.errors.invoke import InvokeAuthorizationError from core.ops.ops_trace_manager import TraceQueueManager from extensions.ext_database import db from factories import file_factory