Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

public record Text2VecMorphVectorizer(
@SerializedName("baseURL") String baseUrl,
@SerializedName("endpoint") String endpoint,
@SerializedName("model") String model,

/** Properties included in the embedding. */
Expand Down Expand Up @@ -44,6 +45,7 @@ public static Text2VecMorphVectorizer of(
public Text2VecMorphVectorizer(Builder builder) {
this(
builder.baseUrl,
builder.endpoint,
builder.model,
builder.sourceProperties,
builder.vectorIndex,
Expand All @@ -56,13 +58,20 @@ public static class Builder implements ObjectBuilder<Text2VecMorphVectorizer> {
private VectorIndex vectorIndex = VectorIndex.DEFAULT_VECTOR_INDEX;

private String baseUrl;
private String endpoint;
private String model;

public Builder baseUrl(String baseUrl) {
this.baseUrl = baseUrl;
return this;
}

/** Defaults to {@code /v1/embeddings} on the server. */
public Builder endpoint(String endpoint) {
this.endpoint = endpoint;
return this;
}

public Builder model(String model) {
this.model = model;
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

public record Text2VecOpenAiVectorizer(
@SerializedName("baseURL") String baseUrl,
@SerializedName("endpoint") String endpoint,
@SerializedName("model") String model,
@SerializedName("modelVersion") String modelVersion,
@SerializedName("dimensions") Integer dimensions,
Expand Down Expand Up @@ -66,6 +67,7 @@ public static Text2VecOpenAiVectorizer of(
*/
public Text2VecOpenAiVectorizer(
String baseUrl,
String endpoint,
String model,
String modelVersion,
Integer dimensions,
Expand All @@ -76,6 +78,7 @@ public Text2VecOpenAiVectorizer(
VectorIndex vectorIndex,
Quantization quantization) {
this.baseUrl = baseUrl;
this.endpoint = endpoint;
this.model = model;
this.modelVersion = modelVersion;
this.dimensions = dimensions;
Expand All @@ -90,6 +93,7 @@ public Text2VecOpenAiVectorizer(
public Text2VecOpenAiVectorizer(Builder builder) {
this(
builder.baseUrl,
builder.endpoint,
builder.model,
builder.modelVersion,
builder.dimensions,
Expand All @@ -108,6 +112,7 @@ public static class Builder implements ObjectBuilder<Text2VecOpenAiVectorizer> {
private VectorIndex vectorIndex = VectorIndex.DEFAULT_VECTOR_INDEX;

private String baseUrl;
private String endpoint;
private String model;
private String modelVersion;
private Integer dimensions;
Expand All @@ -118,6 +123,12 @@ public Builder baseUrl(String baseUrl) {
return this;
}

/** Defaults to {@code /v1/embeddings} on the server. */
public Builder endpoint(String endpoint) {
this.endpoint = endpoint;
return this;
}

public Builder model(String model) {
this.model = model;
return this;
Expand Down
21 changes: 15 additions & 6 deletions src/test/java/io/weaviate/client6/v1/internal/json/JSONTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecAwsVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecCohereVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecDatabricksVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecDigitalOceanVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecGoogleVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecHuggingFaceVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecJinaAiVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecDigitalOceanVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecMistralVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecModel2VecVectorizer;
import io.weaviate.client6.v1.api.collections.vectorizers.Text2VecMorphVectorizer;
Expand All @@ -68,10 +68,10 @@
import io.weaviate.client6.v1.api.rbac.AliasesPermission;
import io.weaviate.client6.v1.api.rbac.BackupsPermission;
import io.weaviate.client6.v1.api.rbac.ClusterPermission;
import io.weaviate.client6.v1.api.rbac.McpPermission;
import io.weaviate.client6.v1.api.rbac.CollectionsPermission;
import io.weaviate.client6.v1.api.rbac.DataPermission;
import io.weaviate.client6.v1.api.rbac.GroupsPermission;
import io.weaviate.client6.v1.api.rbac.McpPermission;
import io.weaviate.client6.v1.api.rbac.NodesPermission;
import io.weaviate.client6.v1.api.rbac.ReplicatePermission;
import io.weaviate.client6.v1.api.rbac.Role;
Expand Down Expand Up @@ -367,7 +367,8 @@ public static Object[][] testCases() {
},
{
VectorConfig.class,
Text2VecDigitalOceanVectorizer.of(v -> v.model("qwen3-embedding-0.6b").baseUrl("https://inference.do-ai.run").sourceProperties("a")),
Text2VecDigitalOceanVectorizer
.of(v -> v.model("qwen3-embedding-0.6b").baseUrl("https://inference.do-ai.run").sourceProperties("a")),
"""
{
"vectorIndexType": "hnsw",
Expand Down Expand Up @@ -429,14 +430,18 @@ public static Object[][] testCases() {
},
{
VectorConfig.class,
Text2VecMorphVectorizer.of(v -> v.sourceProperties("a")),
Text2VecMorphVectorizer.of(
v -> v
.sourceProperties("a")
.endpoint("/v0/example")),
"""
{
"vectorIndexType": "hnsw",
"vectorIndexConfig": {},
"vectorizer": {
"text2vec-morph": {
"properties": ["a"]
"properties": ["a"],
"endpoint": "/v0/example"
}
}
}
Expand Down Expand Up @@ -507,13 +512,17 @@ public static Object[][] testCases() {
{
VectorConfig.class,
Text2VecOpenAiVectorizer
.of(v -> v.sourceProperties("a").model(Text2VecOpenAiVectorizer.TEXT_EMBEDDING_3_LARGE)),
.of(v -> v
.endpoint("/v0/example")
.sourceProperties("a")
.model(Text2VecOpenAiVectorizer.TEXT_EMBEDDING_3_LARGE)),
"""
{
"vectorIndexType": "hnsw",
"vectorIndexConfig": {},
"vectorizer": {
"text2vec-openai": {
"endpoint": "/v0/example",
"model": "text-embedding-3-large",
"properties": ["a"],
"vectorizeClassName": false
Expand Down
Loading