Skip to content

Commit ae1b95e

Browse files
jopemachineclaude
andcommitted
refactor(BA-5837): propagate my_bulk_* rename + BEP cleanup to ValkeyCache surface
Carry the stack-wide `bulk_create_my` / `bulk_update_my` → `my_bulk_create` / `my_bulk_update` rename through the cache_source module added by this PR, plus the GQL / adapter / DTO touchpoints that the rebase resolved with `-X theirs` (which kept stale identifiers). Also strip the residual `BEP-1052 §X` references from the cache_source docstring and the merged-view repository docstring. Only the news fragments retain the BEP wording. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 91b3c6f commit ae1b95e

16 files changed

Lines changed: 97 additions & 98 deletions

File tree

src/ai/backend/common/dto/manager/v2/app_config/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
)
1212
from .response import (
1313
AppConfigNode,
14-
BulkCreateMyAppConfigFragmentsPayload,
15-
BulkUpdateMyAppConfigFragmentsPayload,
1614
GetUserAppConfigPayload,
15+
MyBulkCreateAppConfigFragmentsPayload,
16+
MyBulkUpdateAppConfigFragmentsPayload,
1717
SearchAppConfigsPayload,
1818
)
1919
from .types import (
@@ -28,8 +28,8 @@
2828
"AppConfigOrder",
2929
"AppConfigOrderField",
3030
"AppConfigScopeType",
31-
"BulkCreateMyAppConfigFragmentsPayload",
32-
"BulkUpdateMyAppConfigFragmentsPayload",
31+
"MyBulkCreateAppConfigFragmentsPayload",
32+
"MyBulkUpdateAppConfigFragmentsPayload",
3333
"GetUserAppConfigInput",
3434
"GetUserAppConfigPayload",
3535
"OrderDirection",

src/ai/backend/common/dto/manager/v2/app_config/response.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
__all__ = (
1919
"AppConfigNode",
20-
"BulkCreateMyAppConfigFragmentsPayload",
21-
"BulkUpdateMyAppConfigFragmentsPayload",
20+
"MyBulkCreateAppConfigFragmentsPayload",
21+
"MyBulkUpdateAppConfigFragmentsPayload",
2222
"GetUserAppConfigPayload",
2323
"SearchAppConfigsPayload",
2424
)
@@ -62,8 +62,8 @@ class SearchAppConfigsPayload(BaseResponseModel):
6262
has_previous_page: bool = Field(default=False, description="Whether there is a previous page.")
6363

6464

65-
class BulkCreateMyAppConfigFragmentsPayload(BaseResponseModel):
66-
"""Payload for `bulkCreateMyAppConfigFragments`.
65+
class MyBulkCreateAppConfigFragmentsPayload(BaseResponseModel):
66+
"""Payload for `myBulkCreateAppConfigFragments`.
6767
6868
Each successfully created row produces a recomputed merged
6969
`AppConfigNode`; failures are collected per-item.
@@ -75,8 +75,8 @@ class BulkCreateMyAppConfigFragmentsPayload(BaseResponseModel):
7575
failed: list[AppConfigFragmentBulkError] = Field(description="Per-item failures.")
7676

7777

78-
class BulkUpdateMyAppConfigFragmentsPayload(BaseResponseModel):
79-
"""Payload for `bulkUpdateMyAppConfigFragments`."""
78+
class MyBulkUpdateAppConfigFragmentsPayload(BaseResponseModel):
79+
"""Payload for `myBulkUpdateAppConfigFragments`."""
8080

8181
updated: list[AppConfigNode] = Field(
8282
description="Recomputed merged AppConfig views for each updated USER fragment.",

src/ai/backend/manager/api/adapters/app_config.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
)
2020
from ai.backend.common.dto.manager.v2.app_config.response import (
2121
AppConfigNode,
22-
BulkCreateMyAppConfigFragmentsPayload,
23-
BulkUpdateMyAppConfigFragmentsPayload,
2422
GetUserAppConfigPayload,
23+
MyBulkCreateAppConfigFragmentsPayload,
24+
MyBulkUpdateAppConfigFragmentsPayload,
2525
SearchAppConfigsPayload,
2626
)
2727
from ai.backend.common.dto.manager.v2.app_config.types import AppConfigOrderField, OrderDirection
2828
from ai.backend.common.dto.manager.v2.app_config_fragment.request import (
29-
BulkCreateMyAppConfigFragmentsInput,
30-
BulkUpdateMyAppConfigFragmentsInput,
29+
MyBulkCreateAppConfigFragmentsInput,
30+
MyBulkUpdateAppConfigFragmentsInput,
3131
)
3232
from ai.backend.common.dto.manager.v2.app_config_fragment.response import (
3333
AppConfigFragmentBulkError,
@@ -52,15 +52,15 @@
5252
from ai.backend.manager.services.app_config_fragment.actions.admin_search_app_configs import (
5353
AdminSearchAppConfigsAction,
5454
)
55-
from ai.backend.manager.services.app_config_fragment.actions.bulk_create_my import (
56-
BulkCreateMyAppConfigFragmentsAction,
57-
)
58-
from ai.backend.manager.services.app_config_fragment.actions.bulk_update_my import (
59-
BulkUpdateMyAppConfigFragmentsAction,
60-
)
6155
from ai.backend.manager.services.app_config_fragment.actions.get_user_app_config import (
6256
GetUserAppConfigAction,
6357
)
58+
from ai.backend.manager.services.app_config_fragment.actions.my_bulk_create import (
59+
MyBulkCreateAppConfigFragmentsAction,
60+
)
61+
from ai.backend.manager.services.app_config_fragment.actions.my_bulk_update import (
62+
MyBulkUpdateAppConfigFragmentsAction,
63+
)
6464
from ai.backend.manager.services.app_config_fragment.actions.search_user_app_configs import (
6565
SearchUserAppConfigsAction,
6666
)
@@ -154,33 +154,33 @@ async def admin_search_app_configs(
154154
# reasons travel back through the per-item `failed` list.
155155

156156
async def my_bulk_create(
157-
self, input: BulkCreateMyAppConfigFragmentsInput
158-
) -> BulkCreateMyAppConfigFragmentsPayload:
157+
self, input: MyBulkCreateAppConfigFragmentsInput
158+
) -> MyBulkCreateAppConfigFragmentsPayload:
159159
items = [
160160
MyAppConfigFragmentBulkItem(name=item.name, extra_config=dict(item.extra_config))
161161
for item in input.items
162162
]
163-
wrapper = await self._processors.app_config_fragment.bulk_create_my.wait_for_complete(
164-
BulkCreateMyAppConfigFragmentsAction(entity_ids=[], items=items)
163+
wrapper = await self._processors.app_config_fragment.my_bulk_create.wait_for_complete(
164+
MyBulkCreateAppConfigFragmentsAction(entity_ids=[], items=items)
165165
)
166166
result = wrapper.result
167-
return BulkCreateMyAppConfigFragmentsPayload(
167+
return MyBulkCreateAppConfigFragmentsPayload(
168168
created=[self._data_to_dto(item) for item in result.created],
169169
failed=[self._bulk_error_to_dto(err) for err in result.failed],
170170
)
171171

172172
async def my_bulk_update(
173-
self, input: BulkUpdateMyAppConfigFragmentsInput
174-
) -> BulkUpdateMyAppConfigFragmentsPayload:
173+
self, input: MyBulkUpdateAppConfigFragmentsInput
174+
) -> MyBulkUpdateAppConfigFragmentsPayload:
175175
items = [
176176
MyAppConfigFragmentBulkItem(name=item.name, extra_config=dict(item.extra_config))
177177
for item in input.items
178178
]
179-
wrapper = await self._processors.app_config_fragment.bulk_update_my.wait_for_complete(
180-
BulkUpdateMyAppConfigFragmentsAction(entity_ids=[], items=items)
179+
wrapper = await self._processors.app_config_fragment.my_bulk_update.wait_for_complete(
180+
MyBulkUpdateAppConfigFragmentsAction(entity_ids=[], items=items)
181181
)
182182
result = wrapper.result
183-
return BulkUpdateMyAppConfigFragmentsPayload(
183+
return MyBulkUpdateAppConfigFragmentsPayload(
184184
updated=[self._data_to_dto(item) for item in result.updated],
185185
failed=[self._bulk_error_to_dto(err) for err in result.failed],
186186
)

src/ai/backend/manager/api/adapters/app_config_fragment.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
from ai.backend.common.dto.manager.v2.app_config_fragment.types import (
3333
AppConfigScopeType as DTOAppConfigScopeType,
3434
)
35-
from ai.backend.common.dto.manager.v2.app_config_fragment.types import OrderDirection
3635
from ai.backend.manager.api.adapter_options.pagination.pagination import PaginationSpec
3736
from ai.backend.manager.data.app_config_fragment.bulk_types import (
3837
AppConfigFragmentBulkItem,

src/ai/backend/manager/api/gql/app_config/types/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from .bulk_payloads import (
2-
BulkCreateMyAppConfigFragmentsPayloadGQL,
3-
BulkUpdateMyAppConfigFragmentsPayloadGQL,
2+
MyBulkCreateAppConfigFragmentsPayloadGQL,
3+
MyBulkUpdateAppConfigFragmentsPayloadGQL,
44
)
55
from .filters import (
66
AppConfigFilterGQL,
@@ -14,6 +14,6 @@
1414
"AppConfigGQL",
1515
"AppConfigOrderByGQL",
1616
"AppConfigOrderFieldGQL",
17-
"BulkCreateMyAppConfigFragmentsPayloadGQL",
18-
"BulkUpdateMyAppConfigFragmentsPayloadGQL",
17+
"MyBulkCreateAppConfigFragmentsPayloadGQL",
18+
"MyBulkUpdateAppConfigFragmentsPayloadGQL",
1919
]

src/ai/backend/manager/api/gql/app_config/types/bulk_payloads.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
from __future__ import annotations
44

55
from ai.backend.common.dto.manager.v2.app_config.response import (
6-
BulkCreateMyAppConfigFragmentsPayload as BulkCreateMyPayloadDTO,
6+
MyBulkCreateAppConfigFragmentsPayload as MyBulkCreatePayloadDTO,
77
)
88
from ai.backend.common.dto.manager.v2.app_config.response import (
9-
BulkUpdateMyAppConfigFragmentsPayload as BulkUpdateMyPayloadDTO,
9+
MyBulkUpdateAppConfigFragmentsPayload as MyBulkUpdatePayloadDTO,
1010
)
1111
from ai.backend.common.meta.meta import NEXT_RELEASE_VERSION
1212
from ai.backend.manager.api.gql.app_config.types.node import AppConfigGQL
@@ -24,12 +24,12 @@
2424
@gql_pydantic_type(
2525
BackendAIGQLMeta(
2626
added_version=NEXT_RELEASE_VERSION,
27-
description="Payload for `bulkCreateMyAppConfigFragments` (recomputed views).",
27+
description="Payload for `myBulkCreateAppConfigFragments` (recomputed views).",
2828
),
29-
model=BulkCreateMyPayloadDTO,
30-
name="BulkCreateMyAppConfigFragmentsPayload",
29+
model=MyBulkCreatePayloadDTO,
30+
name="MyBulkCreateAppConfigFragmentsPayload",
3131
)
32-
class BulkCreateMyAppConfigFragmentsPayloadGQL(PydanticOutputMixin[BulkCreateMyPayloadDTO]):
32+
class MyBulkCreateAppConfigFragmentsPayloadGQL(PydanticOutputMixin[MyBulkCreatePayloadDTO]):
3333
created: list[AppConfigGQL] = gql_field(
3434
description="Recomputed merged AppConfig views for each created USER fragment.",
3535
)
@@ -41,12 +41,12 @@ class BulkCreateMyAppConfigFragmentsPayloadGQL(PydanticOutputMixin[BulkCreateMyP
4141
@gql_pydantic_type(
4242
BackendAIGQLMeta(
4343
added_version=NEXT_RELEASE_VERSION,
44-
description="Payload for `bulkUpdateMyAppConfigFragments` (recomputed views).",
44+
description="Payload for `myBulkUpdateAppConfigFragments` (recomputed views).",
4545
),
46-
model=BulkUpdateMyPayloadDTO,
47-
name="BulkUpdateMyAppConfigFragmentsPayload",
46+
model=MyBulkUpdatePayloadDTO,
47+
name="MyBulkUpdateAppConfigFragmentsPayload",
4848
)
49-
class BulkUpdateMyAppConfigFragmentsPayloadGQL(PydanticOutputMixin[BulkUpdateMyPayloadDTO]):
49+
class MyBulkUpdateAppConfigFragmentsPayloadGQL(PydanticOutputMixin[MyBulkUpdatePayloadDTO]):
5050
updated: list[AppConfigGQL] = gql_field(
5151
description="Recomputed merged AppConfig views for each updated USER fragment.",
5252
)

src/ai/backend/manager/api/gql/app_config_fragment/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
admin_bulk_purge_app_config_fragments,
77
admin_bulk_update_app_config_fragments,
88
app_config_fragment,
9-
bulk_create_my_app_config_fragments,
10-
bulk_update_my_app_config_fragments,
9+
my_bulk_create_app_config_fragments,
10+
my_bulk_update_app_config_fragments,
1111
)
1212
from .types import (
1313
AppConfigFragmentFilterGQL,
@@ -26,8 +26,8 @@
2626
"admin_bulk_create_app_config_fragments",
2727
"admin_bulk_update_app_config_fragments",
2828
"admin_bulk_purge_app_config_fragments",
29-
"bulk_create_my_app_config_fragments",
30-
"bulk_update_my_app_config_fragments",
29+
"my_bulk_create_app_config_fragments",
30+
"my_bulk_update_app_config_fragments",
3131
# Types
3232
"AppConfigFragmentGQL",
3333
"AppConfigScopeTypeGQL",

src/ai/backend/manager/api/gql/app_config_fragment/resolver/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
admin_bulk_create_app_config_fragments,
33
admin_bulk_purge_app_config_fragments,
44
admin_bulk_update_app_config_fragments,
5-
bulk_create_my_app_config_fragments,
6-
bulk_update_my_app_config_fragments,
5+
my_bulk_create_app_config_fragments,
6+
my_bulk_update_app_config_fragments,
77
)
88
from .query import (
99
admin_app_config_fragments,
@@ -16,6 +16,6 @@
1616
"admin_bulk_purge_app_config_fragments",
1717
"admin_bulk_update_app_config_fragments",
1818
"app_config_fragment",
19-
"bulk_create_my_app_config_fragments",
20-
"bulk_update_my_app_config_fragments",
19+
"my_bulk_create_app_config_fragments",
20+
"my_bulk_update_app_config_fragments",
2121
]

src/ai/backend/manager/api/gql/app_config_fragment/resolver/mutation.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
from ai.backend.common.meta.meta import NEXT_RELEASE_VERSION
88
from ai.backend.manager.api.gql.app_config.types import (
9-
BulkCreateMyAppConfigFragmentsPayloadGQL,
10-
BulkUpdateMyAppConfigFragmentsPayloadGQL,
9+
MyBulkCreateAppConfigFragmentsPayloadGQL,
10+
MyBulkUpdateAppConfigFragmentsPayloadGQL,
1111
)
1212
from ai.backend.manager.api.gql.app_config_fragment.types import (
1313
AdminBulkCreateAppConfigFragmentInputGQL,
@@ -16,8 +16,8 @@
1616
AdminBulkPurgeAppConfigFragmentsPayloadGQL,
1717
AdminBulkUpdateAppConfigFragmentInputGQL,
1818
AdminBulkUpdateAppConfigFragmentsPayloadGQL,
19-
BulkCreateMyAppConfigFragmentInputGQL,
20-
BulkUpdateMyAppConfigFragmentInputGQL,
19+
MyBulkCreateAppConfigFragmentInputGQL,
20+
MyBulkUpdateAppConfigFragmentInputGQL,
2121
)
2222
from ai.backend.manager.api.gql.decorators import (
2323
BackendAIGQLMeta,
@@ -87,12 +87,12 @@ async def admin_bulk_purge_app_config_fragments(
8787
),
8888
)
8989
)
90-
async def bulk_create_my_app_config_fragments(
90+
async def my_bulk_create_app_config_fragments(
9191
info: Info[StrawberryGQLContext],
92-
input: BulkCreateMyAppConfigFragmentInputGQL,
93-
) -> BulkCreateMyAppConfigFragmentsPayloadGQL:
92+
input: MyBulkCreateAppConfigFragmentInputGQL,
93+
) -> MyBulkCreateAppConfigFragmentsPayloadGQL:
9494
result = await info.context.adapters.app_config.my_bulk_create(input.to_pydantic())
95-
return BulkCreateMyAppConfigFragmentsPayloadGQL.from_pydantic(result)
95+
return MyBulkCreateAppConfigFragmentsPayloadGQL.from_pydantic(result)
9696

9797

9898
@gql_mutation(
@@ -104,9 +104,9 @@ async def bulk_create_my_app_config_fragments(
104104
),
105105
)
106106
)
107-
async def bulk_update_my_app_config_fragments(
107+
async def my_bulk_update_app_config_fragments(
108108
info: Info[StrawberryGQLContext],
109-
input: BulkUpdateMyAppConfigFragmentInputGQL,
110-
) -> BulkUpdateMyAppConfigFragmentsPayloadGQL:
109+
input: MyBulkUpdateAppConfigFragmentInputGQL,
110+
) -> MyBulkUpdateAppConfigFragmentsPayloadGQL:
111111
result = await info.context.adapters.app_config.my_bulk_update(input.to_pydantic())
112-
return BulkUpdateMyAppConfigFragmentsPayloadGQL.from_pydantic(result)
112+
return MyBulkUpdateAppConfigFragmentsPayloadGQL.from_pydantic(result)

src/ai/backend/manager/api/gql/app_config_fragment/types/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
AdminBulkCreateAppConfigFragmentInputGQL,
44
AdminBulkPurgeAppConfigFragmentInputGQL,
55
AdminBulkUpdateAppConfigFragmentInputGQL,
6-
BulkCreateMyAppConfigFragmentInputGQL,
7-
BulkUpdateMyAppConfigFragmentInputGQL,
86
MyAppConfigFragmentItemInputGQL,
7+
MyBulkCreateAppConfigFragmentInputGQL,
8+
MyBulkUpdateAppConfigFragmentInputGQL,
99
)
1010
from .bulk_payloads import (
1111
AdminBulkCreateAppConfigFragmentsPayloadGQL,
@@ -37,8 +37,8 @@
3737
"AppConfigFragmentOrderByGQL",
3838
"AppConfigFragmentOrderFieldGQL",
3939
"AppConfigScopeTypeGQL",
40-
"BulkCreateMyAppConfigFragmentInputGQL",
41-
"BulkUpdateMyAppConfigFragmentInputGQL",
40+
"MyBulkCreateAppConfigFragmentInputGQL",
41+
"MyBulkUpdateAppConfigFragmentInputGQL",
4242
"MyAppConfigFragmentItemInputGQL",
4343
"PurgeAppConfigFragmentKeyGQL",
4444
]

0 commit comments

Comments
 (0)