updates

Author: TheovanKraay

Java/CosmosDB-NoSQL-VectorSearch/Code/pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.azure.cosmos</groupId>
-    <artifactId>your-artifact-id</artifactId>
+    <artifactId>cosmos-db-vector-search-sample</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <properties>
@@ -15,49 +15,16 @@
         <maven.compiler.target>17</maven.compiler.target>
     </properties>
 
-    <repositories>
-<!--        <repository>
-            <id>azure-sdk-for-java</id>
-            <url>https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-java/maven/v1</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>-->
-        <repository>
-            <id>azure-sdk-for-java</id>
-            <url>https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-java/maven/v1</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-ai-openai</artifactId>
             <version>1.0.0-beta.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-search-documents</artifactId>
-            <version>11.6.0-beta.7</version>
-        </dependency>
-<!--        <dependency>
-            <groupId>com.azure</groupId>
-            <artifactId>azure-cosmos</artifactId>
-            <version>4.60.0-alpha.20240507.2</version>
-        </dependency>-->
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-cosmos</artifactId>
-            <version>4.60.0-alpha.20240502.1</version>
+            <version>LATEST</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

Java/CosmosDB-NoSQL-VectorSearch/Code/src/main/java/com/azure/recipe/model/Recipe.java

@@ -8,7 +8,6 @@
 public class Recipe {
     public String id;
     public String name;
-    public String score;
     public String description;
     public List<Double> embedding;
     public String cuisine;

Java/CosmosDB-NoSQL-VectorSearch/Code/src/main/java/com/azure/recipe/service/CosmosDbService.java

@@ -88,32 +88,8 @@ public void uploadRecipes(List<Recipe> recipes) {
     public Iterable<Recipe> vectorSearch(List<Double> vector){
         ArrayList<SqlParameter> paramList = new ArrayList<SqlParameter>();
         paramList.add(new SqlParameter("@embedding", vector.stream().map(aDouble -> (Float) (float) aDouble.doubleValue()).collect(Collectors.toList()).toArray()));
-        SqlQuerySpec querySpec = new SqlQuerySpec("SELECT c.name, c.description, c.embedding, c.cuisine, c.difficulty, c.prepTime, c.cookTime, c.totalTime, c.servings, c.ingredients, c.instructions,  VectorDistance(c.embedding,@embedding) AS score   FROM c", paramList);
-        Iterable<Recipe> filteredRecipes = container.queryItems(querySpec, new CosmosQueryRequestOptions(), Recipe.class).toIterable();
-        filteredRecipes = sortResults(filteredRecipes);
+        SqlQuerySpec querySpec = new SqlQuerySpec("SELECT TOP 3 c.name, c.description, c.embedding, c.cuisine, c.difficulty, c.prepTime, c.cookTime, c.totalTime, c.servings, c.ingredients, c.instructions,  VectorDistance(c.embedding,@embedding) AS SimilarityScore   FROM c ORDER BY VectorDistance(c.embedding,@embedding)", paramList);
+        ArrayList<Recipe> filteredRecipes = (ArrayList<Recipe>) container.queryItems(querySpec, new CosmosQueryRequestOptions(), Recipe.class).collectList().block();
         return filteredRecipes;
     }
-
-    public Iterable<Recipe> sortResults (Iterable<Recipe> recipes){
-        ArrayList <Recipe> filteredRecipesList = new ArrayList<Recipe>();
-        for (Recipe recipe : recipes) {
-            filteredRecipesList.add(recipe);
-        }
-        //order filteredRecipesList by similarity score descending
-        Collections.sort(filteredRecipesList, new Comparator<Recipe>() {
-            @Override
-            public int compare(Recipe o1, Recipe o2) {
-                return Double.compare(Double.parseDouble(o1.getScore()), Double.parseDouble(o2.getScore()));
-            }
-        });
-
-        //reverse the list to get the highest similarity score first
-        Collections.reverse(filteredRecipesList);
-
-        //get top 3 recipes
-        filteredRecipesList = new ArrayList<Recipe>(filteredRecipesList.subList(0, 3));
-
-        //convert filteredRecipesList to Iterable
-        return filteredRecipesList;
-    }
 }

Java/CosmosDB-NoSQL-VectorSearch/README.md

@@ -13,7 +13,7 @@ This repository provides a demo showcasing the usage of the RAG pattern for inte
 
 ### Installation
 ``` bash 
-mvn compile exec:java
+mvn install
 ```
 
 ### Run
@@ -64,7 +64,7 @@ To begin, follow these steps:
     cosmosVectorEmbeddingPolicy.setCosmosVectorEmbeddings(Arrays.asList(embedding));
     collectionDefinition.setVectorEmbeddingPolicy(cosmosVectorEmbeddingPolicy);
 
-        //set vector indexing policy
+    //set vector indexing policy
     IndexingPolicy indexingPolicy = new IndexingPolicy();
     indexingPolicy.setIndexingMode(IndexingMode.CONSISTENT);
     ExcludedPath excludedPath = new ExcludedPath("/*");