diff --git a/api/controllers/console/app/completion.py b/api/controllers/console/app/completion.py index 61a4f1b69d..b62c751a0d 100644 --- a/api/controllers/console/app/completion.py +++ b/api/controllers/console/app/completion.py @@ -161,7 +161,7 @@ class ChatMessageApi(Resource): raise InternalServerError() -def compact_response(response: Union[dict | Generator]) -> Response: +def compact_response(response: Union[dict, Generator]) -> Response: if isinstance(response, dict): return Response(response=json.dumps(response), status=200, mimetype='application/json') else: diff --git a/api/controllers/console/app/message.py b/api/controllers/console/app/message.py index 3f2947b0a3..e73bed7e32 100644 --- a/api/controllers/console/app/message.py +++ b/api/controllers/console/app/message.py @@ -249,7 +249,7 @@ class MessageMoreLikeThisApi(Resource): raise InternalServerError() -def compact_response(response: Union[dict | Generator]) -> Response: +def compact_response(response: Union[dict, Generator]) -> Response: if isinstance(response, dict): return Response(response=json.dumps(response), status=200, mimetype='application/json') else: diff --git a/api/controllers/console/explore/completion.py b/api/controllers/console/explore/completion.py index 45ef582b6b..f1527bf63b 100644 --- a/api/controllers/console/explore/completion.py +++ b/api/controllers/console/explore/completion.py @@ -154,7 +154,7 @@ class ChatStopApi(InstalledAppResource): return {'result': 'success'}, 200 -def compact_response(response: Union[dict | Generator]) -> Response: +def compact_response(response: Union[dict, Generator]) -> Response: if isinstance(response, dict): return Response(response=json.dumps(response), status=200, mimetype='application/json') else: diff --git a/api/controllers/console/explore/message.py b/api/controllers/console/explore/message.py index efc25aaa92..5d07477b5e 100644 --- a/api/controllers/console/explore/message.py +++ b/api/controllers/console/explore/message.py @@ -105,7 +105,7 @@ class MessageMoreLikeThisApi(InstalledAppResource): raise InternalServerError() -def compact_response(response: Union[dict | Generator]) -> Response: +def compact_response(response: Union[dict, Generator]) -> Response: if isinstance(response, dict): return Response(response=json.dumps(response), status=200, mimetype='application/json') else: diff --git a/api/controllers/console/universal_chat/chat.py b/api/controllers/console/universal_chat/chat.py index 9282b1cba2..c50625adc0 100644 --- a/api/controllers/console/universal_chat/chat.py +++ b/api/controllers/console/universal_chat/chat.py @@ -104,7 +104,7 @@ class UniversalChatStopApi(UniversalChatResource): return {'result': 'success'}, 200 -def compact_response(response: Union[dict | Generator]) -> Response: +def compact_response(response: Union[dict, Generator]) -> Response: if isinstance(response, dict): return Response(response=json.dumps(response), status=200, mimetype='application/json') else: diff --git a/api/controllers/service_api/app/completion.py b/api/controllers/service_api/app/completion.py index e72164022d..320ea5c74d 100644 --- a/api/controllers/service_api/app/completion.py +++ b/api/controllers/service_api/app/completion.py @@ -150,7 +150,7 @@ class ChatStopApi(AppApiResource): return {'result': 'success'}, 200 -def compact_response(response: Union[dict | Generator]) -> Response: +def compact_response(response: Union[dict, Generator]) -> Response: if isinstance(response, dict): return Response(response=json.dumps(response), status=200, mimetype='application/json') else: diff --git a/api/controllers/web/message.py b/api/controllers/web/message.py index f43b7f3007..80b0741c03 100644 --- a/api/controllers/web/message.py +++ b/api/controllers/web/message.py @@ -139,7 +139,7 @@ class MessageMoreLikeThisApi(WebApiResource): raise InternalServerError() -def compact_response(response: Union[dict | Generator]) -> Response: +def compact_response(response: Union[dict, Generator]) -> Response: if isinstance(response, dict): return Response(response=json.dumps(response), status=200, mimetype='application/json') else: diff --git a/api/core/agent/agent_executor.py b/api/core/agent/agent_executor.py index 579f3d5d90..40200c60e4 100644 --- a/api/core/agent/agent_executor.py +++ b/api/core/agent/agent_executor.py @@ -59,7 +59,7 @@ class AgentExecutor: self.configuration = configuration self.agent = self._init_agent() - def _init_agent(self) -> Union[BaseSingleActionAgent | BaseMultiActionAgent]: + def _init_agent(self) -> Union[BaseSingleActionAgent, BaseMultiActionAgent]: if self.configuration.strategy == PlanningStrategy.REACT: agent = AutoSummarizingStructuredChatAgent.from_llm_and_tools( model_instance=self.configuration.model_instance, diff --git a/api/core/conversation_message_task.py b/api/core/conversation_message_task.py index a1a3affe51..614fed273d 100644 --- a/api/core/conversation_message_task.py +++ b/api/core/conversation_message_task.py @@ -321,7 +321,7 @@ class ConversationMessageTask: class PubHandler: - def __init__(self, user: Union[Account | EndUser], task_id: str, + def __init__(self, user: Union[Account, EndUser], task_id: str, message: Message, conversation: Conversation, chain_pub: bool = False, agent_thought_pub: bool = False): self._channel = PubHandler.generate_channel_name(user, task_id) @@ -334,7 +334,7 @@ class PubHandler: self._agent_thought_pub = agent_thought_pub @classmethod - def generate_channel_name(cls, user: Union[Account | EndUser], task_id: str): + def generate_channel_name(cls, user: Union[Account, EndUser], task_id: str): if not user: raise ValueError("user is required") @@ -342,7 +342,7 @@ class PubHandler: return "generate_result:{}-{}".format(user_str, task_id) @classmethod - def generate_stopped_cache_key(cls, user: Union[Account | EndUser], task_id: str): + def generate_stopped_cache_key(cls, user: Union[Account, EndUser], task_id: str): user_str = 'account-' + str(user.id) if isinstance(user, Account) else 'end-user-' + str(user.id) return "generate_result_stopped:{}-{}".format(user_str, task_id) @@ -454,7 +454,7 @@ class PubHandler: redis_client.publish(self._channel, json.dumps(content)) @classmethod - def pub_error(cls, user: Union[Account | EndUser], task_id: str, e): + def pub_error(cls, user: Union[Account, EndUser], task_id: str, e): content = { 'error': type(e).__name__, 'description': e.description if getattr(e, 'description', None) is not None else str(e) @@ -467,7 +467,7 @@ class PubHandler: return redis_client.get(self._stopped_cache_key) is not None @classmethod - def ping(cls, user: Union[Account | EndUser], task_id: str): + def ping(cls, user: Union[Account, EndUser], task_id: str): content = { 'event': 'ping' } @@ -476,7 +476,7 @@ class PubHandler: redis_client.publish(channel, json.dumps(content)) @classmethod - def stop(cls, user: Union[Account | EndUser], task_id: str): + def stop(cls, user: Union[Account, EndUser], task_id: str): stopped_cache_key = cls.generate_stopped_cache_key(user, task_id) redis_client.setex(stopped_cache_key, 600, 1) diff --git a/api/services/conversation_service.py b/api/services/conversation_service.py index 0872a232f0..1dcbb52867 100644 --- a/api/services/conversation_service.py +++ b/api/services/conversation_service.py @@ -11,7 +11,7 @@ from services.errors.message import MessageNotExistsError class ConversationService: @classmethod - def pagination_by_last_id(cls, app_model: App, user: Optional[Union[Account | EndUser]], + def pagination_by_last_id(cls, app_model: App, user: Optional[Union[Account, EndUser]], last_id: Optional[str], limit: int, include_ids: Optional[list] = None, exclude_ids: Optional[list] = None, exclude_debug_conversation: bool = False) -> InfiniteScrollPagination: @@ -69,7 +69,7 @@ class ConversationService: @classmethod def rename(cls, app_model: App, conversation_id: str, - user: Optional[Union[Account | EndUser]], name: str, auto_generate: bool): + user: Optional[Union[Account, EndUser]], name: str, auto_generate: bool): conversation = cls.get_conversation(app_model, conversation_id, user) if auto_generate: @@ -104,7 +104,7 @@ class ConversationService: return conversation @classmethod - def get_conversation(cls, app_model: App, conversation_id: str, user: Optional[Union[Account | EndUser]]): + def get_conversation(cls, app_model: App, conversation_id: str, user: Optional[Union[Account, EndUser]]): conversation = db.session.query(Conversation) \ .filter( Conversation.id == conversation_id, @@ -121,7 +121,7 @@ class ConversationService: return conversation @classmethod - def delete(cls, app_model: App, conversation_id: str, user: Optional[Union[Account | EndUser]]): + def delete(cls, app_model: App, conversation_id: str, user: Optional[Union[Account, EndUser]]): conversation = cls.get_conversation(app_model, conversation_id, user) conversation.is_deleted = True diff --git a/api/services/message_service.py b/api/services/message_service.py index fe205bcce0..a4bd3cafba 100644 --- a/api/services/message_service.py +++ b/api/services/message_service.py @@ -16,7 +16,7 @@ from services.errors.message import FirstMessageNotExistsError, MessageNotExists class MessageService: @classmethod - def pagination_by_first_id(cls, app_model: App, user: Optional[Union[Account | EndUser]], + def pagination_by_first_id(cls, app_model: App, user: Optional[Union[Account, EndUser]], conversation_id: str, first_id: Optional[str], limit: int) -> InfiniteScrollPagination: if not user: return InfiniteScrollPagination(data=[], limit=limit, has_more=False) @@ -68,7 +68,7 @@ class MessageService: ) @classmethod - def pagination_by_last_id(cls, app_model: App, user: Optional[Union[Account | EndUser]], + def pagination_by_last_id(cls, app_model: App, user: Optional[Union[Account, EndUser]], last_id: Optional[str], limit: int, conversation_id: Optional[str] = None, include_ids: Optional[list] = None) -> InfiniteScrollPagination: if not user: @@ -119,7 +119,7 @@ class MessageService: ) @classmethod - def create_feedback(cls, app_model: App, message_id: str, user: Optional[Union[Account | EndUser]], + def create_feedback(cls, app_model: App, message_id: str, user: Optional[Union[Account, EndUser]], rating: Optional[str]) -> MessageFeedback: if not user: raise ValueError('user cannot be None') @@ -155,7 +155,7 @@ class MessageService: return feedback @classmethod - def get_message(cls, app_model: App, user: Optional[Union[Account | EndUser]], message_id: str): + def get_message(cls, app_model: App, user: Optional[Union[Account, EndUser]], message_id: str): message = db.session.query(Message).filter( Message.id == message_id, Message.app_id == app_model.id, @@ -170,7 +170,7 @@ class MessageService: return message @classmethod - def get_suggested_questions_after_answer(cls, app_model: App, user: Optional[Union[Account | EndUser]], + def get_suggested_questions_after_answer(cls, app_model: App, user: Optional[Union[Account, EndUser]], message_id: str, check_enabled: bool = True) -> List[Message]: if not user: raise ValueError('user cannot be None') diff --git a/api/services/saved_message_service.py b/api/services/saved_message_service.py index e363f65fa9..21ed0f7d64 100644 --- a/api/services/saved_message_service.py +++ b/api/services/saved_message_service.py @@ -10,7 +10,7 @@ from services.message_service import MessageService class SavedMessageService: @classmethod - def pagination_by_last_id(cls, app_model: App, user: Optional[Union[Account | EndUser]], + def pagination_by_last_id(cls, app_model: App, user: Optional[Union[Account, EndUser]], last_id: Optional[str], limit: int) -> InfiniteScrollPagination: saved_messages = db.session.query(SavedMessage).filter( SavedMessage.app_id == app_model.id, @@ -28,7 +28,7 @@ class SavedMessageService: ) @classmethod - def save(cls, app_model: App, user: Optional[Union[Account | EndUser]], message_id: str): + def save(cls, app_model: App, user: Optional[Union[Account, EndUser]], message_id: str): saved_message = db.session.query(SavedMessage).filter( SavedMessage.app_id == app_model.id, SavedMessage.message_id == message_id, @@ -56,7 +56,7 @@ class SavedMessageService: db.session.commit() @classmethod - def delete(cls, app_model: App, user: Optional[Union[Account | EndUser]], message_id: str): + def delete(cls, app_model: App, user: Optional[Union[Account, EndUser]], message_id: str): saved_message = db.session.query(SavedMessage).filter( SavedMessage.app_id == app_model.id, SavedMessage.message_id == message_id, diff --git a/api/services/web_conversation_service.py b/api/services/web_conversation_service.py index 3c521909dc..5f9fc883f0 100644 --- a/api/services/web_conversation_service.py +++ b/api/services/web_conversation_service.py @@ -10,7 +10,7 @@ from services.conversation_service import ConversationService class WebConversationService: @classmethod - def pagination_by_last_id(cls, app_model: App, user: Optional[Union[Account | EndUser]], + def pagination_by_last_id(cls, app_model: App, user: Optional[Union[Account, EndUser]], last_id: Optional[str], limit: int, pinned: Optional[bool] = None, exclude_debug_conversation: bool = False) -> InfiniteScrollPagination: include_ids = None @@ -38,7 +38,7 @@ class WebConversationService: ) @classmethod - def pin(cls, app_model: App, conversation_id: str, user: Optional[Union[Account | EndUser]]): + def pin(cls, app_model: App, conversation_id: str, user: Optional[Union[Account, EndUser]]): pinned_conversation = db.session.query(PinnedConversation).filter( PinnedConversation.app_id == app_model.id, PinnedConversation.conversation_id == conversation_id, @@ -66,7 +66,7 @@ class WebConversationService: db.session.commit() @classmethod - def unpin(cls, app_model: App, conversation_id: str, user: Optional[Union[Account | EndUser]]): + def unpin(cls, app_model: App, conversation_id: str, user: Optional[Union[Account, EndUser]]): pinned_conversation = db.session.query(PinnedConversation).filter( PinnedConversation.app_id == app_model.id, PinnedConversation.conversation_id == conversation_id,