Skip to content

Commit d713fdd

Browse files
jopemachineclaude
andcommitted
fix(BA-5650-G): align remaining test fixtures and adapter call sites
- Tests for SessionEnqueueData / KernelEnqueueData / TerminatingSessionData now use ``main_access_key`` and ``owner_id`` (renamed in slice F/G). - ``SessionAdapter._session_data_to_node`` reads ``data.owner_id`` and drops the obsolete ``data.access_key``; the SessionMetadata GQL DTO's ``access_key`` field is now an empty string until the read-time resolver lands. - ``cache_invalidation`` uses ``info.access_key`` (the field name on SessionTransitionInfo). - ``ShutdownServiceAction``/``GetContainerLogsAction``/``RenameSessionAction`` no longer accept ``owner_access_key``; drop the kwarg in the GQL adapter. - ``ModelServingRepository.get_session_by_id`` drops the now-removed positional ``owner_access_key`` arg from ``SessionRow.get_session``. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 319ce94 commit d713fdd

7 files changed

Lines changed: 17 additions & 24 deletions

File tree

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,6 @@ async def shutdown_service(
854854
"""Shut down a service in a session."""
855855
action = ShutdownServiceAction(
856856
session_name=str(session_id),
857-
owner_access_key=AccessKey(access_key),
858857
service_name=input.service,
859858
)
860859
await self._processors.session.shutdown_service.wait_for_complete(action)
@@ -872,7 +871,6 @@ async def get_logs(
872871
"""Get container logs for a session."""
873872
action = GetContainerLogsAction(
874873
session_name=str(session_id),
875-
owner_access_key=AccessKey(access_key),
876874
kernel_id=KernelId(kernel_id) if kernel_id else None,
877875
)
878876
result = await self._processors.session.get_container_logs.wait_for_complete(action)
@@ -894,7 +892,6 @@ async def update(
894892
action = RenameSessionAction(
895893
session_name=str(session_id),
896894
new_name=input.name,
897-
owner_access_key=AccessKey(access_key),
898895
)
899896
result = await self._processors.session.rename_session.wait_for_complete(action)
900897
return UpdateSessionPayload(session=self._session_data_to_node(result.session_data))

src/ai/backend/manager/repositories/model_serving/repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ async def get_session_by_id(
738738
async with self._db.begin_readonly_session_read_committed() as session:
739739
try:
740740
return await SessionRow.get_session(
741-
session, session_id, None, kernel_loading_strategy=kernel_loading_strategy
741+
session, session_id, kernel_loading_strategy=kernel_loading_strategy
742742
)
743743
except NoResultFound:
744744
return None

src/ai/backend/manager/repositories/scheduler/db_source/db_source.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1146,9 +1146,7 @@ async def get_terminating_sessions_by_ids(
11461146
for kernel in session_row.kernels
11471147
]
11481148

1149-
owner_main_ak = (
1150-
session_row.user.main_access_key if session_row.user else None
1151-
)
1149+
owner_main_ak = session_row.user.main_access_key if session_row.user else None
11521150
terminating_sessions.append(
11531151
TerminatingSessionData(
11541152
session_id=session_row.id,
@@ -1848,9 +1846,7 @@ async def allocate_sessions(
18481846
session_ids = {alloc.session_id for alloc in allocation_batch.allocations}
18491847
if session_ids:
18501848
query = (
1851-
sa.select(
1852-
SessionRow.id, SessionRow.creation_id, UserRow.main_access_key
1853-
)
1849+
sa.select(SessionRow.id, SessionRow.creation_id, UserRow.main_access_key)
18541850
.select_from(SessionRow)
18551851
.join(UserRow, SessionRow.user_uuid == UserRow.uuid)
18561852
.where(SessionRow.id.in_(session_ids))

src/ai/backend/manager/sokovan/scheduler/post_processors/cache_invalidation.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ async def execute(self, context: PostProcessorContext) -> None:
2727
affected_keys: set[AccessKey] = set()
2828

2929
for info in context.result.successes:
30-
if info.main_access_key:
31-
affected_keys.add(info.main_access_key)
30+
if info.access_key:
31+
affected_keys.add(info.access_key)
3232
for info in context.result.failures:
33-
if info.main_access_key:
34-
affected_keys.add(info.main_access_key)
33+
if info.access_key:
34+
affected_keys.add(info.access_key)
3535

3636
if affected_keys:
3737
await self._repository.invalidate_kernel_related_cache(list(affected_keys))

tests/unit/manager/repositories/scheduler/test_scheduling_history_recording.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,8 @@ async def test_enqueue_session_creates_scheduling_history(
316316
id=session_id,
317317
creation_id=creation_id,
318318
name=f"test-session-{uuid.uuid4().hex[:8]}",
319-
access_key=test_access_key,
320-
user_uuid=test_user_uuid,
319+
main_access_key=test_access_key,
320+
owner_id=test_user_uuid,
321321
group_id=test_group_id,
322322
domain_name=test_domain_name,
323323
scaling_group_name=test_scaling_group_name,
@@ -354,8 +354,8 @@ async def test_enqueue_session_creates_scheduling_history(
354354
scaling_group=test_scaling_group_name,
355355
domain_name=test_domain_name,
356356
group_id=test_group_id,
357-
user_uuid=test_user_uuid,
358-
access_key=test_access_key,
357+
owner_id=test_user_uuid,
358+
main_access_key=test_access_key,
359359
image="python:3.8",
360360
architecture="x86_64",
361361
registry="docker.io",

tests/unit/manager/sokovan/scheduler/terminator/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def _create_terminating_session_data(
137137

138138
return TerminatingSessionData(
139139
session_id=session_id or SessionId(uuid4()),
140-
access_key=AccessKey("test-key"),
140+
main_access_key=AccessKey("test-key"),
141141
creation_id=str(uuid4()),
142142
status=SessionStatus.TERMINATING,
143143
status_info=status_info,

tests/unit/manager/sokovan/scheduler/test_terminate_sessions.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ async def test_terminate_sessions_single_success(
126126

127127
terminating_session = TerminatingSessionData(
128128
session_id=session_id,
129-
access_key=AccessKey("test-key"),
129+
main_access_key=AccessKey("test-key"),
130130
creation_id="test-creation",
131131
status=SessionStatus.TERMINATING,
132132
status_info="USER_REQUESTED",
@@ -181,7 +181,7 @@ async def test_terminate_sessions_multiple_kernels(
181181

182182
terminating_session = TerminatingSessionData(
183183
session_id=session_id,
184-
access_key=AccessKey("test-key"),
184+
main_access_key=AccessKey("test-key"),
185185
creation_id="test-creation",
186186
status=SessionStatus.TERMINATING,
187187
status_info="FORCED_TERMINATION",
@@ -233,7 +233,7 @@ async def test_terminate_sessions_partial_failure(
233233

234234
terminating_session = TerminatingSessionData(
235235
session_id=session_id,
236-
access_key=AccessKey("test-key"),
236+
main_access_key=AccessKey("test-key"),
237237
creation_id="test-creation",
238238
status=SessionStatus.TERMINATING,
239239
status_info="TEST_PARTIAL",
@@ -310,7 +310,7 @@ async def test_terminate_sessions_concurrent_execution(
310310
sessions.append(
311311
TerminatingSessionData(
312312
session_id=session_id,
313-
access_key=AccessKey(f"key-{i}"),
313+
main_access_key=AccessKey(f"key-{i}"),
314314
creation_id=f"creation-{i}",
315315
status=SessionStatus.TERMINATING,
316316
status_info="BATCH_TERMINATION",
@@ -364,7 +364,7 @@ async def test_terminate_sessions_empty_kernel_list(
364364

365365
terminating_session = TerminatingSessionData(
366366
session_id=session_id,
367-
access_key=AccessKey("test-key"),
367+
main_access_key=AccessKey("test-key"),
368368
creation_id="test-creation",
369369
status=SessionStatus.TERMINATING,
370370
status_info="NO_KERNELS",

0 commit comments

Comments
 (0)