From dd7fed06aceeef26245de8c1215cefb8c8032dd9 Mon Sep 17 00:00:00 2001 From: Chandrapal Badshah <12944530+Chan9390@users.noreply.github.com> Date: Thu, 9 Oct 2025 12:01:31 +0530 Subject: [PATCH] fix: rename class to differentiate lighthouse providers --- api/src/backend/api/filters.py | 8 ++++---- api/src/backend/api/models.py | 4 ++-- api/src/backend/api/v1/serializers.py | 9 +++++---- api/src/backend/api/v1/views.py | 4 ++-- api/src/backend/tasks/jobs/lighthouse_providers.py | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/api/src/backend/api/filters.py b/api/src/backend/api/filters.py index 12054b399f..893bf887a3 100644 --- a/api/src/backend/api/filters.py +++ b/api/src/backend/api/filters.py @@ -933,10 +933,10 @@ class TenantApiKeyFilter(FilterSet): class LighthouseProviderConfigFilter(FilterSet): provider_type = ChoiceFilter( - choices=LighthouseProviderConfiguration.ProviderChoices.choices + choices=LighthouseProviderConfiguration.LLMProviderChoices.choices ) provider_type__in = ChoiceInFilter( - choices=LighthouseProviderConfiguration.ProviderChoices.choices, + choices=LighthouseProviderConfiguration.LLMProviderChoices.choices, field_name="provider_type", lookup_expr="in", ) @@ -952,11 +952,11 @@ class LighthouseProviderConfigFilter(FilterSet): class LighthouseProviderModelsFilter(FilterSet): provider_type = ChoiceFilter( - choices=LighthouseProviderConfiguration.ProviderChoices.choices, + choices=LighthouseProviderConfiguration.LLMProviderChoices.choices, field_name="provider_configuration__provider_type", ) provider_type__in = ChoiceInFilter( - choices=LighthouseProviderConfiguration.ProviderChoices.choices, + choices=LighthouseProviderConfiguration.LLMProviderChoices.choices, field_name="provider_configuration__provider_type", lookup_expr="in", ) diff --git a/api/src/backend/api/models.py b/api/src/backend/api/models.py index 4631e3f422..5bbf9b8ab8 100644 --- a/api/src/backend/api/models.py +++ b/api/src/backend/api/models.py @@ -1967,7 +1967,7 @@ class LighthouseProviderConfiguration(RowLevelSecurityProtectedModel): One configuration per provider type per tenant. """ - class ProviderChoices(models.TextChoices): + class LLMProviderChoices(models.TextChoices): OPENAI = "openai", _("OpenAI") id = models.UUIDField(primary_key=True, default=uuid4, editable=False) @@ -1976,7 +1976,7 @@ class LighthouseProviderConfiguration(RowLevelSecurityProtectedModel): provider_type = models.CharField( max_length=50, - choices=ProviderChoices.choices, + choices=LLMProviderChoices.choices, help_text="LLM provider name", ) diff --git a/api/src/backend/api/v1/serializers.py b/api/src/backend/api/v1/serializers.py index c00d43aa41..c6d216145d 100644 --- a/api/src/backend/api/v1/serializers.py +++ b/api/src/backend/api/v1/serializers.py @@ -3080,7 +3080,7 @@ class LighthouseProviderConfigCreateSerializer(RLSSerializer, BaseWriteSerialize provider_type = attrs.get("provider_type") credentials = attrs.get("credentials") or {} - if provider_type == LighthouseProviderConfiguration.ProviderChoices.OPENAI: + if provider_type == LighthouseProviderConfiguration.LLMProviderChoices.OPENAI: try: OpenAICredentialsSerializer(data=credentials).is_valid( raise_exception=True @@ -3136,7 +3136,8 @@ class LighthouseProviderConfigUpdateSerializer(BaseWriteSerializer): if ( credentials is not None - and provider_type == LighthouseProviderConfiguration.ProviderChoices.OPENAI + and provider_type + == LighthouseProviderConfiguration.LLMProviderChoices.OPENAI ): try: OpenAICredentialsSerializer(data=credentials).is_valid( @@ -3211,7 +3212,7 @@ class LighthouseTenantConfigCreateSerializer(RLSSerializer, BaseWriteSerializer) default_models = attrs.get("default_models", {}) if default_provider: - supported = set(LighthouseProviderConfiguration.ProviderChoices.values) + supported = set(LighthouseProviderConfiguration.LLMProviderChoices.values) if default_provider not in supported: raise ValidationError( {"default_provider": f"Unsupported provider '{default_provider}'."} @@ -3289,7 +3290,7 @@ class LighthouseTenantConfigUpdateSerializer(BaseWriteSerializer): ) if default_provider: - supported = set(LighthouseProviderConfiguration.ProviderChoices.values) + supported = set(LighthouseProviderConfiguration.LLMProviderChoices.values) if default_provider not in supported: raise ValidationError( {"default_provider": f"Unsupported provider '{default_provider}'."} diff --git a/api/src/backend/api/v1/views.py b/api/src/backend/api/v1/views.py index 70d8d61d23..2946623ca8 100644 --- a/api/src/backend/api/v1/views.py +++ b/api/src/backend/api/v1/views.py @@ -4282,7 +4282,7 @@ class LighthouseProviderConfigViewSet(BaseRLSViewSet): instance = self.get_object() if ( instance.provider_type - != LighthouseProviderConfiguration.ProviderChoices.OPENAI + != LighthouseProviderConfiguration.LLMProviderChoices.OPENAI ): return Response( data={ @@ -4325,7 +4325,7 @@ class LighthouseProviderConfigViewSet(BaseRLSViewSet): instance = self.get_object() if ( instance.provider_type - != LighthouseProviderConfiguration.ProviderChoices.OPENAI + != LighthouseProviderConfiguration.LLMProviderChoices.OPENAI ): return Response( data={ diff --git a/api/src/backend/tasks/jobs/lighthouse_providers.py b/api/src/backend/tasks/jobs/lighthouse_providers.py index c4d1c00899..3f1163b093 100644 --- a/api/src/backend/tasks/jobs/lighthouse_providers.py +++ b/api/src/backend/tasks/jobs/lighthouse_providers.py @@ -58,7 +58,7 @@ def check_lighthouse_provider_connection(provider_config_id: str) -> Dict: # TODO: Add support for other providers if ( provider_cfg.provider_type - != LighthouseProviderConfiguration.ProviderChoices.OPENAI + != LighthouseProviderConfiguration.LLMProviderChoices.OPENAI ): return {"connected": False, "error": "Unsupported provider type"} @@ -107,7 +107,7 @@ def refresh_lighthouse_provider_models(provider_config_id: str) -> Dict: if ( provider_cfg.provider_type - != LighthouseProviderConfiguration.ProviderChoices.OPENAI + != LighthouseProviderConfiguration.LLMProviderChoices.OPENAI ): return { "created": 0,