Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
refactor(api): require active workspace in request context (#41280)
非法操作59ee8878f9ad
diff --git a/api/controllers/console/tag/tags.py b/api/controllers/console/tag/tags.pyindex 462ddf620b6..db336df5c58 100644--- a/api/controllers/console/tag/tags.py+++ b/api/controllers/console/tag/tags.py@@ -103,7 +103,7 @@ def _enforce_snippet_tag_rbac_if_needed(tag_type: TagType | str | None, context:returnenforce_rbac_access(- tenant_id=_workspace_id(context),+ tenant_id=context.active_workspace_id,account_id=context.account_id,resource_type=RBACResourceScope.WORKSPACE,scene=RBACPermission.SNIPPETS_CREATE_AND_MODIFY,@@ -119,12 +119,6 @@ def _enforce_snippet_tag_rbac_by_tag_id(tag_id: str, context: RequestContext) ->_enforce_snippet_tag_rbac_if_needed(tag_type, context)-def _workspace_id(context: RequestContext) -> str:- if context.active_workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")- return context.active_workspace_id--def _require_tag_edit_permission(*, allow_dataset_editor: bool) -> None:current_user, _ = current_account_with_tenant()if current_user.has_edit_permission:@@ -136,9 +130,9 @@ def _require_tag_edit_permission(*, allow_dataset_editor: bool) -> None:@console_ns.route("/tags")class TagListApi(Resource):- @console_account_admission()@console_ns.doc(params=query_params_from_model(TagListQueryParam))@console_ns.response(200, "Success", console_ns.models[TagListResponse.__name__])+ @console_account_admission()@model_validate(TagListQueryParam)def get(self, req_data: TagListQueryParam, request_context: RequestContext):tags = application_services().tags.list_tags(request_context, req_data.type, req_data.keyword)@@ -190,8 +184,8 @@ class TagUpdateDeleteApi(Resource):return dump_response(TagResponse, tag), 200- @console_account_admission()@console_ns.response(204, "Tag deleted successfully")+ @console_account_admission()def delete(self, request_context: RequestContext, tag_id: UUID):tag_id_str = str(tag_id)diff --git a/api/controllers/console/workspace/skills.py b/api/controllers/console/workspace/skills.pyindex d47f608e5f9..ce1dc6b51c7 100644--- a/api/controllers/console/workspace/skills.py+++ b/api/controllers/console/workspace/skills.py@@ -293,12 +293,6 @@ def _error_response(exc: SkillManagementServiceError) -> tuple[dict[str, object]return body, exc.status_code-def _workspace_id(context: RequestContext) -> str:- if context.active_workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")- return context.active_workspace_id--@console_ns.route("/workspaces/current/skills")class WorkspaceSkillsApi(Resource):@console_ns.doc(params=query_params_from_model(WorkspaceSkillsQuery))@@ -320,7 +314,7 @@ class WorkspaceSkillsApi(Resource):query_input["page"] = request.args.get("page")query = WorkspaceSkillsQuery.model_validate(query_input)result = SkillManagementService(session=session).list_skills(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,keyword=query.keyword,page=query.page,limit=query.limit,@@ -341,7 +335,7 @@ class WorkspaceSkillsApi(Resource):try:payload = SkillCreatePayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).create_skill(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,payload=payload,)@@ -371,7 +365,7 @@ class WorkspaceSkillFileUploadApi(Resource):try:result = SkillManagementService(session=session).upload_file(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,filename=file.filename,content=file.stream.read(),@@ -388,7 +382,7 @@ class WorkspaceSkillTagsApi(Resource):@console_account_admission()@with_session(write=False)def get(self, session: Session, request_context: RequestContext):- result = SkillManagementService(session=session).list_tags(tenant_id=_workspace_id(request_context))+ result = SkillManagementService(session=session).list_tags(tenant_id=request_context.active_workspace_id)return dump_response(SkillTagListResponse, result)@@ -410,7 +404,7 @@ class WorkspaceSkillImportApi(Resource):try:payload = SkillImportPayload(content=upload.read(), filename=upload.filename or "skill.zip")result = SkillManagementService(session=session).import_skill(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,payload=payload,)@@ -433,7 +427,7 @@ class WorkspaceSkillApi(Resource):def get(self, session: Session, request_context: RequestContext, skill_id: str):try:result = SkillManagementService(session=session).get_skill(- tenant_id=_workspace_id(request_context), skill_id=skill_id+ tenant_id=request_context.active_workspace_id, skill_id=skill_id)return dump_response(SkillDetailResponse, result)except SkillManagementServiceError as exc:@@ -452,7 +446,7 @@ class WorkspaceSkillApi(Resource):try:payload = SkillMetadataPayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).update_metadata(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,skill_id=skill_id,payload=payload,@@ -478,7 +472,7 @@ class WorkspaceSkillApi(Resource):try:payload = SkillDeletePayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).delete_skill(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,skill_id=skill_id,confirmation_name=payload.confirmation_name,)@@ -502,7 +496,7 @@ class WorkspaceSkillDuplicateApi(Resource):def post(self, session: Session, request_context: RequestContext, skill_id: str):try:result = SkillManagementService(session=session).duplicate_skill(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,skill_id=skill_id,)@@ -523,7 +517,7 @@ class WorkspaceSkillExportApi(Resource):def get(self, session: Session, request_context: RequestContext, skill_id: str):try:result = SkillManagementService(session=session).pull_published_archive(- tenant_id=_workspace_id(request_context), skill_id=skill_id+ tenant_id=request_context.active_workspace_id, skill_id=skill_id)return send_file(io.BytesIO(result.payload),@@ -547,7 +541,7 @@ class WorkspaceSkillAssistMessageApi(Resource):try:payload = SkillAssistMessagePayload.model_validate(console_ns.payload or {})response = SkillManagementService(session=session).create_assistant_action_stream(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,skill_id=skill_id,user_id=request_context.account_id,message=payload.message,@@ -574,7 +568,7 @@ class WorkspaceSkillFilesCheckApi(Resource):try:payload = SkillDraftFileCheckPayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).check_draft_files(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,skill_id=skill_id,payload=payload,)@@ -598,7 +592,7 @@ class WorkspaceSkillFilesApi(Resource):try:payload = SkillDraftFileOperationPayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).apply_draft_file_operation(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,skill_id=skill_id,payload=payload,@@ -620,7 +614,7 @@ class WorkspaceSkillFilesApi(Resource):try:payload = SkillDraftTreePayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).replace_draft_tree(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,skill_id=skill_id,payload=payload,@@ -649,7 +643,7 @@ class WorkspaceSkillFilePreviewApi(Resource):})result = SkillManagementService(session=session).preview_file(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,skill_id=skill_id,path=query.path,version_id=query.version_id,@@ -678,7 +672,7 @@ class WorkspaceSkillFileContentApi(Resource):})result = SkillManagementService(session=session).pull_file(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,skill_id=skill_id,path=query.path,version_id=query.version_id,@@ -712,7 +706,7 @@ class WorkspaceSkillPublishApi(Resource):try:payload = SkillPublishPayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).publish_skill(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,skill_id=skill_id,payload=payload,@@ -739,7 +733,7 @@ class WorkspaceSkillRestoreApi(Resource):try:payload = SkillRestorePayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).restore_version(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,skill_id=skill_id,payload=payload,@@ -759,7 +753,7 @@ class WorkspaceSkillReferencesApi(Resource):def get(self, session: Session, request_context: RequestContext, skill_id: str):try:result = SkillManagementService(session=session).list_skill_references(- tenant_id=_workspace_id(request_context), skill_id=skill_id+ tenant_id=request_context.active_workspace_id, skill_id=skill_id)return dump_response(SkillReferenceListResponse, result)except SkillManagementServiceError as exc:@@ -774,7 +768,7 @@ class WorkspaceSkillVersionsApi(Resource):def get(self, session: Session, request_context: RequestContext, skill_id: str):try:result = SkillManagementService(session=session).list_versions(- tenant_id=_workspace_id(request_context), skill_id=skill_id+ tenant_id=request_context.active_workspace_id, skill_id=skill_id)return dump_response(SkillVersionListResponse, result)except SkillManagementServiceError as exc:@@ -789,7 +783,7 @@ class WorkspaceSkillVersionApi(Resource):def get(self, session: Session, request_context: RequestContext, skill_id: str, version_id: str):try:result = SkillManagementService(session=session).get_version(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,skill_id=skill_id,version_id=version_id,)@@ -806,7 +800,7 @@ class WorkspaceSkillVersionApi(Resource):try:payload = SkillVersionUpdatePayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).update_version(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,skill_id=skill_id,version_id=version_id,payload=payload,@@ -824,7 +818,7 @@ class WorkspaceSkillVersionApi(Resource):def delete(self, session: Session, request_context: RequestContext, skill_id: str, version_id: str):try:result = SkillManagementService(session=session).delete_version(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,skill_id=skill_id,version_id=version_id,@@ -841,7 +835,7 @@ class WorkspaceAgentSkillBindingsApi(Resource):@with_sessiondef get(self, session: Session, request_context: RequestContext, agent_id: str):result = SkillManagementService(session=session).list_agent_bindings(- tenant_id=_workspace_id(request_context), agent_id=agent_id+ tenant_id=request_context.active_workspace_id, agent_id=agent_id)return dump_response(AgentSkillBindingsResponse, result)@@ -854,7 +848,7 @@ class WorkspaceAgentSkillBindingsApi(Resource):try:payload = AgentSkillBindingsPayload.model_validate(console_ns.payload or {})result = SkillManagementService(session=session).replace_agent_bindings(- tenant_id=_workspace_id(request_context),+ tenant_id=request_context.active_workspace_id,user_id=request_context.account_id,agent_id=agent_id,skill_ids=payload.skill_ids,diff --git a/api/libs/login.py b/api/libs/login.pyindex bf89ab75123..c64193a97fd 100644--- a/api/libs/login.py+++ b/api/libs/login.py@@ -13,6 +13,7 @@ from configs import dify_configfrom dify_app import DifyAppfrom extensions.ext_login import DifyLoginManagerfrom libs.token import check_csrf_token+from machinery.errors import ActiveWorkspaceRequiredErrorfrom models import Accountif TYPE_CHECKING:@@ -52,8 +53,10 @@ def current_account_with_tenant() -> AccountWithTenant:if not isinstance(user, Account):raise ValueError("current_user must be an Account instance")- assert user.current_tenant_id is not None, "The tenant information should be loaded."- return AccountWithTenant(account=user, tenant_id=user.current_tenant_id)+ tenant_id = user.current_tenant_id+ if tenant_id is None:+ raise ActiveWorkspaceRequiredError()+ return AccountWithTenant(account=user, tenant_id=tenant_id)def current_account_with_tenant_optional() -> tuple[Account | None, str | None]:diff --git a/api/machinery/context.py b/api/machinery/context.pyindex bc462afaf68..5d6f5436619 100644--- a/api/machinery/context.py+++ b/api/machinery/context.py@@ -7,4 +7,4 @@ class RequestContext(NamedTuple):request_id: strtrace_id: str | Noneaccount_id: str- active_workspace_id: str | None+ active_workspace_id: strdiff --git a/api/services/account_education_service.py b/api/services/account_education_service.pyindex bfecad64c8a..20634fc9e34 100644--- a/api/services/account_education_service.py+++ b/api/services/account_education_service.py@@ -3,7 +3,6 @@from typing import Protocolfrom machinery.context import RequestContext-from machinery.errors import ActiveWorkspaceRequiredErrorfrom services.account_errors import AccountNotFoundError, EducationRateLimitExceededErrorfrom services.account_ports import AccountRepositoryfrom services.entities.account_entities import (@@ -72,8 +71,6 @@ class AccountEducationService:account = self._accounts.get(context.account_id)if account is None:raise AccountNotFoundError- if context.active_workspace_id is None:- raise ActiveWorkspaceRequiredErrorif self._activation_rate_limiter.is_rate_limited(account.email):raise EducationRateLimitExceededErrorself._activation_rate_limiter.increment_rate_limit(account.email)diff --git a/api/services/account_initialization_service.py b/api/services/account_initialization_service.pyindex f94de95baca..8fbf38c3f11 100644--- a/api/services/account_initialization_service.py+++ b/api/services/account_initialization_service.py@@ -4,7 +4,6 @@ from collections.abc import Callablefrom datetime import datetimefrom machinery.context import RequestContext-from machinery.errors import ActiveWorkspaceRequiredErrorfrom services.account_errors import (AccountAlreadyInitializedError,AccountNotFoundError,@@ -40,8 +39,6 @@ class AccountInitializationService:if invitation_code is None:raise MissingInvitationCodeError("invitation_code is required")workspace_id = context.active_workspace_id- if workspace_id is None:- raise ActiveWorkspaceRequiredErrorresult = self._accounts.initialize(context.account_id,diff --git a/api/services/app_site_service.py b/api/services/app_site_service.pyindex c7e732eba64..3b0d6f34eb7 100644--- a/api/services/app_site_service.py+++ b/api/services/app_site_service.py@@ -87,7 +87,7 @@ class AppSiteService:def update(self, context: RequestContext, app_id: str, changes: AppSiteChanges) -> AppSiteCommandResult:return self._sites.update_site(- workspace_id=self._workspace_id(context),+ workspace_id=context.active_workspace_id,app_id=app_id,actor_id=context.account_id,changes=changes,@@ -95,13 +95,7 @@ class AppSiteService:def reset_access_token(self, context: RequestContext, app_id: str) -> AppSiteCommandResult:return self._sites.reset_access_token(- workspace_id=self._workspace_id(context),+ workspace_id=context.active_workspace_id,app_id=app_id,actor_id=context.account_id,)-- @staticmethod- def _workspace_id(context: RequestContext) -> str:- if context.active_workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")- return context.active_workspace_iddiff --git a/api/services/auth/data_source_api_key_auth_service.py b/api/services/auth/data_source_api_key_auth_service.pyindex 8bdad21a30f..585845a4a55 100644--- a/api/services/auth/data_source_api_key_auth_service.py+++ b/api/services/auth/data_source_api_key_auth_service.py@@ -5,7 +5,6 @@ from dataclasses import replacefrom typing import Protocolfrom machinery.context import RequestContext-from machinery.errors import ActiveWorkspaceRequiredErrorfrom services.entities.data_source_api_key_auth_entities import (DataSourceApiKeyAuthBindingCreate,DataSourceApiKeyAuthBindingRecord,@@ -48,10 +47,10 @@ class DataSourceApiKeyAuthService:self._encryptor = encryptordef list_bindings(self, context: RequestContext) -> tuple[DataSourceApiKeyAuthBindingRecord, ...]:- return tuple(self._bindings.list_enabled(self._require_workspace(context)))+ return tuple(self._bindings.list_enabled(context.active_workspace_id))def create_binding(self, context: RequestContext, command: DataSourceApiKeyAuthBindingCreate) -> None:- workspace_id = self._require_workspace(context)+ workspace_id = context.active_workspace_idif not self._validator.validate(command.provider, command.credentials):return@@ -68,10 +67,4 @@ class DataSourceApiKeyAuthService:)def delete_binding(self, context: RequestContext, binding_id: str) -> None:- self._bindings.delete(self._require_workspace(context), binding_id)-- @staticmethod- def _require_workspace(context: RequestContext) -> str:- if context.active_workspace_id is None:- raise ActiveWorkspaceRequiredError()- return context.active_workspace_id+ self._bindings.delete(context.active_workspace_id, binding_id)diff --git a/api/services/billing_portal_service.py b/api/services/billing_portal_service.pyindex d9ee27b1955..601e61de66b 100644--- a/api/services/billing_portal_service.py+++ b/api/services/billing_portal_service.py@@ -40,8 +40,6 @@ class BillingPortalService:def _resolve_account_email_and_workspace_id(self, context: RequestContext) -> tuple[str, str]:workspace_id = context.active_workspace_id- if workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")account = self._accounts.get(context.account_id)if account is None:diff --git a/api/services/compliance_download_service.py b/api/services/compliance_download_service.pyindex d379d24c8b8..f4b8701c9c4 100644--- a/api/services/compliance_download_service.py+++ b/api/services/compliance_download_service.py@@ -4,7 +4,6 @@ from collections.abc import Callablefrom typing import Protocol, TypedDictfrom machinery.context import RequestContext-from machinery.errors import ActiveWorkspaceRequiredErrorfrom services.errors.billing import ComplianceRateLimitExceededError@@ -37,9 +36,6 @@ class ComplianceDownloadService:device_info: str,) -> ComplianceDownloadLink:workspace_id = request_context.active_workspace_id- if workspace_id is None:- raise ActiveWorkspaceRequiredError-account_id = request_context.account_idlimiter_key = f"{account_id}:{workspace_id}"if self._rate_limiter.is_rate_limited(limiter_key):diff --git a/api/services/data_source_oauth_service.py b/api/services/data_source_oauth_service.pyindex bc1261d3efe..7e91839a9fe 100644--- a/api/services/data_source_oauth_service.py+++ b/api/services/data_source_oauth_service.py@@ -92,7 +92,7 @@ class DataSourceOAuthService:if not access_token:raise DataSourceOAuthConfigurationError("Internal secret is not set")- workspace_id = self._require_active_workspace(context)+ workspace_id = context.active_workspace_idauthorization = self._provider_gateway.authorize_internal(access_token, workspace_id)self._bindings.upsert_authorization(workspace_id=workspace_id,@@ -112,7 +112,7 @@ class DataSourceOAuthService:if not code:raise InvalidDataSourceOAuthCodeError("Invalid code")- workspace_id = self._require_active_workspace(context)+ workspace_id = context.active_workspace_idauthorization = self._provider_gateway.authorize(code)self._bindings.upsert_authorization(workspace_id=workspace_id,@@ -121,7 +121,7 @@ class DataSourceOAuthService:)def sync(self, context: RequestContext, *, binding_id: str) -> None:- workspace_id = self._require_active_workspace(context)+ workspace_id = context.active_workspace_idbinding = self._bindings.get_enabled(workspace_id=workspace_id,provider=self._provider_name,@@ -139,10 +139,3 @@ class DataSourceOAuthService:)if not updated:raise DataSourceOAuthError("Data source binding not found")-- @staticmethod- def _require_active_workspace(context: RequestContext) -> str:- workspace_id = context.active_workspace_id- if workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")- return workspace_iddiff --git a/api/services/feature_query_service.py b/api/services/feature_query_service.pyindex b3a72ab9ea8..83fac59fd87 100644--- a/api/services/feature_query_service.py+++ b/api/services/feature_query_service.py@@ -36,19 +36,19 @@ class FeatureQueryService:self._app_dsl_version = app_dsl_versiondef get_features(self, context: RequestContext) -> FeatureModel:- return self.get_workspace_features(self._require_active_workspace(context))+ return self.get_workspace_features(context.active_workspace_id)def get_workspace_features(self, workspace_id: str) -> FeatureModel:return self._features.get_workspace_features(workspace_id)def get_vector_space(self, context: RequestContext) -> VectorSpaceLimitationModel:- return self.get_workspace_vector_space(self._require_active_workspace(context))+ return self.get_workspace_vector_space(context.active_workspace_id)def get_workspace_vector_space(self, workspace_id: str) -> VectorSpaceLimitationModel:return self._features.get_vector_space(workspace_id)def get_trial_models(self, context: RequestContext) -> list[str]:- return self._features.get_trial_models(self._require_active_workspace(context))+ return self._features.get_trial_models(context.active_workspace_id)def get_app_dsl_version(self) -> str:return self._app_dsl_version@@ -58,10 +58,3 @@ class FeatureQueryService:def get_license(self) -> LicenseModel:return self._features.get_license()-- @staticmethod- def _require_active_workspace(context: RequestContext) -> str:- workspace_id = context.active_workspace_id- if workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")- return workspace_iddiff --git a/api/services/retention/workflow_run/archive_log_service.py b/api/services/retention/workflow_run/archive_log_service.pyindex 070ca9260bc..875e9bd499b 100644--- a/api/services/retention/workflow_run/archive_log_service.py+++ b/api/services/retention/workflow_run/archive_log_service.py@@ -126,7 +126,7 @@ class WorkflowRunArchiveService:def list_archives(self, context: RequestContext) -> WorkflowRunArchiveList:"""Return monthly archive metadata for the active workspace."""- tenant_id = self._active_workspace_id(context)+ tenant_id = context.active_workspace_idrecords_by_month: dict[tuple[int, int], list[WorkflowRunArchiveBundleRecord]] = {}for record in self._bundles.list_for_tenant(tenant_id):records_by_month.setdefault((record.year, record.month), []).append(record)@@ -172,7 +172,7 @@ class WorkflowRunArchiveService:month: int,) -> WorkflowRunArchiveDownloadTask:"""Create or return the idempotent download task for one workspace/month."""- tenant_id = self._active_workspace_id(context)+ tenant_id = context.active_workspace_idbundles = self._bundles.list_for_tenant_month(tenant_id, year=year, month=month)if not bundles:raise WorkflowRunArchiveNotFoundError(f"Workflow run archive not found: {year:04d}-{month:02d}")@@ -217,7 +217,7 @@ class WorkflowRunArchiveService:def get_download(self, context: RequestContext, *, download_id: str) -> WorkflowRunArchiveDownloadTask:"""Return a cached download task or raise after its TTL expires."""- tenant_id = self._active_workspace_id(context)+ tenant_id = context.active_workspace_idtask = self._tasks.get(tenant_id=tenant_id, download_id=download_id)if task is None:raise WorkflowRunArchiveDownloadTaskNotFoundError(f"Workflow run archive download not found: {download_id}")@@ -284,10 +284,3 @@ class WorkflowRunArchiveService:expires_at_utc = expires_at if expires_at.tzinfo else expires_at.replace(tzinfo=datetime.UTC)remaining_seconds = int((expires_at_utc - datetime.datetime.now(datetime.UTC)).total_seconds())return max(1, min(3600, remaining_seconds))-- @staticmethod- def _active_workspace_id(context: RequestContext) -> str:- workspace_id = context.active_workspace_id- if workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")- return workspace_iddiff --git a/api/services/step_by_step_tour_service.py b/api/services/step_by_step_tour_service.pyindex 9597d3d5e77..95f584ff046 100644--- a/api/services/step_by_step_tour_service.py+++ b/api/services/step_by_step_tour_service.py@@ -45,7 +45,7 @@ class StepByStepTourService:self._rollout_started_at = rollout_started_atdef get_state(self, context: RequestContext) -> StepByStepTourResult:- workspace_id = self._require_workspace(context)+ workspace_id = context.active_workspace_idaccount = self._accounts.get(context.account_id)if account is None:raise RuntimeError("Console account admission resolved an unknown account")@@ -56,7 +56,7 @@ class StepByStepTourService:return self._to_result(self._states.initialize(context.account_id, workspace_id))def patch_state(self, context: RequestContext, patch: StepByStepTourPatch) -> StepByStepTourResult:- workspace_id = self._require_workspace(context)+ workspace_id = context.active_workspace_idstate = self._states.mutate(context.account_id,lambda current: self._apply_action(current, patch=patch, workspace_id=workspace_id),@@ -120,12 +120,6 @@ class StepByStepTourService:case _:raise ValueError(f"Unsupported action: {patch.action}")- @staticmethod- def _require_workspace(context: RequestContext) -> str:- if context.active_workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")- return context.active_workspace_id-@staticmethoddef _require_task_id(task_id: str | None) -> str:if task_id is None:diff --git a/api/services/tag_application_service.py b/api/services/tag_application_service.pyindex 05488fda80a..e599de6295e 100644--- a/api/services/tag_application_service.py+++ b/api/services/tag_application_service.py@@ -76,28 +76,22 @@ class TagApplicationService:self._tags = tagsdef list_tags(self, context: RequestContext, tag_type: str, keyword: str | None = None) -> tuple[TagSummary, ...]:- return tuple(self._tags.list_tags(self._workspace_id(context), tag_type, keyword))+ return tuple(self._tags.list_tags(context.active_workspace_id, tag_type, keyword))def get_tag_type(self, context: RequestContext, tag_id: str) -> str | None:- return self._tags.get_tag_type(self._workspace_id(context), tag_id)+ return self._tags.get_tag_type(context.active_workspace_id, tag_id)def create_tag(self, context: RequestContext, tag: CreateTagInput) -> TagSummary:- return self._tags.create_tag(self._workspace_id(context), context.account_id, tag)+ return self._tags.create_tag(context.active_workspace_id, context.account_id, tag)def update_tag(self, context: RequestContext, tag_id: str, tag: UpdateTagInput) -> TagSummary:- return self._tags.update_tag(self._workspace_id(context), tag_id, tag)+ return self._tags.update_tag(context.active_workspace_id, tag_id, tag)def delete_tag(self, context: RequestContext, tag_id: str) -> None:- self._tags.delete_tag(self._workspace_id(context), tag_id)+ self._tags.delete_tag(context.active_workspace_id, tag_id)def create_bindings(self, context: RequestContext, binding: TagBindingInput) -> None:- self._tags.create_bindings(self._workspace_id(context), context.account_id, binding)+ self._tags.create_bindings(context.active_workspace_id, context.account_id, binding)def delete_bindings(self, context: RequestContext, binding: TagBindingInput) -> None:- self._tags.delete_bindings(self._workspace_id(context), binding)-- @staticmethod- def _workspace_id(context: RequestContext) -> str:- if context.active_workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")- return context.active_workspace_id+ self._tags.delete_bindings(context.active_workspace_id, binding)diff --git a/api/services/workflow_statistic_query_service.py b/api/services/workflow_statistic_query_service.pyindex 4649fbe3aa8..87456ebc2bc 100644--- a/api/services/workflow_statistic_query_service.py+++ b/api/services/workflow_statistic_query_service.py@@ -27,7 +27,7 @@ class WorkflowStatisticQueryService:timezone: str,) -> list[DailyRunsStats]:return self._workflow_runs.get_daily_runs_statistics(- tenant_id=self._workspace_id(context),+ tenant_id=context.active_workspace_id,app_id=app_id,triggered_from=WorkflowRunTriggeredFrom.APP_RUN,start_date=start_date,@@ -45,7 +45,7 @@ class WorkflowStatisticQueryService:timezone: str,) -> list[DailyTerminalsStats]:return self._workflow_runs.get_daily_terminals_statistics(- tenant_id=self._workspace_id(context),+ tenant_id=context.active_workspace_id,app_id=app_id,triggered_from=WorkflowRunTriggeredFrom.APP_RUN,start_date=start_date,@@ -63,7 +63,7 @@ class WorkflowStatisticQueryService:timezone: str,) -> list[DailyTokenCostStats]:return self._workflow_runs.get_daily_token_cost_statistics(- tenant_id=self._workspace_id(context),+ tenant_id=context.active_workspace_id,app_id=app_id,triggered_from=WorkflowRunTriggeredFrom.APP_RUN,start_date=start_date,@@ -81,17 +81,10 @@ class WorkflowStatisticQueryService:timezone: str,) -> list[AverageInteractionStats]:return self._workflow_runs.get_average_app_interaction_statistics(- tenant_id=self._workspace_id(context),+ tenant_id=context.active_workspace_id,app_id=app_id,triggered_from=WorkflowRunTriggeredFrom.APP_RUN,start_date=start_date,end_date=end_date,timezone=timezone,)-- @staticmethod- def _workspace_id(context: RequestContext) -> str:- workspace_id = context.active_workspace_id- if workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")- return workspace_iddiff --git a/api/services/workspace_member_query_service.py b/api/services/workspace_member_query_service.pyindex 76ccb3d25a7..b3570ef54d7 100644--- a/api/services/workspace_member_query_service.py+++ b/api/services/workspace_member_query_service.py@@ -67,8 +67,6 @@ class WorkspaceMemberQueryService:def list_current(self, context: RequestContext) -> tuple[WorkspaceMemberSummary, ...]:workspace_id = context.active_workspace_id- if workspace_id is None:- raise RuntimeError("Console account admission did not resolve an active workspace")records = tuple(self._members.list_for_workspace(workspace_id))role_subjects = tuple(diff --git a/api/tests/unit_tests/controllers/console/auth/test_data_source_bearer_auth.py b/api/tests/unit_tests/controllers/console/auth/test_data_source_bearer_auth.pyindex 7f04e26e0ca..47f25498f3a 100644--- a/api/tests/unit_tests/controllers/console/auth/test_data_source_bearer_auth.py+++ b/api/tests/unit_tests/controllers/console/auth/test_data_source_bearer_auth.py@@ -23,7 +23,6 @@ from controllers.console.auth.error import ()from libs.exception import BaseHTTPExceptionfrom machinery.context import RequestContext-from machinery.errors import ActiveWorkspaceRequiredErrorfrom services.auth.data_source_api_key_auth_service import DataSourceApiKeyAuthServicefrom services.auth.errors import (DataSourceApiKeyAuthCredentialValidationError,@@ -212,28 +211,6 @@ def test_api_key_auth_binding_payload_rejects_invalid_structure(payload: dict[stApiKeyAuthBindingPayload.model_validate(payload)-def test_create_data_source_auth_binding_preserves_admission_invariant_error() -> None:- api = ApiKeyAuthDataSourceBinding()- method = unwrap(api.post)- request_context = _request_context()- req_data = ApiKeyAuthBindingPayload(- category="api_key",- provider="firecrawl",- credentials={"auth_type": "bearer", "config": {"api_key": "secret"}},- )- service = create_autospec(DataSourceApiKeyAuthService, instance=True, spec_set=True)- service.create_binding.side_effect = ActiveWorkspaceRequiredError()-- with (- patch(- "controllers.console.auth.data_source_bearer_auth.application_services",- return_value=_application_services(service),- ),- pytest.raises(ActiveWorkspaceRequiredError),- ):- method(api, req_data, request_context)--def test_delete_data_source_auth_binding_passes_context_and_binding_id() -> None:api = ApiKeyAuthDataSourceBindingDelete()method = unwrap(api.delete)diff --git a/api/tests/unit_tests/controllers/console/test_spec.py b/api/tests/unit_tests/controllers/console/test_spec.pyindex 9e6083e950f..87a032b64ca 100644--- a/api/tests/unit_tests/controllers/console/test_spec.py+++ b/api/tests/unit_tests/controllers/console/test_spec.py@@ -58,7 +58,7 @@ class TestSpecSchemaDefinitionsApi:request_id="request-1",trace_id=None,account_id="account-1",- active_workspace_id=None,+ active_workspace_id="workspace-1",)service = create_autospec(SchemaDefinitionService, instance=True, spec_set=True)service.list.return_value = ()diff --git a/api/tests/unit_tests/controllers/console/workspace/test_accounts.py b/api/tests/unit_tests/controllers/console/workspace/test_accounts.pyindex a0487e7b329..4ddce9a1b62 100644--- a/api/tests/unit_tests/controllers/console/workspace/test_accounts.py+++ b/api/tests/unit_tests/controllers/console/workspace/test_accounts.py@@ -253,7 +253,7 @@ class TestAccountUpdateApis:request_id="request-1",trace_id=None,account_id=user.id,- active_workspace_id=None,+ active_workspace_id="workspace-1",)profile = MagicMock()profile.update.return_value = userdiff --git a/api/tests/unit_tests/libs/test_login.py b/api/tests/unit_tests/libs/test_login.pyindex 420b640eb0c..d451ee43471 100644--- a/api/tests/unit_tests/libs/test_login.py+++ b/api/tests/unit_tests/libs/test_login.py@@ -9,6 +9,7 @@ from werkzeug.exceptions import Unauthorizedimport libs.login as login_modulefrom extensions.ext_login import DifyLoginManagerfrom libs.login import current_user+from machinery.errors import ActiveWorkspaceRequiredErrorfrom models.account import Account, Tenantfrom tests.unit_tests.config_override import apply_config_overrides@@ -283,7 +284,7 @@ class TestCurrentAccountWithTenant:account = Account(name="Test User", email="[email protected]")mocker.patch.object(login_module, "current_user", new=account)- with pytest.raises(AssertionError, match="tenant information should be loaded"):+ with pytest.raises(ActiveWorkspaceRequiredError, match="active workspace"):login_module.current_account_with_tenant()diff --git a/api/tests/unit_tests/services/auth/test_data_source_api_key_auth_service.py b/api/tests/unit_tests/services/auth/test_data_source_api_key_auth_service.pyindex 70f3ec8343f..ee3a31b9004 100644--- a/api/tests/unit_tests/services/auth/test_data_source_api_key_auth_service.py+++ b/api/tests/unit_tests/services/auth/test_data_source_api_key_auth_service.py@@ -3,10 +3,7 @@from datetime import datetimefrom unittest.mock import MagicMock-import pytest-from machinery.context import RequestContext-from machinery.errors import ActiveWorkspaceRequiredErrorfrom services.auth.data_source_api_key_auth_service import DataSourceApiKeyAuthServicefrom services.entities.data_source_api_key_auth_entities import (DataSourceApiKeyAuthBindingCreate,@@ -15,12 +12,12 @@ from services.entities.data_source_api_key_auth_entities import ()-def _context(workspace_id: str | None = "workspace-1") -> RequestContext:+def _context() -> RequestContext:return RequestContext(request_id="request-1",trace_id=None,account_id="account-1",- active_workspace_id=workspace_id,+ active_workspace_id="workspace-1",)@@ -103,10 +100,3 @@ def test_delete_binding_scopes_to_active_workspace() -> None:service.delete_binding(_context(), "binding-1")bindings.delete.assert_called_once_with("workspace-1", "binding-1")---def test_use_cases_require_active_workspace() -> None:- service, _bindings, _validator, _encryptor = _service()-- with pytest.raises(ActiveWorkspaceRequiredError, match="active workspace"):- service.list_bindings(_context(None))diff --git a/api/tests/unit_tests/services/test_account_initialization_service.py b/api/tests/unit_tests/services/test_account_initialization_service.pyindex 020d80353b4..e929e1ff11d 100644--- a/api/tests/unit_tests/services/test_account_initialization_service.py+++ b/api/tests/unit_tests/services/test_account_initialization_service.py@@ -6,7 +6,6 @@ from unittest.mock import Mockimport pytestfrom machinery.context import RequestContext-from machinery.errors import ActiveWorkspaceRequiredErrorfrom services.account_errors import (AccountAlreadyInitializedError,InvalidInvitationCodeError,@@ -103,26 +102,6 @@ def test_cloud_initialization_rejects_missing_or_invalid_invitation() -> None:accounts.initialize.assert_called_once()-def test_cloud_initialization_requires_admitted_workspace() -> None:- accounts = Mock(spec=AccountRepository)- service = AccountInitializationService(- accounts=accounts,- invitation_required=True,- now=lambda: datetime(2026, 8, 10),- )- context = RequestContext(- request_id="request-1",- trace_id="trace-1",- account_id="account-1",- active_workspace_id=None,- )-- with pytest.raises(ActiveWorkspaceRequiredError):- service.initialize(context, interface_language="en-US", timezone="UTC", invitation_code="invite")-- accounts.initialize.assert_not_called()--def test_initialization_rejects_an_active_account_before_consuming_invitation() -> None:accounts = Mock(spec=AccountRepository)accounts.initialize.return_value = AccountInitializationResult(diff --git a/api/tests/unit_tests/services/test_app_site_service.py b/api/tests/unit_tests/services/test_app_site_service.pyindex bd685795b4b..79226bfc76a 100644--- a/api/tests/unit_tests/services/test_app_site_service.py+++ b/api/tests/unit_tests/services/test_app_site_service.py@@ -1,7 +1,5 @@from unittest.mock import MagicMock-import pytest-from machinery.context import RequestContextfrom services.app_site_service import AppSiteChanges, AppSiteCommandResult, AppSiteService@@ -49,11 +47,3 @@ def test_service_passes_stable_identity_to_store() -> None:app_id="app-1",actor_id="account-1",)---def test_service_rejects_context_without_active_workspace() -> None:- context = RequestContext("request-1", None, "account-1", None)- service = AppSiteService(sites=MagicMock())-- with pytest.raises(RuntimeError, match="active workspace"):- service.update(context, "app-1", AppSiteChanges())diff --git a/api/tests/unit_tests/services/test_billing_portal_service.py b/api/tests/unit_tests/services/test_billing_portal_service.pyindex 9ce544864f7..676d0686629 100644--- a/api/tests/unit_tests/services/test_billing_portal_service.py+++ b/api/tests/unit_tests/services/test_billing_portal_service.py@@ -10,12 +10,12 @@ from services.billing_portal_service import BillingPortalServicefrom services.entities.account_entities import AccountSnapshot-def _context(*, workspace_id: str | None = "workspace-1") -> RequestContext:+def _context() -> RequestContext:return RequestContext(request_id="request-1",trace_id="trace-1",account_id="account-1",- active_workspace_id=workspace_id,+ active_workspace_id="workspace-1",)@@ -102,15 +102,3 @@ def test_missing_account_does_not_call_billing(service.get_invoices(_context())get_invoices.assert_not_called()---def test_missing_workspace_does_not_query_account_or_billing(- service: BillingPortalService,- accounts: Mock,- get_invoices: MagicMock,-) -> None:- with pytest.raises(RuntimeError, match="did not resolve an active workspace"):- service.get_invoices(_context(workspace_id=None))-- accounts.get.assert_not_called()- get_invoices.assert_not_called()diff --git a/api/tests/unit_tests/services/test_compliance_download_service.py b/api/tests/unit_tests/services/test_compliance_download_service.pyindex c803bb84e8b..43071564778 100644--- a/api/tests/unit_tests/services/test_compliance_download_service.py+++ b/api/tests/unit_tests/services/test_compliance_download_service.py@@ -3,7 +3,6 @@ from unittest.mock import MagicMockimport pytestfrom machinery.context import RequestContext-from machinery.errors import ActiveWorkspaceRequiredErrorfrom services.compliance_download_service import ComplianceDownloadRateLimiter, ComplianceDownloadServicefrom services.errors.billing import BillingUpstreamUnavailableError, ComplianceRateLimitExceededError@@ -109,28 +108,3 @@ def test_get_link_does_not_increment_after_fetch_failure()rate_limiter.increment_rate_limit.assert_not_called()---def test_get_link_requires_active_workspace(- service: ComplianceDownloadService,- fetch_link: MagicMock,- rate_limiter: MagicMock,-) -> None:- request_context = RequestContext(- request_id="request-1",- trace_id="trace-1",- account_id="account-1",- active_workspace_id=None,- )-- with pytest.raises(ActiveWorkspaceRequiredError):- service.get_link(- request_context=request_context,- document_name="SOC2_Type_II",- ip_address="127.0.0.1",- device_info="test-agent",- )-- rate_limiter.is_rate_limited.assert_not_called()- fetch_link.assert_not_called()- rate_limiter.increment_rate_limit.assert_not_called()diff --git a/api/tests/unit_tests/services/test_feature_query_service.py b/api/tests/unit_tests/services/test_feature_query_service.pyindex d39e93cb006..edbc4a4a463 100644--- a/api/tests/unit_tests/services/test_feature_query_service.py+++ b/api/tests/unit_tests/services/test_feature_query_service.py@@ -1,7 +1,5 @@from unittest.mock import create_autospec-import pytest-from enums import DeploymentEditionfrom machinery.context import RequestContextfrom services.entities.feature_entities import (@@ -13,12 +11,12 @@ from services.entities.feature_entities import (from services.feature_query_service import FeatureQueryGateway, FeatureQueryService-def _request_context(*, active_workspace_id: str | None = "workspace_123") -> RequestContext:+def _request_context() -> RequestContext:return RequestContext(request_id="request_123",trace_id=None,account_id="account_123",- active_workspace_id=active_workspace_id,+ active_workspace_id="workspace_123",)@@ -68,13 +66,3 @@ def test_workspace_id_queries_delegate_without_request_context() -> None:assert service.get_workspace_vector_space("workspace_123") is vector_spacegateway.get_workspace_features.assert_called_once_with("workspace_123")gateway.get_vector_space.assert_called_once_with("workspace_123")---def test_workspace_queries_require_active_workspace() -> None:- gateway = create_autospec(FeatureQueryGateway, instance=True, spec_set=True)- service = FeatureQueryService(features=gateway, app_dsl_version="0.7.0")-- with pytest.raises(RuntimeError, match="did not resolve an active workspace"):- service.get_features(_request_context(active_workspace_id=None))-- gateway.get_workspace_features.assert_not_called()diff --git a/api/tests/unit_tests/services/test_step_by_step_tour_service.py b/api/tests/unit_tests/services/test_step_by_step_tour_service.pyindex 40017bb7798..1290987ffce 100644--- a/api/tests/unit_tests/services/test_step_by_step_tour_service.py+++ b/api/tests/unit_tests/services/test_step_by_step_tour_service.py@@ -14,7 +14,7 @@ from services.entities.onboarding_entities import StepByStepTourPatch, StepByStefrom services.step_by_step_tour_service import StepByStepTourService-def _context(*, workspace_id: str | None = "workspace-1") -> RequestContext:+def _context(*, workspace_id: str = "workspace-1") -> RequestContext:return RequestContext(request_id="request-1",trace_id="trace-1",@@ -191,15 +191,6 @@ def test_rejects_unsupported_task_id() -> None:StepByStepTourService._require_task_id("unknown")-def test_rejects_missing_workspace_before_using_state_repository() -> None:- states = StateRepositoryStub()-- with pytest.raises(RuntimeError, match="did not resolve an active workspace"):- _service(states=states).patch_state(_context(workspace_id=None), StepByStepTourPatch("skip"))-- assert states.mutation_account_ids == []--def test_get_state_rejects_unknown_admitted_account() -> None:states = StateRepositoryStub()service = StepByStepTourService(diff --git a/api/tests/unit_tests/services/test_tag_application_service.py b/api/tests/unit_tests/services/test_tag_application_service.pyindex a97d8723f82..a8fb39eed8d 100644--- a/api/tests/unit_tests/services/test_tag_application_service.py+++ b/api/tests/unit_tests/services/test_tag_application_service.py@@ -42,13 +42,5 @@ def test_service_passes_stable_identity_to_store(context: RequestContext) -> Nonstore.delete_bindings.assert_called_once_with("workspace-1", TagBindingInput(("tag-1",), "app-1", "app"))-def test_service_rejects_context_without_active_workspace() -> None:- context = RequestContext("request-1", None, "account-1", None)- service = TagApplicationService(tags=MagicMock())-- with pytest.raises(RuntimeError, match="active workspace"):- service.list_tags(context, "app")--def test_skill_binding_target_error_message() -> None:assert str(TagBindingTargetNotFoundError("skill")) == "Skill not found"diff --git a/api/tests/unit_tests/services/test_workflow_statistic_query_service.py b/api/tests/unit_tests/services/test_workflow_statistic_query_service.pyindex fde9b86b739..f330be15e45 100644--- a/api/tests/unit_tests/services/test_workflow_statistic_query_service.py+++ b/api/tests/unit_tests/services/test_workflow_statistic_query_service.py@@ -1,20 +1,18 @@from datetime import UTC, datetimefrom unittest.mock import MagicMock-import pytest-from machinery.context import RequestContextfrom models.enums import WorkflowRunTriggeredFromfrom repositories.api_workflow_run_repository import APIWorkflowRunRepositoryfrom services.workflow_statistic_query_service import WorkflowStatisticQueryService-def _request_context(*, workspace_id: str | None = "workspace-1") -> RequestContext:+def _request_context() -> RequestContext:return RequestContext(request_id="request-1",trace_id="trace-1",account_id="account-1",- active_workspace_id=workspace_id,+ active_workspace_id="workspace-1",)@@ -70,19 +68,3 @@ def test_workflow_statistic_queries_delegate_to_workflow_run_repository() -> Nonworkflow_runs.get_daily_terminals_statistics.assert_called_once_with(**expected_arguments)workflow_runs.get_daily_token_cost_statistics.assert_called_once_with(**expected_arguments)workflow_runs.get_average_app_interaction_statistics.assert_called_once_with(**expected_arguments)---def test_workflow_statistic_query_requires_active_workspace() -> None:- workflow_runs = MagicMock(spec=APIWorkflowRunRepository)- service = WorkflowStatisticQueryService(workflow_runs=workflow_runs)-- with pytest.raises(RuntimeError, match="did not resolve an active workspace"):- service.get_daily_runs(- _request_context(workspace_id=None),- app_id="app-1",- start_date=None,- end_date=None,- timezone="UTC",- )-- workflow_runs.get_daily_runs_statistics.assert_not_called()diff --git a/api/tests/unit_tests/services/test_workspace_member_query_service.py b/api/tests/unit_tests/services/test_workspace_member_query_service.pyindex cc2d3fb859d..1525e62a7fc 100644--- a/api/tests/unit_tests/services/test_workspace_member_query_service.py+++ b/api/tests/unit_tests/services/test_workspace_member_query_service.py@@ -13,12 +13,12 @@ from services.workspace_member_query_service import ()-def make_context(*, workspace_id: str | None = "workspace-1") -> RequestContext:+def make_context() -> RequestContext:return RequestContext(request_id="request-1",trace_id="trace-1",account_id="actor-1",- active_workspace_id=workspace_id,+ active_workspace_id="workspace-1",)@@ -130,18 +130,6 @@ def test_list_current_projects_members_and_merges_roles_by_account_id() -> None:]-def test_list_current_rejects_missing_workspace_before_calling_ports() -> None:- members = RecordingMemberQuery([])- roles = RecordingRoleResolver({})- service = WorkspaceMemberQueryService(members=members, roles=roles)-- with pytest.raises(RuntimeError, match="Console account admission did not resolve an active workspace"):- service.list_current(make_context(workspace_id=None))-- assert members.workspace_ids == []- assert roles.calls == []--def test_list_current_propagates_role_resolution_failure() -> None:members = RecordingMemberQuery([make_member("member-1")])service = WorkspaceMemberQueryService(members=members, roles=FailingRoleResolver())