Merge pull request #23 from schemacrawler/full-text

Update full text search

Author: sualeh

pom.xml

@@ -9,7 +9,7 @@
     <version>16.25.2</version>
   </parent>
   <artifactId>schemacrawler-ai</artifactId>
-  <version>16.25.2-1</version>
+  <version>16.25.2-2</version>
   <packaging>jar</packaging>
   <name>SchemaCrawler AI</name>
   <description>Integrates SchemaCrawler with AI chat services.</description>
@@ -156,7 +156,7 @@
             </goals>
             <configuration>
               <source>21</source>
-              <doctitle>SchemaCrawler AI 16.25.2-1</doctitle>
+              <doctitle>SchemaCrawler AI 16.25.2-2</doctitle>
             </configuration>
           </execution>
         </executions>

src/main/assembly/assembly.xml

@@ -30,7 +30,7 @@
 		<exclude>javax.validation:*</exclude>
 		<exclude>com.azure:azure-core-test</exclude>
 		<exclude>org.apache.ant:*</exclude>
-        <exclude>us.fatehi:*</exclude>
+        <exclude>us.fatehi:schemacrawler*</exclude>
       </excludes>
     </dependencySet>	
   </dependencySets>

src/main/java/schemacrawler/tools/command/aichat/utility/lanchain4j/GitHubModelFactory.java

@@ -43,8 +43,6 @@
 
 public class GitHubModelFactory implements AiModelFactory {
 
-  private static final String TEXT_EMBEDDING_MODEL = "text-embedding-3-small";
-
   private final PropertyName aiProvider = new PropertyName("github-models", "GitHub Models");
   private final AiChatCommandOptions aiChatCommandOptions;
 
@@ -88,9 +86,10 @@ public ChatMemory newChatMemory() {
 
   @Override
   public EmbeddingModel newEmbeddingModel() {
+    final String embeddingModelName = "text-embedding-3-small";
     return GitHubModelsEmbeddingModel.builder()
         .gitHubToken(aiChatCommandOptions.apiKey())
-        .modelName(TEXT_EMBEDDING_MODEL)
+        .modelName(embeddingModelName)
         .build();
   }
 

src/main/java/schemacrawler/tools/command/aichat/utility/lanchain4j/OpenAIModelFactory.java

@@ -37,15 +37,14 @@
 import dev.langchain4j.model.openai.OpenAiChatModel;
 import dev.langchain4j.model.openai.OpenAiChatModelName;
 import dev.langchain4j.model.openai.OpenAiEmbeddingModel;
+import dev.langchain4j.model.openai.OpenAiEmbeddingModelName;
 import dev.langchain4j.model.openai.OpenAiTokenizer;
 import schemacrawler.tools.command.aichat.options.AiChatCommandOptions;
 import schemacrawler.tools.command.aichat.utility.lanchain4j.AiModelFactoryUtility.AiModelFactory;
 import us.fatehi.utility.property.PropertyName;
 
 public class OpenAIModelFactory implements AiModelFactory {
 
-  private static final String TEXT_EMBEDDING_MODEL = "text-embedding-3-small";
-
   private final PropertyName aiProvider = new PropertyName("openai", "OpenAI");
   private final AiChatCommandOptions aiChatCommandOptions;
 
@@ -95,9 +94,10 @@ public ChatMemory newChatMemory() {
 
   @Override
   public EmbeddingModel newEmbeddingModel() {
+    final String embeddingModelName = OpenAiEmbeddingModelName.TEXT_EMBEDDING_3_SMALL.toString();
     return OpenAiEmbeddingModel.builder()
         .apiKey(aiChatCommandOptions.apiKey())
-        .modelName(TEXT_EMBEDDING_MODEL)
+        .modelName(embeddingModelName)
         .build();
   }