♻️ split test script in v1 and v2

Author: ianardee

.github/workflows/_test-code-samples.yml

@@ -3,6 +3,16 @@ on:
   workflow_call:
   workflow_dispatch:
 
+env:
+  MINDEE_API_KEY: ${{ secrets.MINDEE_API_KEY_SE_TESTS }}
+  WORKFLOW_ID: ${{ secrets.WORKFLOW_ID_SE_TESTS }}
+  MINDEE_V2_API_KEY: ${{ secrets.MINDEE_V2_SE_TESTS_API_KEY }}
+  MINDEE_V2_SE_TESTS_BLANK_PDF_URL: ${{ secrets.MINDEE_V2_SE_TESTS_BLANK_PDF_URL }}
+  MINDEE_V2_SE_TESTS_FINDOC_MODEL_ID: ${{ secrets.MINDEE_V2_SE_TESTS_FINDOC_MODEL_ID }}
+  MINDEE_V2_SE_TESTS_CLASSIFICATION_MODEL_ID: ${{ secrets.MINDEE_V2_SE_TESTS_CLASSIFICATION_MODEL_ID }}
+  MINDEE_V2_SE_TESTS_CROP_MODEL_ID: ${{ secrets.MINDEE_V2_SE_TESTS_CROP_MODEL_ID }}
+  MINDEE_V2_SE_TESTS_SPLIT_MODEL_ID: ${{ secrets.MINDEE_V2_SE_TESTS_SPLIT_MODEL_ID }}
+
 jobs:
   test_sample_code:
     name: Test Code Samples
@@ -31,6 +41,10 @@ jobs:
       - name: Install mindee-java-api
         run: mvn clean install -DskipTests
 
-      - name: Tests sample code
+      - name: Tests v2 sample code
+        run: |
+          ./tests/test_v2_code_samples.sh
+
+      - name: Tests v1 sample code
         run: |
-          ./tests/test_code_samples.sh ${{ secrets.MINDEE_ACCOUNT_SE_TESTS }} ${{ secrets.MINDEE_ENDPOINT_SE_TESTS }} ${{ secrets.MINDEE_API_KEY_SE_TESTS }} ${{ secrets.MINDEE_V2_SE_TESTS_API_KEY }} ${{ secrets.MINDEE_V2_SE_TESTS_FINDOC_MODEL_ID }}
+          ./tests/test_v1_code_samples.sh ${{ secrets.MINDEE_ACCOUNT_SE_TESTS }} ${{ secrets.MINDEE_ENDPOINT_SE_TESTS }}

docs/code_samples/default_v2.txt docs/code_samples/v2_extraction.txtdocs/code_samples/default_v2.txt renamed to docs/code_samples/v2_extraction.txt

@@ -1,34 +1,27 @@
 #! /bin/sh
 set -e
 
-OUTPUT_FILE='SimpleMindeeClient.java'
+OUTPUT_FILE='SimpleMindeeClientV1.java'
 ACCOUNT=$1
 ENDPOINT=$2
-API_KEY=$3
-API_KEY_V2=$4
-MODEL_ID=$5
 
 if [ -z "${ACCOUNT}" ]; then echo "ACCOUNT is required"; exit 1; fi
 if [ -z "${ENDPOINT}" ]; then echo "ENDPOINT is required"; exit 1; fi
 
 # We need the dependencies otherwise we get class not found exceptions
 mvn dependency:copy-dependencies
 
-for f in $(find docs/code_samples -maxdepth 1 -name "*.txt" -not -name "workflow_execution.txt" | sort -h)
+for f in $(
+  find docs/code_samples -maxdepth 1 -name "*.txt" -not -name "workflow_*.txt" -not -name "v2_*.txt" | sort -h
+)
 do
-  if echo "${f}" | grep -q "default_v2.txt"; then
-    if [ -z "${API_KEY_V2}" ] || [ -z "${MODEL_ID}" ]; then
-      echo "Skipping ${f} (API_KEY_V2 or MODEL_ID not supplied)"
-      echo
-      continue
-    fi
-  fi
   echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
   echo "${f}"
   echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
   echo
 
-  cat "${f}" > $OUTPUT_FILE
+  sed "s/my-api-key/${MINDEE_API_KEY}/" "${f}" > $OUTPUT_FILE
+  sed -i "s/\/path\/to\/the\/file.ext/src\/test\/resources\/file_types\/pdf\/blank_1.pdf/" $OUTPUT_FILE
 
   if echo "${f}" | grep -q "custom_v1.txt"
   then
@@ -50,18 +43,7 @@ do
     sed -i "s/my-version/1/" $OUTPUT_FILE
   fi
 
-  if echo "${f}" | grep -q "default_v2.txt"
-  then
-    sed -i "s/MY_API_KEY/$API_KEY_V2/" $OUTPUT_FILE
-    sed -i "s/MY_MODEL_ID/$MODEL_ID/" $OUTPUT_FILE
-  else
-    sed -i "s/my-api-key/$API_KEY/" $OUTPUT_FILE
-  fi
-
-  sed -i "s/my-api-key/$API_KEY/" $OUTPUT_FILE
-  sed -i "s/\/path\/to\/the\/file.ext/src\/test\/resources\/file_types\/pdf\/blank_1.pdf/" $OUTPUT_FILE
-
-  javac -cp ./target/dependency/*:./target/* SimpleMindeeClient.java
+  sleep 0.5  # avoid too many request errors
+  javac -cp ./target/dependency/*:./target/* "${OUTPUT_FILE}"
   java -cp  .:./target/dependency/*:./target/* SimpleMindeeClient
-
 done

tests/test_code_samples.sh tests/test_v1_code_samples.shtests/test_code_samples.sh renamed to tests/test_v1_code_samples.sh

@@ -0,0 +1,52 @@
+#! /bin/sh
+set -e
+
+OUTPUT_FILE='SimpleMindeeClientV2.java'
+
+# We need the dependencies otherwise we get class not found exceptions
+mvn dependency:copy-dependencies
+
+for f in $(
+  find docs/code_samples -maxdepth 1 -name "v2_*.txt" | sort -h
+)
+do
+  echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+  echo "${f}"
+  echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+  echo
+
+  sed "s/MY_API_KEY/${MINDEE_V2_API_KEY}/" "${f}" > $OUTPUT_FILE
+  sed -i "s/\/path\/to\/the\/file.ext/src\/test\/resources\/file_types\/pdf\/blank_1.pdf/" $OUTPUT_FILE
+
+  cat "${f}" > $OUTPUT_FILE
+
+  if echo "${f}" | grep -q "v2_classification.txt"
+  then
+    sed -i "s/MY_MODEL_ID/${MINDEE_V2_SE_TESTS_CLASSIFICATION_MODEL_ID}/" $OUTPUT_FILE
+  fi
+
+  if echo "${f}" | grep -q "v2_crop.txt"
+  then
+    sed -i "s/MY_MODEL_ID/${MINDEE_V2_SE_TESTS_CROP_MODEL_ID}/" $OUTPUT_FILE
+  fi
+
+  if echo "${f}" | grep -q "v2_extraction.txt"
+  then
+    sed -i "s/MY_MODEL_ID/${MINDEE_V2_SE_TESTS_FINDOC_MODEL_ID}/" $OUTPUT_FILE
+  fi
+
+  if echo "${f}" | grep -q "v2_ocr.txt"
+  then
+    sed -i "s/MY_MODEL_ID/${MINDEE_V2_SE_TESTS_OCR_MODEL_ID}/" $OUTPUT_FILE
+  fi
+
+  if echo "${f}" | grep -q "v2_split.txt"
+  then
+    sed -i "s/MY_MODEL_ID/${MINDEE_V2_SE_TESTS_SPLIT_MODEL_ID}/" $OUTPUT_FILE
+  fi
+
+  sleep 0.5  # avoid too many request errors
+    javac -cp ./target/dependency/*:./target/* "${OUTPUT_FILE}"
+  java -cp  .:./target/dependency/*:./target/* SimpleMindeeClient
+
+done