Skip to content

Commit 0c5678b

Browse files
committed
refactor: replace resolve global id method to it's new version
1 parent b5d8a65 commit 0c5678b

File tree

3 files changed

+16
-11
lines changed

3 files changed

+16
-11
lines changed

src/ai/backend/manager/api/gql/model_deployment/model_deployment.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
ModelDeploymentStatus as CommonDeploymentStatus,
1818
)
1919
from ai.backend.common.exception import ModelDeploymentUnavailableError
20-
from ai.backend.manager.api.gql.base import OrderDirection, StringFilter
20+
from ai.backend.manager.api.gql.base import OrderDirection, StringFilter, resolve_global_id
2121
from ai.backend.manager.api.gql.domain import Domain
2222
from ai.backend.manager.api.gql.model_deployment.access_token import (
2323
AccessToken,
@@ -229,7 +229,7 @@ async def access_tokens(self, info: Info[StrawberryGQLContext]) -> AccessTokenCo
229229
),
230230
)
231231

232-
_, deployment_id = AsyncNode.resolve_global_id(info, str(self._deployment_id))
232+
_, deployment_id = resolve_global_id(str(self._deployment_id))
233233
access_token_loader = DataLoader(
234234
apartial(AccessToken.batch_load_by_deployment_ids, info.context)
235235
)
@@ -291,7 +291,7 @@ async def scaling_rule(self, info: Info[StrawberryGQLContext]) -> ScalingRule:
291291

292292
@strawberry.field
293293
async def replica_state(self, info: Info[StrawberryGQLContext]) -> ReplicaState:
294-
_, deployment_id = AsyncNode.resolve_global_id(info, self.id)
294+
_, deployment_id = resolve_global_id(self.id)
295295

296296
return ReplicaState(
297297
_deployment_id=UUID(deployment_id),
@@ -606,7 +606,7 @@ async def deployments(
606606
@strawberry.field(description="Added in 25.13.0")
607607
async def deployment(id: ID, info: Info[StrawberryGQLContext]) -> Optional[ModelDeployment]:
608608
"""Get a specific deployment by ID."""
609-
_, deployment_id = AsyncNode.resolve_global_id(info, id)
609+
_, deployment_id = resolve_global_id(id)
610610
dataloader = DataLoader(apartial(ModelDeployment.batch_load_by_ids, info.context))
611611
deployment: list[ModelDeployment] = await dataloader.load(deployment_id)
612612

@@ -637,7 +637,7 @@ async def update_model_deployment(
637637
input: UpdateModelDeploymentInput, info: Info[StrawberryGQLContext]
638638
) -> UpdateModelDeploymentPayload:
639639
"""Update an existing model deployment."""
640-
_, deployment_id = AsyncNode.resolve_global_id(info, input.id)
640+
_, deployment_id = resolve_global_id(input.id)
641641
deployment_processor = info.context.processors.deployment
642642
if deployment_processor is None:
643643
raise ModelDeploymentUnavailableError(
@@ -656,7 +656,7 @@ async def delete_model_deployment(
656656
input: DeleteModelDeploymentInput, info: Info[StrawberryGQLContext]
657657
) -> DeleteModelDeploymentPayload:
658658
"""Delete a model deployment."""
659-
_, deployment_id = AsyncNode.resolve_global_id(info, input.id)
659+
_, deployment_id = resolve_global_id(input.id)
660660
deployment_processor = info.context.processors.deployment
661661
if deployment_processor is None:
662662
raise ModelDeploymentUnavailableError(
@@ -695,7 +695,7 @@ class SyncReplicaPayload:
695695
async def sync_replicas(
696696
input: SyncReplicaInput, info: Info[StrawberryGQLContext]
697697
) -> SyncReplicaPayload:
698-
_, deployment_id = AsyncNode.resolve_global_id(info, input.model_deployment_id)
698+
_, deployment_id = resolve_global_id(input.model_deployment_id)
699699
deployment_processor = info.context.processors.deployment
700700
if deployment_processor is None:
701701
raise ModelDeploymentUnavailableError(

src/ai/backend/manager/api/gql/model_deployment/model_replica.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from ai.backend.common.data.model_deployment.types import LivenessStatus as CommonLivenessStatus
1515
from ai.backend.common.data.model_deployment.types import ReadinessStatus as CommonReadinessStatus
1616
from ai.backend.common.exception import ModelDeploymentUnavailableError
17-
from ai.backend.manager.api.gql.base import JSONString, OrderDirection
17+
from ai.backend.manager.api.gql.base import JSONString, OrderDirection, resolve_global_id
1818
from ai.backend.manager.api.gql.session import Session
1919
from ai.backend.manager.api.gql.types import StrawberryGQLContext
2020
from ai.backend.manager.data.deployment.types import ModelReplicaData
@@ -221,7 +221,7 @@ class ReplicaStatusChangedPayload:
221221
@strawberry.field(description="Added in 25.13.0")
222222
async def replica(id: ID, info: Info[StrawberryGQLContext]) -> Optional[ModelReplica]:
223223
"""Get a specific replica by ID."""
224-
_, replica_id = AsyncNode.resolve_global_id(info, id)
224+
_, replica_id = resolve_global_id(id)
225225
replica_loader = DataLoader(apartial(ModelReplica.batch_load_by_revision_ids, info.context))
226226
replicas: list[ModelReplica] = await replica_loader.load(UUID(replica_id))
227227
return replicas[0]

src/ai/backend/manager/api/gql/model_deployment/model_revision.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@
1717
from ai.backend.common.types import ClusterMode as CommonClusterMode
1818
from ai.backend.common.types import MountPermission as CommonMountPermission
1919
from ai.backend.common.types import RuntimeVariant
20-
from ai.backend.manager.api.gql.base import JSONString, OrderDirection, StringFilter
20+
from ai.backend.manager.api.gql.base import (
21+
JSONString,
22+
OrderDirection,
23+
StringFilter,
24+
resolve_global_id,
25+
)
2126
from ai.backend.manager.api.gql.image import (
2227
Image,
2328
)
@@ -582,7 +587,7 @@ async def revisions(
582587
@strawberry.field(description="Added in 25.13.0")
583588
async def revision(id: ID, info: Info[StrawberryGQLContext]) -> ModelRevision:
584589
"""Get a specific revision by ID."""
585-
_, revision_id = AsyncNode.resolve_global_id(info, id)
590+
_, revision_id = resolve_global_id(id)
586591
revision_loader = DataLoader(apartial(ModelRevision.batch_load_by_ids, info.context))
587592
revision: list[ModelRevision] = await revision_loader.load(revision_id)
588593
return revision[0]

0 commit comments

Comments
 (0)