Skip to content

armgit / dify

Public Imported from GitHub
0

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.

refactor(api): group installed and trial app services (#42878)

非法操作3dce05e09e76
diff --git a/api/controllers/console/explore/completion.py b/api/controllers/console/explore/completion.py
index 2f6c2c59948..063e708a39f 100644
--- a/api/controllers/console/explore/completion.py
+++ b/api/controllers/console/explore/completion.py
@@ -98,7 +98,7 @@ class CompletionApi(Resource):
installed_app: InstalledAppRef,
) -> Response:
try:
- response = application_services().installed_app_generation.generate_completion(
+ response = application_services().installed_apps.generation.generate_completion(
installed_app=installed_app,
account_id=request_context.account_id,
args=req_data.model_dump(exclude_none=True),
@@ -178,7 +178,7 @@ class ChatApi(Resource):
installed_app: InstalledAppRef,
) -> Response:
try:
- response = application_services().installed_app_generation.generate_chat(
+ response = application_services().installed_apps.generation.generate_chat(
installed_app=installed_app,
account_id=request_context.account_id,
args=req_data.model_dump(exclude_none=True),
diff --git a/api/controllers/console/explore/conversation.py b/api/controllers/console/explore/conversation.py
index 8a537e78522..adfd3851e86 100644
--- a/api/controllers/console/explore/conversation.py
+++ b/api/controllers/console/explore/conversation.py
@@ -92,7 +92,7 @@ class ConversationListApi(Resource):
def get(
self, query: ConversationListQuery, request_context: RequestContext, installed_app: InstalledAppRef
) -> dict[str, object]:
- page = application_services().installed_app_conversations.get_page(
+ page = application_services().installed_apps.conversations.get_page(
installed_app=installed_app,
account_id=request_context.account_id,
last_id=query.last_id or None,
@@ -111,7 +111,7 @@ class ConversationApi(Resource):
@get_installed_app
@_conversation_errors
def delete(self, request_context: RequestContext, installed_app: InstalledAppRef, c_id: UUID) -> tuple[str, int]:
- application_services().installed_app_conversations.delete(
+ application_services().installed_apps.conversations.delete(
installed_app=installed_app, account_id=request_context.account_id, conversation_id=str(c_id)
)
return "", 204
@@ -135,7 +135,7 @@ class ConversationRenameApi(Resource):
installed_app: InstalledAppRef,
c_id: UUID,
) -> dict[str, object]:
- conversation = application_services().installed_app_conversations.rename(
+ conversation = application_services().installed_apps.conversations.rename(
installed_app=installed_app,
account_id=request_context.account_id,
conversation_id=str(c_id),
@@ -154,7 +154,7 @@ class ConversationPinApi(Resource):
@get_installed_app
@_conversation_errors
def patch(self, request_context: RequestContext, installed_app: InstalledAppRef, c_id: UUID) -> dict[str, object]:
- application_services().installed_app_conversations.set_pinned(
+ application_services().installed_apps.conversations.set_pinned(
installed_app=installed_app,
account_id=request_context.account_id,
conversation_id=str(c_id),
@@ -173,7 +173,7 @@ class ConversationUnPinApi(Resource):
@get_installed_app
@_conversation_errors
def patch(self, request_context: RequestContext, installed_app: InstalledAppRef, c_id: UUID) -> dict[str, object]:
- application_services().installed_app_conversations.set_pinned(
+ application_services().installed_apps.conversations.set_pinned(
installed_app=installed_app,
account_id=request_context.account_id,
conversation_id=str(c_id),
diff --git a/api/controllers/console/explore/installed_app.py b/api/controllers/console/explore/installed_app.py
index d1ab49867a1..a0f6c9cdb92 100644
--- a/api/controllers/console/explore/installed_app.py
+++ b/api/controllers/console/explore/installed_app.py
@@ -145,7 +145,7 @@ class InstalledAppsListApi(Resource):
def get(self, query: InstalledAppsListQuery, request_context: RequestContext) -> dict[str, object]:
cursor = _decode_installed_app_cursor(query.cursor)
try:
- page = application_services().installed_apps.get_visible_page(
+ page = application_services().installed_apps.management.get_visible_page(
tenant_id=request_context.active_workspace_id,
user_id=request_context.account_id,
cursor=cursor,
@@ -193,7 +193,7 @@ class InstalledAppApi(Resource):
installed_app: InstalledAppRef,
) -> dict[str, object]:
try:
- detail = application_services().installed_apps.get_detail(
+ detail = application_services().installed_apps.management.get_detail(
installed_app=installed_app, account_id=request_context.account_id
)
except InstalledAppUnavailableError as error:
@@ -217,7 +217,9 @@ class InstalledAppApi(Resource):
self, req_data: InstalledAppUpdatePayload, request_context: RequestContext, installed_app: InstalledAppRef
) -> dict[str, str]:
try:
- application_services().installed_apps.set_pinned(installed_app=installed_app, is_pinned=req_data.is_pinned)
+ application_services().installed_apps.management.set_pinned(
+ installed_app=installed_app, is_pinned=req_data.is_pinned
+ )
except InstalledAppNotFoundError as error:
raise InstalledAppNotFoundHTTPError() from error
diff --git a/api/controllers/console/explore/installed_app_admission.py b/api/controllers/console/explore/installed_app_admission.py
index 1934350e974..049f629ef4e 100644
--- a/api/controllers/console/explore/installed_app_admission.py
+++ b/api/controllers/console/explore/installed_app_admission.py
@@ -33,7 +33,7 @@ def get_installed_app[T, **P, R](
if installed_app_id is None:
raise RuntimeError("The installed-app admission route must provide installed_app_id")
try:
- installed_app = application_services().installed_app_access.get_access(
+ installed_app = application_services().installed_apps.access.get_access(
installed_app_id=str(installed_app_id),
tenant_id=request_context.active_workspace_id,
account_id=request_context.account_id,
diff --git a/api/controllers/console/explore/message.py b/api/controllers/console/explore/message.py
index f0c955ff1c6..f4ff9326877 100644
--- a/api/controllers/console/explore/message.py
+++ b/api/controllers/console/explore/message.py
@@ -130,7 +130,7 @@ class MessageListApi(Resource):
def get(
self, query: MessageListQuery, request_context: RequestContext, installed_app: InstalledAppRef
) -> dict[str, object]:
- page = application_services().installed_app_messages.get_page(
+ page = application_services().installed_apps.messages.get_page(
installed_app=installed_app,
account_id=request_context.account_id,
conversation_id=query.conversation_id,
@@ -158,7 +158,7 @@ class MessageFeedbackApi(Resource):
installed_app: InstalledAppRef,
message_id: UUID,
) -> dict[str, object]:
- application_services().installed_app_messages.set_feedback(
+ application_services().installed_apps.messages.set_feedback(
installed_app=installed_app,
account_id=request_context.account_id,
message_id=str(message_id),
@@ -186,7 +186,7 @@ class MessageMoreLikeThisApi(Resource):
installed_app: InstalledAppRef,
message_id: UUID,
) -> Response:
- response = application_services().installed_app_generation.generate_more_like_this(
+ response = application_services().installed_apps.generation.generate_more_like_this(
installed_app=installed_app,
account_id=request_context.account_id,
message_id=str(message_id),
@@ -209,7 +209,7 @@ class MessageSuggestedQuestionApi(Resource):
self, request_context: RequestContext, installed_app: InstalledAppRef, message_id: UUID
) -> dict[str, object]:
try:
- questions = application_services().installed_app_messages.get_suggested_questions(
+ questions = application_services().installed_apps.messages.get_suggested_questions(
installed_app=installed_app,
account_id=request_context.account_id,
message_id=str(message_id),
diff --git a/api/controllers/console/explore/trial.py b/api/controllers/console/explore/trial.py
index 906a1573964..475169401c7 100644
--- a/api/controllers/console/explore/trial.py
+++ b/api/controllers/console/explore/trial.py
@@ -511,7 +511,7 @@ class TrialAppWorkflowRunApi(Resource):
Run workflow
"""
try:
- response = application_services().trial_app_generation.generate_workflow(
+ response = application_services().trial_apps.generation.generate_workflow(
trial_app=trial_app,
account_id=request_context.account_id,
args=req_data.model_dump(),
@@ -580,7 +580,7 @@ class TrialChatApi(Resource):
args["parent_message_id"] = uuid_value(args["parent_message_id"])
try:
- response = application_services().trial_app_generation.generate_chat(
+ response = application_services().trial_apps.generation.generate_chat(
trial_app=trial_app,
account_id=request_context.account_id,
args=args,
@@ -712,7 +712,7 @@ class TrialChatAudioApi(Resource):
app=AudioAppRef(app_id=trial_app.app_id, tenant_id=trial_app.tenant_id, app_mode=trial_app.app_mode),
audio=audio,
)
- application_services().trial_app_usage.record(app_id=trial_app.app_id, account_id=request_context.account_id)
+ application_services().trial_apps.usage.record(app_id=trial_app.app_id, account_id=request_context.account_id)
return dump_response(AudioTranscriptResponse, transcript)
@@ -741,7 +741,7 @@ class TrialChatTextApi(Resource):
try:
# Preserve usage after MIME inspection, including a missing message's
# null response. Early provider/MIME failures do not consume a trial.
- application_services().trial_app_usage.record(
+ application_services().trial_apps.usage.record(
app_id=trial_app.app_id, account_id=request_context.account_id
)
except BaseException:
@@ -764,7 +764,7 @@ class TrialCompletionApi(Resource):
@model_validate(CompletionRequest)
def post(self, req_data: CompletionRequest, request_context: RequestContext, trial_app: TrialAppRef) -> Response:
try:
- response = application_services().trial_app_generation.generate_completion(
+ response = application_services().trial_apps.generation.generate_completion(
trial_app=trial_app,
account_id=request_context.account_id,
args=req_data.model_dump(),
diff --git a/api/controllers/console/explore/trial_app_admission.py b/api/controllers/console/explore/trial_app_admission.py
index d4ea89a6bc8..e9903270d61 100644
--- a/api/controllers/console/explore/trial_app_admission.py
+++ b/api/controllers/console/explore/trial_app_admission.py
@@ -37,7 +37,7 @@ def get_trial_app[T, **P, R](
if app_id is None:
raise RuntimeError("The trial app admission route must provide app_id")
try:
- trial_app = application_services().trial_app_access.get_access(
+ trial_app = application_services().trial_apps.access.get_access(
app_id=str(app_id), account_id=request_context.account_id
)
except TrialAppUnavailableError as error:
diff --git a/api/controllers/console/explore/workflow.py b/api/controllers/console/explore/workflow.py
index 74515faaf20..48e5168f407 100644
--- a/api/controllers/console/explore/workflow.py
+++ b/api/controllers/console/explore/workflow.py
@@ -58,7 +58,7 @@ class InstalledAppWorkflowRunApi(Resource):
Run workflow
"""
try:
- response = application_services().installed_app_generation.generate_workflow(
+ response = application_services().installed_apps.generation.generate_workflow(
installed_app=installed_app,
account_id=request_context.account_id,
args=req_data.model_dump(exclude_none=True),
diff --git a/api/extensions/application_services/installed_app.py b/api/extensions/application_services/installed_app.py
new file mode 100644
index 00000000000..f0811dc8b20
--- /dev/null
+++ b/api/extensions/application_services/installed_app.py
@@ -0,0 +1,80 @@
+"""Composition of Installed App use cases."""
+
+from dataclasses import dataclass
+
+from flask import current_app
+from sqlalchemy.orm import Session, sessionmaker
+
+from repositories.installed_app_conversation_repository import SQLAlchemyInstalledAppConversationRepository
+from repositories.installed_app_message_repository import SQLAlchemyInstalledAppMessageRepository
+from repositories.installed_app_repository import SQLAlchemyInstalledAppRepository
+from services.conversation_service import ConversationService
+from services.installed_app_access_service import InstalledAppAccessService
+from services.installed_app_conversation_service import InstalledAppConversationService
+from services.installed_app_generation_adapters import AppGenerateServiceRuntime
+from services.installed_app_generation_service import InstalledAppGenerationService
+from services.installed_app_message_adapters import InstalledAppMessageRuntime, emit_installed_app_feedback
+from services.installed_app_message_service import InstalledAppMessageService
+from services.installed_app_service import InstalledAppService, WorkspaceRoleLookup
+from services.webapp_access_query_service import WebAppAccessQueryService
+
+
+@dataclass(frozen=True, slots=True)
+class InstalledAppServices:
+ access: InstalledAppAccessService
+ management: InstalledAppService
+ generation: InstalledAppGenerationService
+ conversations: InstalledAppConversationService
+ messages: InstalledAppMessageService
+
+
+def _generate_installed_app_conversation_name(
+ *, tenant_id: str, app_id: str, conversation_id: str, query: str, app_mode: str
+) -> str:
+ # Legacy provider and tracing lookups use db.session. Give them their own
+ # scope so teardown releases it before the conversation write transaction,
+ # without removing a session owned by the surrounding request.
+ with current_app.app_context():
+ return ConversationService.generate_name(
+ tenant_id=tenant_id, app_id=app_id, conversation_id=conversation_id, query=query, app_mode=app_mode
+ )
+
+
+def build_installed_app_services(
+ *,
+ database_client: sessionmaker[Session],
+ webapp_access: WebAppAccessQueryService,
+ get_workspace_role: WorkspaceRoleLookup,
+ webapp_auth_enabled: bool,
+) -> InstalledAppServices:
+ installed_apps = SQLAlchemyInstalledAppRepository(session_factory=database_client)
+ access = InstalledAppAccessService(
+ installed_apps=installed_apps,
+ is_user_allowed=webapp_access.is_user_allowed,
+ get_access_modes=webapp_access.batch_get_access_modes,
+ get_user_permissions=webapp_access.batch_get_user_permissions,
+ )
+ message_runtime = InstalledAppMessageRuntime(session_factory=database_client)
+ return InstalledAppServices(
+ access=access,
+ management=InstalledAppService(
+ installed_apps=installed_apps,
+ get_workspace_role=get_workspace_role,
+ get_visible_app_ids=access.get_visible_app_ids if webapp_auth_enabled else None,
+ ),
+ generation=InstalledAppGenerationService(
+ usage=installed_apps,
+ runtime=AppGenerateServiceRuntime(session_factory=database_client),
+ ),
+ conversations=InstalledAppConversationService(
+ conversations=SQLAlchemyInstalledAppConversationRepository(session_factory=database_client),
+ generate_name=_generate_installed_app_conversation_name,
+ enqueue_delete_cleanup=ConversationService.enqueue_delete_cleanup,
+ ),
+ messages=InstalledAppMessageService(
+ messages=SQLAlchemyInstalledAppMessageRepository(session_factory=database_client),
+ get_extra_contents=message_runtime.get_extra_contents,
+ suggested_questions=message_runtime.get_suggested_questions,
+ emit_feedback=emit_installed_app_feedback,
+ ),
+ )
diff --git a/api/extensions/application_services/trial_app.py b/api/extensions/application_services/trial_app.py
new file mode 100644
index 00000000000..be28822cf8d
--- /dev/null
+++ b/api/extensions/application_services/trial_app.py
@@ -0,0 +1,30 @@
+"""Composition of Trial App use cases."""
+
+from dataclasses import dataclass
+
+from sqlalchemy.orm import Session, sessionmaker
+
+from repositories.trial_app_repository import TrialAppRepository
+from services.trial_app_access_service import TrialAppAccessService
+from services.trial_app_generation_adapters import AppGenerateServiceRuntime
+from services.trial_app_generation_service import TrialAppGenerationService
+from services.trial_app_usage import TrialAppUsageRecorder
+
+
+@dataclass(frozen=True, slots=True)
+class TrialAppServices:
+ access: TrialAppAccessService
+ generation: TrialAppGenerationService
+ usage: TrialAppUsageRecorder
+
+
+def build_trial_app_services(
+ *, database_client: sessionmaker[Session], trial_apps: TrialAppRepository
+) -> TrialAppServices:
+ return TrialAppServices(
+ access=TrialAppAccessService(apps=trial_apps),
+ generation=TrialAppGenerationService(
+ runtime=AppGenerateServiceRuntime(session_factory=database_client), usage=trial_apps
+ ),
+ usage=trial_apps,
+ )
diff --git a/api/extensions/ext_application_services.py b/api/extensions/ext_application_services.py
index af28bae4933..fdbae58ee70 100644
--- a/api/extensions/ext_application_services.py
+++ b/api/extensions/ext_application_services.py
@@ -25,7 +25,9 @@ from core.tools.tool_file_manager import ToolFileManager
from enums import DeploymentEdition, WebAppAccessMode
from extensions.application_services.agent import AgentAppServices, build_agent_app_services
from extensions.application_services.app import AppServices, build_app_api_key_service, build_app_services
+from extensions.application_services.installed_app import InstalledAppServices, build_installed_app_services
from extensions.application_services.knowledge import build_dataset_api_key_service
+from extensions.application_services.trial_app import TrialAppServices, build_trial_app_services
from extensions.ext_redis import RedisClientWrapper, redis_client
from extensions.ext_storage import storage
from libs.datetime_utils import naive_utc_now, utc_now
@@ -56,9 +58,6 @@ from repositories.factory import DifyAPIRepositoryFactory
from repositories.file_grant_repository import FileGrantRepository
from repositories.human_input_file_upload_repository import SQLAlchemyHumanInputFileUploadRepository
from repositories.installation_state_repository import InstallationStateRepository
-from repositories.installed_app_conversation_repository import SQLAlchemyInstalledAppConversationRepository
-from repositories.installed_app_message_repository import SQLAlchemyInstalledAppMessageRepository
-from repositories.installed_app_repository import SQLAlchemyInstalledAppRepository
from repositories.message_file_preview_repository import MessageFilePreviewQueryRepository
from repositories.oauth_access_token_repository import SQLAlchemyOAuthAccessTokenRepository
from repositories.oauth_device_token_repository import SQLAlchemyOAuthDeviceTokenRepository
@@ -170,7 +169,6 @@ from services.auth.data_source_api_key_auth_service import DataSourceApiKeyAuthS
from services.billing_portal_service import BillingPortalService
from services.billing_service import BillingService
from services.compliance_download_service import ComplianceDownloadService
-from services.conversation_service import ConversationService
from services.data_source_oauth_service import DataSourceOAuthService, InvalidDataSourceOAuthProviderError
from services.enterprise.enterprise_service import EnterpriseService
from services.entities.file_grant_entities import FileGrantLimits
@@ -184,13 +182,6 @@ from services.file_service import FileService
from services.human_input_file_upload_service import HumanInputFileUploadService
from services.init_validation_service import InitValidationService
from services.inner_mail_service import InnerMailService
-from services.installed_app_access_service import InstalledAppAccessService
-from services.installed_app_conversation_service import InstalledAppConversationService
-from services.installed_app_generation_adapters import AppGenerateServiceRuntime as InstalledAppGenerateServiceRuntime
-from services.installed_app_generation_service import InstalledAppGenerationService
-from services.installed_app_message_adapters import InstalledAppMessageRuntime, emit_installed_app_feedback
-from services.installed_app_message_service import InstalledAppMessageService
-from services.installed_app_service import InstalledAppService
from services.knowledge.api_key_service import DatasetApiKeyService
from services.message_file_preview_service import MessageFilePreviewService
from services.message_suggested_questions_adapters import MessageSuggestedQuestionsRuntime
@@ -236,10 +227,6 @@ from services.step_by_step_tour_service import StepByStepTourService
from services.system_feature_service import SystemFeatureService
from services.tag_application_service import TagApplicationService
from services.tool_file_download_service import ToolFileDownloadService
-from services.trial_app_access_service import TrialAppAccessService
-from services.trial_app_generation_adapters import AppGenerateServiceRuntime
-from services.trial_app_generation_service import TrialAppGenerationService
-from services.trial_app_usage import TrialAppUsageRecorder
from services.upload_file_delivery_service import UploadFileDeliveryService
from services.web_app_runtime_query_service import WebAppRuntimeQueryService
from services.web_passport_gateways import (
@@ -265,18 +252,6 @@ logger = logging.getLogger(__name__)
_EXTENSION_KEY = "application_services"
-def _generate_installed_app_conversation_name(
- *, tenant_id: str, app_id: str, conversation_id: str, query: str, app_mode: str
-) -> str:
- # Legacy provider and tracing lookups use db.session. Give them their own
- # scope so teardown releases it before the conversation write transaction,
- # without removing a session owned by the surrounding request.
- with current_app.app_context():
- return ConversationService.generate_name(
- tenant_id=tenant_id, app_id=app_id, conversation_id=conversation_id, query=query, app_mode=app_mode
- )
-
-
# TODO: Normalize EnterpriseService.WebAppAuth result/error contracts in the SDK,
# migrate its callers, then inject its methods directly and remove these adapters.
# Define SDK errors for timeouts, transport failures, upstream status and invalid
@@ -391,11 +366,7 @@ class ApplicationServices:
oauth_server: OAuthServerService
oauth_device: OAuthDeviceApplicationService
init_validation: InitValidationService
- installed_app_access: InstalledAppAccessService
- installed_app_conversations: InstalledAppConversationService
- installed_app_generation: InstalledAppGenerationService
- installed_app_messages: InstalledAppMessageService
- installed_apps: InstalledAppService
+ installed_apps: InstalledAppServices
notifications: NotificationService
step_by_step_tour: StepByStepTourService
partner_tenant_bindings: PartnerTenantBindingService
@@ -403,10 +374,8 @@ class ApplicationServices:
remote_files: RemoteFileService
saved_messages: SavedMessageService
app_tasks: AppTaskControlService
- trial_app_access: TrialAppAccessService
app_audio: AppAudio
- trial_app_generation: TrialAppGenerationService
- trial_app_usage: TrialAppUsageRecorder
+ trial_apps: TrialAppServices
workflow_run_archives: WorkflowRunArchiveService
workflow_runs: WorkflowRunService
workspace_queries: WorkspaceQueryService
@@ -572,7 +541,6 @@ def build_application_services(
redis: RedisClientWrapper,
) -> ApplicationServices:
installation_state = InstallationStateRepository(session_factory=database_client)
- installed_apps = SQLAlchemyInstalledAppRepository(session_factory=database_client)
data_source_api_key_auth_bindings = SQLAlchemyDataSourceApiKeyAuthBindingRepository(session_factory=database_client)
app_definition_repository = AppDefinitionQueryRepository(session_factory=database_client)
app_definitions = AppDefinitionQueryService(
@@ -590,14 +558,7 @@ def build_application_services(
get_access_modes=_batch_get_enterprise_webapp_access_modes,
get_user_permissions=_batch_get_enterprise_webapp_user_permissions,
)
- installed_app_access = InstalledAppAccessService(
- installed_apps=installed_apps,
- is_user_allowed=webapp_access.is_user_allowed,
- get_access_modes=webapp_access.batch_get_access_modes,
- get_user_permissions=webapp_access.batch_get_user_permissions,
- )
app_preview_repository = AppPreviewQueryRepository(session_factory=database_client)
- installed_app_message_runtime = InstalledAppMessageRuntime(session_factory=database_client)
feature_gateway = FeatureServiceGateway()
accounts = SQLAlchemyAccountRepository(session_factory=database_client)
integrations = SQLAlchemyAccountIntegrationRepository(session_factory=database_client)
@@ -831,26 +792,11 @@ def build_application_services(
queries=AppScopedEndUserQueryService(end_users=app_scoped_end_user_repository),
),
webapp_access=webapp_access,
- installed_app_access=installed_app_access,
- installed_app_conversations=InstalledAppConversationService(
- conversations=SQLAlchemyInstalledAppConversationRepository(session_factory=database_client),
- generate_name=_generate_installed_app_conversation_name,
- enqueue_delete_cleanup=ConversationService.enqueue_delete_cleanup,
- ),
- installed_app_generation=InstalledAppGenerationService(
- usage=installed_apps,
- runtime=InstalledAppGenerateServiceRuntime(session_factory=database_client),
- ),
- installed_app_messages=InstalledAppMessageService(
- messages=SQLAlchemyInstalledAppMessageRepository(session_factory=database_client),
- get_extra_contents=installed_app_message_runtime.get_extra_contents,
- suggested_questions=installed_app_message_runtime.get_suggested_questions,
- emit_feedback=emit_installed_app_feedback,
- ),
- installed_apps=InstalledAppService(
- installed_apps=installed_apps,
+ installed_apps=build_installed_app_services(
+ database_client=database_client,
+ webapp_access=webapp_access,
get_workspace_role=workspace_query_repository.get_account_role,
- get_visible_app_ids=installed_app_access.get_visible_app_ids if webapp_auth_enabled else None,
+ webapp_auth_enabled=webapp_auth_enabled,
),
web_app_runtime=WebAppRuntimeQueryService(
runtime=app_definition_repository,
@@ -928,12 +874,8 @@ def build_application_services(
saved_messages=SQLAlchemySavedMessageRepository(session_factory=database_client),
),
app_tasks=AppTaskControlService(redis_client=redis),
- trial_app_access=TrialAppAccessService(apps=trial_apps),
app_audio=AppAudioRuntime(session_factory=database_client),
- trial_app_generation=TrialAppGenerationService(
- runtime=AppGenerateServiceRuntime(session_factory=database_client), usage=trial_apps
- ),
- trial_app_usage=trial_apps,
+ trial_apps=build_trial_app_services(database_client=database_client, trial_apps=trial_apps),
workflow_run_archives=WorkflowRunArchiveService(
bundles=WorkflowRunArchiveBundleQueryRepository(session_factory=database_client),
tasks=WorkflowRunArchiveDownloadTaskCache(redis=redis),
diff --git a/api/tests/unit_tests/controllers/console/explore/test_completion.py b/api/tests/unit_tests/controllers/console/explore/test_completion.py
index 40385c027f7..faa349483d3 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_completion.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_completion.py
@@ -25,6 +25,7 @@ from tests.unit_tests.controllers.console.explore.test_installed_app_admission i
)
from tests.unit_tests.controllers.console.explore.test_installed_app_completion import (
_USED_AT,
+ _InstalledAppServices,
_last_used_at,
_Runtime,
_RuntimeCall,
@@ -353,9 +354,11 @@ def test_chat_conversation_preflight_returns_404_before_starting_generation_and_
)
services = _Services(
- installed_app_generation=InstalledAppGenerationService(
- usage=SQLAlchemyInstalledAppRepository(session_factory=sqlite_session_factory),
- runtime=AppGenerateServiceRuntime(session_factory=sqlite_session_factory),
+ installed_apps=_InstalledAppServices(
+ generation=InstalledAppGenerationService(
+ usage=SQLAlchemyInstalledAppRepository(session_factory=sqlite_session_factory),
+ runtime=AppGenerateServiceRuntime(session_factory=sqlite_session_factory),
+ )
)
)
monkeypatch.setattr(completion_module, "application_services", lambda: services)
diff --git a/api/tests/unit_tests/controllers/console/explore/test_conversation.py b/api/tests/unit_tests/controllers/console/explore/test_conversation.py
index 2577de5ed4e..30c131a9cc3 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_conversation.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_conversation.py
@@ -33,9 +33,14 @@ type _Operation = Literal["list", "delete", "rename", "pin", "unpin"]
_OPERATIONS: tuple[_Operation, ...] = ("list", "delete", "rename", "pin", "unpin")
+@dataclass(frozen=True)
+class _InstalledAppServices:
+ conversations: InstalledAppConversationService
+
+
@dataclass(frozen=True)
class _Services:
- installed_app_conversations: InstalledAppConversationService
+ installed_apps: _InstalledAppServices
@dataclass
@@ -109,10 +114,12 @@ def conversations(
state.sessions.append(session)
services = _Services(
- InstalledAppConversationService(
- conversations=SQLAlchemyInstalledAppConversationRepository(session_factory=factory),
- generate_name=state.generate_name,
- enqueue_delete_cleanup=state.enqueue_cleanup,
+ installed_apps=_InstalledAppServices(
+ conversations=InstalledAppConversationService(
+ conversations=SQLAlchemyInstalledAppConversationRepository(session_factory=factory),
+ generate_name=state.generate_name,
+ enqueue_delete_cleanup=state.enqueue_cleanup,
+ )
)
)
monkeypatch.setattr(module, "application_services", lambda: services)
diff --git a/api/tests/unit_tests/controllers/console/explore/test_installed_app.py b/api/tests/unit_tests/controllers/console/explore/test_installed_app.py
index 2f4d8e80f0b..b0c2ddeef1b 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_installed_app.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_installed_app.py
@@ -34,9 +34,14 @@ __all__ = ["harness"]
_USED_AT = datetime(2024, 1, 1)
+@dataclass
+class _InstalledAppServices:
+ management: InstalledAppService
+
+
@dataclass
class _Services:
- installed_apps: InstalledAppService
+ installed_apps: _InstalledAppServices
@dataclass
@@ -110,10 +115,12 @@ def management(
sessions.append(session)
services = _Services(
- installed_apps=InstalledAppService(
- installed_apps=SQLAlchemyInstalledAppRepository(session_factory=factory),
- get_workspace_role=WorkspaceQueryRepository(factory).get_account_role,
- get_visible_app_ids=None,
+ installed_apps=_InstalledAppServices(
+ management=InstalledAppService(
+ installed_apps=SQLAlchemyInstalledAppRepository(session_factory=factory),
+ get_workspace_role=WorkspaceQueryRepository(factory).get_account_role,
+ get_visible_app_ids=None,
+ )
)
)
management = _Management(harness, factory, services, sessions)
@@ -213,7 +220,7 @@ def _enable_visibility(management: _Management) -> None:
get_access_modes=management.get_access_modes,
get_user_permissions=management.get_user_permissions,
)
- management.services.installed_apps = InstalledAppService(
+ management.services.installed_apps.management = InstalledAppService(
installed_apps=repository,
get_workspace_role=WorkspaceQueryRepository(management.session_factory).get_account_role,
get_visible_app_ids=access.get_visible_app_ids,
diff --git a/api/tests/unit_tests/controllers/console/explore/test_installed_app_admission.py b/api/tests/unit_tests/controllers/console/explore/test_installed_app_admission.py
index d9aeb4a55dc..7694b85b4e5 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_installed_app_admission.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_installed_app_admission.py
@@ -50,9 +50,14 @@ class _AdmissionState:
permission_calls: list[tuple[str, str]] = field(default_factory=list)
+@dataclass(frozen=True)
+class _InstalledAppServices:
+ access: InstalledAppAccessService
+
+
@dataclass(frozen=True)
class _ApplicationServices:
- installed_app_access: InstalledAppAccessService
+ installed_apps: _InstalledAppServices
@dataclass(frozen=True)
@@ -130,11 +135,13 @@ def harness(
pytest.fail(f"Single-app admission should not query batch permissions: {user_id=}, {app_ids=}")
services = _ApplicationServices(
- installed_app_access=InstalledAppAccessService(
- installed_apps=SQLAlchemyInstalledAppRepository(session_factory=repository_factory),
- is_user_allowed=permission_check,
- get_access_modes=unexpected_access_modes,
- get_user_permissions=unexpected_user_permissions,
+ installed_apps=_InstalledAppServices(
+ access=InstalledAppAccessService(
+ installed_apps=SQLAlchemyInstalledAppRepository(session_factory=repository_factory),
+ is_user_allowed=permission_check,
+ get_access_modes=unexpected_access_modes,
+ get_user_permissions=unexpected_user_permissions,
+ )
)
)
diff --git a/api/tests/unit_tests/controllers/console/explore/test_installed_app_completion.py b/api/tests/unit_tests/controllers/console/explore/test_installed_app_completion.py
index af0b802fa99..72ccd03f418 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_installed_app_completion.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_installed_app_completion.py
@@ -67,9 +67,14 @@ class _Runtime:
pytest.fail(f"Unexpected more-like-this call: {app_id=}, {account_id=}, {message_id=}, {streaming=}")
+@dataclass(frozen=True)
+class _InstalledAppServices:
+ generation: InstalledAppGenerationService
+
+
@dataclass(frozen=True)
class _Services:
- installed_app_generation: InstalledAppGenerationService
+ installed_apps: _InstalledAppServices
@pytest.fixture
@@ -83,7 +88,7 @@ def runtime(
usage=SQLAlchemyInstalledAppRepository(session_factory=sqlite_session_factory),
runtime=runtime,
)
- services = _Services(installed_app_generation=service)
+ services = _Services(installed_apps=_InstalledAppServices(generation=service))
monkeypatch.setattr(completion_module, "application_services", lambda: services)
monkeypatch.setattr(completion_service_module, "naive_utc_now", lambda: _USED_AT)
harness.api.add_resource(
@@ -398,9 +403,11 @@ def test_resource_removed_after_admission_is_revalidated_before_generation(
harness.state.permission_action = delete_resource
services = _Services(
- installed_app_generation=InstalledAppGenerationService(
- usage=SQLAlchemyInstalledAppRepository(session_factory=sqlite_session_factory),
- runtime=AppGenerateServiceRuntime(session_factory=sqlite_session_factory),
+ installed_apps=_InstalledAppServices(
+ generation=InstalledAppGenerationService(
+ usage=SQLAlchemyInstalledAppRepository(session_factory=sqlite_session_factory),
+ runtime=AppGenerateServiceRuntime(session_factory=sqlite_session_factory),
+ )
)
)
monkeypatch.setattr(completion_module, "application_services", lambda: services)
diff --git a/api/tests/unit_tests/controllers/console/explore/test_message.py b/api/tests/unit_tests/controllers/console/explore/test_message.py
index 828dcb15a05..9960a84eb10 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_message.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_message.py
@@ -43,10 +43,15 @@ _OPERATIONS: tuple[_Operation, ...] = ("list", "feedback", "more-like-this", "su
_BLOCKING: dict[str, object] = {"answer": "你好", "metadata": {}, "usage": None}
+@dataclass(frozen=True)
+class _InstalledAppServices:
+ messages: InstalledAppMessageService
+ generation: InstalledAppGenerationService
+
+
@dataclass(frozen=True)
class _Services:
- installed_app_messages: InstalledAppMessageService
- installed_app_generation: InstalledAppGenerationService
+ installed_apps: _InstalledAppServices
@dataclass
@@ -144,14 +149,16 @@ def messages(
state.sessions.append(session)
services = _Services(
- installed_app_messages=InstalledAppMessageService(
- messages=SQLAlchemyInstalledAppMessageRepository(session_factory=factory),
- get_extra_contents=state.get_extra_contents,
- suggested_questions=state.suggested_questions,
- emit_feedback=state.emit_feedback,
- ),
- installed_app_generation=InstalledAppGenerationService(
- usage=SQLAlchemyInstalledAppRepository(session_factory=factory), runtime=state
+ installed_apps=_InstalledAppServices(
+ messages=InstalledAppMessageService(
+ messages=SQLAlchemyInstalledAppMessageRepository(session_factory=factory),
+ get_extra_contents=state.get_extra_contents,
+ suggested_questions=state.suggested_questions,
+ emit_feedback=state.emit_feedback,
+ ),
+ generation=InstalledAppGenerationService(
+ usage=SQLAlchemyInstalledAppRepository(session_factory=factory), runtime=state
+ ),
),
)
monkeypatch.setattr(module, "application_services", lambda: services)
diff --git a/api/tests/unit_tests/controllers/console/explore/test_saved_message.py b/api/tests/unit_tests/controllers/console/explore/test_saved_message.py
index 70438e4ab76..9cce8c23fac 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_saved_message.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_saved_message.py
@@ -31,9 +31,14 @@ _ACCOUNT_ID = "11111111-1111-4111-8111-111111111111"
_WORKSPACE_ID = "22222222-2222-4222-8222-222222222222"
+@dataclass(frozen=True)
+class _InstalledAppServiceMocks:
+ access: MagicMock
+
+
@dataclass(frozen=True)
class _ApplicationServiceMocks:
- installed_app_access: MagicMock
+ installed_apps: _InstalledAppServiceMocks
saved_messages: MagicMock
@@ -129,10 +134,10 @@ def _expected_record() -> dict[str, object]:
@pytest.fixture
def services() -> Generator[_ApplicationServiceMocks]:
service_mocks = _ApplicationServiceMocks(
- installed_app_access=MagicMock(),
+ installed_apps=_InstalledAppServiceMocks(access=MagicMock()),
saved_messages=MagicMock(),
)
- service_mocks.installed_app_access.get_access.return_value = _installed_app()
+ service_mocks.installed_apps.access.get_access.return_value = _installed_app()
with patch.object(
module,
"application_services",
@@ -212,7 +217,7 @@ class TestSavedMessageListApi:
response = http_app.test_client().get(f"/saved-messages/{installed_app.id}", query_string=query_string)
assert response.status_code == 422
- services.installed_app_access.get_access.assert_called_once_with(
+ services.installed_apps.access.get_access.assert_called_once_with(
installed_app_id=installed_app.id,
tenant_id=_WORKSPACE_ID,
account_id=_ACCOUNT_ID,
diff --git a/api/tests/unit_tests/controllers/console/explore/test_trial_audio.py b/api/tests/unit_tests/controllers/console/explore/test_trial_audio.py
index 057abae7872..319b5c50870 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_trial_audio.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_trial_audio.py
@@ -124,10 +124,15 @@ class _Runtime:
return self.output
+@dataclass(frozen=True)
+class _TrialAppServices:
+ access: TrialAppAccessService
+ usage: TrialAppRepository
+
+
@dataclass(frozen=True)
class _ApplicationServices:
- trial_app_access: TrialAppAccessService
- trial_app_usage: TrialAppRepository
+ trial_apps: _TrialAppServices
app_audio: _Runtime
recommended_app_queries: _FeatureState
@@ -186,7 +191,11 @@ def harness(
runtime = _Runtime(sessions=sessions)
repository = TrialAppRepository(session_factory=repository_factory)
- services = _ApplicationServices(TrialAppAccessService(apps=repository), repository, runtime, state)
+ services = _ApplicationServices(
+ trial_apps=_TrialAppServices(access=TrialAppAccessService(apps=repository), usage=repository),
+ app_audio=runtime,
+ recommended_app_queries=state,
+ )
def setup_completed() -> bool:
state.events.append("setup")
diff --git a/api/tests/unit_tests/controllers/console/explore/test_trial_file_upload.py b/api/tests/unit_tests/controllers/console/explore/test_trial_file_upload.py
index 8405a8cd85f..402c1526608 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_trial_file_upload.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_trial_file_upload.py
@@ -85,9 +85,14 @@ class _ExternalIO:
)
+@dataclass(frozen=True)
+class _TrialAppServices:
+ access: TrialAppAccessService
+
+
@dataclass(frozen=True)
class _ApplicationServices:
- trial_app_access: TrialAppAccessService
+ trial_apps: _TrialAppServices
recommended_app_queries: _Features
files: FileService
remote_files: RemoteFileService
@@ -162,7 +167,9 @@ def harness(
io = _ExternalIO(sessions)
files = FileService(session_factory=sqlite_session_factory)
services = _ApplicationServices(
- trial_app_access=TrialAppAccessService(apps=TrialAppRepository(session_factory=repository_factory)),
+ trial_apps=_TrialAppServices(
+ access=TrialAppAccessService(apps=TrialAppRepository(session_factory=repository_factory))
+ ),
recommended_app_queries=features,
files=files,
remote_files=RemoteFileService(files=files),
diff --git a/api/tests/unit_tests/controllers/console/explore/test_trial_generation.py b/api/tests/unit_tests/controllers/console/explore/test_trial_generation.py
index 1cca9c4e84a..a962454f9f9 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_trial_generation.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_trial_generation.py
@@ -111,10 +111,15 @@ class _Tasks:
self.calls.append(task_id)
+@dataclass(frozen=True)
+class _TrialAppServices:
+ access: TrialAppAccessService
+ generation: TrialAppGenerationService
+
+
@dataclass(frozen=True)
class _ApplicationServices:
- trial_app_access: TrialAppAccessService
- trial_app_generation: TrialAppGenerationService
+ trial_apps: _TrialAppServices
recommended_app_queries: _FeatureState
app_tasks: _Tasks
@@ -178,8 +183,10 @@ def harness(
runtime = _Runtime(sessions=sessions)
repository = TrialAppRepository(session_factory=repository_factory)
services = _ApplicationServices(
- trial_app_access=TrialAppAccessService(apps=repository),
- trial_app_generation=TrialAppGenerationService(runtime=runtime, usage=repository),
+ trial_apps=_TrialAppServices(
+ access=TrialAppAccessService(apps=repository),
+ generation=TrialAppGenerationService(runtime=runtime, usage=repository),
+ ),
recommended_app_queries=state,
app_tasks=_Tasks(),
)
diff --git a/api/tests/unit_tests/controllers/console/explore/test_trial_suggested_questions.py b/api/tests/unit_tests/controllers/console/explore/test_trial_suggested_questions.py
index debd05ac16b..d4a84a91185 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_trial_suggested_questions.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_trial_suggested_questions.py
@@ -94,9 +94,14 @@ class _Provider:
self.traces.append(task)
+@dataclass(frozen=True)
+class _TrialAppServices:
+ access: TrialAppAccessService
+
+
@dataclass(frozen=True)
class _ApplicationServices:
- trial_app_access: TrialAppAccessService
+ trial_apps: _TrialAppServices
recommended_app_queries: _Features
message_suggested_questions: MessageSuggestedQuestionsRuntime
@@ -193,7 +198,9 @@ def harness(
provider = _Provider(read_sessions)
services = _ApplicationServices(
- trial_app_access=TrialAppAccessService(apps=TrialAppRepository(session_factory=read_factory)),
+ trial_apps=_TrialAppServices(
+ access=TrialAppAccessService(apps=TrialAppRepository(session_factory=read_factory))
+ ),
recommended_app_queries=features,
message_suggested_questions=MessageSuggestedQuestionsRuntime(session_factory=read_factory),
)
diff --git a/api/tests/unit_tests/controllers/console/explore/test_workflow.py b/api/tests/unit_tests/controllers/console/explore/test_workflow.py
index b3a5e1fe5fc..e44c82310f7 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_workflow.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_workflow.py
@@ -77,9 +77,14 @@ class _Runtime:
assert installation.last_used_at == self.last_used_at
+@dataclass(frozen=True)
+class _InstalledAppServices:
+ generation: InstalledAppGenerationService
+
+
@dataclass(frozen=True)
class _Services:
- installed_app_generation: InstalledAppGenerationService
+ installed_apps: _InstalledAppServices
app_tasks: AppTaskControlService
@@ -97,9 +102,11 @@ def runtime(
installation.last_used_at = _LAST_USED_AT
runtime = _Runtime(sqlite_session_factory, harness.installed_app.id)
services = _Services(
- installed_app_generation=InstalledAppGenerationService(
- usage=SQLAlchemyInstalledAppRepository(session_factory=sqlite_session_factory),
- runtime=runtime,
+ installed_apps=_InstalledAppServices(
+ generation=InstalledAppGenerationService(
+ usage=SQLAlchemyInstalledAppRepository(session_factory=sqlite_session_factory),
+ runtime=runtime,
+ )
),
app_tasks=AppTaskControlService(redis_client=stop_redis),
)
@@ -390,9 +397,11 @@ def test_workflow_run_revalidates_app_while_stop_uses_admission_snapshot(
harness.state.permission_action = remove_app
services = _Services(
- installed_app_generation=InstalledAppGenerationService(
- usage=SQLAlchemyInstalledAppRepository(session_factory=sqlite_session_factory),
- runtime=AppGenerateServiceRuntime(session_factory=sqlite_session_factory),
+ installed_apps=_InstalledAppServices(
+ generation=InstalledAppGenerationService(
+ usage=SQLAlchemyInstalledAppRepository(session_factory=sqlite_session_factory),
+ runtime=AppGenerateServiceRuntime(session_factory=sqlite_session_factory),
+ )
),
app_tasks=AppTaskControlService(redis_client=stop_redis),
)
diff --git a/api/tests/unit_tests/extensions/test_ext_application_services.py b/api/tests/unit_tests/extensions/test_ext_application_services.py
index bb8632622a8..019e3e70df1 100644
--- a/api/tests/unit_tests/extensions/test_ext_application_services.py
+++ b/api/tests/unit_tests/extensions/test_ext_application_services.py
@@ -224,14 +224,20 @@ def test_build_application_services_preserves_composed_boundaries(
assert isinstance(services.oauth_device, OAuthDeviceApplicationService)
assert redis.register_script.call_count == 3
- assert isinstance(services.installed_app_generation, InstalledAppGenerationService)
- installed_apps = services.installed_app_access._installed_apps
+ assert isinstance(services.installed_apps.generation, InstalledAppGenerationService)
+ installed_apps = services.installed_apps.access._installed_apps
assert isinstance(installed_apps, SQLAlchemyInstalledAppRepository)
- assert services.installed_app_generation._usage is installed_apps
- runtime = services.installed_app_generation._runtime
+ assert services.installed_apps.management._installed_apps is installed_apps
+ assert services.installed_apps.generation._usage is installed_apps
+ runtime = services.installed_apps.generation._runtime
assert isinstance(runtime, InstalledAppGenerateServiceRuntime)
assert runtime._session_factory is sqlite_session_factory
+ trial_apps = services.trial_apps.usage
+ assert services.trial_apps.access._apps is trial_apps
+ assert services.trial_apps.generation._usage is trial_apps
+ assert services.recommended_app_queries._trial_apps is trial_apps
+
@pytest.mark.parametrize(
("deployment_edition", "setup_completed"),
@@ -784,7 +790,7 @@ def test_build_application_services_wires_trial_app_usage(
app_id = str(uuid4())
account_id = str(uuid4())
- services.trial_app_usage.record(app_id=app_id, account_id=account_id)
+ services.trial_apps.usage.record(app_id=app_id, account_id=account_id)
with sqlite_session_factory() as session:
record = session.scalar(
@@ -855,14 +861,14 @@ def test_build_application_services_wires_installed_app_admission(
)
if deployment_edition == DeploymentEdition.ENTERPRISE and not permission_result:
with pytest.raises(InstalledAppAccessDeniedError):
- services.installed_app_access.get_access(
+ services.installed_apps.access.get_access(
installed_app_id=installed_app_ref.id,
tenant_id=installed_app_ref.tenant_id,
account_id=account_id,
)
else:
assert (
- services.installed_app_access.get_access(
+ services.installed_apps.access.get_access(
installed_app_id=installed_app_ref.id,
tenant_id=installed_app_ref.tenant_id,
account_id=account_id,
@@ -905,7 +911,7 @@ def test_installed_app_admission_normalizes_known_enterprise_errors(
redis=MagicMock(spec=RedisClientWrapper),
)
with pytest.raises(WebAppAccessUnavailableError) as raised:
- services.installed_app_access.get_access(
+ services.installed_apps.access.get_access(
installed_app_id=installed_app_ref.id,
tenant_id=installed_app_ref.tenant_id,
account_id=account_id,
@@ -936,9 +942,9 @@ def test_trial_generation_uses_configured_access_runtime_and_usage(
session.add(account)
session.add(TrialApp(app_id=app_id, tenant_id=tenant_id))
- admitted = services.trial_app_access.get_access(app_id=app_id, account_id=account_id)
+ admitted = services.trial_apps.access.get_access(app_id=app_id, account_id=account_id)
with patch.object(AppGenerateService, "generate", return_value={"answer": "hello"}):
- response = services.trial_app_generation.generate_completion(
+ response = services.trial_apps.generation.generate_completion(
trial_app=admitted, account_id=account_id, args={"inputs": {}}
)
@@ -993,7 +999,7 @@ def test_app_audio_uses_the_configured_database_and_app_owner(
monkeypatch.setattr(audio_provider_gateway, "speech_to_text", transcribe)
monkeypatch.setattr(audio_provider_gateway, "text_to_speech", synthesize)
- admitted = services.trial_app_access.get_access(app_id=app_id, account_id=account_id)
+ admitted = services.trial_apps.access.get_access(app_id=app_id, account_id=account_id)
assert services.app_audio.transcript_asr(
app=AudioAppRef(admitted.app_id, admitted.tenant_id, admitted.app_mode),
audio=AudioUpload(stream=BytesIO(b"audio"), mime_type="audio/mp3"),
@@ -1338,10 +1344,10 @@ def test_installed_app_management_composition_reads_real_installations_and_curre
assert services.webapp_access.batch_get_user_permissions(
user_id=account_id, app_ids=(installed_app_ref.app_id,)
) == {installed_app_ref.app_id: True}
- assert services.installed_app_access.get_visible_app_ids(
+ assert services.installed_apps.access.get_visible_app_ids(
user_id=account_id, app_ids=(installed_app_ref.app_id,)
) == frozenset({installed_app_ref.app_id})
- page = services.installed_apps.get_visible_page(
+ page = services.installed_apps.management.get_visible_page(
tenant_id=installed_app_ref.tenant_id,
user_id=account_id,
cursor=None,
@@ -1361,8 +1367,8 @@ def test_installed_app_management_composition_reads_real_installations_and_curre
stored_membership = session.get(TenantAccountJoin, membership_id)
assert stored_membership is not None
stored_membership.role = TenantAccountRole.NORMAL
- services.installed_apps.set_pinned(installed_app=installed_app_ref, is_pinned=True)
- detail = services.installed_apps.get_detail(installed_app=installed_app_ref, account_id=account_id)
+ services.installed_apps.management.set_pinned(installed_app=installed_app_ref, is_pinned=True)
+ detail = services.installed_apps.management.get_detail(installed_app=installed_app_ref, account_id=account_id)
assert detail.editable is False
assert detail.installation.is_pinned is True
assert detail.installation.id == installed_app_ref.id
@@ -1476,7 +1482,7 @@ def test_installed_app_conversations_wire_real_persistence_naming_and_cleanup(
redis=MagicMock(spec=RedisClientWrapper),
)
naming_app = Flask(__name__)
- admitted_app = services.installed_app_access.get_access(
+ admitted_app = services.installed_apps.access.get_access(
installed_app_id=installed_app_ref.id,
tenant_id=installed_app_ref.tenant_id,
account_id=account_id,
@@ -1487,7 +1493,7 @@ def test_installed_app_conversations_wire_real_persistence_naming_and_cleanup(
previous_metadata = get_credit_usage_metadata()
with naming_app.app_context(), use_credit_usage_metadata({"request_id": "naming-request"}):
outer_session = db.session()
- renamed = services.installed_app_conversations.rename(
+ renamed = services.installed_apps.conversations.rename(
installed_app=admitted_app,
account_id=account_id,
conversation_id=conversation_id,
@@ -1501,7 +1507,7 @@ def test_installed_app_conversations_wire_real_persistence_naming_and_cleanup(
assert naming_sessions[0] is not outer_session
assert not naming_sessions[0].in_transaction()
assert db.session() is outer_session
- services.installed_app_conversations.delete(
+ services.installed_apps.conversations.delete(
installed_app=admitted_app, account_id=account_id, conversation_id=conversation_id
)
assert get_credit_usage_metadata() == previous_metadata
@@ -1559,7 +1565,7 @@ def test_installed_app_visibility_batches_settings_before_permissions_and_preser
initialization_password="",
redis=MagicMock(spec=RedisClientWrapper),
)
- visible = services.installed_app_access.get_visible_app_ids(user_id="viewer", app_ids=app_ids)
+ visible = services.installed_apps.access.get_visible_app_ids(user_id="viewer", app_ids=app_ids)
assert visible == frozenset({"allowed", "truthy-permission"})
assert enterprise_request.call_args_list == [
@@ -1590,7 +1596,7 @@ def test_installed_app_visibility_skips_and_logs_each_invalid_access_mode(
initialization_password="",
redis=MagicMock(spec=RedisClientWrapper),
)
- visible = services.installed_app_access.get_visible_app_ids(user_id="viewer", app_ids=app_ids)
+ visible = services.installed_apps.access.get_visible_app_ids(user_id="viewer", app_ids=app_ids)
assert visible == frozenset(valid_ids)
expected_calls = [call("POST", "/webapp/access-mode/batch/id", json={"appIds": list(app_ids)})]
@@ -1621,7 +1627,7 @@ def test_installed_app_visibility_skips_unnecessary_enterprise_requests(
initialization_password="",
redis=MagicMock(spec=RedisClientWrapper),
)
- visible = services.installed_app_access.get_visible_app_ids(user_id="viewer", app_ids=app_ids)
+ visible = services.installed_apps.access.get_visible_app_ids(user_id="viewer", app_ids=app_ids)
assert visible == frozenset()
if app_ids:
@@ -1652,7 +1658,7 @@ def test_installed_app_visibility_propagates_access_unavailable_with_original_ca
redis=MagicMock(spec=RedisClientWrapper),
)
with pytest.raises(WebAppAccessUnavailableError) as caught:
- services.installed_app_access.get_visible_app_ids(user_id="viewer", app_ids=("app-1",))
+ services.installed_apps.access.get_visible_app_ids(user_id="viewer", app_ids=("app-1",))
assert type(caught.value) is WebAppAccessUnavailableError
assert caught.value.__cause__ is enterprise_error