Add missing model

metaloom · Feb 7, 2023 · 0e353e6 · 0e353e6
1 parent 6303552
commit 0e353e6
Show file tree

Hide file tree

Showing 10 changed files with 75 additions and 10 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Johannes Schüth
+   Copyright 2023 Johannes Schüth
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/common/pom.xml b/common/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>io.metaloom.qdrant</groupId>
 		<artifactId>qdrant-java-client</artifactId>
-		<version>0.9.1-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 	</parent>
 
 	<name>Qdrant Java Client :: common</name>

diff --git a/grpc/pom.xml b/grpc/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>io.metaloom.qdrant</groupId>
 		<artifactId>qdrant-java-client</artifactId>
-		<version>0.9.1-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 	</parent>
 
 	<name>Qdrant Java Client :: grpc</name>

diff --git a/http/pom.xml b/http/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>io.metaloom.qdrant</groupId>
 		<artifactId>qdrant-java-client</artifactId>
-		<version>0.9.1-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 	</parent>
 
 	<name>Qdrant Java Client :: http</name>

diff --git a/http/src/main/java/io/metaloom/qdrant/client/http/model/collection/CollectionInfo.java b/http/src/main/java/io/metaloom/qdrant/client/http/model/collection/CollectionInfo.java
@@ -1,5 +1,7 @@
 package io.metaloom.qdrant.client.http.model.collection;
 
+import java.util.Map;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import io.metaloom.qdrant.client.http.model.RestModel;
@@ -28,7 +30,7 @@ public class CollectionInfo implements RestModel {
 	private CollectionConfig config;
 
 	@JsonProperty("payload_schema")
-	private PayloadIndexInfo payloadSchema;
+	private Map<String, PayloadIndexInfo> payloadSchema;
 
 	public CollectionStatus getStatus() {
 		return status;
@@ -75,11 +77,11 @@ public CollectionInfo setConfig(CollectionConfig config) {
 		return this;
 	}
 
-	public PayloadIndexInfo getPayloadSchema() {
+	public Map<String, PayloadIndexInfo> getPayloadSchema() {
 		return payloadSchema;
 	}
 
-	public CollectionInfo setPayloadSchema(PayloadIndexInfo payloadSchema) {
+	public CollectionInfo setPayloadSchema(Map<String, PayloadIndexInfo> payloadSchema) {
 		this.payloadSchema = payloadSchema;
 		return this;
 	}

diff --git a/http/src/main/java/io/metaloom/qdrant/client/http/model/collection/PayloadIndexInfo.java b/http/src/main/java/io/metaloom/qdrant/client/http/model/collection/PayloadIndexInfo.java
@@ -1,7 +1,42 @@
 package io.metaloom.qdrant.client.http.model.collection;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import io.metaloom.qdrant.client.http.model.RestModel;
 
 public class PayloadIndexInfo implements RestModel {
 
+	@JsonProperty("data_type")
+	private PayloadSchemaType dataType;
+
+	private PayloadSchemaParams params;
+
+	private int points;
+
+	public PayloadSchemaType getDataType() {
+		return dataType;
+	}
+
+	public PayloadIndexInfo setDataType(PayloadSchemaType dataType) {
+		this.dataType = dataType;
+		return this;
+	}
+
+	public PayloadSchemaParams getParams() {
+		return params;
+	}
+
+	public PayloadIndexInfo setParams(PayloadSchemaParams params) {
+		this.params = params;
+		return this;
+	}
+
+	public int getPoints() {
+		return points;
+	}
+
+	public PayloadIndexInfo setPoints(int points) {
+		this.points = points;
+		return this;
+	}
 }
diff --git a/http/src/main/java/io/metaloom/qdrant/client/http/model/collection/PayloadSchemaParams.java b/http/src/main/java/io/metaloom/qdrant/client/http/model/collection/PayloadSchemaParams.java
@@ -0,0 +1,28 @@
+package io.metaloom.qdrant.client.http.model.collection;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum PayloadSchemaParams {
+
+	KEYWORD("keyword"),
+
+	INTEGER("integer"),
+
+	FLOAT("float"),
+
+	GEO("geo"),
+
+	TEXT("text");
+
+	String name;
+
+	private PayloadSchemaParams(String name) {
+		this.name = name;
+	}
+
+	@JsonValue
+	public String getName() {
+		return name;
+	}
+
+}
diff --git a/http/src/main/java/io/metaloom/qdrant/client/json/Json.java b/http/src/main/java/io/metaloom/qdrant/client/json/Json.java
@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
@@ -50,6 +49,7 @@ public final class Json {
 	static {
 		mapper = new ObjectMapper()
 			.setSerializationInclusion(Include.NON_NULL);
+			//.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
 
 		SimpleModule module = new SimpleModule();
 		module.addDeserializer(NamedVector.class, new NamedVectorDeserializer());

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.metaloom.qdrant</groupId>
 	<artifactId>qdrant-java-client</artifactId>
-	<version>0.9.1-SNAPSHOT</version>
+	<version>0.10.0-SNAPSHOT</version>
 
 	<parent>
 		<groupId>io.metaloom</groupId>

diff --git a/report/pom.xml b/report/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>io.metaloom.qdrant</groupId>
 		<artifactId>qdrant-java-client</artifactId>
-		<version>0.9.1-SNAPSHOT</version>
+		<version>0.10.0-SNAPSHOT</version>
 	</parent>
 
 	<name>Qdrant Java Client :: report</name>