Hosts for DINO and CLIP are now normalized in terms of their suffix.

Signed-off-by: Ralph Gasser <[email protected]>
vitrivr · Jan 15, 2024 · e6f1ae2 · e6f1ae2
1 parent bce794b
commit e6f1ae2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...es/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/clip/CLIP.kt b/...es/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/clip/CLIP.kt
@@ -91,8 +91,8 @@ class CLIP : ExternalWithFloatVectorDescriptorAnalyser<ContentElement<*>>() {
      * @return A list of CLIP feature descriptors.
      */
     override fun analyse(content: ContentElement<*>, hostname: String): FloatVectorDescriptor = when (content) {
-        is ImageContent -> FloatVectorDescriptor(UUID.randomUUID(), null, httpRequest(content, "$hostname/extract/clip_image"), true)
-        is TextContent -> FloatVectorDescriptor(UUID.randomUUID(), null, httpRequest(content, "$hostname/extract/clip_text"), true)
+        is ImageContent -> FloatVectorDescriptor(UUID.randomUUID(), null, httpRequest(content, "${hostname.removeSuffix("/")}/extract/clip_image"), true)
+        is TextContent -> FloatVectorDescriptor(UUID.randomUUID(), null, httpRequest(content, "${hostname.removeSuffix("/")}/extract/clip_text"), true)
         else -> throw IllegalArgumentException("Content '$content' not supported")
     }
 }
diff --git a/...es/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/dino/DINO.kt b/...es/src/main/kotlin/org/vitrivr/engine/base/features/external/implementations/dino/DINO.kt
@@ -90,6 +90,6 @@ class DINO : ExternalWithFloatVectorDescriptorAnalyser<ImageContent>() {
      * @return A list of CLIP feature descriptors.
      */
     override fun analyse(content: ImageContent, hostname: String): FloatVectorDescriptor {
-        return FloatVectorDescriptor(UUID.randomUUID(), null, httpRequest(content, "$hostname/extract/dino"), true)
+        return FloatVectorDescriptor(UUID.randomUUID(), null, httpRequest(content, "${hostname.removeSuffix("/")}/extract/dino"), true)
     }
 }