Skip to content

Commit 6204a82

Browse files
StriftStrift
committed
Run spotless
1 parent 0efed6e commit 6204a82

4 files changed

Lines changed: 62 additions & 95 deletions

File tree

‎src/main/java/com/meilisearch/sdk/Index.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,8 @@ public Map<String, Embedders> getEmbeddersSettings() throws MeilisearchException
12711271
* @see <a href="https://www.meilisearch.com/docs/reference/api/settings#update-embedders">API
12721272
* specification</a>
12731273
*/
1274-
public TaskInfo updateEmbeddersSettings(Map<String, Embedders> embedders) throws MeilisearchException {
1274+
public TaskInfo updateEmbeddersSettings(Map<String, Embedders> embedders)
1275+
throws MeilisearchException {
12751276
return this.settingsHandler.updateEmbedders(this.uid, embedders);
12761277
}
12771278

‎src/main/java/com/meilisearch/sdk/SettingsHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,8 @@ Map<String, Embedders> getEmbedders(String uid) throws MeilisearchException {
794794
* @return TaskInfo instance
795795
* @throws MeilisearchException if an error occurs
796796
*/
797-
TaskInfo updateEmbedders(String uid, Map<String, Embedders> embedders) throws MeilisearchException {
797+
TaskInfo updateEmbedders(String uid, Map<String, Embedders> embedders)
798+
throws MeilisearchException {
798799
return httpClient.patch(
799800
settingsPath(uid).addSubroute("embedders").getURL(),
800801
embedders == null ? httpClient.jsonHandler.encode(embedders) : embedders,

‎src/main/java/com/meilisearch/sdk/model/Embedders.java‎

Lines changed: 21 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.meilisearch.sdk.model;
22

3+
import com.fasterxml.jackson.annotation.JsonInclude;
4+
import java.util.Map;
35
import lombok.*;
46
import lombok.experimental.Accessors;
5-
import java.util.Map;
6-
import com.fasterxml.jackson.annotation.JsonInclude;
77

88
@Builder
99
@AllArgsConstructor(access = AccessLevel.PACKAGE)
@@ -12,100 +12,61 @@
1212
@Accessors(chain = true)
1313
@JsonInclude(JsonInclude.Include.NON_NULL)
1414
public class Embedders {
15-
/**
16-
* Source of the embedder.
17-
* Accepts: ollama, rest, openAI, huggingFace and userProvided
18-
*/
15+
/** Source of the embedder. Accepts: ollama, rest, openAI, huggingFace and userProvided */
1916
protected EmbedderSource source;
2017

2118
/**
22-
* API key for authentication with the embedder service.
23-
* Optional: Only applicable for openAi, ollama, and rest sources.
19+
* API key for authentication with the embedder service. Optional: Only applicable for openAi,
20+
* ollama, and rest sources.
2421
*/
2522
protected String apiKey;
2623

2724
/**
28-
* Model to use for generating embeddings.
29-
* Optional: Only applicable for ollama, openAI, and huggingFace sources.
25+
* Model to use for generating embeddings. Optional: Only applicable for ollama, openAI, and
26+
* huggingFace sources.
3027
*/
3128
protected String model;
3229

33-
/**
34-
* Template for document embedding.
35-
* Optional.
36-
*/
30+
/** Template for document embedding. Optional. */
3731
protected String documentTemplate;
3832

3933
/**
40-
* Dimensions of the embedding vectors.
41-
* Optional: Only applicable for openAi, huggingFace, ollama, and rest sources.
34+
* Dimensions of the embedding vectors. Optional: Only applicable for openAi, huggingFace,
35+
* ollama, and rest sources.
4236
*/
4337
protected Integer dimensions;
4438

45-
/**
46-
* Distribution configuration.
47-
* Optional.
48-
*/
39+
/** Distribution configuration. Optional. */
4940
protected String distribution;
5041

51-
/**
52-
* Request configuration.
53-
* Mandatory only when using rest embedder, optional otherwise.
54-
*/
42+
/** Request configuration. Mandatory only when using rest embedder, optional otherwise. */
5543
protected Map<String, Object> request;
5644

57-
/**
58-
* Response configuration.
59-
* Mandatory only when using rest embedder, optional otherwise.
60-
*/
45+
/** Response configuration. Mandatory only when using rest embedder, optional otherwise. */
6146
protected Map<String, Object> response;
6247

63-
/**
64-
* Maximum bytes for document template.
65-
* Optional.
66-
*/
48+
/** Maximum bytes for document template. Optional. */
6749
protected Integer documentTemplateMaxBytes;
6850

69-
/**
70-
* Revision identifier.
71-
* Optional: Only applicable for huggingFace.
72-
*/
51+
/** Revision identifier. Optional: Only applicable for huggingFace. */
7352
protected String revision;
7453

75-
/**
76-
* HTTP headers.
77-
* Optional: Only applicable for rest.
78-
*/
54+
/** HTTP headers. Optional: Only applicable for rest. */
7955
protected Map<String, String> headers;
8056

81-
/**
82-
* Whether to use binary quantization.
83-
* Optional.
84-
*/
57+
/** Whether to use binary quantization. Optional. */
8558
protected Boolean binaryQuantized;
8659

87-
/**
88-
* URL for the embedder service.
89-
* Optional.
90-
*/
60+
/** URL for the embedder service. Optional. */
9161
protected String url;
9262

93-
/**
94-
* Input fields for the embedder.
95-
* Optional.
96-
*/
63+
/** Input fields for the embedder. Optional. */
9764
protected String[] inputField;
9865

99-
/**
100-
* Type of input for the embedder.
101-
* Optional.
102-
*/
66+
/** Type of input for the embedder. Optional. */
10367
protected EmbedderInputType inputType;
10468

105-
/**
106-
* Query for the embedder.
107-
* Optional.
108-
*/
69+
/** Query for the embedder. Optional. */
10970
protected String query;
11071

11172
public Embedders() {}

‎src/test/java/com/meilisearch/integration/SettingsTest.java‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import com.meilisearch.integration.classes.AbstractIT;
1717
import com.meilisearch.integration.classes.TestData;
1818
import com.meilisearch.sdk.Index;
19-
import com.meilisearch.sdk.model.Embedders;
2019
import com.meilisearch.sdk.model.EmbedderSource;
20+
import com.meilisearch.sdk.model.Embedders;
2121
import com.meilisearch.sdk.model.FacetSortValue;
2222
import com.meilisearch.sdk.model.Faceting;
2323
import com.meilisearch.sdk.model.LocalizedAttribute;
@@ -1488,21 +1488,23 @@ public void testUpdateEmbeddersSettings() throws Exception {
14881488
HashMap<String, Embedders> newEmbedders = new HashMap<>();
14891489

14901490
// Test OpenAI embedder with apiKey and model
1491-
Embedders openAiEmbedder = new Embedders()
1492-
.setSource(EmbedderSource.OPEN_AI)
1493-
.setApiKey("test-api-key")
1494-
.setModel("text-embedding-ada-002")
1495-
.setDimensions(1536)
1496-
.setDocumentTemplate("OpenAI document: {{document}}")
1497-
.setDocumentTemplateMaxBytes(8000)
1498-
.setBinaryQuantized(true);
1491+
Embedders openAiEmbedder =
1492+
new Embedders()
1493+
.setSource(EmbedderSource.OPEN_AI)
1494+
.setApiKey("test-api-key")
1495+
.setModel("text-embedding-ada-002")
1496+
.setDimensions(1536)
1497+
.setDocumentTemplate("OpenAI document: {{document}}")
1498+
.setDocumentTemplateMaxBytes(8000)
1499+
.setBinaryQuantized(true);
14991500

15001501
// Test HuggingFace embedder with model and revision
1501-
Embedders huggingFaceEmbedder = new Embedders()
1502-
.setSource(EmbedderSource.HUGGING_FACE)
1503-
.setModel("sentence-transformers/all-MiniLM-L6-v2")
1504-
.setRevision("main")
1505-
.setDistribution("uniform");
1502+
Embedders huggingFaceEmbedder =
1503+
new Embedders()
1504+
.setSource(EmbedderSource.HUGGING_FACE)
1505+
.setModel("sentence-transformers/all-MiniLM-L6-v2")
1506+
.setRevision("main")
1507+
.setDistribution("uniform");
15061508

15071509
// Test REST embedder with request and response
15081510
Map<String, Object> request = new HashMap<>();
@@ -1515,25 +1517,26 @@ public void testUpdateEmbeddersSettings() throws Exception {
15151517
Map<String, String> headers = new HashMap<>();
15161518
headers.put("Authorization", "Bearer test-token");
15171519

1518-
Embedders restEmbedder = new Embedders()
1519-
.setSource(EmbedderSource.REST)
1520-
.setApiKey("test-rest-key")
1521-
.setRequest(request)
1522-
.setResponse(response)
1523-
.setHeaders(headers)
1524-
.setDimensions(384);
1520+
Embedders restEmbedder =
1521+
new Embedders()
1522+
.setSource(EmbedderSource.REST)
1523+
.setApiKey("test-rest-key")
1524+
.setRequest(request)
1525+
.setResponse(response)
1526+
.setHeaders(headers)
1527+
.setDimensions(384);
15251528

15261529
// Test Ollama embedder
1527-
Embedders ollamaEmbedder = new Embedders()
1528-
.setSource(EmbedderSource.OLLAMA)
1529-
.setModel("llama2")
1530-
.setApiKey("test-ollama-key")
1531-
.setDimensions(4096);
1530+
Embedders ollamaEmbedder =
1531+
new Embedders()
1532+
.setSource(EmbedderSource.OLLAMA)
1533+
.setModel("llama2")
1534+
.setApiKey("test-ollama-key")
1535+
.setDimensions(4096);
15321536

15331537
// Test UserProvided embedder
1534-
Embedders userProvidedEmbedder = new Embedders()
1535-
.setSource(EmbedderSource.USER_PROVIDED)
1536-
.setDimensions(768);
1538+
Embedders userProvidedEmbedder =
1539+
new Embedders().setSource(EmbedderSource.USER_PROVIDED).setDimensions(768);
15371540

15381541
// Add all embedders to the map
15391542
newEmbedders.put("openai", openAiEmbedder);
@@ -1555,7 +1558,9 @@ public void testUpdateEmbeddersSettings() throws Exception {
15551558
assertThat(retrievedOpenAi.getApiKey(), is(equalTo("test-api-key")));
15561559
assertThat(retrievedOpenAi.getModel(), is(equalTo("text-embedding-ada-002")));
15571560
assertThat(retrievedOpenAi.getDimensions(), is(equalTo(1536)));
1558-
assertThat(retrievedOpenAi.getDocumentTemplate(), is(equalTo("OpenAI document: {{document}}")));
1561+
assertThat(
1562+
retrievedOpenAi.getDocumentTemplate(),
1563+
is(equalTo("OpenAI document: {{document}}")));
15591564
assertThat(retrievedOpenAi.getDocumentTemplateMaxBytes(), is(equalTo(8000)));
15601565
assertThat(retrievedOpenAi.getBinaryQuantized(), is(equalTo(true)));
15611566

@@ -1596,9 +1601,8 @@ public void testResetEmbeddersSettings() throws Exception {
15961601

15971602
// Create new embedders settings
15981603
HashMap<String, Embedders> newEmbedders = new HashMap<>();
1599-
Embedders embedder = new Embedders()
1600-
.setSource(EmbedderSource.USER_PROVIDED)
1601-
.setDimensions(768);
1604+
Embedders embedder =
1605+
new Embedders().setSource(EmbedderSource.USER_PROVIDED).setDimensions(768);
16021606
newEmbedders.put("test", embedder);
16031607

16041608
// Update settings

0 commit comments

Comments
 (0)