Fix naming

takahirom · Feb 9, 2025 · 8409881 · 8409881
1 parent 657dc74
commit 8409881
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 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
@@ -53,7 +53,7 @@ INPUT_PROMPT
     ): AiAssertionResults
 
     fun assert(
-      assertionTargetImages: AssertionTargetImages,
+      targetImages: TargetImages,
       aiAssertionOptions: AiAssertionOptions
     ): AiAssertionResults
 
@@ -63,11 +63,11 @@ INPUT_PROMPT
     }
   }
 
-  class AssertionTargetImages(
-    val images: List<AssertionTargetImage>,
+  class TargetImages(
+    val images: List<TargetImage>,
   )
 
-  class AssertionTargetImage(
+  class TargetImage(
     val filePath: String,
   )
 

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
@@ -39,7 +39,7 @@ class GeminiAiAssertionModel(
       is AiAssertionOptions.AssertionImageType.Actual -> actualImageFilePath
     }
     return assert(
-      AiAssertionOptions.AssertionTargetImages(listOf(AiAssertionOptions.AssertionTargetImage(imageFilePath))),
+      AiAssertionOptions.TargetImages(listOf(AiAssertionOptions.TargetImage(imageFilePath))),
       template,
       inputPrompt,
       systemPrompt,
@@ -48,14 +48,14 @@ class GeminiAiAssertionModel(
   }
 
   private fun assert(
-    assertionTargetImages: AiAssertionOptions.AssertionTargetImages,
+    targetImages: AiAssertionOptions.TargetImages,
     template: String,
     inputPrompt: String,
     systemPrompt: String,
     aiAssertionOptions: AiAssertionOptions
   ): AiAssertionResults {
     val imageByteArrays =
-      assertionTargetImages.images.map { image -> readByteArrayFromFile(image.filePath) }
+      targetImages.images.map { image -> readByteArrayFromFile(image.filePath) }
 
     val inputContent = content {
       imageByteArrays.forEach { imageByteArray ->
@@ -130,14 +130,14 @@ class GeminiAiAssertionModel(
   }
 
   override fun assert(
-    assertionTargetImages: AiAssertionOptions.AssertionTargetImages,
+    targetImages: AiAssertionOptions.TargetImages,
     aiAssertionOptions: AiAssertionOptions
   ): AiAssertionResults {
     val systemPrompt = aiAssertionOptions.systemPrompt
     val template = aiAssertionOptions.promptTemplate
     val inputPrompt = aiAssertionOptions.inputPrompt(aiAssertionOptions)
     return assert(
-      assertionTargetImages,
+      targetImages,
       template,
       inputPrompt,
       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,7 @@ 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.AssertionTargetImage
+import com.github.takahirom.roborazzi.AiAssertionOptions.TargetImage
 import com.github.takahirom.roborazzi.CaptureResults.Companion.json
 import io.ktor.client.HttpClient
 import io.ktor.client.plugins.HttpTimeout
@@ -83,9 +83,9 @@ class OpenAiAiAssertionModel(
       is AiAssertionOptions.AssertionImageType.Actual -> actualImageFilePath
     }
     return assert(
-      assertionTargetImages = AiAssertionOptions.AssertionTargetImages(
+      targetImages = AiAssertionOptions.TargetImages(
         listOf(
-          AssertionTargetImage(
+          TargetImage(
             imageFilePath
           )
         )
@@ -98,14 +98,14 @@ class OpenAiAiAssertionModel(
   }
 
   override fun assert(
-    assertionTargetImages: AiAssertionOptions.AssertionTargetImages,
+    targetImages: AiAssertionOptions.TargetImages,
     aiAssertionOptions: AiAssertionOptions
   ): AiAssertionResults {
     val systemPrompt = aiAssertionOptions.systemPrompt
     val template = aiAssertionOptions.promptTemplate
     val inputPrompt = aiAssertionOptions.inputPrompt(aiAssertionOptions)
     return assert(
-      assertionTargetImages = assertionTargetImages,
+      targetImages = targetImages,
       systemPrompt = systemPrompt,
       template = template,
       inputPrompt = inputPrompt,
@@ -114,13 +114,13 @@ class OpenAiAiAssertionModel(
   }
 
   private fun assert(
-    assertionTargetImages: AiAssertionOptions.AssertionTargetImages,
+    targetImages: AiAssertionOptions.TargetImages,
     systemPrompt: String,
     template: String,
     inputPrompt: String,
     aiAssertionOptions: AiAssertionOptions
   ): AiAssertionResults {
-    val imageBase64s = assertionTargetImages.images.map { image ->
+    val imageBase64s = targetImages.images.map { image ->
       val imageBytes = readByteArrayFromFile(image.filePath)
       imageBytes.encodeBase64()
     }

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
@@ -69,7 +69,7 @@ class AiManualTest {
       aiAssertionOptions = AiAssertionOptions(
         aiAssertionModel = object : AiAssertionOptions.AiAssertionModel {
           override fun assert(
-            assertionTargetImages: AiAssertionOptions.AssertionTargetImages,
+            targetImages: AiAssertionOptions.TargetImages,
             aiAssertionOptions: AiAssertionOptions
           ): AiAssertionResults {
             return AiAssertionResults(