Skip to content

chore: delete all mentions of vectorizeClassName #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bevzzz wants to merge 1 commit into from
Closed

chore: delete all mentions of vectorizeClassName #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 69 additions & 67 deletions src/test/java/io/weaviate/client/v1/schema/model/WeaviateClassTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,79 @@
package io.weaviate.client.v1.schema.model;

import com.google.gson.GsonBuilder;
import io.weaviate.client.v1.misc.model.BQConfig;
import io.weaviate.client.v1.misc.model.VectorIndexConfig;
import java.util.HashMap;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.InstanceOfAssertFactories.MAP;

import java.util.HashMap;
import java.util.Map;

import org.junit.Test;

import com.google.gson.GsonBuilder;

import io.weaviate.client.v1.misc.model.BQConfig;
import io.weaviate.client.v1.misc.model.VectorIndexConfig;

public class WeaviateClassTest {

@Test
public void shouldReturnModuleConfigSetWithLowerCase() {
WeaviateClass clazz = WeaviateClass.builder()
.moduleConfig(createContextionaryModuleConfig())
.build();
.moduleConfig(createContextionaryModuleConfig())
.build();

Object moduleConfig = clazz.getModuleConfig();

assertThat(moduleConfig)
.asInstanceOf(MAP)
.containsOnlyKeys("text2vec-contextionary");
.asInstanceOf(MAP)
.containsOnlyKeys("text2vec-contextionary");
}

@Test
public void shouldReturnModuleConfigSetWithUpperCase() {
WeaviateClass clazz = WeaviateClass.builder()
.ModuleConfig(createContextionaryModuleConfig())
.build();
.ModuleConfig(createContextionaryModuleConfig())
.build();

Object moduleConfig = clazz.getModuleConfig();

assertThat(moduleConfig)
.asInstanceOf(MAP)
.containsOnlyKeys("text2vec-contextionary");
.asInstanceOf(MAP)
.containsOnlyKeys("text2vec-contextionary");
}

@Test
public void shouldSerializeClass() {
WeaviateClass clazz = WeaviateClass.builder()
.moduleConfig(createContextionaryModuleConfig())
.className("Band")
.description("Band that plays and produces music")
.vectorIndexType("hnsw")
.vectorizer("text2vec-contextionary")
.build();
.moduleConfig(createContextionaryModuleConfig())
.className("Band")
.description("Band that plays and produces music")
.vectorIndexType("hnsw")
.vectorizer("text2vec-contextionary")
.build();

String result = new GsonBuilder().create().toJson(clazz);

assertThat(result).isEqualTo("{\"class\":\"Band\",\"description\":\"Band that plays and produces music\"," +
"\"moduleConfig\":{\"text2vec-contextionary\":{\"vectorizeClassName\":false}},\"vectorIndexType\":\"hnsw\"," +
"\"vectorizer\":\"text2vec-contextionary\"}");
"\"moduleConfig\":{\"text2vec-contextionary\":{\"vectorIndexType\":\"hnsw\"," +
"\"vectorizer\":\"text2vec-contextionary\"}");
}


@Test
public void shouldSerializeClassWithFlatIndexType() {
WeaviateClass clazz = WeaviateClass.builder()
.moduleConfig(createContextionaryModuleConfig())
.className("Band")
.description("Band that plays and produces music")
.vectorIndexType("flat")
.vectorIndexConfig(createBqIndexConfig())
.vectorizer("text2vec-contextionary")
.build();
.moduleConfig(createContextionaryModuleConfig())
.className("Band")
.description("Band that plays and produces music")
.vectorIndexType("flat")
.vectorIndexConfig(createBqIndexConfig())
.vectorizer("text2vec-contextionary")
.build();

String result = new GsonBuilder().create().toJson(clazz);

assertThat(result).isEqualTo("{\"class\":\"Band\",\"description\":\"Band that plays and produces music\"," +
"\"moduleConfig\":{\"text2vec-contextionary\":{\"vectorizeClassName\":false}}," +
"\"vectorIndexConfig\":{\"bq\":{\"enabled\":true,\"rescoreLimit\":100}},\"vectorIndexType\":\"flat\"," +
"\"vectorizer\":\"text2vec-contextionary\"}");
"\"moduleConfig\":{\"text2vec-contextionary\":{\"vectorIndexConfig\":{\"bq\":{\"enabled\":true,\"rescoreLimit\":100}},"
+ "\"vectorIndexType\":\"flat\",\"vectorizer\":\"text2vec-contextionary\"}");
}

@Test
Expand All @@ -80,51 +82,51 @@ public void shouldSerializeClassWithVectorConfig() {
contextionaryVectorizer.put("text2vec-contextionary", "some-setting");

WeaviateClass.VectorConfig hnswVectorConfig = WeaviateClass.VectorConfig.builder()
.vectorIndexType("hnsw")
.vectorizer(contextionaryVectorizer)
.build();
.vectorIndexType("hnsw")
.vectorizer(contextionaryVectorizer)
.build();
WeaviateClass.VectorConfig flatVectorConfig = WeaviateClass.VectorConfig.builder()
.vectorIndexType("flat")
.vectorizer(contextionaryVectorizer)
.vectorIndexConfig(createBqIndexConfig())
.build();
.vectorIndexType("flat")
.vectorizer(contextionaryVectorizer)
.vectorIndexConfig(createBqIndexConfig())
.build();

Map<String, WeaviateClass.VectorConfig> vectorConfig = new HashMap<>();
vectorConfig.put("flatVector", flatVectorConfig);
vectorConfig.put("hnswVector", hnswVectorConfig);

WeaviateClass clazz = WeaviateClass.builder()
.moduleConfig(createContextionaryModuleConfig())
.className("Band")
.description("Band that plays and produces music")
.vectorConfig(vectorConfig)
.build();
.moduleConfig(createContextionaryModuleConfig())
.className("Band")
.description("Band that plays and produces music")
.vectorConfig(vectorConfig)
.build();

String result = new GsonBuilder().create().toJson(clazz);

assertThat(result).satisfiesAnyOf(
serialized -> assertThat(serialized).isEqualTo("{\"class\":\"Band\"," +
"\"description\":\"Band that plays and produces music\"," +
"\"moduleConfig\":{\"text2vec-contextionary\":{\"vectorizeClassName\":false}}," +
"\"vectorConfig\":{" +
"\"hnswVector\":{\"vectorIndexType\":\"hnsw\",\"vectorizer\":{\"text2vec-contextionary\":\"some-setting\"}}," +
"\"flatVector\":{\"vectorIndexConfig\":{\"bq\":{\"enabled\":true,\"rescoreLimit\":100}},\"vectorIndexType\":\"flat\"," +
"\"vectorizer\":{\"text2vec-contextionary\":\"some-setting\"}}" +
"}}"),
serialized -> assertThat(serialized).isEqualTo("{\"class\":\"Band\"," +
"\"description\":\"Band that plays and produces music\"," +
"\"moduleConfig\":{\"text2vec-contextionary\":{\"vectorizeClassName\":false}}," +
"\"vectorConfig\":{" +
"\"flatVector\":{\"vectorIndexConfig\":{\"bq\":{\"enabled\":true,\"rescoreLimit\":100}},\"vectorIndexType\":\"flat\"," +
"\"vectorizer\":{\"text2vec-contextionary\":\"some-setting\"}}" +
"\"hnswVector\":{\"vectorIndexType\":\"hnsw\",\"vectorizer\":{\"text2vec-contextionary\":\"some-setting\"}}," +
"}}")
);
serialized -> assertThat(serialized).isEqualTo("{\"class\":\"Band\"," +
"\"description\":\"Band that plays and produces music\"," +
"\"moduleConfig\":{\"text2vec-contextionary\":{\"vectorConfig\":{" +
"\"hnswVector\":{\"vectorIndexType\":\"hnsw\",\"vectorizer\":{\"text2vec-contextionary\":\"some-setting\"}},"
+
"\"flatVector\":{\"vectorIndexConfig\":{\"bq\":{\"enabled\":true,\"rescoreLimit\":100}},\"vectorIndexType\":\"flat\","
+
"\"vectorizer\":{\"text2vec-contextionary\":\"some-setting\"}}" +
"}}"),
serialized -> assertThat(serialized).isEqualTo("{\"class\":\"Band\"," +
"\"description\":\"Band that plays and produces music\"," +
"\"moduleConfig\":{\"text2vec-contextionary\":{\"vectorConfig\":{" +
"\"flatVector\":{\"vectorIndexConfig\":{\"bq\":{\"enabled\":true,\"rescoreLimit\":100}},\"vectorIndexType\":\"flat\","
+
"\"vectorizer\":{\"text2vec-contextionary\":\"some-setting\"}}" +
"\"hnswVector\":{\"vectorIndexType\":\"hnsw\",\"vectorizer\":{\"text2vec-contextionary\":\"some-setting\"}},"
+
"}}"));
}

private Object createContextionaryModuleConfig() {
Map<String, Object> text2vecContextionary = new HashMap<>();
text2vecContextionary.put("vectorizeClassName", false);

Map<String, Object> moduleConfig = new HashMap<>();
moduleConfig.put("text2vec-contextionary", text2vecContextionary);
Expand All @@ -134,10 +136,10 @@ private Object createContextionaryModuleConfig() {

private VectorIndexConfig createBqIndexConfig() {
return VectorIndexConfig.builder()
.bq(BQConfig.builder()
.enabled(true)
.rescoreLimit(100L)
.build())
.build();
.bq(BQConfig.builder()
.enabled(true)
.rescoreLimit(100L)
.build())
.build();
}
}
Loading
Loading