Strings are now trimmed upon reception.

vitrivr · Aug 6, 2024 · 80d4226 · 80d4226
1 parent db17efe
commit 80d4226
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/api/AsrApi.kt b/...engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/api/AsrApi.kt
@@ -42,7 +42,7 @@ class AsrApi(host: String, model: String, timeoutMs: Long, pollingIntervalMs: Lo
      * @return The [JobResult]
      */
     override suspend fun pollJob(jobId: String): JobResult<Value.String> = try {
-        this.automatedSpeechRecognitionApi.getJobResultsApiTasksAutomatedSpeechRecognitionJobsJobGet(jobId).body().let { r -> JobResult(r.status, r.result?.transcript?.let { Value.String(it) }) }
+        this.automatedSpeechRecognitionApi.getJobResultsApiTasksAutomatedSpeechRecognitionJobsJobGet(jobId).body().let { r -> JobResult(r.status, r.result?.transcript?.let { Value.String(it.trim()) }) }
     } catch (e: Throwable) {
         JobResult(JobState.failed, null)
     }

diff --git a/...ain/kotlin/org/vitrivr/engine/base/features/external/api/ConditionalImageCaptioningApi.kt b/...ain/kotlin/org/vitrivr/engine/base/features/external/api/ConditionalImageCaptioningApi.kt
@@ -44,7 +44,7 @@ class ConditionalImageCaptioningApi(host: String, model: String, timeoutMs: Long
      */
     override suspend fun pollJob(jobId: String): JobResult<Value.String> = try {
         this.conditionalImageCaptioningApi.getJobResultsApiTasksConditionalImageCaptioningJobsJobGet(jobId).body().let { result ->
-            JobResult(result.status, result.result?.caption?.let { Value.String(it) })
+            JobResult(result.status, result.result?.caption?.let { Value.String(it.trim()) })
         }
     } catch (e: Throwable) {
         logger.error(e) { "Failed to poll for status of conditional image captioning job." }

diff --git a/...e-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/api/ImageCaptioningApi.kt b/...e-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/api/ImageCaptioningApi.kt
@@ -43,7 +43,7 @@ class ImageCaptioningApi(host: String, model: String, timeoutMs: Long, pollingIn
      */
     override suspend fun pollJob(jobId: String): JobResult<Value.String> = try {
         this.imageCaptioningApi.getJobResultsApiTasksImageCaptioningJobsJobGet(jobId).body().let { result ->
-            JobResult(result.status, result.result?.caption?.let { Value.String(it) })
+            JobResult(result.status, result.result?.caption?.let { Value.String(it.trim()) })
         }
     } catch (e: Throwable) {
         logger.error(e) { "Failed to poll for status of image captioning job." }

diff --git a/...e-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/api/ObjectDetectionApi.kt b/...e-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/api/ObjectDetectionApi.kt
@@ -44,7 +44,7 @@ class ObjectDetectionApi(host: String, model: String, timeoutMs: Long, pollingIn
      */
     override suspend fun pollJob(jobId: String): JobResult<List<Value.String>> = try {
         this.objectDetectionApi.getJobResultsApiTasksObjectDetectionJobsJobGet(jobId).body().let { result ->
-            JobResult(result.status, result.result?.labels?.map { Value.String(it) })
+            JobResult(result.status, result.result?.labels?.map { Value.String(it.trim()) })
         }
     } catch (e: Throwable) {
         logger.error(e) { "Failed to poll for status of object detection job." }

diff --git a/...engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/api/OcrApi.kt b/...engine-module-fes/src/main/kotlin/org/vitrivr/engine/base/features/external/api/OcrApi.kt
@@ -43,7 +43,7 @@ class OcrApi(host: String, model: String, timeoutMs: Long, pollingIntervalMs: Lo
      */
     override suspend fun pollJob(jobId: String): JobResult<Value.String> = try {
         this.opticalCharacterRecognitionApi.getJobResultsApiTasksOpticalCharacterRecognitionJobsJobGet(jobId).body().let { result ->
-            JobResult(result.status, result.result?.text?.let { Value.String(it) })
+            JobResult(result.status, result.result?.text?.let { Value.String(it.trim()) })
         }
     } catch (e: Throwable) {
         logger.error(e) { "Failed to poll for status of OCR job." }