diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/Descriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/Descriptor.kt index 21276392..73a953cb 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/Descriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/Descriptor.kt @@ -18,16 +18,15 @@ typealias DescriptorId = UUID */ interface Descriptor : Persistable { /** The [DescriptorId] held by this [Descriptor]. */ - val id: DescriptorId + var id: DescriptorId /** The [RetrievableId] of the [Retrievable] that is being described by this [Descriptor]. */ - val retrievableId: RetrievableId? + var retrievableId: RetrievableId? /** The [Schema.Field] backing this [Descriptor]. */ val field: Schema.Field<*, out Descriptor>? - - /** */ + /** Flag indicating whether this [Descriptor] is persistent or not. */ override val transient: Boolean get() = this.field != null diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/BooleanDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/BooleanDescriptor.kt index e0da1bca..e1334a2a 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/BooleanDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/BooleanDescriptor.kt @@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value */ data class BooleanDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, override val value: Value.Boolean, override val field: Schema.Field<*, BooleanDescriptor>? = null ) : ScalarDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/DoubleDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/DoubleDescriptor.kt index c727a402..8cb8e234 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/DoubleDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/DoubleDescriptor.kt @@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value */ data class DoubleDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, override val value: Value.Double, override val field: Schema.Field<*, DoubleDescriptor>? = null ) : ScalarDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/FloatDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/FloatDescriptor.kt index 58988a27..f0f0bf7f 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/FloatDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/FloatDescriptor.kt @@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value */ data class FloatDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, override val value: Value.Float, override val field: Schema.Field<*, FloatDescriptor>? = null ) : ScalarDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/IntDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/IntDescriptor.kt index 2f7d924d..cbfb3ba8 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/IntDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/IntDescriptor.kt @@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value */ data class IntDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, override val value: Value.Int, override val field: Schema.Field<*, IntDescriptor>? = null ) : ScalarDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/LongDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/LongDescriptor.kt index 45fc98b9..a9a56df2 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/LongDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/LongDescriptor.kt @@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value */ data class LongDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, override val value: Value.Long, override val field: Schema.Field<*, LongDescriptor>? = null ) : ScalarDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/StringDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/StringDescriptor.kt index 5567053a..e6615886 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/StringDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/scalar/StringDescriptor.kt @@ -15,8 +15,8 @@ import org.vitrivr.engine.core.model.types.Value */ data class StringDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId?, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, override val value: Value.String, override val field: Schema.Field<*, StringDescriptor>? = null ) : ScalarDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/LabelDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/LabelDescriptor.kt index 42105200..125b5c6b 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/LabelDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/LabelDescriptor.kt @@ -14,8 +14,8 @@ import org.vitrivr.engine.core.model.types.Value * @version 1.0.0 */ data class LabelDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId?, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, val label: Value.String, val confidence: Value.Float, override val field: Schema.Field<*, LabelDescriptor>? = null diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/RasterDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/RasterDescriptor.kt index 0caea991..72b89c5a 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/RasterDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/RasterDescriptor.kt @@ -8,8 +8,8 @@ import org.vitrivr.engine.core.model.types.Type import org.vitrivr.engine.core.model.types.Value data class RasterDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, val hist: List, val raster: List, override val field: Schema.Field<*, RasterDescriptor>? = null diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/SkeletonDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/SkeletonDescriptor.kt index d7b5ad81..8d3ec7d9 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/SkeletonDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/SkeletonDescriptor.kt @@ -8,8 +8,8 @@ import org.vitrivr.engine.core.model.types.Type import org.vitrivr.engine.core.model.types.Value data class SkeletonDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, val person: Value.Int, val skeleton: List, val weights: List, diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/MediaDimensionsDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/MediaDimensionsDescriptor.kt index e6bac000..de28fa22 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/MediaDimensionsDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/MediaDimensionsDescriptor.kt @@ -17,8 +17,8 @@ import java.util.* * @version 1.0.0 */ data class MediaDimensionsDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, val width: Value.Int, val height: Value.Int, override val field: Schema.Field<*, MediaDimensionsDescriptor>? = null diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/Rectangle2DMetadataDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/Rectangle2DMetadataDescriptor.kt index 59847c82..70c4fa32 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/Rectangle2DMetadataDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/Rectangle2DMetadataDescriptor.kt @@ -16,8 +16,8 @@ import java.util.* * @version 1.0.0 */ data class Rectangle2DMetadataDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, val leftX: Value.Int, val leftY: Value.Int, val width: Value.Int, diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt index f4bae67e..fd3b36f0 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt @@ -16,8 +16,8 @@ import java.util.* * @version 1.0.0 */ data class TemporalMetadataDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, //retrievable Id must come first, due to reflection + override var id: DescriptorId, + override var retrievableId: RetrievableId?, //retrievable Id must come first, due to reflection val startNs: Value.Long, val endNs: Value.Long, override val field: Schema.Field<*, TemporalMetadataDescriptor>? = null diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt index c4a77719..1de8e8c1 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt @@ -16,8 +16,8 @@ import java.util.* * @version 1.0.0 */ data class FileSourceMetadataDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, val path: Value.String, val size: Value.Long, override val field: Schema.Field<*, FileSourceMetadataDescriptor>? = null diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/MapStructDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/MapStructDescriptor.kt index fc0a7fa2..53e94935 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/MapStructDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/MapStructDescriptor.kt @@ -10,8 +10,8 @@ import org.vitrivr.engine.core.model.types.Value import java.util.* data class MapStructDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, val columnTypes: Map, val columnValues: Map, override val transient: Boolean = false, diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt index 19a867a3..9b226f10 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt @@ -16,8 +16,8 @@ import java.util.* * @version 1.0.0 */ class VideoSourceMetadataDescriptor( - override val id: DescriptorId, - override val retrievableId: RetrievableId, + override var id: DescriptorId, + override var retrievableId: RetrievableId?, val width: Value.Int, val height: Value.Int, val fps: Value.Double, diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/BooleanVectorDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/BooleanVectorDescriptor.kt index 07077435..d5dcc468 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/BooleanVectorDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/BooleanVectorDescriptor.kt @@ -16,8 +16,8 @@ import java.util.* */ data class BooleanVectorDescriptor( - override val id: UUID = UUID.randomUUID(), - override val retrievableId: RetrievableId? = null, + override var id: UUID = UUID.randomUUID(), + override var retrievableId: RetrievableId? = null, override val vector: List, override val field: Schema.Field<*, BooleanVectorDescriptor>? = null ) : VectorDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/DoubleVectorDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/DoubleVectorDescriptor.kt index b2d2e227..46ec0081 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/DoubleVectorDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/DoubleVectorDescriptor.kt @@ -16,8 +16,8 @@ import java.util.* */ data class DoubleVectorDescriptor( - override val id: UUID = UUID.randomUUID(), - override val retrievableId: RetrievableId? = null, + override var id: UUID = UUID.randomUUID(), + override var retrievableId: RetrievableId? = null, override val vector: List, override val field: Schema.Field<*, DoubleVectorDescriptor>? = null ) : VectorDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/FloatVectorDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/FloatVectorDescriptor.kt index 4c259e9f..6e9f4ace 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/FloatVectorDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/FloatVectorDescriptor.kt @@ -17,8 +17,8 @@ import java.util.* */ data class FloatVectorDescriptor( - override val id: UUID = UUID.randomUUID(), - override val retrievableId: RetrievableId? = null, + override var id: UUID = UUID.randomUUID(), + override var retrievableId: RetrievableId? = null, override val vector: List, override val field: Schema.Field<*, FloatVectorDescriptor>? = null ) : VectorDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/IntVectorDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/IntVectorDescriptor.kt index 03ba72c9..4b3b42ee 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/IntVectorDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/IntVectorDescriptor.kt @@ -16,8 +16,8 @@ import java.util.* */ data class IntVectorDescriptor( - override val id: UUID = UUID.randomUUID(), - override val retrievableId: RetrievableId? = null, + override var id: UUID = UUID.randomUUID(), + override var retrievableId: RetrievableId? = null, override val vector: List, override val field: Schema.Field<*, IntVectorDescriptor>? = null ) : VectorDescriptor { diff --git a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/LongVectorDescriptor.kt b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/LongVectorDescriptor.kt index 40c3c15e..74d41884 100644 --- a/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/LongVectorDescriptor.kt +++ b/vitrivr-engine-core/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/vector/LongVectorDescriptor.kt @@ -16,8 +16,8 @@ import java.util.* */ data class LongVectorDescriptor( - override val id: UUID = UUID.randomUUID(), - override val retrievableId: RetrievableId? = null, + override var id: UUID = UUID.randomUUID(), + override var retrievableId: RetrievableId? = null, override val vector: List, override val field: Schema.Field<*, LongVectorDescriptor>? = null ) : VectorDescriptor { diff --git a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/Common.kt b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/Common.kt index 42c3a425..42659a00 100644 --- a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/Common.kt +++ b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/Common.kt @@ -10,6 +10,7 @@ import org.vitrivr.engine.core.model.query.basics.ComparisonOperator import org.vitrivr.engine.core.model.query.bool.SimpleBooleanQuery import org.vitrivr.engine.core.model.types.Type import org.vitrivr.engine.core.model.types.Value +import java.util.* /** The name of the retrievable entity. */ const val RETRIEVABLE_ENTITY_NAME = "retrievable" @@ -106,6 +107,34 @@ internal fun SimpleBooleanQuery<*>.operator() = when (this.comparison) { ComparisonOperator.GEQ -> Compare.Operator.GEQUAL } +/** + * Tries to convert this [Any] to a [PublicValue] (Cottontail DB). + * + * @return [PublicValue] for this [Any] + */ +internal fun Any.toCottontailValue(): PublicValue = when (this) { + is UUID -> UuidValue(this) + is String -> StringValue(this) + is Boolean -> BooleanValue(this) + is Byte -> ByteValue(this) + is Short -> ShortValue(this) + is Int -> IntValue(this) + is Long -> LongValue(this) + is Float -> FloatValue(this) + is Double -> DoubleValue(this) + is Date -> DateValue(this) + is Value.Boolean -> BooleanValue(this.value) + is Value.Byte -> ByteValue(this.value) + is Value.Double -> DoubleValue(this.value) + is Value.Float -> FloatValue(this.value) + is Value.Int -> IntValue(this.value) + is Value.Long -> LongValue(this.value) + is Value.Short -> ShortValue(this.value) + is Value.String -> StringValue(this.value) + is Value.DateTime -> DateValue(this.value) + else -> throw IllegalArgumentException("Unsupported type for vector value.") +} + /** * Converts this [Value] (vitrivr-engine) to a [PublicValue] (Cottontail DB). * diff --git a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/struct/StructDescriptorWriter.kt b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/struct/StructDescriptorWriter.kt index 5f39115a..3eff0a45 100644 --- a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/struct/StructDescriptorWriter.kt +++ b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/descriptors/struct/StructDescriptorWriter.kt @@ -9,15 +9,14 @@ import org.vitrivr.cottontail.client.language.basics.predicate.Compare import org.vitrivr.cottontail.client.language.dml.BatchInsert import org.vitrivr.cottontail.client.language.dml.Insert import org.vitrivr.cottontail.client.language.dml.Update -import org.vitrivr.cottontail.core.values.* +import org.vitrivr.cottontail.core.values.UuidValue import org.vitrivr.engine.core.model.descriptor.struct.StructDescriptor import org.vitrivr.engine.core.model.metamodel.Schema -import org.vitrivr.engine.core.model.types.Value import org.vitrivr.engine.plugin.cottontaildb.CottontailConnection import org.vitrivr.engine.plugin.cottontaildb.DESCRIPTOR_ID_COLUMN_NAME import org.vitrivr.engine.plugin.cottontaildb.RETRIEVABLE_ID_COLUMN_NAME import org.vitrivr.engine.plugin.cottontaildb.descriptors.AbstractDescriptorWriter -import java.util.* +import org.vitrivr.engine.plugin.cottontaildb.toCottontailValue private val logger: KLogger = KotlinLogging.logger {} @@ -43,29 +42,7 @@ class StructDescriptorWriter(field: Schema.Field<*, StructDescriptor>, connectio /* Append fields. */ for ((field, value) in item.values()) { - insert.value( - field, when (value) { - null -> null - is UUID -> UuidValue(value) - is String -> StringValue(value) - is Value.String -> StringValue(value.value) - is Boolean -> BooleanValue(value) - is Value.Boolean -> BooleanValue(value.value) - is Byte -> ByteValue(value) - is Value.Byte -> ByteValue(value.value) - is Short -> ShortValue(value) - is Value.Short -> ShortValue(value.value) - is Int -> IntValue(value) - is Value.Int -> IntValue(value.value) - is Long -> LongValue(value) - is Value.Long -> LongValue(value.value) - is Float -> FloatValue(value) - is Value.Float -> FloatValue(value.value) - is Double -> DoubleValue(value) - is Value.Double -> DoubleValue(value.value) - else -> throw IllegalArgumentException("Unsupported type ${value::class.simpleName} for struct descriptor.") - } - ) + insert.value(field, value?.toCottontailValue()) } return try { @@ -106,29 +83,7 @@ class StructDescriptorWriter(field: Schema.Field<*, StructDescriptor>, connectio when (it) { 0 -> UuidValue(item.id) 1 -> item.retrievableId?.let { v -> UuidValue(v) } - else -> when (val v = values[it - 2].second) { - null -> null - is UUID -> UuidValue(v) - is String -> StringValue(v) - is Value.String -> StringValue(v.value) - is Boolean -> BooleanValue(v) - is Value.Boolean -> BooleanValue(v.value) - is Byte -> ByteValue(v) - is Value.Byte -> ByteValue(v.value) - is Short -> ShortValue(v) - is Value.Short -> ShortValue(v.value) - is Int -> IntValue(v) - is Value.Int -> IntValue(v.value) - is Long -> LongValue(v) - is Value.Long -> LongValue(v.value) - is Float -> FloatValue(v) - is Value.Float -> FloatValue(v.value) - is Double -> DoubleValue(v) - is Value.Double -> DoubleValue(v.value) - is Date -> DateValue(v) - is Value.DateTime -> DateValue(v.value) - else -> throw IllegalArgumentException("Unsupported type ${v::class.simpleName} for struct descriptor.") - } + else -> values[it - 2].second?.toCottontailValue() } } insert.any(*inserts) @@ -163,7 +118,7 @@ class StructDescriptorWriter(field: Schema.Field<*, StructDescriptor>, connectio /* Append values. */ for ((field, value) in item.values()) { - update.any(field to value) + update.any(field to value?.toCottontailValue()) } /* Update values. */ diff --git a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/retrievable/RetrievableWriter.kt b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/retrievable/RetrievableWriter.kt index ab3c5410..fffc53d0 100644 --- a/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/retrievable/RetrievableWriter.kt +++ b/vitrivr-engine-module-cottontaildb/src/main/kotlin/org/vitrivr/engine/plugin/cottontaildb/retrievable/RetrievableWriter.kt @@ -10,6 +10,7 @@ import org.vitrivr.cottontail.client.language.basics.predicate.Compare import org.vitrivr.cottontail.client.language.dml.BatchInsert import org.vitrivr.cottontail.client.language.dml.Delete import org.vitrivr.cottontail.client.language.dml.Insert +import org.vitrivr.cottontail.client.language.dml.Update import org.vitrivr.cottontail.core.database.Name import org.vitrivr.cottontail.core.values.StringValue import org.vitrivr.cottontail.core.values.UuidValue @@ -80,10 +81,28 @@ internal class RetrievableWriter(private val connection: CottontailConnection) : } /** + * Updates a specific [Retrievable] using this [RetrievableWriter]. * + * @param item A [Retrievable]s to update. + * @return True on success, false otherwise. */ override fun update(item: Retrievable): Boolean { - TODO("Not yet implemented") + val update = Update(this.entityName).where( + Compare( + Column(this.entityName.column(RETRIEVABLE_ID_COLUMN_NAME)), + Compare.Operator.EQUAL, + Literal(UuidValue(item.id)) + ) + ).values(RETRIEVABLE_TYPE_COLUMN_NAME to item.type?.let { StringValue(it) }) + + /* Update values. */ + return try { + this.connection.client.update(update) + true + } catch (e: StatusRuntimeException) { + logger.error(e) { "Failed to update descriptor due to exception." } + false + } } /** diff --git a/vitrivr-engine-module-features/build.gradle b/vitrivr-engine-module-features/build.gradle index f72e6009..e693c8bd 100644 --- a/vitrivr-engine-module-features/build.gradle +++ b/vitrivr-engine-module-features/build.gradle @@ -3,6 +3,10 @@ plugins { id 'signing' } +repositories { + mavenCentral() +} + dependencies { api project(':vitrivr-engine-core') } @@ -16,7 +20,7 @@ publishing { version = System.getenv().getOrDefault("MAVEN_PUBLICATION_VERSION", version.toString()) from components.java pom { - name = 'vitrivr Engine Base' + name = 'vitrivr Engine Features Plugin' description = 'Shared based components of the vitrivr multimedia retrieval engine (e.g., database connection, features).' url = 'https://github.com/vitrivr/vitrivr-engine/' licenses { diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/StringConnection.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/StringConnection.kt similarity index 88% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/StringConnection.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/StringConnection.kt index 95052ddf..1299e3da 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/StringConnection.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/StringConnection.kt @@ -1,6 +1,6 @@ -package org.vitrivr.engine.base.database.string +package org.vitrivr.engine.module.features.database.string -import org.vitrivr.engine.base.database.string.writer.StringRetrievableWriter +import org.vitrivr.engine.module.features.database.string.writer.StringRetrievableWriter import org.vitrivr.engine.core.database.AbstractConnection import org.vitrivr.engine.core.database.retrievable.NoRetrievableInitializer import org.vitrivr.engine.core.database.retrievable.RetrievableInitializer diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/StringConnectionProvider.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/StringConnectionProvider.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/StringConnectionProvider.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/StringConnectionProvider.kt index 481c43ec..552a5b86 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/StringConnectionProvider.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/StringConnectionProvider.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.database.string +package org.vitrivr.engine.module.features.database.string import org.vitrivr.engine.core.database.ConnectionProvider import org.vitrivr.engine.core.database.descriptor.DescriptorProvider diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/StringWriterProvider.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/StringWriterProvider.kt similarity index 87% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/StringWriterProvider.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/StringWriterProvider.kt index f0712230..67615e2c 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/StringWriterProvider.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/StringWriterProvider.kt @@ -1,6 +1,6 @@ -package org.vitrivr.engine.base.database.string +package org.vitrivr.engine.module.features.database.string -import org.vitrivr.engine.base.database.string.writer.StringDescriptorWriter +import org.vitrivr.engine.module.features.database.string.writer.StringDescriptorWriter import org.vitrivr.engine.core.database.Connection import org.vitrivr.engine.core.database.descriptor.DescriptorProvider import org.vitrivr.engine.core.database.descriptor.DescriptorReader diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/writer/StringDescriptorWriter.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/writer/StringDescriptorWriter.kt similarity index 73% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/writer/StringDescriptorWriter.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/writer/StringDescriptorWriter.kt index e737dc1c..87be81de 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/writer/StringDescriptorWriter.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/writer/StringDescriptorWriter.kt @@ -1,6 +1,6 @@ -package org.vitrivr.engine.base.database.string.writer +package org.vitrivr.engine.module.features.database.string.writer -import org.vitrivr.engine.base.database.string.StringConnection +import org.vitrivr.engine.module.features.database.string.StringConnection import org.vitrivr.engine.core.database.descriptor.DescriptorWriter import org.vitrivr.engine.core.model.descriptor.Descriptor import org.vitrivr.engine.core.model.metamodel.Schema diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/writer/StringRetrievableWriter.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/writer/StringRetrievableWriter.kt similarity index 93% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/writer/StringRetrievableWriter.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/writer/StringRetrievableWriter.kt index fb835c77..21c4d5e3 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/writer/StringRetrievableWriter.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/writer/StringRetrievableWriter.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.database.string.writer +package org.vitrivr.engine.module.features.database.string.writer import org.vitrivr.engine.core.database.retrievable.RetrievableWriter import org.vitrivr.engine.core.model.Persistable diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/writer/StringWriter.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/writer/StringWriter.kt similarity index 95% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/writer/StringWriter.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/writer/StringWriter.kt index f5863755..4e8d7ab9 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/database/string/writer/StringWriter.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/database/string/writer/StringWriter.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.database.string.writer +package org.vitrivr.engine.module.features.database.string.writer import org.vitrivr.engine.core.database.Writer import org.vitrivr.engine.core.model.Persistable diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/averagecolor/AverageColor.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/averagecolor/AverageColor.kt similarity index 99% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/averagecolor/AverageColor.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/averagecolor/AverageColor.kt index 4e8dfa8a..2510922b 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/averagecolor/AverageColor.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/averagecolor/AverageColor.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.averagecolor +package org.vitrivr.engine.module.features.feature.averagecolor import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/averagecolor/AverageColorExtractor.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/averagecolor/AverageColorExtractor.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/averagecolor/AverageColorExtractor.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/averagecolor/AverageColorExtractor.kt index fa0b0731..4bf0afcc 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/averagecolor/AverageColorExtractor.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/averagecolor/AverageColorExtractor.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.averagecolor +package org.vitrivr.engine.module.features.feature.averagecolor import org.vitrivr.engine.core.features.AbstractExtractor import org.vitrivr.engine.core.features.metadata.source.file.FileSourceMetadataExtractor diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/averagecolor/AverageColorRetriever.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/averagecolor/AverageColorRetriever.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/averagecolor/AverageColorRetriever.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/averagecolor/AverageColorRetriever.kt index 6e32d8f3..dee63bf2 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/averagecolor/AverageColorRetriever.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/averagecolor/AverageColorRetriever.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.averagecolor +package org.vitrivr.engine.module.features.feature.averagecolor import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/ErrorStatus.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/ErrorStatus.kt similarity index 78% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/ErrorStatus.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/ErrorStatus.kt index 151512e3..226adb11 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/ErrorStatus.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/ErrorStatus.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.external +package org.vitrivr.engine.module.features.feature.external import kotlinx.serialization.Serializable diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/ExternalAnalyser.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/ExternalAnalyser.kt similarity index 93% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/ExternalAnalyser.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/ExternalAnalyser.kt index 335b654c..ae0908d6 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/ExternalAnalyser.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/ExternalAnalyser.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.external +package org.vitrivr.engine.module.features.feature.external import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging @@ -6,17 +6,13 @@ import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromStream import org.vitrivr.engine.core.model.content.element.ContentElement -import org.vitrivr.engine.core.model.content.element.ImageContent -import org.vitrivr.engine.core.model.content.element.TextContent import org.vitrivr.engine.core.model.descriptor.Descriptor import org.vitrivr.engine.core.model.descriptor.scalar.FloatDescriptor import org.vitrivr.engine.core.model.descriptor.vector.FloatVectorDescriptor import org.vitrivr.engine.core.model.metamodel.Analyser import org.vitrivr.engine.core.model.types.Value -import org.vitrivr.engine.core.util.extension.toDataUrl import java.net.HttpURLConnection import java.net.URI -import java.net.URLEncoder import java.nio.charset.StandardCharsets import java.util.* diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/common/DenseRetriever.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/common/DenseRetriever.kt similarity index 95% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/common/DenseRetriever.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/common/DenseRetriever.kt index 401c0a6a..c218bcc6 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/common/DenseRetriever.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/common/DenseRetriever.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.external.common +package org.vitrivr.engine.module.features.feature.external.common import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.flow diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/common/ExternalWithFloatVectorDescriptorAnalyser.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/common/ExternalWithFloatVectorDescriptorAnalyser.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/common/ExternalWithFloatVectorDescriptorAnalyser.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/common/ExternalWithFloatVectorDescriptorAnalyser.kt index f4516778..c3d6d702 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/common/ExternalWithFloatVectorDescriptorAnalyser.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/common/ExternalWithFloatVectorDescriptorAnalyser.kt @@ -1,11 +1,11 @@ -package org.vitrivr.engine.base.features.external.common +package org.vitrivr.engine.module.features.feature.external.common import io.github.oshai.kotlinlogging.KLogger import io.github.oshai.kotlinlogging.KotlinLogging import kotlinx.serialization.builtins.ListSerializer import kotlinx.serialization.builtins.serializer import kotlinx.serialization.json.Json -import org.vitrivr.engine.base.features.external.ExternalAnalyser +import org.vitrivr.engine.module.features.feature.external.ExternalAnalyser import org.vitrivr.engine.core.model.content.element.ContentElement import org.vitrivr.engine.core.model.content.element.ImageContent import org.vitrivr.engine.core.model.content.element.TextContent diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/clip/CLIP.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/clip/CLIP.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/clip/CLIP.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/clip/CLIP.kt index c281192d..b412db53 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/clip/CLIP.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/clip/CLIP.kt @@ -1,7 +1,7 @@ -package org.vitrivr.engine.base.features.external.implementations.clip +package org.vitrivr.engine.module.features.feature.external.implementations.clip -import org.vitrivr.engine.base.features.external.ExternalAnalyser -import org.vitrivr.engine.base.features.external.common.DenseRetriever +import org.vitrivr.engine.module.features.feature.external.ExternalAnalyser +import org.vitrivr.engine.module.features.feature.external.common.DenseRetriever import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext import org.vitrivr.engine.core.model.content.element.ContentElement @@ -29,7 +29,7 @@ import java.util.* * @author Rahel Arnold * @version 1.2.0 */ -class CLIP : ExternalAnalyser,FloatVectorDescriptor>() { +class CLIP : ExternalAnalyser, FloatVectorDescriptor>() { companion object { /** diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/clip/CLIPExtractor.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/clip/CLIPExtractor.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/clip/CLIPExtractor.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/clip/CLIPExtractor.kt index 61f92779..4c05eff7 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/clip/CLIPExtractor.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/clip/CLIPExtractor.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.external.implementations.clip +package org.vitrivr.engine.module.features.feature.external.implementations.clip import org.vitrivr.engine.core.features.AbstractExtractor import org.vitrivr.engine.core.model.content.ContentType diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/dino/DINO.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/dino/DINO.kt similarity index 95% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/dino/DINO.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/dino/DINO.kt index f2326b8b..65e78566 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/dino/DINO.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/dino/DINO.kt @@ -1,7 +1,7 @@ -package org.vitrivr.engine.base.features.external.implementations.dino +package org.vitrivr.engine.module.features.feature.external.implementations.dino -import org.vitrivr.engine.base.features.external.ExternalAnalyser -import org.vitrivr.engine.base.features.external.common.DenseRetriever +import org.vitrivr.engine.module.features.feature.external.ExternalAnalyser +import org.vitrivr.engine.module.features.feature.external.common.DenseRetriever import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext import org.vitrivr.engine.core.model.content.Content @@ -26,7 +26,7 @@ import java.util.* * @author Rahel Arnold * @version 1.0.0 */ -class DINO : ExternalAnalyser() { +class DINO : ExternalAnalyser() { override val contentClasses = setOf(ImageContent::class) override val descriptorClass = FloatVectorDescriptor::class diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/dino/DINOExtractor.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/dino/DINOExtractor.kt similarity index 95% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/dino/DINOExtractor.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/dino/DINOExtractor.kt index 0b7386db..41009ee2 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/dino/DINOExtractor.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/external/implementations/dino/DINOExtractor.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.external.implementations.dino +package org.vitrivr.engine.module.features.feature.external.implementations.dino import org.vitrivr.engine.core.features.AbstractExtractor import org.vitrivr.engine.core.model.content.ContentType diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/fulltext/FulltextRetriever.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/fulltext/FulltextRetriever.kt similarity index 92% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/fulltext/FulltextRetriever.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/fulltext/FulltextRetriever.kt index 2985326b..62c91fe6 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/fulltext/FulltextRetriever.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/fulltext/FulltextRetriever.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.fulltext +package org.vitrivr.engine.module.features.feature.fulltext import org.vitrivr.engine.core.context.QueryContext import org.vitrivr.engine.core.features.AbstractRetriever diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AudioTranscription.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AudioTranscription.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AudioTranscription.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AudioTranscription.kt index 89e83cb0..ac4ed61d 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AudioTranscription.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AudioTranscription.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageColorGrid8.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageColorGrid8.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageColorGrid8.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageColorGrid8.kt index a19cbe1f..c719d255 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageColorGrid8.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageColorGrid8.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageColorGrid8Reduced15.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageColorGrid8Reduced15.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageColorGrid8Reduced15.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageColorGrid8Reduced15.kt index 67b147ef..6d1a2ea7 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageColorGrid8Reduced15.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageColorGrid8Reduced15.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageColorRaster.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageColorRaster.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageColorRaster.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageColorRaster.kt index ddfd8d66..c7c58cd1 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageColorRaster.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageColorRaster.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageFuzzyHist.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageFuzzyHist.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageFuzzyHist.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageFuzzyHist.kt index cb6484dc..65fff5ef 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageFuzzyHist.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageFuzzyHist.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageFuzzyHistNormalized.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageFuzzyHistNormalized.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageFuzzyHistNormalized.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageFuzzyHistNormalized.kt index 54ee1a76..5bf8dccf 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/AverageFuzzyHistNormalized.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/AverageFuzzyHistNormalized.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/CLD.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/CLD.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/CLD.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/CLD.kt index d1b213c6..88ee2dcb 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/CLD.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/CLD.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/CLDReduced15.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/CLDReduced15.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/CLDReduced15.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/CLDReduced15.kt index a3da0f42..223d36ad 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/CLDReduced15.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/CLDReduced15.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/ConceptMasksADE20k.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/ConceptMasksADE20k.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/ConceptMasksADE20k.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/ConceptMasksADE20k.kt index 2ef24d21..86e0f1b6 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/ConceptMasksADE20k.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/ConceptMasksADE20k.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantColor.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantColor.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantColor.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantColor.kt index 7e23662d..3815b753 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantColor.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantColor.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantEdgeGrid.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantEdgeGrid.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantEdgeGrid.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantEdgeGrid.kt index d0eedcf4..c2160e8a 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantEdgeGrid.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantEdgeGrid.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantEdgeGrid16.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantEdgeGrid16.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantEdgeGrid16.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantEdgeGrid16.kt index a82ad68c..dfed671a 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantEdgeGrid16.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantEdgeGrid16.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantEdgeGrid8.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantEdgeGrid8.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantEdgeGrid8.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantEdgeGrid8.kt index d189192d..7d113eec 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/DominantEdgeGrid8.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/DominantEdgeGrid8.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/EHD.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/EHD.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/EHD.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/EHD.kt index 038a5177..cc6b7d0f 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/EHD.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/EHD.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/EdgeARP88.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/EdgeARP88.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/EdgeARP88.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/EdgeARP88.kt index f67fadbc..fffa3ee9 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/EdgeARP88.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/EdgeARP88.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/EdgeGrid16.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/EdgeGrid16.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/EdgeGrid16.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/EdgeGrid16.kt index 68a04dd9..130a9c27 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/EdgeGrid16.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/EdgeGrid16.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/HOGMF25k512.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/HOGMF25k512.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/HOGMF25k512.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/HOGMF25k512.kt index 199f1848..bbd42660 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/HOGMF25k512.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/HOGMF25k512.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/HueHistogram.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/HueHistogram.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/HueHistogram.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/HueHistogram.kt index a0393098..0b13a5f9 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/HueHistogram.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/HueHistogram.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/InceptionResNetV2.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/InceptionResNetV2.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/InceptionResNetV2.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/InceptionResNetV2.kt index ef0b9832..33c366c4 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/InceptionResNetV2.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/InceptionResNetV2.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/MedianColor.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/MedianColor.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/MedianColor.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/MedianColor.kt index a4b68333..abfc77dd 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/MedianColor.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/MedianColor.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/MedianFuzzyHist.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/MedianFuzzyHist.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/MedianFuzzyHist.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/MedianFuzzyHist.kt index 28339d63..bcec984f 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/MedianFuzzyHist.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/MedianFuzzyHist.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/OpenCLIP.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/OpenCLIP.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/OpenCLIP.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/OpenCLIP.kt index 3af95c66..cd355315 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/OpenCLIP.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/OpenCLIP.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/ProvidedOCR.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/ProvidedOCR.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/ProvidedOCR.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/ProvidedOCR.kt index 087e6ce0..382724fd 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/ProvidedOCR.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/ProvidedOCR.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/SURFMF25K512.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/SURFMF25K512.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/SURFMF25K512.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/SURFMF25K512.kt index a74347d7..2301a03b 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/SURFMF25K512.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/SURFMF25K512.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/SkeletonPose.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/SkeletonPose.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/SkeletonPose.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/SkeletonPose.kt index 758a211d..337d9d66 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/SkeletonPose.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/SkeletonPose.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/VisualTextCoEmbedding.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/VisualTextCoEmbedding.kt similarity index 97% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/VisualTextCoEmbedding.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/VisualTextCoEmbedding.kt index 8b4d4ad5..02bcd4f7 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/VisualTextCoEmbedding.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/VisualTextCoEmbedding.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/WhisperASR.kt b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/WhisperASR.kt similarity index 96% rename from vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/WhisperASR.kt rename to vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/WhisperASR.kt index 3fa6a272..638bb9a7 100644 --- a/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/WhisperASR.kt +++ b/vitrivr-engine-module-features/src/main/kotlin/org/vitrivr/engine/module/features/feature/migration/WhisperASR.kt @@ -1,4 +1,4 @@ -package org.vitrivr.engine.base.features.migration +package org.vitrivr.engine.module.features.feature.migration import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext diff --git a/vitrivr-engine-module-features/src/main/resources/META-INF/services/org.vitrivr.engine.core.database.ConnectionProvider b/vitrivr-engine-module-features/src/main/resources/META-INF/services/org.vitrivr.engine.core.database.ConnectionProvider index 1e4fbb14..fef2bf14 100644 --- a/vitrivr-engine-module-features/src/main/resources/META-INF/services/org.vitrivr.engine.core.database.ConnectionProvider +++ b/vitrivr-engine-module-features/src/main/resources/META-INF/services/org.vitrivr.engine.core.database.ConnectionProvider @@ -1 +1 @@ -org.vitrivr.engine.base.database.string.StringConnectionProvider \ No newline at end of file +org.vitrivr.engine.module.features.database.string.StringConnectionProvider \ No newline at end of file diff --git a/vitrivr-engine-module-features/src/main/resources/META-INF/services/org.vitrivr.engine.core.model.metamodel.Analyser b/vitrivr-engine-module-features/src/main/resources/META-INF/services/org.vitrivr.engine.core.model.metamodel.Analyser index ae7011b7..b7f83405 100644 --- a/vitrivr-engine-module-features/src/main/resources/META-INF/services/org.vitrivr.engine.core.model.metamodel.Analyser +++ b/vitrivr-engine-module-features/src/main/resources/META-INF/services/org.vitrivr.engine.core.model.metamodel.Analyser @@ -1,30 +1,30 @@ -org.vitrivr.engine.base.features.averagecolor.AverageColor -org.vitrivr.engine.base.features.external.implementations.dino.DINO -org.vitrivr.engine.base.features.external.implementations.clip.CLIP -org.vitrivr.engine.base.features.migration.WhisperASR -org.vitrivr.engine.base.features.migration.ProvidedOCR -org.vitrivr.engine.base.features.migration.AudioTranscription -org.vitrivr.engine.base.features.migration.SkeletonPose -org.vitrivr.engine.base.features.migration.MedianColor -org.vitrivr.engine.base.features.migration.CLD -org.vitrivr.engine.base.features.migration.CLDReduced15 -org.vitrivr.engine.base.features.migration.AverageFuzzyHistNormalized -org.vitrivr.engine.base.features.migration.AverageFuzzyHist -org.vitrivr.engine.base.features.migration.MedianFuzzyHist -org.vitrivr.engine.base.features.migration.HueHistogram -org.vitrivr.engine.base.features.migration.DominantEdgeGrid -org.vitrivr.engine.base.features.migration.EHD -org.vitrivr.engine.base.features.migration.AverageColorGrid8 -org.vitrivr.engine.base.features.migration.AverageColorGrid8Reduced15 -org.vitrivr.engine.base.features.migration.EdgeGrid16 -org.vitrivr.engine.base.features.migration.DominantEdgeGrid16 -org.vitrivr.engine.base.features.migration.VisualTextCoEmbedding -org.vitrivr.engine.base.features.migration.OpenCLIP -org.vitrivr.engine.base.features.migration.HOGMF25k512 -org.vitrivr.engine.base.features.migration.SURFMF25K512 -org.vitrivr.engine.base.features.migration.InceptionResNetV2 -org.vitrivr.engine.base.features.migration.ConceptMasksADE20k -org.vitrivr.engine.base.features.migration.AverageColorRaster -org.vitrivr.engine.base.features.migration.EdgeARP88 -org.vitrivr.engine.base.features.migration.DominantColor -org.vitrivr.engine.base.features.migration.DominantEdgeGrid8 \ No newline at end of file +org.vitrivr.engine.module.features.feature.averagecolor.AverageColor +org.vitrivr.engine.module.features.feature.external.implementations.dino.DINO +org.vitrivr.engine.module.features.feature.external.implementations.clip.CLIP +org.vitrivr.engine.module.features.feature.migration.WhisperASR +org.vitrivr.engine.module.features.feature.migration.ProvidedOCR +org.vitrivr.engine.module.features.feature.migration.AudioTranscription +org.vitrivr.engine.module.features.feature.migration.SkeletonPose +org.vitrivr.engine.module.features.feature.migration.MedianColor +org.vitrivr.engine.module.features.feature.migration.CLD +org.vitrivr.engine.module.features.feature.migration.CLDReduced15 +org.vitrivr.engine.module.features.feature.migration.AverageFuzzyHistNormalized +org.vitrivr.engine.module.features.feature.migration.AverageFuzzyHist +org.vitrivr.engine.module.features.feature.migration.MedianFuzzyHist +org.vitrivr.engine.module.features.feature.migration.HueHistogram +org.vitrivr.engine.module.features.feature.migration.DominantEdgeGrid +org.vitrivr.engine.module.features.feature.migration.EHD +org.vitrivr.engine.module.features.feature.migration.AverageColorGrid8 +org.vitrivr.engine.module.features.feature.migration.AverageColorGrid8Reduced15 +org.vitrivr.engine.module.features.feature.migration.EdgeGrid16 +org.vitrivr.engine.module.features.feature.migration.DominantEdgeGrid16 +org.vitrivr.engine.module.features.feature.migration.VisualTextCoEmbedding +org.vitrivr.engine.module.features.feature.migration.OpenCLIP +org.vitrivr.engine.module.features.feature.migration.HOGMF25k512 +org.vitrivr.engine.module.features.feature.migration.SURFMF25K512 +org.vitrivr.engine.module.features.feature.migration.InceptionResNetV2 +org.vitrivr.engine.module.features.feature.migration.ConceptMasksADE20k +org.vitrivr.engine.module.features.feature.migration.AverageColorRaster +org.vitrivr.engine.module.features.feature.migration.EdgeARP88 +org.vitrivr.engine.module.features.feature.migration.DominantColor +org.vitrivr.engine.module.features.feature.migration.DominantEdgeGrid8 \ No newline at end of file diff --git a/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/ASR.kt b/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/ASR.kt index 2bc87c68..7906e089 100644 --- a/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/ASR.kt +++ b/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/ASR.kt @@ -3,7 +3,6 @@ package org.vitrivr.engine.base.features.external.implementations import org.vitrivr.engine.base.features.external.common.ApiWrapper import org.vitrivr.engine.base.features.external.common.ExternalFesAnalyser import org.vitrivr.engine.base.features.external.common.FesExtractor -import org.vitrivr.engine.base.features.fulltext.FulltextRetriever import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext import org.vitrivr.engine.core.model.content.Content @@ -16,11 +15,15 @@ import org.vitrivr.engine.core.model.query.fulltext.SimpleFulltextQuery import org.vitrivr.engine.core.model.retrievable.Retrievable import org.vitrivr.engine.core.model.retrievable.RetrievableId import org.vitrivr.engine.core.model.types.Value -import org.vitrivr.engine.core.model.types.Value.String as StringValue import org.vitrivr.engine.core.operators.Operator import org.vitrivr.engine.core.operators.ingest.Extractor import org.vitrivr.engine.core.operators.retrieve.Retriever +import org.vitrivr.engine.module.features.feature.fulltext.FulltextRetriever import java.util.* +import kotlin.IllegalArgumentException +import kotlin.String +import kotlin.require +import org.vitrivr.engine.core.model.types.Value.String as StringValue /** * Implementation of the [ASR] [ExternalFesAnalyser] that uses an external FES API to analyse audio content. diff --git a/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/DenseEmbedding.kt b/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/DenseEmbedding.kt index ade38d50..d510689f 100644 --- a/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/DenseEmbedding.kt +++ b/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/DenseEmbedding.kt @@ -1,7 +1,6 @@ package org.vitrivr.engine.base.features.external.implementations import org.vitrivr.engine.base.features.external.common.ApiWrapper -import org.vitrivr.engine.base.features.external.common.DenseRetriever import org.vitrivr.engine.base.features.external.common.ExternalFesAnalyser import org.vitrivr.engine.base.features.external.common.FesExtractor import org.vitrivr.engine.core.context.IndexContext @@ -19,6 +18,7 @@ import org.vitrivr.engine.core.model.types.Value import org.vitrivr.engine.core.operators.Operator import org.vitrivr.engine.core.operators.ingest.Extractor import org.vitrivr.engine.core.operators.retrieve.Retriever +import org.vitrivr.engine.module.features.feature.external.common.DenseRetriever import java.util.* /** diff --git a/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/ImageCaption.kt b/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/ImageCaption.kt index 708b4c4a..c61a63d4 100644 --- a/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/ImageCaption.kt +++ b/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/ImageCaption.kt @@ -3,7 +3,6 @@ package org.vitrivr.engine.base.features.external.implementations import org.vitrivr.engine.base.features.external.common.ApiWrapper import org.vitrivr.engine.base.features.external.common.ExternalFesAnalyser import org.vitrivr.engine.base.features.external.common.FesExtractor -import org.vitrivr.engine.base.features.fulltext.FulltextRetriever import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext import org.vitrivr.engine.core.model.content.element.ImageContent @@ -18,6 +17,7 @@ import org.vitrivr.engine.core.model.types.Value import org.vitrivr.engine.core.operators.Operator import org.vitrivr.engine.core.operators.ingest.Extractor import org.vitrivr.engine.core.operators.retrieve.Retriever +import org.vitrivr.engine.module.features.feature.fulltext.FulltextRetriever import java.util.* diff --git a/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/OCR.kt b/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/OCR.kt index 238dbe90..22ff2219 100644 --- a/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/OCR.kt +++ b/vitrivr-engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/OCR.kt @@ -3,11 +3,9 @@ package org.vitrivr.engine.base.features.external.implementations import org.vitrivr.engine.base.features.external.common.ApiWrapper import org.vitrivr.engine.base.features.external.common.ExternalFesAnalyser import org.vitrivr.engine.base.features.external.common.FesExtractor -import org.vitrivr.engine.base.features.fulltext.FulltextRetriever import org.vitrivr.engine.core.context.IndexContext import org.vitrivr.engine.core.context.QueryContext import org.vitrivr.engine.core.model.content.Content -import org.vitrivr.engine.core.model.content.element.ContentElement import org.vitrivr.engine.core.model.content.element.ImageContent import org.vitrivr.engine.core.model.content.element.TextContent import org.vitrivr.engine.core.model.descriptor.scalar.StringDescriptor @@ -20,6 +18,7 @@ import org.vitrivr.engine.core.model.types.Value import org.vitrivr.engine.core.operators.Operator import org.vitrivr.engine.core.operators.ingest.Extractor import org.vitrivr.engine.core.operators.retrieve.Retriever +import org.vitrivr.engine.module.features.feature.fulltext.FulltextRetriever import java.util.* /** diff --git a/vitrivr-engine-module-m3d/build.gradle b/vitrivr-engine-module-m3d/build.gradle index d45eda1b..babdb025 100644 --- a/vitrivr-engine-module-m3d/build.gradle +++ b/vitrivr-engine-module-m3d/build.gradle @@ -90,7 +90,7 @@ publishing { from components.java pom { name = 'vitrivr Engine Base' - description = 'Shared based components of the vitrivr multimedia retrieval engine (e.g., database connection, features).' + description = 'Shared based components of the vitrivr multimedia retrieval engine. To contains logic an features to handle 3D meshes.' url = 'https://github.com/vitrivr/vitrivr-engine/' licenses { license { diff --git a/vitrivr-engine-module-statistics/build.gradle b/vitrivr-engine-module-statistics/build.gradle index f72e6009..8f65ebe6 100644 --- a/vitrivr-engine-module-statistics/build.gradle +++ b/vitrivr-engine-module-statistics/build.gradle @@ -12,11 +12,11 @@ publishing { publications { mavenJava(MavenPublication) { groupId = 'org.vitrivr' - artifactId = 'vitrivr-engine-plugin-features' + artifactId = 'vitrivr-engine-plugin-statistics' version = System.getenv().getOrDefault("MAVEN_PUBLICATION_VERSION", version.toString()) from components.java pom { - name = 'vitrivr Engine Base' + name = 'vitrivr Engine Statistics' description = 'Shared based components of the vitrivr multimedia retrieval engine (e.g., database connection, features).' url = 'https://github.com/vitrivr/vitrivr-engine/' licenses {