Check correct provider for all models (except Ollama ones) (#389)

Author: ptitjes

prompt/prompt-executor/prompt-executor-clients/prompt-executor-anthropic-client/src/jvmTest/kotlin/ai/koog/prompt/executor/clients/anthropic/AnthropicModelsTest.kt

@@ -0,0 +1,22 @@
+package ai.koog.prompt.executor.clients.anthropic
+
+import ai.koog.prompt.executor.clients.list
+import ai.koog.prompt.llm.LLMProvider
+import kotlin.test.Test
+import kotlin.test.assertSame
+
+class AnthropicModelsTest {
+
+    @Test
+    fun `Anthropic models should have Anthropic provider`() {
+        val models = AnthropicModels.list()
+
+        models.forEach { model ->
+            assertSame(
+                expected = LLMProvider.Anthropic,
+                actual = model.provider,
+                message = "Anthropic model ${model.id} doesn't have Anthropic provider but ${model.provider}."
+            )
+        }
+    }
+}

prompt/prompt-executor/prompt-executor-clients/prompt-executor-google-client/src/jvmTest/kotlin/ai/koog/prompt/executor/clients/google/GoogleModelsTest.kt

@@ -0,0 +1,22 @@
+package ai.koog.prompt.executor.clients.google
+
+import ai.koog.prompt.executor.clients.list
+import ai.koog.prompt.llm.LLMProvider
+import kotlin.test.Test
+import kotlin.test.assertSame
+
+class GoogleModelsTest {
+
+    @Test
+    fun `Google models should have Google provider`() {
+        val models = GoogleModels.list()
+
+        models.forEach { model ->
+            assertSame(
+                expected = LLMProvider.Google,
+                actual = model.provider,
+                message = "Google model ${model.id} doesn't have Google provider but ${model.provider}."
+            )
+        }
+    }
+}

prompt/prompt-executor/prompt-executor-clients/prompt-executor-openai-client/src/jvmMain/kotlin/ai/koog/prompt/executor/clients/openai/LLModelsDefinitions.kt

@@ -0,0 +1,22 @@
+package ai.koog.prompt.executor.clients.openai
+
+import ai.koog.prompt.executor.clients.list
+import ai.koog.prompt.llm.LLMProvider
+import kotlin.test.Test
+import kotlin.test.assertSame
+
+class OpenAIModelsTest {
+
+    @Test
+    fun `OpenAI models should have OpenAI provider`() {
+        val models = OpenAIModels.list()
+
+        models.forEach { model ->
+            assertSame(
+                expected = LLMProvider.OpenAI,
+                actual = model.provider,
+                message = "OpenAI model ${model.id} doesn't have OpenAI provider but ${model.provider}."
+            )
+        }
+    }
+}

prompt/prompt-executor/prompt-executor-clients/prompt-executor-openai-client/src/jvmTest/kotlin/ai/koog/prompt/executor/clients/openai/OpenAIModelsTest.kt

@@ -0,0 +1,22 @@
+package ai.koog.prompt.executor.clients.openrouter
+
+import ai.koog.prompt.executor.clients.list
+import ai.koog.prompt.llm.LLMProvider
+import kotlin.test.Test
+import kotlin.test.assertSame
+
+class OpenRouterModelsTest {
+
+    @Test
+    fun `OpenRouter models should have OpenRouter provider`() {
+        val models = OpenRouterModels.list()
+
+        models.forEach { model ->
+            assertSame(
+                expected = LLMProvider.OpenRouter,
+                actual = model.provider,
+                message = "OpenRouter model ${model.id} doesn't have OpenRouter provider but ${model.provider}."
+            )
+        }
+    }
+}

prompt/prompt-executor/prompt-executor-clients/prompt-executor-openrouter-client/src/jvmTest/kotlin/ai/koog/prompt/executor/clients/openrouter/OpenRouterModelsTest.kt

@@ -6,17 +6,25 @@ import kotlin.reflect.full.createType
 import kotlin.reflect.full.memberProperties
 
 /**
- * Retrieves all public properties of the specified object that are of type `LLModel` and returns them as a list.
+ * Retrieves all public properties of the specified object and nested objects that are of type `LLModel` and
+ * returns them as a list.
  *
  * @param obj The object to inspect for properties of type `LLModel`.
- * @return A list of `LLModel` instances extracted from the public properties of the provided object.
+ * @return A list of `LLModel` instances extracted from the public properties of the provided object
+ *   and its nested objects.
  */
 public fun allModelsIn(obj: Any): List<LLModel> {
-        return obj::class.memberProperties
-            .filter { it.visibility == KVisibility.PUBLIC }
-            .filter { it.returnType == LLModel::class.createType() }
-            .map { it.getter.call(obj) as LLModel }
-    }
+    val immediateModels = obj::class.memberProperties
+        .filter { it.visibility == KVisibility.PUBLIC }
+        .filter { it.returnType == LLModel::class.createType() }
+        .map { it.getter.call(obj) as LLModel }
+
+    val nestedModels = obj::class.nestedClasses
+        .mapNotNull { it.objectInstance }
+        .flatMap { allModelsIn(it) }
+
+    return immediateModels + nestedModels
+}
 
 /**
  * Retrieves a list of all `LLModel` instances defined within the current `LLModelDefinitions`.
@@ -30,4 +38,3 @@ public fun allModelsIn(obj: Any): List<LLModel> {
 public fun LLModelDefinitions.list(): List<LLModel> {
     return allModelsIn(this)
 }
-