fix(BA-5832): align gql/adapters with BA-5829 split-adapter + lazy-load layout

jopemachine · claude · jopemachine · commit d3191d233ec2 · 2026-04-26T22:01:37.000+09:00
The `-X theirs` rebase onto BA-5829 lost the merged-view adapter split (`AppConfigFragmentAdapter` -> `AppConfigAdapter` for merged views) and the import-cycle fix (lightened `app_config_fragment/__init__` + `strawberry.lazy()` on `AppConfigGQL.fragments` + JSON scalar on fragment payload fields). Re-apply BA-5829's versions of: - `api/adapters/app_config.py` — gains the merged-view + my_bulk surface (and pulls `app_config.types` re-exports along with it). - `api/adapters/app_config_fragment.py` — narrowed back to raw fragment ops only; merged-view methods no longer live here. - `api/gql/app_config_fragment/__init__.py` — emptied so `app_config.types` doesn't re-enter the partially-initialized package via the resolver. - `api/gql/app_config_fragment/resolver/__init__.py` — drops the removed `scoped_app_config_fragments` re-export. - `api/gql/app_config_fragment/types/{node,bulk_inputs}.py` — switches the `config` field type from `dict[str, Any]` to the `JSON` scalar so Strawberry can resolve it. - `api/gql/app_config/resolver/query.py` — calls the merged-view methods on `AppConfigAdapter` (not the fragment adapter). - `api/gql/data_loader/data_loaders.py` — drops the stale `batch_load_by_ids` reference on `AppConfigFragmentAdapter`. - `api/gql/schema.py` — imports resolver functions via the submodule paths directly, matching the lighter `app_config_fragment` package init. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
diff --git a/src/ai/backend/manager/api/adapters/app_config_fragment.py b/src/ai/backend/manager/api/adapters/app_config_fragment.py
@@ -6,33 +6,13 @@
 
 from __future__ import annotations
 
-from ai.backend.common.contexts.user import current_user
-from ai.backend.common.dto.manager.v2.app_config.request import (
-    AppConfigFilter,
-    AppConfigOrder,
-    GetUserAppConfigInput,
-    SearchAppConfigsInput,
-    SearchMyAppConfigsInput,
-)
-from ai.backend.common.dto.manager.v2.app_config.response import (
-    AppConfigNode,
-    BulkCreateMyAppConfigFragmentsPayload,
-    BulkUpdateMyAppConfigFragmentsPayload,
-    GetUserAppConfigPayload,
-    SearchAppConfigsPayload,
-)
-from ai.backend.common.dto.manager.v2.app_config.types import (
-    AppConfigOrderField,
-)
 from ai.backend.common.dto.manager.v2.app_config_fragment.request import (
     AdminBulkCreateAppConfigFragmentsInput,
     AdminBulkPurgeAppConfigFragmentsInput,
     AdminBulkUpdateAppConfigFragmentsInput,
     AppConfigFragmentFilter,
     AppConfigFragmentKeyInput,
     AppConfigFragmentOrder,
-    BulkCreateMyAppConfigFragmentsInput,
-    BulkUpdateMyAppConfigFragmentsInput,
     SearchAppConfigFragmentsInput,
 )
 from ai.backend.common.dto.manager.v2.app_config_fragment.response import (
@@ -53,11 +33,9 @@
     AppConfigScopeType as DTOAppConfigScopeType,
 )
 from ai.backend.manager.api.adapter_options.pagination.pagination import PaginationSpec
-from ai.backend.manager.data.app_config.types import AppConfigData
 from ai.backend.manager.data.app_config_fragment.bulk_types import (
     AppConfigFragmentBulkItem,
     AppConfigFragmentBulkItemError,
-    MyAppConfigFragmentBulkItem,
 )
 from ai.backend.manager.data.app_config_fragment.types import (
     AppConfigFragmentData,
@@ -67,10 +45,7 @@
 from ai.backend.manager.models.app_config_fragment.conditions import AppConfigFragmentConditions
 from ai.backend.manager.models.app_config_fragment.orders import AppConfigFragmentOrders
 from ai.backend.manager.models.app_config_fragment.row import AppConfigFragmentRow
-from ai.backend.manager.repositories.app_config_fragment.types import (
-    AppConfigFragmentSearchScope,
-    UserAppConfigSearchScope,
-)
+from ai.backend.manager.repositories.app_config_fragment.types import AppConfigFragmentSearchScope
 from ai.backend.manager.repositories.base import BatchQuerier, QueryCondition, QueryOrder
 from ai.backend.manager.services.app_config_fragment.actions.admin_bulk_create import (
     AdminBulkCreateAppConfigFragmentsAction,
@@ -84,25 +59,10 @@
 from ai.backend.manager.services.app_config_fragment.actions.admin_search import (
     AdminSearchAppConfigFragmentsAction,
 )
-from ai.backend.manager.services.app_config_fragment.actions.admin_search_app_configs import (
-    AdminSearchAppConfigsAction,
-)
-from ai.backend.manager.services.app_config_fragment.actions.bulk_create_my import (
-    BulkCreateMyAppConfigFragmentsAction,
-)
-from ai.backend.manager.services.app_config_fragment.actions.bulk_update_my import (
-    BulkUpdateMyAppConfigFragmentsAction,
-)
 from ai.backend.manager.services.app_config_fragment.actions.get import GetAppConfigFragmentAction
-from ai.backend.manager.services.app_config_fragment.actions.get_user_app_config import (
-    GetUserAppConfigAction,
-)
 from ai.backend.manager.services.app_config_fragment.actions.search import (
     SearchAppConfigFragmentsAction,
 )
-from ai.backend.manager.services.app_config_fragment.actions.search_user_app_configs import (
-    SearchUserAppConfigsAction,
-)
 
 from .base import BaseAdapter
 
@@ -330,52 +290,6 @@ async def admin_bulk_purge(
             failed=[self._bulk_error_to_dto(err) for err in result.failed],
         )
 
-    async def my_bulk_create(
-        self, input: BulkCreateMyAppConfigFragmentsInput
-    ) -> BulkCreateMyAppConfigFragmentsPayload:
-        me = current_user()
-        if me is None:
-            raise UnreachableError("User context is not available")
-        items = [
-            MyAppConfigFragmentBulkItem(name=item.name, extra_config=dict(item.extra_config))
-            for item in input.items
-        ]
-        wrapper = await self._processors.app_config_fragment.bulk_create_my.wait_for_complete(
-            BulkCreateMyAppConfigFragmentsAction(
-                entity_ids=[item.name for item in items],
-                user_id=me.user_id,
-                items=items,
-            )
-        )
-        result = wrapper.result
-        return BulkCreateMyAppConfigFragmentsPayload(
-            created=[self._app_config_data_to_dto(item) for item in result.created],
-            failed=[self._bulk_error_to_dto(err) for err in result.failed],
-        )
-
-    async def my_bulk_update(
-        self, input: BulkUpdateMyAppConfigFragmentsInput
-    ) -> BulkUpdateMyAppConfigFragmentsPayload:
-        me = current_user()
-        if me is None:
-            raise UnreachableError("User context is not available")
-        items = [
-            MyAppConfigFragmentBulkItem(name=item.name, extra_config=dict(item.extra_config))
-            for item in input.items
-        ]
-        wrapper = await self._processors.app_config_fragment.bulk_update_my.wait_for_complete(
-            BulkUpdateMyAppConfigFragmentsAction(
-                entity_ids=[item.name for item in items],
-                user_id=me.user_id,
-                items=items,
-            )
-        )
-        result = wrapper.result
-        return BulkUpdateMyAppConfigFragmentsPayload(
-            updated=[self._app_config_data_to_dto(item) for item in result.updated],
-            failed=[self._bulk_error_to_dto(err) for err in result.failed],
-        )
-
     @staticmethod
     def _bulk_error_to_dto(
         err: AppConfigFragmentBulkItemError,
diff --git a/src/ai/backend/manager/api/gql/app_config/resolver/query.py b/src/ai/backend/manager/api/gql/app_config/resolver/query.py
@@ -51,7 +51,7 @@ async def my_app_configs(
     limit: int | None = None,
     offset: int | None = None,
 ) -> list[AppConfigGQL]:
-    payload = await info.context.adapters.app_config_fragment.my_search_app_configs(
+    payload = await info.context.adapters.app_config.my_search_app_configs(
         SearchMyAppConfigsInput(
             filter=filter.to_pydantic() if filter else None,
             order=[o.to_pydantic() for o in order_by] if order_by else None,
@@ -88,7 +88,7 @@ async def admin_app_configs(
     offset: int | None = None,
 ) -> list[AppConfigGQL]:
     check_admin_only()
-    payload = await info.context.adapters.app_config_fragment.admin_search_app_configs(
+    payload = await info.context.adapters.app_config.admin_search_app_configs(
         SearchAppConfigsInput(
             filter=filter.to_pydantic() if filter else None,
             order=[o.to_pydantic() for o in order_by] if order_by else None,
diff --git a/src/ai/backend/manager/api/gql/app_config_fragment/__init__.py b/src/ai/backend/manager/api/gql/app_config_fragment/__init__.py
@@ -1,39 +1,9 @@
-"""AppConfigFragment GraphQL API package."""
+"""AppConfigFragment GraphQL API package.
 
-from .resolver import (
-    admin_app_config_fragments,
-    admin_bulk_create_app_config_fragments,
-    admin_bulk_purge_app_config_fragments,
-    admin_bulk_update_app_config_fragments,
-    app_config_fragment,
-    my_bulk_create_app_config_fragments,
-    my_bulk_update_app_config_fragments,
-)
-from .types import (
-    AppConfigFragmentFilterGQL,
-    AppConfigFragmentGQL,
-    AppConfigFragmentKeyInputGQL,
-    AppConfigFragmentOrderByGQL,
-    AppConfigFragmentOrderFieldGQL,
-    AppConfigScopeTypeGQL,
-)
-
-__all__ = [
-    # Queries — scope-bound list belongs on DomainV2 / UserV2 child fields
-    "app_config_fragment",
-    "scoped_app_config_fragments",
-    "admin_app_config_fragments",
-    # Bulk mutations
-    "admin_bulk_create_app_config_fragments",
-    "admin_bulk_update_app_config_fragments",
-    "admin_bulk_purge_app_config_fragments",
-    "my_bulk_create_app_config_fragments",
-    "my_bulk_update_app_config_fragments",
-    # Types
-    "AppConfigFragmentGQL",
-    "AppConfigScopeTypeGQL",
-    "AppConfigFragmentFilterGQL",
-    "AppConfigFragmentOrderByGQL",
-    "AppConfigFragmentOrderFieldGQL",
-    "AppConfigFragmentKeyInputGQL",
-]
+Resolver and type names are re-exported by ``schema.py`` directly via
+their submodules to keep this package's ``__init__`` import-light: a
+top-level ``from app_config_fragment import ...`` would otherwise drag
+in the mutation resolvers, which back-import from
+``app_config.types.bulk_payloads`` and form an import cycle when
+``AppConfigGQL`` is loading.
+"""
diff --git a/src/ai/backend/manager/api/gql/app_config_fragment/resolver/__init__.py b/src/ai/backend/manager/api/gql/app_config_fragment/resolver/__init__.py
@@ -8,7 +8,6 @@
 from .query import (
     admin_app_config_fragments,
     app_config_fragment,
-    scoped_app_config_fragments,
 )
 
 __all__ = [
diff --git a/src/ai/backend/manager/api/gql/app_config_fragment/types/bulk_inputs.py b/src/ai/backend/manager/api/gql/app_config_fragment/types/bulk_inputs.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any
+from strawberry.scalars import JSON
 
 from ai.backend.common.dto.manager.v2.app_config_fragment.request import (
     AdminAppConfigFragmentItemInput as AdminItemInputDTO,
@@ -46,7 +46,7 @@
 )
 class AdminAppConfigFragmentItemInputGQL(PydanticInputMixin[AdminItemInputDTO]):
     key: AppConfigFragmentKeyInputGQL = gql_field(description="Natural-key identifier.")
-    config: dict[str, Any] = gql_field(description="Raw configuration payload.")
+    config: JSON = gql_field(description="Raw configuration payload.")
 
 
 @gql_pydantic_input(
@@ -91,7 +91,7 @@ class AdminBulkPurgeAppConfigFragmentInputGQL(PydanticInputMixin[AdminBulkPurgeI
 )
 class MyAppConfigFragmentItemInputGQL(PydanticInputMixin[MyItemInputDTO]):
     name: str = gql_field(description="Policy name.")
-    config: dict[str, Any] = gql_field(description="Raw configuration payload.")
+    config: JSON = gql_field(description="Raw configuration payload.")
 
 
 @gql_pydantic_input(
diff --git a/src/ai/backend/manager/api/gql/app_config_fragment/types/node.py b/src/ai/backend/manager/api/gql/app_config_fragment/types/node.py
@@ -3,29 +3,26 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Any
 from uuid import UUID
 
+from strawberry.scalars import JSON
+
 from ai.backend.common.dto.manager.v2.app_config_fragment.response import AppConfigFragmentNode
 from ai.backend.common.dto.manager.v2.app_config_fragment.types import AppConfigScopeType
 from ai.backend.common.meta.meta import NEXT_RELEASE_VERSION
 from ai.backend.manager.api.gql.decorators import (
     BackendAIGQLMeta,
-    gql_enum,
     gql_field,
     gql_pydantic_type,
 )
 from ai.backend.manager.api.gql.pydantic_compat import PydanticOutputMixin
 
-# Register the shared DTO enum as a Strawberry type.
-AppConfigScopeTypeGQL = gql_enum(
-    BackendAIGQLMeta(
-        added_version=NEXT_RELEASE_VERSION,
-        description="App-config scope type.",
-    ),
-    AppConfigScopeType,
-    name="AppConfigScopeType",
-)
+# The shared DTO enum is auto-registered by Strawberry the first time it
+# is referenced as a typed field. Re-export under the ``GQL`` suffix so
+# other modules can write `from ... import AppConfigScopeTypeGQL`. Calling
+# `strawberry.enum(...)` here would clash with that auto-registration
+# under the same `"AppConfigScopeType"` name.
+AppConfigScopeTypeGQL = AppConfigScopeType
 
 
 @gql_pydantic_type(
@@ -41,6 +38,6 @@ class AppConfigFragmentGQL(PydanticOutputMixin[AppConfigFragmentNode]):
     scope_type: AppConfigScopeType = gql_field(description="Scope type.")
     scope_id: str = gql_field(description="Scope id.")
     name: str = gql_field(description="Policy name (FK to app_config_policies).")
-    config: dict[str, Any] | None = gql_field(description="Raw configuration payload, or null.")
+    config: JSON | None = gql_field(description="Raw configuration payload, or null.")
     created_at: datetime = gql_field(description="Creation timestamp.")
     updated_at: datetime | None = gql_field(description="Last update timestamp.")
diff --git a/src/ai/backend/manager/api/gql/data_loader/data_loaders.py b/src/ai/backend/manager/api/gql/data_loader/data_loaders.py
@@ -123,12 +123,25 @@ def app_config_fragment_loader(
         adapter = self._adapters.app_config_fragment
 
         async def load_fn(ids: list[uuid.UUID]) -> list[AppConfigFragmentGQL | None]:
+            from ai.backend.common.dto.manager.query import UUIDFilter  # pants: no-infer-dep
+            from ai.backend.common.dto.manager.v2.app_config_fragment.request import (  # pants: no-infer-dep
+                AppConfigFragmentFilter,
+                SearchAppConfigFragmentsInput,
+            )
             from ai.backend.manager.api.gql.app_config_fragment.types import (  # pants: no-infer-dep
                 AppConfigFragmentGQL as F,
             )
 
-            dtos = await adapter.batch_load_by_ids(ids)
-            return [F.from_pydantic(dto) if dto is not None else None for dto in dtos]
+            if not ids:
+                return []
+            payload = await adapter.admin_search(
+                SearchAppConfigFragmentsInput(
+                    filter=AppConfigFragmentFilter(id=UUIDFilter.model_validate({"in": list(ids)})),
+                    limit=len(ids),
+                ),
+            )
+            by_id = {dto.id: F.from_pydantic(dto) for dto in payload.items}
+            return [by_id.get(fragment_id) for fragment_id in ids]
 
         return DataLoader(load_fn=load_fn)
 
diff --git a/src/ai/backend/manager/api/gql/schema.py b/src/ai/backend/manager/api/gql/schema.py
@@ -20,15 +20,17 @@
     my_app_configs,
     public_app_config_fragments,
 )
-from .app_config_fragment import (
-    admin_app_config_fragments,
+from .app_config_fragment.resolver.mutation import (
     admin_bulk_create_app_config_fragments,
     admin_bulk_purge_app_config_fragments,
     admin_bulk_update_app_config_fragments,
-    app_config_fragment,
     my_bulk_create_app_config_fragments,
     my_bulk_update_app_config_fragments,
 )
+from .app_config_fragment.resolver.query import (
+    admin_app_config_fragments,
+    app_config_fragment,
+)
 from .app_config_policy import (
     admin_bulk_create_app_config_policies,
     admin_bulk_purge_app_config_policies,
@@ -531,7 +533,6 @@ class Query:
     app_config_policies = app_config_policies
     # App Config Fragment APIs
     app_config_fragment = app_config_fragment
-    scoped_app_config_fragments = scoped_app_config_fragments
     admin_app_config_fragments = admin_app_config_fragments
     public_app_config_fragments = public_app_config_fragments
     # App Config merged view APIs

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`from .query import (`
`9`	`9`	`admin_app_config_fragments,`
`10`	`10`	`app_config_fragment,`
`11`		`- scoped_app_config_fragments,`
`12`	`11`	`)`
`13`	`12`
`14`	`13`	`__all__ = [`