Fix extractor submission related bugs (#1154)

* new parameters need to be reflected on frontend * add more default core extractors * in the catch need to match input params too
clowder-framework · Jul 24, 2024 · bb35e0b · bb35e0b
1 parent 5ea5e46
commit bb35e0b
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 5 deletions.
diff --git a/docker-compose.extractors.yml b/docker-compose.extractors.yml
@@ -47,6 +47,50 @@ services:
       - clowder2
     restart: unless-stopped
 
+  wordcount:
+    image: clowder/extractors-wordcount:latest
+    environment:
+      CLOWDER_VERSION: 2
+      RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
+    networks:
+      - clowder2
+    restart: unless-stopped
+
+  image-preview:
+    image: clowder/extractors-image-preview:latest
+    environment:
+      CLOWDER_VERSION: 2
+      RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
+    networks:
+      - clowder2
+    restart: unless-stopped
+
+  image-metadata:
+    image: clowder/extractors-image-metadata:latest
+    environment:
+      CLOWDER_VERSION: 2
+      RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
+    networks:
+      - clowder2
+    restart: unless-stopped
+
+  audio-preview:
+    image: clowder/extractors-audio-preview:latest
+    environment:
+      CLOWDER_VERSION: 2
+      RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
+    networks:
+      - clowder2
+    restart: unless-stopped
+
+  file-digest:
+    image: clowder/extractors-digest:latest
+    environment:
+      CLOWDER_VERSION: 2
+      RABBITMQ_URI: amqp://guest:guest@rabbitmq:5672/%2F
+    networks:
+      - clowder2
+    restart: unless-stopped
 
 networks:
   clowder2:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -50,7 +50,7 @@ services:
       RABBITMQ_HOST: ${RABBITMQ_HOST:-rabbitmq}
       RABBITMQ_USER: ${RABBITMQ_USER:-guest}
       RABBITMQ_PASS: ${RABBITMQ_PASS:-guest}
-      API_HOST: ${API_HOST:-http://localhost}
+      API_HOST: ${API_HOST:-http://backend}
       elasticsearch_url: http://elasticsearch:9200
       auth_base: http://localhost
       auth_realm: clowder

diff --git a/frontend/src/actions/dataset.js b/frontend/src/actions/dataset.js
@@ -142,6 +142,7 @@ export function submitDatasetExtractionAction(
 		return V2.DatasetsService.getDatasetExtractApiV2DatasetsDatasetIdExtractPost(
 			datasetId,
 			extractorName,
+			null,
 			requestBody
 		)
 			.then((json) => {

diff --git a/frontend/src/actions/file.js b/frontend/src/actions/file.js
@@ -344,12 +344,18 @@ export function generateFilePresignedUrl(
 
 export const SUBMIT_FILE_EXTRACTION = "SUBMIT_FILE_EXTRACTION";
 
-export function submitFileExtractionAction(fileId, extractorName, requestBody) {
+export function submitFileExtractionAction(
+	fileId,
+	extractorName,
+	datasetId,
+	requestBody
+) {
 	return (dispatch) => {
 		return V2.FilesService.postFileExtractApiV2FilesFileIdExtractPost(
 			fileId,
 			extractorName,
 			null,
+			datasetId,
 			requestBody
 		)
 			.then((json) => {
@@ -363,7 +369,13 @@ export function submitFileExtractionAction(fileId, extractorName, requestBody) {
 				dispatch(
 					handleErrors(
 						reason,
-						submitFileExtractionAction(fileId, extractorName, requestBody)
+						submitFileExtractionAction(
+							fileId,
+							extractorName,
+							null,
+							datasetId,
+							requestBody
+						)
 					)
 				);
 			});

diff --git a/frontend/src/components/listeners/SubmitExtraction.tsx b/frontend/src/components/listeners/SubmitExtraction.tsx
@@ -55,8 +55,12 @@ export default function SubmitExtraction(props: SubmitExtractionProps) {
 	const submitFileExtraction = (
 		fileId: string | undefined,
 		extractorName: string | undefined,
+		datasetId: string | undefined,
 		requestBody: FormData
-	) => dispatch(submitFileExtractionAction(fileId, extractorName, requestBody));
+	) =>
+		dispatch(
+			submitFileExtractionAction(fileId, extractorName, datasetId, requestBody)
+		);
 	const submitDatasetExtraction = (
 		datasetId: string | undefined,
 		extractorName: string | undefined,
@@ -74,7 +78,7 @@ export default function SubmitExtraction(props: SubmitExtractionProps) {
 			submitDatasetExtraction(datasetId, extractorName, formData);
 			handleNext();
 		} else if (fileId !== undefined) {
-			submitFileExtraction(fileId, extractorName, formData);
+			submitFileExtraction(fileId, extractorName, datasetId, formData);
 			handleNext();
 		}
 	};