first cut of aot improvements

Signed-off-by: Josh Long <[email protected]>

Author: joshlong

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/aot/OpenAiRuntimeHints.java

@@ -16,6 +16,10 @@
 
 package org.springframework.ai.openai.aot;
 
+import org.springframework.ai.openai.OpenAiChatOptions;
+import org.springframework.ai.openai.api.OpenAiApi;
+import org.springframework.ai.openai.api.OpenAiAudioApi;
+import org.springframework.ai.openai.api.OpenAiImageApi;
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
@@ -37,10 +41,19 @@ public class OpenAiRuntimeHints implements RuntimeHintsRegistrar {
 	@Override
 	public void registerHints(@NonNull RuntimeHints hints, @Nullable ClassLoader classLoader) {
 		var mcs = MemberCategory.values();
-
-		for (var tr : findJsonAnnotatedClassesInPackage("org.springframework.ai.openai")) {
+		for (var tr : (findJsonAnnotatedClassesInPackage(OpenAiChatOptions.class))) {
+			hints.reflection().registerType(tr, mcs);
+		}
+		for (var tr : (findJsonAnnotatedClassesInPackage(OpenAiApi.class))) {
+			hints.reflection().registerType(tr, mcs);
+		}
+		for (var tr : (findJsonAnnotatedClassesInPackage(OpenAiAudioApi.class))) {
+			hints.reflection().registerType(tr, mcs);
+		}
+		for (var tr : findJsonAnnotatedClassesInPackage(OpenAiImageApi.class)) {
 			hints.reflection().registerType(tr, mcs);
 		}
+
 	}
 
 }

spring-ai-model/src/main/java/org/springframework/ai/embedding/AbstractEmbeddingModel.java

@@ -16,19 +16,19 @@
 
 package org.springframework.ai.embedding;
 
-import java.io.IOException;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
 import org.springframework.context.annotation.ImportRuntimeHints;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.util.Assert;
 
+import java.io.IOException;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
 /**
  * Abstract implementation of the {@link EmbeddingModel} interface that provides
  * dimensions calculation caching.
@@ -44,6 +44,15 @@ public abstract class AbstractEmbeddingModel implements EmbeddingModel {
 
 	private static final Map<String, Integer> KNOWN_EMBEDDING_DIMENSIONS = loadKnownModelDimensions();
 
+	static class Hints implements RuntimeHintsRegistrar {
+
+		@Override
+		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
+			hints.resources().registerResource(EMBEDDING_MODEL_DIMENSIONS_PROPERTIES);
+		}
+
+	}
+
 	/**
 	 * Cached embedding dimensions.
 	 */
@@ -97,13 +106,4 @@ public int dimensions() {
 		return this.embeddingDimensions.get();
 	}
 
-	static class Hints implements RuntimeHintsRegistrar {
-
-		@Override
-		public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-			hints.resources().registerResource(EMBEDDING_MODEL_DIMENSIONS_PROPERTIES);
-		}
-
-	}
-
 }