Merge branch 'main' into feat/ai-perso/add-ai-personalization-spec

Author: shortcuts

clients/algoliasearch-client-csharp/algoliasearch/Models/Ingestion/AuthInputPartial.cs

@@ -80,6 +80,16 @@ public AuthInputPartial(AuthAlgoliaInsightsPartial actualInstance)
     ActualInstance = actualInstance ?? throw new ArgumentException("Invalid instance found. Must not be null.");
   }
 
+  /// <summary>
+  /// Initializes a new instance of the AuthInputPartial class
+  /// with a Dictionary{string, string}
+  /// </summary>
+  /// <param name="actualInstance">An instance of Dictionary&lt;string, string&gt;.</param>
+  public AuthInputPartial(Dictionary<string, string> actualInstance)
+  {
+    ActualInstance = actualInstance;
+  }
+
 
   /// <summary>
   /// Gets or Sets ActualInstance
@@ -146,6 +156,16 @@ public AuthAlgoliaInsightsPartial AsAuthAlgoliaInsightsPartial()
     return (AuthAlgoliaInsightsPartial)ActualInstance;
   }
 
+  /// <summary>
+  /// Get the actual instance of `Dictionary{string, string}`. If the actual instance is not `Dictionary{string, string}`,
+  /// the InvalidClassException will be thrown
+  /// </summary>
+  /// <returns>An instance of Dictionary&lt;string, string&gt;</returns>
+  public Dictionary<string, string> AsDictionaryString()
+  {
+    return (Dictionary<string, string>)ActualInstance;
+  }
+
 
   /// <summary>
   /// Check if the actual instance is of `AuthGoogleServiceAccountPartial` type.
@@ -201,6 +221,15 @@ public bool IsAuthAlgoliaInsightsPartial()
     return ActualInstance.GetType() == typeof(AuthAlgoliaInsightsPartial);
   }
 
+  /// <summary>
+  /// Check if the actual instance is of `Dictionary{string, string}` type.
+  /// </summary>
+  /// <returns>Whether or not the instance is the type</returns>
+  public bool IsDictionaryString()
+  {
+    return ActualInstance.GetType() == typeof(Dictionary<string, string>);
+  }
+
   /// <summary>
   /// Returns the string presentation of the object
   /// </summary>
@@ -357,6 +386,18 @@ public override AuthInputPartial Read(ref Utf8JsonReader reader, Type typeToConv
         System.Diagnostics.Debug.WriteLine($"Failed to deserialize into AuthAlgoliaInsightsPartial: {exception}");
       }
     }
+    if (root.ValueKind == JsonValueKind.Object)
+    {
+      try
+      {
+        return new AuthInputPartial(jsonDocument.Deserialize<Dictionary<string, string>>(JsonConfig.Options));
+      }
+      catch (Exception exception)
+      {
+        // deserialization failed, try the next one
+        System.Diagnostics.Debug.WriteLine($"Failed to deserialize into Dictionary<string, string>: {exception}");
+      }
+    }
     throw new InvalidDataException($"The JSON string cannot be deserialized into any schema defined.");
   }
 

clients/algoliasearch-client-csharp/algoliasearch/Utils/SearchClientExtensions.cs

@@ -344,7 +344,7 @@ public async Task<IEnumerable<Rule>> BrowseRulesAsync(string indexName, SearchRu
       var page = prevResp?.Item2 ?? 0;
       var searchSynonymsResponse = await SearchRulesAsync(indexName, searchRulesParams, requestOptions);
       return new Tuple<SearchRulesResponse, int>(searchSynonymsResponse, page + 1);
-    }, resp => resp?.Item1 is { NbHits: < hitsPerPage }).ConfigureAwait(false);
+    }, resp => resp?.Item1 is { Hits.Count: < hitsPerPage }).ConfigureAwait(false);
 
     return all.SelectMany(u => u.Item1.Hits);
   }
@@ -367,7 +367,7 @@ public async Task<IEnumerable<SynonymHit>> BrowseSynonymsAsync(string indexName,
       var searchSynonymsResponse = await SearchSynonymsAsync(indexName, synonymsParams, requestOptions);
       page = page + 1;
       return new Tuple<SearchSynonymsResponse, int>(searchSynonymsResponse, page);
-    }, resp => resp?.Item1 is { NbHits: < hitsPerPage }).ConfigureAwait(false);
+    }, resp => resp?.Item1 is { Hits.Count: < hitsPerPage }).ConfigureAwait(false);
 
     return all.SelectMany(u => u.Item1.Hits);
   }

clients/algoliasearch-client-go/algolia/ingestion/model_auth_input_partial.go

@@ -6126,6 +6126,10 @@ public GetApiKeyResponse waitForApiKey(String key, ApiKeyOperation operation) {
   public <T> Iterable<T> browseObjects(String indexName, BrowseParamsObject params, Class<T> innerType, RequestOptions requestOptions) {
     final Holder<String> currentCursor = new Holder<>();
 
+    if (params.getHitsPerPage() == null) {
+      params.setHitsPerPage(1000);
+    }
+
     return AlgoliaIterableHelper.createIterable(
       () -> {
         BrowseResponse<T> response = this.browse(indexName, params, innerType, requestOptions);
@@ -6175,7 +6179,7 @@ public Iterable<SynonymHit> browseSynonyms(String indexName, SearchSynonymsParam
     return AlgoliaIterableHelper.createIterable(
       () -> {
         SearchSynonymsResponse response = this.searchSynonyms(indexName, params, requestOptions);
-        currentPage.value = response.getNbHits() < params.getHitsPerPage() ? null : currentPage.value + 1;
+        currentPage.value = response.getHits().size() < params.getHitsPerPage() ? null : currentPage.value + 1;
         return response.getHits().iterator();
       },
       () -> currentPage.value != null
@@ -6217,7 +6221,7 @@ public Iterable<Rule> browseRules(String indexName, SearchRulesParams params, Re
     return AlgoliaIterableHelper.createIterable(
       () -> {
         SearchRulesResponse response = this.searchRules(indexName, params.setPage(currentPage.value), requestOptions);
-        currentPage.value = response.getNbHits() < hitsPerPage ? null : currentPage.value + 1;
+        currentPage.value = response.getHits().size() < hitsPerPage ? null : currentPage.value + 1;
         return response.getHits().iterator();
       },
       () -> currentPage.value != null

clients/algoliasearch-client-go/algolia/search/api_search.go

@@ -6,14 +6,44 @@
 import com.algolia.exceptions.AlgoliaRuntimeException;
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.*;
 import java.io.IOException;
+import java.util.Map;
 import java.util.logging.Logger;
 
 /** AuthInputPartial */
 @JsonDeserialize(using = AuthInputPartial.Deserializer.class)
 public interface AuthInputPartial {
+  // AuthInputPartial as Map<String, String> wrapper.
+  static AuthInputPartial of(Map<String, String> value) {
+    return new MapOfStringStringWrapper(value);
+  }
+
+  // AuthInputPartial as Map<String, String> wrapper.
+  @JsonSerialize(using = MapOfStringStringWrapper.Serializer.class)
+  class MapOfStringStringWrapper implements AuthInputPartial {
+
+    private final Map<String, String> value;
+
+    MapOfStringStringWrapper(Map<String, String> value) {
+      this.value = value;
+    }
+
+    public Map<String, String> getValue() {
+      return value;
+    }
+
+    static class Serializer extends JsonSerializer<MapOfStringStringWrapper> {
+
+      @Override
+      public void serialize(MapOfStringStringWrapper value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+        gen.writeObject(value.getValue());
+      }
+    }
+  }
+
   class Deserializer extends JsonDeserializer<AuthInputPartial> {
 
     private static final Logger LOGGER = Logger.getLogger(Deserializer.class.getName());
@@ -81,6 +111,16 @@ public AuthInputPartial deserialize(JsonParser jp, DeserializationContext ctxt)
           );
         }
       }
+      // deserialize Map<String, String>
+      if (tree.isObject()) {
+        try (JsonParser parser = tree.traverse(jp.getCodec())) {
+          Map<String, String> value = parser.readValueAs(new TypeReference<Map<String, String>>() {});
+          return new AuthInputPartial.MapOfStringStringWrapper(value);
+        } catch (Exception e) {
+          // deserialization failed, continue
+          LOGGER.finest("Failed to deserialize oneOf Map<String, String> (error: " + e.getMessage() + ") (type: Map<String, String>)");
+        }
+      }
       throw new AlgoliaRuntimeException(String.format("Failed to deserialize json element: %s", tree));
     }
 

clients/algoliasearch-client-java/algoliasearch/src/main/java/com/algolia/api/SearchClient.java

@@ -55,7 +55,9 @@
         "import": "./dist/lite/builds/browser.js",
         "default": "./dist/lite/builds/browser.umd.js"
       }
-    }
+    },
+    "./dist/*": "./dist/*.js",
+    "./dist/lite/builds/*": "./dist/lite/builds/*.js"
   },
   "jsdelivr": "./dist/algoliasearch.umd.js",
   "unpkg": "./dist/algoliasearch.umd.js",

clients/algoliasearch-client-java/algoliasearch/src/main/java/com/algolia/model/ingestion/AuthInputPartial.java

@@ -37,7 +37,7 @@
         "default": "./dist/builds/browser.umd.js"
       }
     },
-    "./src/*": "./src/*.ts"
+    "./dist/builds/*": "./dist/builds/*.js"
   },
   "jsdelivr": "./dist/builds/browser.umd.js",
   "unpkg": "./dist/builds/browser.umd.js",

clients/algoliasearch-client-javascript/packages/algoliasearch/package.json

@@ -37,7 +37,7 @@
         "default": "./dist/builds/browser.umd.js"
       }
     },
-    "./src/*": "./src/*.ts"
+    "./dist/builds/*": "./dist/builds/*.js"
   },
   "jsdelivr": "./dist/builds/browser.umd.js",
   "unpkg": "./dist/builds/browser.umd.js",

clients/algoliasearch-client-javascript/packages/client-abtesting/package.json

@@ -37,7 +37,7 @@
         "default": "./dist/builds/browser.umd.js"
       }
     },
-    "./src/*": "./src/*.ts"
+    "./dist/builds/*": "./dist/builds/*.js"
   },
   "jsdelivr": "./dist/builds/browser.umd.js",
   "unpkg": "./dist/builds/browser.umd.js",

clients/algoliasearch-client-javascript/packages/client-analytics/package.json

@@ -37,7 +37,7 @@
         "default": "./dist/builds/browser.umd.js"
       }
     },
-    "./src/*": "./src/*.ts"
+    "./dist/builds/*": "./dist/builds/*.js"
   },
   "jsdelivr": "./dist/builds/browser.umd.js",
   "unpkg": "./dist/builds/browser.umd.js",

clients/algoliasearch-client-javascript/packages/client-insights/package.json

@@ -37,7 +37,7 @@
         "default": "./dist/builds/browser.umd.js"
       }
     },
-    "./src/*": "./src/*.ts"
+    "./dist/builds/*": "./dist/builds/*.js"
   },
   "jsdelivr": "./dist/builds/browser.umd.js",
   "unpkg": "./dist/builds/browser.umd.js",

clients/algoliasearch-client-javascript/packages/client-personalization/package.json

@@ -37,7 +37,7 @@
         "default": "./dist/builds/browser.umd.js"
       }
     },
-    "./src/*": "./src/*.ts"
+    "./dist/builds/*": "./dist/builds/*.js"
   },
   "jsdelivr": "./dist/builds/browser.umd.js",
   "unpkg": "./dist/builds/browser.umd.js",

clients/algoliasearch-client-javascript/packages/client-query-suggestions/package.json

@@ -412,6 +412,7 @@ export function createSearchClient({
               indexName,
               browseParams: {
                 cursor: previousResponse ? previousResponse.cursor : undefined,
+                hitsPerPage: 1000,
                 ...browseParams,
               },
             },
@@ -456,7 +457,7 @@ export function createSearchClient({
             requestOptions,
           );
         },
-        validate: (response) => response.nbHits < params.hitsPerPage,
+        validate: (response) => response.hits.length < params.hitsPerPage,
         ...browseRulesOptions,
       });
     },
@@ -501,7 +502,7 @@ export function createSearchClient({
           params.page += 1;
           return resp;
         },
-        validate: (response) => response.nbHits < params.hitsPerPage,
+        validate: (response) => response.hits.length < params.hitsPerPage,
         ...browseSynonymsOptions,
       });
     },

clients/algoliasearch-client-javascript/packages/client-search/package.json

@@ -13,4 +13,5 @@ export type AuthInputPartial =
   | AuthAPIKeyPartial
   | AuthOAuthPartial
   | AuthAlgoliaPartial
-  | AuthAlgoliaInsightsPartial;
+  | AuthAlgoliaInsightsPartial
+  | { [key: string]: string };

clients/algoliasearch-client-javascript/packages/client-search/src/searchClient.ts

@@ -37,7 +37,7 @@
         "default": "./dist/builds/browser.umd.js"
       }
     },
-    "./src/*": "./src/*.ts"
+    "./dist/builds/*": "./dist/builds/*.js"
   },
   "jsdelivr": "./dist/builds/browser.umd.js",
   "unpkg": "./dist/builds/browser.umd.js",

clients/algoliasearch-client-javascript/packages/ingestion/model/authInputPartial.ts

@@ -37,7 +37,7 @@
         "default": "./dist/builds/browser.umd.js"
       }
     },
-    "./src/*": "./src/*.ts"
+    "./dist/builds/*": "./dist/builds/*.js"
   },
   "jsdelivr": "./dist/builds/browser.umd.js",
   "unpkg": "./dist/builds/browser.umd.js",

clients/algoliasearch-client-javascript/packages/ingestion/package.json

@@ -37,7 +37,7 @@
         "default": "./dist/builds/browser.umd.js"
       }
     },
-    "./src/*": "./src/*.ts"
+    "./dist/builds/*": "./dist/builds/*.js"
   },
   "jsdelivr": "./dist/builds/browser.umd.js",
   "unpkg": "./dist/builds/browser.umd.js",