use deco to avoid current_user (#26077)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

api/services/agent_service.py

@@ -10,7 +10,7 @@ from core.plugin.impl.exc import PluginDaemonClientSideError
 from core.tools.tool_manager import ToolManager
 from extensions.ext_database import db
 from libs.login import current_user
-from models.account import Account
+from models import Account
 from models.model import App, Conversation, EndUser, Message, MessageAgentThought
 
 

api/services/app_service.py

@@ -18,7 +18,7 @@ from events.app_event import app_was_created
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from libs.login import current_user
-from models.account import Account
+from models import Account
 from models.model import App, AppMode, AppModelConfig, Site
 from models.tools import ApiToolProvider
 from services.billing_service import BillingService

api/services/billing_service.py

@@ -7,7 +7,7 @@ from tenacity import retry, retry_if_exception_type, stop_before_delay, wait_fix
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from libs.helper import RateLimiter
-from models.account import Account, TenantAccountJoin, TenantAccountRole
+from models import Account, TenantAccountJoin, TenantAccountRole
 
 
 class BillingService:

api/services/conversation_service.py

@@ -14,8 +14,7 @@ from extensions.ext_database import db
 from factories import variable_factory
 from libs.datetime_utils import naive_utc_now
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
-from models import ConversationVariable
-from models.account import Account
+from models import Account, ConversationVariable
 from models.model import App, Conversation, EndUser, Message
 from services.errors.conversation import (
     ConversationNotExistsError,

api/services/dataset_service.py

@@ -29,7 +29,7 @@ from extensions.ext_redis import redis_client
 from libs import helper
 from libs.datetime_utils import naive_utc_now
 from libs.login import current_user
-from models.account import Account, TenantAccountRole
+from models import Account, TenantAccountRole
 from models.dataset import (
     AppDatasetJoin,
     ChildChunk,

api/services/file_service.py

@@ -19,7 +19,7 @@ from core.rag.extractor.extract_processor import ExtractProcessor
 from extensions.ext_storage import storage
 from libs.datetime_utils import naive_utc_now
 from libs.helper import extract_tenant_id
-from models.account import Account
+from models import Account
 from models.enums import CreatorUserRole
 from models.model import EndUser, UploadFile
 

api/services/hit_testing_service.py

@@ -9,7 +9,7 @@ from core.rag.models.document import Document
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
 from extensions.ext_database import db
-from models.account import Account
+from models import Account
 from models.dataset import Dataset, DatasetQuery
 
 logger = logging.getLogger(__name__)

api/services/message_service.py

@@ -12,7 +12,7 @@ from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
 from core.ops.utils import measure_time
 from extensions.ext_database import db
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
-from models.account import Account
+from models import Account
 from models.model import App, AppMode, AppModelConfig, EndUser, Message, MessageFeedback
 from services.conversation_service import ConversationService
 from services.errors.message import (

api/services/metadata_service.py

@@ -1,12 +1,11 @@
 import copy
 import logging
 
-from flask_login import current_user
-
 from core.rag.index_processor.constant.built_in_field import BuiltInField, MetadataDataSource
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from libs.datetime_utils import naive_utc_now
+from libs.login import current_account_with_tenant
 from models.dataset import Dataset, DatasetMetadata, DatasetMetadataBinding
 from services.dataset_service import DocumentService
 from services.entities.knowledge_entities.knowledge_entities import (
@@ -23,11 +22,11 @@ class MetadataService:
         # check if metadata name is too long
         if len(metadata_args.name) > 255:
             raise ValueError("Metadata name cannot exceed 255 characters.")
-
+        current_user, current_tenant_id = current_account_with_tenant()
         # check if metadata name already exists
         if (
             db.session.query(DatasetMetadata)
-            .filter_by(tenant_id=current_user.current_tenant_id, dataset_id=dataset_id, name=metadata_args.name)
+            .filter_by(tenant_id=current_tenant_id, dataset_id=dataset_id, name=metadata_args.name)
             .first()
         ):
             raise ValueError("Metadata name already exists.")
@@ -35,7 +34,7 @@ class MetadataService:
             if field.value == metadata_args.name:
                 raise ValueError("Metadata name already exists in Built-in fields.")
         metadata = DatasetMetadata(
-            tenant_id=current_user.current_tenant_id,
+            tenant_id=current_tenant_id,
             dataset_id=dataset_id,
             type=metadata_args.type,
             name=metadata_args.name,
@@ -53,9 +52,10 @@ class MetadataService:
 
         lock_key = f"dataset_metadata_lock_{dataset_id}"
         # check if metadata name already exists
+        current_user, current_tenant_id = current_account_with_tenant()
         if (
             db.session.query(DatasetMetadata)
-            .filter_by(tenant_id=current_user.current_tenant_id, dataset_id=dataset_id, name=name)
+            .filter_by(tenant_id=current_tenant_id, dataset_id=dataset_id, name=name)
             .first()
         ):
             raise ValueError("Metadata name already exists.")
@@ -220,9 +220,10 @@ class MetadataService:
                 db.session.commit()
                 # deal metadata binding
                 db.session.query(DatasetMetadataBinding).filter_by(document_id=operation.document_id).delete()
+                current_user, current_tenant_id = current_account_with_tenant()
                 for metadata_value in operation.metadata_list:
                     dataset_metadata_binding = DatasetMetadataBinding(
-                        tenant_id=current_user.current_tenant_id,
+                        tenant_id=current_tenant_id,
                         dataset_id=dataset.id,
                         document_id=operation.document_id,
                         metadata_id=metadata_value.id,

api/services/oauth_server.py

@@ -7,7 +7,7 @@ from werkzeug.exceptions import BadRequest
 
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
-from models.account import Account
+from models import Account
 from models.model import OAuthProviderApp
 from services.account_service import AccountService
 

api/services/rag_pipeline/pipeline_template/customized/customized_retrieval.py

@@ -1,7 +1,7 @@
 import yaml
-from flask_login import current_user
 
 from extensions.ext_database import db
+from libs.login import current_account_with_tenant
 from models.dataset import PipelineCustomizedTemplate
 from services.rag_pipeline.pipeline_template.pipeline_template_base import PipelineTemplateRetrievalBase
 from services.rag_pipeline.pipeline_template.pipeline_template_type import PipelineTemplateType
@@ -13,9 +13,8 @@ class CustomizedPipelineTemplateRetrieval(PipelineTemplateRetrievalBase):
     """
 
     def get_pipeline_templates(self, language: str) -> dict:
-        result = self.fetch_pipeline_templates_from_customized(
-            tenant_id=current_user.current_tenant_id, language=language
-        )
+        _, current_tenant_id = current_account_with_tenant()
+        result = self.fetch_pipeline_templates_from_customized(tenant_id=current_tenant_id, language=language)
         return result
 
     def get_pipeline_template_detail(self, template_id: str):

api/services/rag_pipeline/rag_pipeline.py

@@ -54,7 +54,7 @@ from core.workflow.system_variable import SystemVariable
 from core.workflow.workflow_entry import WorkflowEntry
 from extensions.ext_database import db
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
-from models.account import Account
+from models import Account
 from models.dataset import (  # type: ignore
     Dataset,
     Document,

api/services/saved_message_service.py

@@ -2,7 +2,7 @@ from typing import Union
 
 from extensions.ext_database import db
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
-from models.account import Account
+from models import Account
 from models.model import App, EndUser
 from models.web import SavedMessage
 from services.message_service import MessageService

api/services/web_conversation_service.py

@@ -6,7 +6,7 @@ from sqlalchemy.orm import Session
 from core.app.entities.app_invoke_entities import InvokeFrom
 from extensions.ext_database import db
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
-from models.account import Account
+from models import Account
 from models.model import App, EndUser
 from models.web import PinnedConversation
 from services.conversation_service import ConversationService

api/services/webapp_auth_service.py

@@ -10,7 +10,7 @@ from extensions.ext_database import db
 from libs.helper import TokenManager
 from libs.passport import PassportService
 from libs.password import compare_password
-from models.account import Account, AccountStatus
+from models import Account, AccountStatus
 from models.model import App, EndUser, Site
 from services.app_service import AppService
 from services.enterprise.enterprise_service import EnterpriseService

api/services/workflow/workflow_converter.py

@@ -22,7 +22,7 @@ from core.prompt.utils.prompt_template_parser import PromptTemplateParser
 from core.workflow.nodes import NodeType
 from events.app_event import app_was_created
 from extensions.ext_database import db
-from models.account import Account
+from models import Account
 from models.api_based_extension import APIBasedExtension, APIBasedExtensionPoint
 from models.model import App, AppMode, AppModelConfig
 from models.workflow import Workflow, WorkflowType

api/services/workflow_draft_variable_service.py

@@ -32,8 +32,7 @@ from factories.file_factory import StorageKeyLoader
 from factories.variable_factory import build_segment, segment_to_variable
 from libs.datetime_utils import naive_utc_now
 from libs.uuid_utils import uuidv7
-from models import App, Conversation
-from models.account import Account
+from models import Account, App, Conversation
 from models.enums import DraftVariableType
 from models.workflow import Workflow, WorkflowDraftVariable, WorkflowDraftVariableFile, is_system_variable_editable
 from repositories.factory import DifyAPIRepositoryFactory

api/services/workflow_service.py

@@ -30,7 +30,7 @@ from extensions.ext_database import db
 from extensions.ext_storage import storage
 from factories.file_factory import build_from_mapping, build_from_mappings
 from libs.datetime_utils import naive_utc_now
-from models.account import Account
+from models import Account
 from models.model import App, AppMode
 from models.tools import WorkflowToolProvider
 from models.workflow import Workflow, WorkflowNodeExecutionModel, WorkflowNodeExecutionTriggeredFrom, WorkflowType