fix merge problem

api/app.py

@@ -1,3 +1,4 @@
+import os
 import sys
 
 

api/app_factory.py

@@ -46,7 +46,7 @@ def create_app() -> tuple[any, DifyApp]:
     end_time = time.perf_counter()
     if dify_config.DEBUG:
         logger.info("Finished create_app (%s ms)", round((end_time - start_time) * 1000, 2))
-    return app
+    return socketio_app, app
 
 
 def initialize_extensions(app: DifyApp):

api/controllers/console/app/workflow_comment.py

@@ -1,6 +1,6 @@
 import logging
 
-from flask_restful import Resource, fields, marshal_with, reqparse
+from flask_restx import Resource, fields, marshal_with, reqparse
 
 from controllers.console import api
 from controllers.console.app.wraps import get_app_model

api/controllers/console/app/workflow_draft_variable.py

@@ -18,6 +18,7 @@ from core.variables.segment_group import SegmentGroup
 from core.variables.segments import ArrayFileSegment, FileSegment, Segment
 from core.variables.types import SegmentType
 from core.workflow.constants import CONVERSATION_VARIABLE_NODE_ID, SYSTEM_VARIABLE_NODE_ID
+from extensions.ext_database import db
 from factories import variable_factory
 from factories.file_factory import build_from_mapping, build_from_mappings
 from libs.login import current_user, login_required

api/fields/online_user_fields.py

@@ -1,4 +1,4 @@
-from flask_restful import fields
+from flask_restx import fields
 
 online_user_partial_fields = {
     "id": fields.String,

api/fields/workflow_comment_fields.py

@@ -1,4 +1,4 @@
-from flask_restful import fields
+from flask_restx import fields
 
 from libs.helper import AvatarUrlField, TimestampField