Fix TargetImage's position of class

takahirom · Feb 10, 2025 · 633220e · 633220e
1 parent 8409881
commit 633220e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/...roborazzi-core/src/commonMain/kotlin/com/github/takahirom/roborazzi/AiAssertionOptions.kt b/...roborazzi-core/src/commonMain/kotlin/com/github/takahirom/roborazzi/AiAssertionOptions.kt
@@ -57,20 +57,20 @@ INPUT_PROMPT
       aiAssertionOptions: AiAssertionOptions
     ): AiAssertionResults
 
+    class TargetImages(
+      val images: List<TargetImage>,
+    )
+
+    class TargetImage(
+      val filePath: String,
+    )
+
     companion object {
       const val DefaultMaxOutputTokens = 300
       const val DefaultTemperature = 0.4F
     }
   }
 
-  class TargetImages(
-    val images: List<TargetImage>,
-  )
-
-  class TargetImage(
-    val filePath: String,
-  )
-
 
   sealed interface AssertionImageType {
     class Comparison : AssertionImageType

diff --git a/...razzi-ai-gemini/src/commonMain/kotlin/com/github/takahirom/roborazzi/GeminiRoborazziAi.kt b/...razzi-ai-gemini/src/commonMain/kotlin/com/github/takahirom/roborazzi/GeminiRoborazziAi.kt
@@ -3,6 +3,8 @@ package com.github.takahirom.roborazzi
 import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel
 import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel.Companion.DefaultMaxOutputTokens
 import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel.Companion.DefaultTemperature
+import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel.TargetImage
+import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel.TargetImages
 import dev.shreyaspatil.ai.client.generativeai.GenerativeModel
 import dev.shreyaspatil.ai.client.generativeai.type.FunctionType
 import dev.shreyaspatil.ai.client.generativeai.type.GenerationConfig
@@ -39,16 +41,16 @@ class GeminiAiAssertionModel(
       is AiAssertionOptions.AssertionImageType.Actual -> actualImageFilePath
     }
     return assert(
-      AiAssertionOptions.TargetImages(listOf(AiAssertionOptions.TargetImage(imageFilePath))),
-      template,
-      inputPrompt,
-      systemPrompt,
-      aiAssertionOptions
+      targetImages = TargetImages(listOf(TargetImage(imageFilePath))),
+      template = template,
+      inputPrompt = inputPrompt,
+      systemPrompt = systemPrompt,
+      aiAssertionOptions = aiAssertionOptions
     )
   }
 
   private fun assert(
-    targetImages: AiAssertionOptions.TargetImages,
+    targetImages: TargetImages,
     template: String,
     inputPrompt: String,
     systemPrompt: String,
@@ -130,7 +132,7 @@ class GeminiAiAssertionModel(
   }
 
   override fun assert(
-    targetImages: AiAssertionOptions.TargetImages,
+    targetImages: TargetImages,
     aiAssertionOptions: AiAssertionOptions
   ): AiAssertionResults {
     val systemPrompt = aiAssertionOptions.systemPrompt

diff --git a/...-ai-openai/src/commonMain/kotlin/com/github/takahirom/roborazzi/OpenAiAiAssertionModel.kt b/...-ai-openai/src/commonMain/kotlin/com/github/takahirom/roborazzi/OpenAiAiAssertionModel.kt
@@ -2,7 +2,8 @@ package com.github.takahirom.roborazzi
 
 import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel.Companion.DefaultMaxOutputTokens
 import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel.Companion.DefaultTemperature
-import com.github.takahirom.roborazzi.AiAssertionOptions.TargetImage
+import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel.TargetImage
+import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel.TargetImages
 import com.github.takahirom.roborazzi.CaptureResults.Companion.json
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.HttpTimeout
@@ -83,7 +84,7 @@ class OpenAiAiAssertionModel(
       is AiAssertionOptions.AssertionImageType.Actual -> actualImageFilePath
     }
     return assert(
-      targetImages = AiAssertionOptions.TargetImages(
+      targetImages = TargetImages(
         listOf(
           TargetImage(
             imageFilePath
@@ -98,7 +99,7 @@ class OpenAiAiAssertionModel(
   }
 
   override fun assert(
-    targetImages: AiAssertionOptions.TargetImages,
+    targetImages: TargetImages,
     aiAssertionOptions: AiAssertionOptions
   ): AiAssertionResults {
     val systemPrompt = aiAssertionOptions.systemPrompt
@@ -114,7 +115,7 @@ class OpenAiAiAssertionModel(
   }
 
   private fun assert(
-    targetImages: AiAssertionOptions.TargetImages,
+    targetImages: TargetImages,
     systemPrompt: String,
     template: String,
     inputPrompt: String,

diff --git a/sample-android/src/test/java/com/github/takahirom/roborazzi/sample/boxed/AiManualTest.kt b/sample-android/src/test/java/com/github/takahirom/roborazzi/sample/boxed/AiManualTest.kt
@@ -4,6 +4,7 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onRoot
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.github.takahirom.roborazzi.AiAssertionOptions
+import com.github.takahirom.roborazzi.AiAssertionOptions.AiAssertionModel.TargetImages
 import com.github.takahirom.roborazzi.AiAssertionResult
 import com.github.takahirom.roborazzi.AiAssertionResults
 import com.github.takahirom.roborazzi.DEFAULT_ROBORAZZI_OUTPUT_DIR_PATH
@@ -69,7 +70,7 @@ class AiManualTest {
       aiAssertionOptions = AiAssertionOptions(
         aiAssertionModel = object : AiAssertionOptions.AiAssertionModel {
           override fun assert(
-            targetImages: AiAssertionOptions.TargetImages,
+            targetImages: TargetImages,
             aiAssertionOptions: AiAssertionOptions
           ): AiAssertionResults {
             return AiAssertionResults(