Skip to content

Commit 145f530

Browse files
committed
fix aimodels list_all query
1 parent 4d0f09d commit 145f530

File tree

1 file changed

+22
-52
lines changed

1 file changed

+22
-52
lines changed

api/schema/aimodel_schema.py

Lines changed: 22 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ def _update_aimodel_tags(model: AIModel, tags: Optional[List[str]]) -> None:
3838
return
3939
model.tags.clear()
4040
for tag in tags:
41-
model.tags.add(
42-
Tag.objects.get_or_create(defaults={"value": tag}, value__iexact=tag)[0]
43-
)
41+
model.tags.add(Tag.objects.get_or_create(defaults={"value": tag}, value__iexact=tag)[0])
4442
model.save()
4543

4644

@@ -190,9 +188,9 @@ def ai_models(
190188
queryset = AIModel.objects.all()
191189
else:
192190
# For authenticated users, show their models and public models
193-
queryset = AIModel.objects.filter(
194-
user=user
195-
) | AIModel.objects.filter(is_public=True, is_active=True)
191+
queryset = AIModel.objects.filter(user=user) | AIModel.objects.filter(
192+
is_public=True, is_active=True
193+
)
196194
else:
197195
# For non-authenticated users, only show public active models
198196
queryset = AIModel.objects.filter(is_public=True, is_active=True)
@@ -203,10 +201,12 @@ def ai_models(
203201
if order is not strawberry.UNSET:
204202
queryset = strawberry_django.ordering.apply(order, queryset, info)
205203

204+
queryset = queryset.distinct()
205+
206206
if pagination is not strawberry.UNSET:
207207
queryset = strawberry_django.pagination.apply(pagination, queryset)
208208

209-
return TypeAIModel.from_django_list(list(queryset.distinct()))
209+
return TypeAIModel.from_django_list(list(queryset))
210210

211211
@strawberry.field
212212
@trace_resolver(name="get_ai_model", attributes={"component": "aimodel"})
@@ -279,9 +279,7 @@ class Mutation:
279279
"get_data": lambda result, **kwargs: {
280280
"model_id": str(result.id),
281281
"model_name": result.name,
282-
"organization": (
283-
str(result.organization.id) if result.organization else None
284-
),
282+
"organization": (str(result.organization.id) if result.organization else None),
285283
},
286284
},
287285
)
@@ -348,9 +346,7 @@ def create_ai_model(
348346
"get_data": lambda result, **kwargs: {
349347
"model_id": str(result.id),
350348
"model_name": result.name,
351-
"organization": (
352-
str(result.organization.id) if result.organization else None
353-
),
349+
"organization": (str(result.organization.id) if result.organization else None),
354350
},
355351
},
356352
)
@@ -372,13 +368,9 @@ def update_ai_model(
372368
user=user, organization=model.organization
373369
).first()
374370
if not org_member or not org_member.role.can_change:
375-
raise DjangoValidationError(
376-
"You don't have permission to update this model."
377-
)
371+
raise DjangoValidationError("You don't have permission to update this model.")
378372
else:
379-
raise DjangoValidationError(
380-
"You don't have permission to update this model."
381-
)
373+
raise DjangoValidationError("You don't have permission to update this model.")
382374

383375
# Update fields
384376
if input.name is not None:
@@ -459,13 +451,9 @@ def delete_ai_model(self, info: Info, model_id: int) -> MutationResponse[bool]:
459451
user=user, organization=model.organization
460452
).first()
461453
if not org_member or not org_member.role.can_delete:
462-
raise DjangoValidationError(
463-
"You don't have permission to delete this model."
464-
)
454+
raise DjangoValidationError("You don't have permission to delete this model.")
465455
else:
466-
raise DjangoValidationError(
467-
"You don't have permission to delete this model."
468-
)
456+
raise DjangoValidationError("You don't have permission to delete this model.")
469457

470458
model.delete()
471459
return MutationResponse.success_response(True)
@@ -492,9 +480,7 @@ def create_model_endpoint(
492480
try:
493481
model = AIModel.objects.get(id=input.model_id)
494482
except AIModel.DoesNotExist:
495-
raise DjangoValidationError(
496-
f"AI Model with ID {input.model_id} does not exist."
497-
)
483+
raise DjangoValidationError(f"AI Model with ID {input.model_id} does not exist.")
498484

499485
# Check permissions
500486
if not user.is_superuser and model.user != user:
@@ -513,9 +499,7 @@ def create_model_endpoint(
513499

514500
# If this is primary, unset other primary endpoints
515501
if input.is_primary:
516-
ModelEndpoint.objects.filter(model=model, is_primary=True).update(
517-
is_primary=False
518-
)
502+
ModelEndpoint.objects.filter(model=model, is_primary=True).update(is_primary=False)
519503

520504
endpoint = ModelEndpoint.objects.create(
521505
model=model,
@@ -533,9 +517,7 @@ def create_model_endpoint(
533517
is_active=input.is_active,
534518
)
535519

536-
return MutationResponse.success_response(
537-
TypeModelEndpoint.from_django(endpoint)
538-
)
520+
return MutationResponse.success_response(TypeModelEndpoint.from_django(endpoint))
539521

540522
@strawberry.mutation
541523
@BaseMutation.mutation(
@@ -559,9 +541,7 @@ def update_model_endpoint(
559541
try:
560542
endpoint = ModelEndpoint.objects.get(id=input.id)
561543
except ModelEndpoint.DoesNotExist:
562-
raise DjangoValidationError(
563-
f"Model Endpoint with ID {input.id} does not exist."
564-
)
544+
raise DjangoValidationError(f"Model Endpoint with ID {input.id} does not exist.")
565545

566546
model = endpoint.model
567547

@@ -576,9 +556,7 @@ def update_model_endpoint(
576556
"You don't have permission to update this endpoint."
577557
)
578558
else:
579-
raise DjangoValidationError(
580-
"You don't have permission to update this endpoint."
581-
)
559+
raise DjangoValidationError("You don't have permission to update this endpoint.")
582560

583561
# Update fields
584562
if input.url is not None:
@@ -612,9 +590,7 @@ def update_model_endpoint(
612590
endpoint.is_primary = True
613591

614592
endpoint.save()
615-
return MutationResponse.success_response(
616-
TypeModelEndpoint.from_django(endpoint)
617-
)
593+
return MutationResponse.success_response(TypeModelEndpoint.from_django(endpoint))
618594

619595
@strawberry.mutation
620596
@BaseMutation.mutation(
@@ -629,18 +605,14 @@ def update_model_endpoint(
629605
},
630606
},
631607
)
632-
def delete_model_endpoint(
633-
self, info: Info, endpoint_id: int
634-
) -> MutationResponse[bool]:
608+
def delete_model_endpoint(self, info: Info, endpoint_id: int) -> MutationResponse[bool]:
635609
"""Delete a model endpoint."""
636610
user = info.context.user
637611

638612
try:
639613
endpoint = ModelEndpoint.objects.get(id=endpoint_id)
640614
except ModelEndpoint.DoesNotExist:
641-
raise DjangoValidationError(
642-
f"Model Endpoint with ID {endpoint_id} does not exist."
643-
)
615+
raise DjangoValidationError(f"Model Endpoint with ID {endpoint_id} does not exist.")
644616

645617
model = endpoint.model
646618

@@ -655,9 +627,7 @@ def delete_model_endpoint(
655627
"You don't have permission to delete this endpoint."
656628
)
657629
else:
658-
raise DjangoValidationError(
659-
"You don't have permission to delete this endpoint."
660-
)
630+
raise DjangoValidationError("You don't have permission to delete this endpoint.")
661631

662632
endpoint.delete()
663633
return MutationResponse.success_response(True)

0 commit comments

Comments
 (0)