Merge branch 'main' into fix/chore-fix

api/core/app/apps/completion/app_config_manager.py

@@ -42,7 +42,7 @@ class CompletionAppConfigManager(BaseAppConfigManager):
             app_model_config_dict = app_model_config.to_dict()
             config_dict = app_model_config_dict.copy()
         else:
-            config_dict = override_config_dict
+            config_dict = override_config_dict or {}
 
         app_mode = AppMode.value_of(app_model.mode)
         app_config = CompletionAppConfig(

api/core/app/apps/completion/app_generator.py

@@ -83,8 +83,6 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
         query = query.replace("\x00", "")
         inputs = args["inputs"]
 
-        extras = {}
-
         # get conversation
         conversation = None
 
@@ -99,7 +97,7 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
 
             # validate config
             override_model_config_dict = CompletionAppConfigManager.config_validate(
-                tenant_id=app_model.tenant_id, config=args.get("model_config")
+                tenant_id=app_model.tenant_id, config=args.get("model_config", {})
             )
 
         # parse files
@@ -132,11 +130,11 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
                 user_inputs=inputs, variables=app_config.variables, tenant_id=app_model.tenant_id
             ),
             query=query,
-            files=file_objs,
+            files=list(file_objs),
             user_id=user.id,
             stream=streaming,
             invoke_from=invoke_from,
-            extras=extras,
+            extras={},
             trace_manager=trace_manager,
         )
 
@@ -157,7 +155,7 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
         worker_thread = threading.Thread(
             target=self._generate_worker,
             kwargs={
-                "flask_app": current_app._get_current_object(),
+                "flask_app": current_app._get_current_object(),  # type: ignore
                 "application_generate_entity": application_generate_entity,
                 "queue_manager": queue_manager,
                 "message_id": message.id,
@@ -197,6 +195,8 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
             try:
                 # get message
                 message = self._get_message(message_id)
+                if message is None:
+                    raise MessageNotExistsError()
 
                 # chatbot app
                 runner = CompletionAppRunner()
@@ -293,7 +293,7 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
             model_conf=ModelConfigConverter.convert(app_config),
             inputs=message.inputs,
             query=message.query,
-            files=file_objs,
+            files=list(file_objs),
             user_id=user.id,
             stream=stream,
             invoke_from=invoke_from,
@@ -317,7 +317,7 @@ class CompletionAppGenerator(MessageBasedAppGenerator):
         worker_thread = threading.Thread(
             target=self._generate_worker,
             kwargs={
-                "flask_app": current_app._get_current_object(),
+                "flask_app": current_app._get_current_object(),  # type: ignore
                 "application_generate_entity": application_generate_entity,
                 "queue_manager": queue_manager,
                 "message_id": message.id,

api/core/app/apps/completion/app_runner.py

@@ -76,7 +76,7 @@ class CompletionAppRunner(AppRunner):
                 tenant_id=app_config.tenant_id,
                 app_generate_entity=application_generate_entity,
                 inputs=inputs,
-                query=query,
+                query=query or "",
                 message_id=message.id,
             )
         except ModerationError as e:
@@ -122,7 +122,7 @@ class CompletionAppRunner(AppRunner):
                 tenant_id=app_record.tenant_id,
                 model_config=application_generate_entity.model_conf,
                 config=dataset_config,
-                query=query,
+                query=query or "",
                 invoke_from=application_generate_entity.invoke_from,
                 show_retrieve_source=app_config.additional_features.show_retrieve_source,
                 hit_callback=hit_callback,

api/core/app/apps/completion/generate_response_converter.py

@@ -15,7 +15,7 @@ class CompletionAppGenerateResponseConverter(AppGenerateResponseConverter):
     _blocking_response_type = CompletionAppBlockingResponse
 
     @classmethod
-    def convert_blocking_full_response(cls, blocking_response: CompletionAppBlockingResponse) -> dict:
+    def convert_blocking_full_response(cls, blocking_response: CompletionAppBlockingResponse) -> dict:  # type: ignore[override]
         """
         Convert blocking full response.
         :param blocking_response: blocking response
@@ -35,7 +35,7 @@ class CompletionAppGenerateResponseConverter(AppGenerateResponseConverter):
         return response
 
     @classmethod
-    def convert_blocking_simple_response(cls, blocking_response: CompletionAppBlockingResponse) -> dict:
+    def convert_blocking_simple_response(cls, blocking_response: CompletionAppBlockingResponse) -> dict:  # type: ignore[override]
         """
         Convert blocking simple response.
         :param blocking_response: blocking response