Merge branch 'flopez/3806-1' into flopez/remove-routing-protocol

Author: flopez7

docker-setup/docker-compose.dev.yml

@@ -102,7 +102,7 @@ services:
     container_name: hp-dev-graph-node
     # In case of issues on Mac M1 rebuild the image for it locally
     # https://github.com/graphprotocol/graph-node/blob/master/docker/README.md#running-graph-node-on-an-macbook-m1
-    image: graphprotocol/graph-node
+    image: graphprotocol/graph-node:v0.41.1
     restart: *default-restart
     logging:
       <<: *default-logging

packages/apps/job-launcher/server/src/common/constants/errors.ts

@@ -26,23 +26,6 @@ export enum ErrorJob {
   NoRefundFound = 'No refund found for this escrow',
 }
 
-/**
- * Represents error messages associated with a job moderation.
- */
-export enum ErrorContentModeration {
-  ErrorProcessingDataset = 'Error processing dataset',
-  InappropriateContent = 'Job cannot be processed due to inappropriate content',
-  ContentModerationFailed = 'Job cannot be processed due to failure in content moderation',
-  NoDestinationURIFound = 'No destination URI found in the response',
-  InvalidBucketUrl = 'Invalid bucket URL',
-  DataMustBeStoredInGCS = 'Data must be stored in Google Cloud Storage',
-  NoResultsFound = 'No results found',
-  ResultsParsingFailed = 'Results parsing failed',
-  JobModerationFailed = 'Job moderation failed',
-  ProcessContentModerationRequestFailed = 'Process content moderation request failed',
-  CompleteContentModerationFailed = 'Complete content moderation failed',
-}
-
 /**
  * Represents error messages associated to webhook.
  */

packages/apps/job-launcher/server/src/common/constants/index.ts

@@ -66,6 +66,14 @@ export const LOGOUT_PATH = '/auth/logout';
 
 export const MUTEX_TIMEOUT = 2000; //ms
 
-export const GS_PROTOCOL = 'gs://';
-export const GCV_CONTENT_MODERATION_ASYNC_BATCH_SIZE = 100;
-export const GCV_CONTENT_MODERATION_BATCH_SIZE_PER_TASK = 2000;
+/**
+ * Regex for GCS URL in subdomain format: https://<bucket>.storage.googleapis.com/<object_path>
+ */
+export const GCS_HTTP_REGEX_SUBDOMAIN =
+  /^https:\/\/([a-zA-Z0-9\-.]+)\.storage\.googleapis\.com\/?(.*)$/;
+
+/**
+ * Regex for GCS URL in path-based format: https://storage.googleapis.com/<bucket>/<object_path>
+ */
+export const GCS_HTTP_REGEX_PATH_BASED =
+  /^https:\/\/storage\.googleapis\.com\/([^/]+)\/?(.*)$/;