Make sure provider is passed alongside with model instead of autocalculated

Author: nelsonkopliku

config/test.exs

@@ -160,3 +160,17 @@ config :junit_formatter,
 config :trento,
        :flaky_tests_detection,
        enabled?: System.get_env("WRITE_JUNIT") == "1"
+
+config :trento, :ai,
+  providers: [
+    provider1: [
+      models: [
+        "model1"
+      ]
+    ],
+    provider2: [
+      models: [
+        "model1"
+      ]
+    ]
+  ]

lib/trento/ai/llm_registry.ex

@@ -43,11 +43,27 @@ defmodule Trento.AI.LLMRegistry do
     end)
   end
 
+  @doc """
+  Checks if a given model is supported by a specific provider.
+  """
+  @spec model_supported_by_provider?(bitstring(), atom()) :: boolean()
+  def model_supported_by_provider?(model, provider) do
+    model in get_provider_models(provider)
+  end
+
   @doc """
   Checks if a given model is supported by any provider.
   """
   @spec model_supported?(bitstring()) :: boolean()
   def model_supported?(model), do: model in get_provider_models(:all)
 
+  @doc """
+  Checks if a given provider is supported.
+  """
+  @spec provider_supported?(atom()) :: boolean()
+  def provider_supported?(provider) when is_atom(provider), do: provider in providers()
+
+  def provider_supported?(_), do: false
+
   defp get_ai_providers_config, do: Keyword.get(ApplicationConfigLoader.load(), :providers, [])
 end

lib/trento/ai/user_configuration.ex

@@ -14,6 +14,7 @@ defmodule Trento.AI.UserConfiguration do
   schema "ai_configurations" do
     field :model, :string
     field :provider, Ecto.Enum, values: LLMRegistry.providers()
+    # field :provider, :string
     field :api_key, EncryptedBinary, redact: true
 
     belongs_to :user, Trento.Users.User, primary_key: true
@@ -22,29 +23,53 @@ defmodule Trento.AI.UserConfiguration do
   end
 
   def changeset(ai_configuration, attrs) do
-    updated_attrs = maybe_update_provider(attrs)
-
     ai_configuration
-    |> cast(updated_attrs, [:user_id, :model, :provider, :api_key])
-    |> validate_required([:user_id, :model, :api_key])
-    |> validate_change(:model, &validate_model/2)
+    |> cast(attrs, [:user_id, :model, :provider, :api_key])
+    |> validate_required([:user_id, :model, :provider, :api_key])
+    |> validate_change(:provider, &validate_provider/2)
+    |> validate_model()
     |> unique_constraint(:user_id,
       name: :ai_configurations_pkey,
       message: "User already has a configuration"
     )
     |> foreign_key_constraint(:user_id, message: "User does not exist")
   end
 
-  defp maybe_update_provider(%{model: model} = attrs),
-    do: Map.put(attrs, :provider, LLMRegistry.get_model_provider(model))
-
-  defp maybe_update_provider(attrs), do: attrs
-
-  defp validate_model(_model_field_atom, model) do
-    if LLMRegistry.model_supported?(model) do
+  defp validate_provider(_provider_field_atom, provider) do
+    if LLMRegistry.provider_supported?(provider) do
       []
     else
-      [model: {"is not supported", validation: :ai_model_validity}]
+      [provider: {"is not supported", validation: :ai_provider_validity}]
     end
   end
+
+  defp validate_model(%{errors: [provider: _]} = changeset), do: changeset
+
+  defp validate_model(changeset) do
+    provider = get_field(changeset, :provider)
+    model = get_field(changeset, :model)
+
+    changeset
+    |> force_change(:model, model)
+    |> force_change(:provider, provider)
+    |> validate_change(:model, fn _model_atom, _model ->
+      model_supported? = LLMRegistry.model_supported?(model)
+      model_supported_by_provider? = LLMRegistry.model_supported_by_provider?(model, provider)
+
+      case {model_supported?, model_supported_by_provider?} do
+        {true, true} ->
+          []
+
+        {true, false} ->
+          [
+            model:
+              {"is not supported by the specified provider",
+               validation: :ai_model_provider_mismatch}
+          ]
+
+        {false, _} ->
+          [model: {"is not supported", validation: :ai_model_validity}]
+      end
+    end)
+  end
 end

lib/trento_web/openapi/v1/schema/ai.ex

@@ -48,6 +48,12 @@ defmodule TrentoWeb.OpenApi.V1.Schema.AI do
         type: :object,
         additionalProperties: false,
         properties: %{
+          provider: %Schema{
+            type: :string,
+            description: "AI provider.",
+            nullable: false,
+            example: "googleai"
+          },
           model: %Schema{
             type: :string,
             description: "AI model.",
@@ -62,10 +68,11 @@ defmodule TrentoWeb.OpenApi.V1.Schema.AI do
           }
         },
         example: %{
+          provider: "googleai",
           model: "gemini-2.0-flash",
           api_key: "AIza..."
         },
-        required: [:model, :api_key]
+        required: [:provider, :model, :api_key]
       },
       struct?: false
     )
@@ -82,14 +89,22 @@ defmodule TrentoWeb.OpenApi.V1.Schema.AI do
         additionalProperties: false,
         minProperties: 1,
         properties: %{
+          provider: %Schema{
+            type: :string,
+            description: "AI provider.",
+            nullable: false,
+            example: "googleai"
+          },
           model: %Schema{
             type: :string,
             description: "AI model.",
+            nullable: false,
             example: "gemini-2.0-flash"
           },
           api_key: %Schema{
             type: :string,
             description: "AI API key.",
+            nullable: false,
             example: "AIza..."
           }
         },

test/support/factory.ex

@@ -1461,24 +1461,43 @@ defmodule Trento.Factory do
     }
   end
 
-  def random_ai_model_factory(_) do
+  def random_ai_provider_factory(_) do
     Trento.AI.AICase.stub_config_loader()
 
-    :all
+    Enum.random(LLMRegistry.providers())
+  end
+
+  def random_ai_model_factory(attrs) do
+    Trento.AI.AICase.stub_config_loader()
+
+    attrs
+    |> Map.get(:provider, :all)
     |> LLMRegistry.get_provider_models()
     |> Enum.random()
   end
 
   def ai_user_configuration_factory(attrs) do
     user_id = Map.get(attrs, :user_id, 1)
-    model = Map.get(attrs, :model, build(:random_ai_model))
+    provider = Map.get(attrs, :provider, build(:random_ai_provider))
+    model = Map.get(attrs, :model, build(:random_ai_model, provider: provider))
 
-    %UserConfiguration{}
-    |> UserConfiguration.changeset(%{
+    %UserConfiguration{
       user_id: user_id,
+      provider: provider,
       model: model,
       api_key: Faker.String.base64(32)
-    })
-    |> Ecto.Changeset.apply_changes()
+    }
+  end
+
+  def ai_configuration_creation_params_factory(attrs) do
+    provider = Map.get(attrs, :provider, build(:random_ai_provider))
+    model = Map.get(attrs, :model, build(:random_ai_model, provider: provider))
+    api_key = Map.get(attrs, :api_key, Faker.String.base64(32))
+
+    %{
+      provider: provider,
+      model: model,
+      api_key: api_key
+    }
   end
 end