Cleanup in existing Descriptors.

vitrivr · Mar 27, 2024 · 854ffdd · 854ffdd
1 parent 541f2c1
commit 854ffdd
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 51 deletions.
diff --git a/...c/main/kotlin/org/vitrivr/engine/core/features/metadata/source/file/FileSourceMetadata.kt b/...c/main/kotlin/org/vitrivr/engine/core/features/metadata/source/file/FileSourceMetadata.kt
@@ -33,7 +33,7 @@ class FileSourceMetadata : Analyser<ContentElement<*>, FileSourceMetadataDescrip
      *  @param field The [Schema.Field] to create the prototype for.
      * @return [FileSourceMetadataDescriptor]
      */
-    override fun prototype(field: Schema.Field<*, *>) = FileSourceMetadataDescriptor(UUID.randomUUID(), UUID.randomUUID(), "", 0, true)
+    override fun prototype(field: Schema.Field<*, *>) = FileSourceMetadataDescriptor.PROTOTYPE
 
     /**
      * Generates and returns a new [FileSourceMetadataExtractor] for the provided [Schema.Field].

diff --git a/...tlin/org/vitrivr/engine/core/features/metadata/source/file/FileSourceMetadataExtractor.kt b/...tlin/org/vitrivr/engine/core/features/metadata/source/file/FileSourceMetadataExtractor.kt
@@ -8,6 +8,7 @@ import org.vitrivr.engine.core.model.metamodel.Schema
 import org.vitrivr.engine.core.model.retrievable.Ingested
 import org.vitrivr.engine.core.model.retrievable.Retrievable
 import org.vitrivr.engine.core.model.retrievable.attributes.SourceAttribute
+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.source.file.FileSource
@@ -44,16 +45,14 @@ class FileSourceMetadataExtractor(
      * @return List of resulting [Descriptor]s.
      */
     override fun extract(retrievable: Retrievable): List<FileSourceMetadataDescriptor> {
-//        check(retrievable is RetrievableWithSource) { "Incoming retrievable is not a retrievable with source. This is a programmer's error!" }
-//        check(retrievable.source is FileSource) { "Incoming retrievable is not a retrievable with file source. This is a programmer's error!" }
         val source = retrievable.filteredAttribute(SourceAttribute::class.java)?.source as? FileSource
             ?: throw IllegalArgumentException("Incoming retrievable is not a retrievable with file source. This is a programmer's error!")
         return listOf(
             FileSourceMetadataDescriptor(
                 id = UUID.randomUUID(),
                 retrievableId = retrievable.id,
-                path = source.path.absolutePathString(),
-                size = Files.size(source.path),
+                path = Value.String(source.path.absolutePathString()),
+                size = Value.Long(Files.size(source.path)),
                 transient = !persisting
             )
         )

diff --git a/...in/org/vitrivr/engine/core/features/metadata/source/video/VideoSourceMetadataExtractor.kt b/...in/org/vitrivr/engine/core/features/metadata/source/video/VideoSourceMetadataExtractor.kt
@@ -8,6 +8,7 @@ import org.vitrivr.engine.core.model.descriptor.struct.metadata.source.VideoSour
 import org.vitrivr.engine.core.model.metamodel.Schema
 import org.vitrivr.engine.core.model.retrievable.Retrievable
 import org.vitrivr.engine.core.model.retrievable.attributes.SourceAttribute
+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.source.MediaType
@@ -48,12 +49,12 @@ class VideoSourceMetadataExtractor(
             VideoSourceMetadataDescriptor(
                 id = UUID.randomUUID(),
                 retrievableId = retrievable.id,
-                width = source.width() ?: 0,
-                height = source.height() ?: 0,
-                fps = source.fps() ?: 0.0,
-                channels = source.channels() ?: 0,
-                sampleRate = source.sampleRate() ?: 0,
-                sampleSize = source.sampleSize() ?: 0,
+                width = Value.Int(source.width() ?: 0),
+                height = Value.Int(source.height() ?: 0),
+                fps = Value.Double(source.fps() ?: 0.0),
+                channels = Value.Int(source.channels() ?: 0),
+                sampleRate = Value.Int(source.sampleRate() ?: 0),
+                sampleSize = Value.Int(source.sampleSize() ?: 0),
                 transient = !persisting
             )
         )

diff --git a/...re/src/main/kotlin/org/vitrivr/engine/core/features/metadata/temporal/TemporalMetadata.kt b/...re/src/main/kotlin/org/vitrivr/engine/core/features/metadata/temporal/TemporalMetadata.kt
@@ -37,7 +37,7 @@ class TemporalMetadata : Analyser<ContentElement<*>, TemporalMetadataDescriptor>
      * @param field The [Schema.Field] to create the prototype for.
      * @return [FloatVectorDescriptor]
      */
-    override fun prototype(field: Schema.Field<*, *>) = TemporalMetadataDescriptor(UUID.randomUUID(), UUID.randomUUID(), 0, 0, true)
+    override fun prototype(field: Schema.Field<*, *>) = TemporalMetadataDescriptor.PROTOTYPE
 
     /**
      * Generates and returns a new [FileSourceMetadataExtractor] for the provided [Schema.Field].

diff --git a/...in/kotlin/org/vitrivr/engine/core/features/metadata/temporal/TemporalMetadataExtractor.kt b/...in/kotlin/org/vitrivr/engine/core/features/metadata/temporal/TemporalMetadataExtractor.kt
@@ -9,6 +9,7 @@ import org.vitrivr.engine.core.model.metamodel.Schema
 import org.vitrivr.engine.core.model.retrievable.Ingested
 import org.vitrivr.engine.core.model.retrievable.Retrievable
 import org.vitrivr.engine.core.model.retrievable.attributes.ContentAttribute
+import org.vitrivr.engine.core.model.types.Value
 import org.vitrivr.engine.core.operators.Operator
 import org.vitrivr.engine.core.operators.ingest.Extractor
 import java.util.*
@@ -34,8 +35,8 @@ class TemporalMetadataExtractor(input: Operator<Retrievable>, field: Schema.Fiel
         val content = retrievable.filteredAttributes(ContentAttribute::class.java).map { it.content }
         val descriptors = content.filterIsInstance<TemporalContent>().map { c ->
             when (c) {
-                is TemporalContent.Timepoint -> TemporalMetadataDescriptor(UUID.randomUUID(), retrievable.id, c.timepointNs, c.timepointNs, !persisting)
-                is TemporalContent.TimeSpan -> TemporalMetadataDescriptor(UUID.randomUUID(), retrievable.id, c.startNs, c.endNs, !persisting)
+                is TemporalContent.Timepoint -> TemporalMetadataDescriptor(UUID.randomUUID(), retrievable.id, Value.Long(c.timepointNs), Value.Long(c.timepointNs), !persisting)
+                is TemporalContent.TimeSpan -> TemporalMetadataDescriptor(UUID.randomUUID(), retrievable.id, Value.Long(c.startNs), Value.Long(c.endNs), !persisting)
             }
         }
         return descriptors

diff --git a/...engine-core/src/main/kotlin/org/vitrivr/engine/core/features/migration/MediaDimensions.kt b/...engine-core/src/main/kotlin/org/vitrivr/engine/core/features/migration/MediaDimensions.kt
@@ -16,7 +16,7 @@ import java.util.*
 class  MediaDimensions : Analyser<ContentElement<*>, MediaDimensionsDescriptor> {
     override val contentClasses = setOf(ContentElement::class)
     override val descriptorClass = MediaDimensionsDescriptor::class
-    override fun prototype(field: Schema.Field<*,*>) = MediaDimensionsDescriptor(UUID.randomUUID(), UUID.randomUUID(), 0, 0, true)
+    override fun prototype(field: Schema.Field<*,*>) = MediaDimensionsDescriptor.PROTOTYPE
     override fun newRetrieverForContent(field: Schema.Field<ContentElement<*>, MediaDimensionsDescriptor>, content: Collection<ContentElement<*>>, context: QueryContext): Retriever<ContentElement<*>, MediaDimensionsDescriptor> {
         TODO("Not yet implemented")
     }

diff --git a/...ore/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/SkeletonDescriptor.kt b/...ore/src/main/kotlin/org/vitrivr/engine/core/model/descriptor/struct/SkeletonDescriptor.kt
@@ -9,7 +9,7 @@ import org.vitrivr.engine.core.model.types.Value
 data class SkeletonDescriptor(
     override val id: DescriptorId,
     override val retrievableId: RetrievableId,
-    val person: Int,
+    val person: Value.Int,
     val skeleton: List<Value.Float>,
     val weights: List<Value.Float>,
     override val transient: Boolean = false
@@ -27,8 +27,8 @@ data class SkeletonDescriptor(
     )
 
     override fun values(): List<Pair<String, Any?>> = listOf(
-            "person" to this.person,
-            "skeleton" to this.skeleton,
-            "weights" to this.weights
+        "person" to this.person,
+        "skeleton" to this.skeleton,
+        "weights" to this.weights
     )
 }
diff --git a/...lin/org/vitrivr/engine/core/model/descriptor/struct/metadata/MediaDimensionsDescriptor.kt b/...lin/org/vitrivr/engine/core/model/descriptor/struct/metadata/MediaDimensionsDescriptor.kt
@@ -3,22 +3,36 @@ package org.vitrivr.engine.core.model.descriptor.struct.metadata
 import org.vitrivr.engine.core.model.descriptor.DescriptorId
 import org.vitrivr.engine.core.model.descriptor.FieldSchema
 import org.vitrivr.engine.core.model.descriptor.struct.StructDescriptor
+import org.vitrivr.engine.core.model.descriptor.struct.metadata.source.FileSourceMetadataDescriptor
+import org.vitrivr.engine.core.model.descriptor.struct.metadata.source.VideoSourceMetadataDescriptor
 import org.vitrivr.engine.core.model.retrievable.RetrievableId
 import org.vitrivr.engine.core.model.types.Type
+import org.vitrivr.engine.core.model.types.Value
+import java.util.*
 
+/**
+ * A [StructDescriptor] used to store metadata about a 2D raster graphic.
+ *
+ * @author Ralph Gasser
+ * @version 1.0.0
+ */
 data class MediaDimensionsDescriptor(
-        override val id: DescriptorId,
-        override val retrievableId: RetrievableId,
-        val width: Int,
-        val height: Int,
-        override val transient: Boolean = false
+    override val id: DescriptorId,
+    override val retrievableId: RetrievableId,
+    val width: Value.Int,
+    val height: Value.Int,
+    override val transient: Boolean = false
 ) : StructDescriptor {
 
         companion object {
+            /** The field schema associated with a [VideoSourceMetadataDescriptor]. */
             private val SCHEMA = listOf(
                 FieldSchema("width", Type.INT),
                 FieldSchema("height", Type.INT),
             )
+
+            /** The prototype [MediaDimensionsDescriptor]. */
+            val PROTOTYPE = MediaDimensionsDescriptor(UUID.randomUUID(), UUID.randomUUID(), Value.Int(0), Value.Int(0))
         }
 
         /**
@@ -34,7 +48,7 @@ data class MediaDimensionsDescriptor(
         * @return A [Map] of this [MediaDimensionsDescriptor]'s fields (without the IDs).
         */
         override fun values(): List<Pair<String, Any?>> = listOf(
-                "width" to this.width,
-                "height" to this.height
+            "width" to this.width,
+            "height" to this.height
         )
 }
diff --git a/...org/vitrivr/engine/core/model/descriptor/struct/metadata/Rectangle2DMetadataDescriptor.kt b/...org/vitrivr/engine/core/model/descriptor/struct/metadata/Rectangle2DMetadataDescriptor.kt
@@ -3,33 +3,39 @@ package org.vitrivr.engine.core.model.descriptor.struct.metadata
 import org.vitrivr.engine.core.model.descriptor.DescriptorId
 import org.vitrivr.engine.core.model.descriptor.FieldSchema
 import org.vitrivr.engine.core.model.descriptor.struct.StructDescriptor
+import org.vitrivr.engine.core.model.descriptor.struct.metadata.source.VideoSourceMetadataDescriptor
 import org.vitrivr.engine.core.model.retrievable.RetrievableId
 import org.vitrivr.engine.core.model.types.Type
+import org.vitrivr.engine.core.model.types.Value
+import java.util.*
 
 /**
- * A [StructDescriptor] used to store temporal metadata.
+ * A [StructDescriptor] used to store spatial metadata in a 2D raster graphic.
  *
  * @author Ralph Gasser
  * @version 1.0.0
  */
 data class Rectangle2DMetadataDescriptor(
     override val id: DescriptorId,
     override val retrievableId: RetrievableId,
-    val leftX: Int,
-    val leftY: Int,
-    val width: Int,
-    val height: Int,
+    val leftX: Value.Int,
+    val leftY: Value.Int,
+    val width: Value.Int,
+    val height: Value.Int,
     override val transient: Boolean = false
 ) : StructDescriptor {
 
     companion object {
+        /** The field schema associated with a [Rectangle2DMetadataDescriptor]. */
         private val SCHEMA = listOf(
             FieldSchema("leftX", Type.INT),
             FieldSchema("leftY", Type.INT),
             FieldSchema("width", Type.INT),
             FieldSchema("height", Type.INT),
+        )
 
-            )
+        /** The prototype [Rectangle2DMetadataDescriptor]. */
+        val PROTOTYPE = Rectangle2DMetadataDescriptor(UUID.randomUUID(), UUID.randomUUID(), Value.Int(0), Value.Int(0), Value.Int(0), Value.Int(0))
     }
 
     /**

diff --git a/...in/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt b/...in/org/vitrivr/engine/core/model/descriptor/struct/metadata/TemporalMetadataDescriptor.kt
@@ -3,8 +3,11 @@ package org.vitrivr.engine.core.model.descriptor.struct.metadata
 import org.vitrivr.engine.core.model.descriptor.DescriptorId
 import org.vitrivr.engine.core.model.descriptor.FieldSchema
 import org.vitrivr.engine.core.model.descriptor.struct.StructDescriptor
+import org.vitrivr.engine.core.model.descriptor.struct.metadata.source.VideoSourceMetadataDescriptor
 import org.vitrivr.engine.core.model.retrievable.RetrievableId
 import org.vitrivr.engine.core.model.types.Type
+import org.vitrivr.engine.core.model.types.Value
+import java.util.*
 
 /**
  * A [StructDescriptor] used to store temporal metadata.
@@ -15,16 +18,20 @@ import org.vitrivr.engine.core.model.types.Type
 data class TemporalMetadataDescriptor(
     override val id: DescriptorId,
     override val retrievableId: RetrievableId, //retrievable Id must come first, due to reflection
-    val startNs: Long,
-    val endNs: Long,
+    val startNs: Value.Long,
+    val endNs: Value.Long,
     override val transient: Boolean = false
 ) : StructDescriptor {
 
     companion object {
+        /** The field schema associated with a [TemporalMetadataDescriptor]. */
         private val SCHEMA = listOf(
             FieldSchema("start", Type.LONG),
             FieldSchema("end", Type.LONG),
         )
+
+        /** The prototype [TemporalMetadataDescriptor]. */
+        val PROTOTYPE = TemporalMetadataDescriptor(UUID.randomUUID(), UUID.randomUUID(), Value.Long(0L), Value.Long(0L))
     }
 
     /**

diff --git a/...trivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt b/...trivr/engine/core/model/descriptor/struct/metadata/source/FileSourceMetadataDescriptor.kt
@@ -5,6 +5,8 @@ import org.vitrivr.engine.core.model.descriptor.FieldSchema
 import org.vitrivr.engine.core.model.descriptor.struct.StructDescriptor
 import org.vitrivr.engine.core.model.retrievable.RetrievableId
 import org.vitrivr.engine.core.model.types.Type
+import org.vitrivr.engine.core.model.types.Value
+import java.util.*
 
 /**
  * A [StructDescriptor] used to store metadata about a file.
@@ -15,16 +17,20 @@ import org.vitrivr.engine.core.model.types.Type
 data class FileSourceMetadataDescriptor(
     override val id: DescriptorId,
     override val retrievableId: RetrievableId,
-    val path: String,
-    val size: Long,
+    val path: Value.String,
+    val size: Value.Long,
     override val transient: Boolean = false
 ) : StructDescriptor {
 
     companion object {
+        /** The field schema associated with a [FileSourceMetadataDescriptor]. */
         private val SCHEMA = listOf(
             FieldSchema("path", Type.STRING),
             FieldSchema("size", Type.LONG),
         )
+
+        /** The prototype [FileSourceMetadataDescriptor]. */
+        val PROTOTYPE = FileSourceMetadataDescriptor(UUID.randomUUID(), UUID.randomUUID(), Value.String(""), Value.Long(0L))
     }
 
     /**

diff --git a/...rivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt b/...rivr/engine/core/model/descriptor/struct/metadata/source/VideoSourceMetadataDescriptor.kt
@@ -5,6 +5,7 @@ import org.vitrivr.engine.core.model.descriptor.FieldSchema
 import org.vitrivr.engine.core.model.descriptor.struct.StructDescriptor
 import org.vitrivr.engine.core.model.retrievable.RetrievableId
 import org.vitrivr.engine.core.model.types.Type
+import org.vitrivr.engine.core.model.types.Value
 import java.util.*
 
 /**
@@ -16,12 +17,12 @@ import java.util.*
 class VideoSourceMetadataDescriptor(
     override val id: DescriptorId,
     override val retrievableId: RetrievableId,
-    val width: Int,
-    val height: Int,
-    val fps: Double,
-    val channels: Int,
-    val sampleRate: Int,
-    val sampleSize: Int,
+    val width: Value.Int,
+    val height: Value.Int,
+    val fps: Value.Double,
+    val channels: Value.Int,
+    val sampleRate: Value.Int,
+    val sampleSize: Value.Int,
     override val transient: Boolean = false
 ) : StructDescriptor {
 
@@ -37,7 +38,7 @@ class VideoSourceMetadataDescriptor(
         )
 
         /** The prototype [VideoSourceMetadataDescriptor]. */
-        val PROTOTYPE = VideoSourceMetadataDescriptor(UUID.randomUUID(), UUID.randomUUID(), 0, 0, 0.0, 0, 0, 0)
+        val PROTOTYPE = VideoSourceMetadataDescriptor(UUID.randomUUID(), UUID.randomUUID(), Value.Int(0), Value.Int(0), Value.Double(0.0), Value.Int(0), Value.Int(0), Value.Int(0))
     }
 
     /**

diff --git a/...odule-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/SkeletonPose.kt b/...odule-features/src/main/kotlin/org/vitrivr/engine/base/features/migration/SkeletonPose.kt
@@ -19,7 +19,7 @@ class SkeletonPose : Analyser<ContentElement<*>, SkeletonDescriptor> {
     override fun prototype(field: Schema.Field<*, *>): SkeletonDescriptor = SkeletonDescriptor(
         id = java.util.UUID.randomUUID(),
         retrievableId = java.util.UUID.randomUUID(),
-        person = 0,
+        person = Value.Int(0),
         skeleton = List(12) { Value.Float(0.0f) },
         weights = List(12) { Value.Float(0.0f) },
         transient = true

diff --git a/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/tools/CineastMigrationTool.kt b/vitrivr-engine-server/src/main/kotlin/org/vitrivr/engine/tools/CineastMigrationTool.kt
@@ -179,7 +179,7 @@ data class CineastSkeletonPoseFeature(
         return SkeletonDescriptor(
             id = DescriptorId.randomUUID(),
             retrievableId = RetrievableId.fromString(idmap[id]),
-            person = person,
+            person = Value.Int(person),
             skeleton = skeleton.map { Value.Float(it) },
             weights = weights.map { Value.Float(it) },
             transient = false
@@ -332,8 +332,8 @@ class CineastMigrationTool(val migrationconfigpath: String, val schemaconfigpath
             val fileMetadataDescriptor = FileSourceMetadataDescriptor(
                 id = DescriptorId.randomUUID(),
                 retrievableId = objectRetrievable.id,
-                path = mobject.path,
-                size = size,
+                path = Value.String(mobject.path),
+                size = Value.Long(size),
             )
             filemetadatawriter.add(fileMetadataDescriptor)
             retrievableWriter.add(objectRetrievable)
@@ -384,8 +384,8 @@ class CineastMigrationTool(val migrationconfigpath: String, val schemaconfigpath
                         id = DescriptorId.randomUUID(),
                         retrievableId = RetrievableId.fromString(retrievableId)
                             ?: throw IllegalArgumentException("Could not find retrievable id for object ${mobjectmetadata.objectid}"),
-                        width = width,
-                        height = height,
+                        width = Value.Int(width),
+                        height = Value.Int(height),
                         transient = false
                     )
                     mediadimensionswriter.add(dimensionsDescriptor)
@@ -448,8 +448,8 @@ class CineastMigrationTool(val migrationconfigpath: String, val schemaconfigpath
             val temporalMetadataDescriptor = TemporalMetadataDescriptor(
                 id = DescriptorId.randomUUID(),
                 retrievableId = ingested.id,
-                startNs = segment.segmentstartabs.toLong() * 1000 * 1000 * 1000,
-                endNs = segment.segmentendabs.toLong() * 1000 * 1000 * 1000,
+                startNs = Value.Long(segment.segmentstartabs.toLong() * 1000 * 1000 * 1000),
+                endNs = Value.Long(segment.segmentendabs.toLong() * 1000 * 1000 * 1000),
             )
 
             ingestedList.add(ingested)