From 9a8cfafc2ee09bda7d9695cd7747ca1d54315698 Mon Sep 17 00:00:00 2001
From: Eric Schmidt <erschmid@google.com>
Date: Wed, 14 Apr 2021 09:23:16 -0700
Subject: [PATCH] samples: updates v1beta3 to v1; renames v1beta2 samples
 (#198)

---
 ...se_form.js => batch-parse-form.v1beta2.js} |  0
 ..._table.js => batch-parse-table.v1beta2.js} |  3 ---
 ...t.v1beta3.js => batch-process-document.js} | 23 +++++++++++--------
 .../{parse_form.js => parse-form.v1beta2.js}  |  0
 ...{parse_table.js => parse-table.v1beta2.js} |  0
 ...h_model.js => parse-with-model.v1beta2.js} |  0
 ...ocument.v1beta3.js => process-document.js} |  4 ++--
 document-ai/quickstart.js                     |  4 ++--
 ...et_endpoint.js => set-endpoint.v1beta2.js} |  0
 ...st.js => batch-parse-form.v1beta2.test.js} |  4 ++--
 ...t.js => batch-parse-table.v1beta2.test.js} |  4 ++--
 ...test.js => batch-process-document.test.js} |  2 +-
 ...orm.test.js => parse-form.v1beta2.test.js} | 11 +++++----
 ...le.test.js => parse-table.v1beta2.test.js} | 11 +++++----
 ...st.js => parse-with-model.v1beta2.test.js} |  4 ++--
 ...beta3.test.js => process-document.test.js} |  4 ++--
 ...t.test.js => set-endpoint.v1beta2.test.js} | 11 +++++----
 17 files changed, 48 insertions(+), 37 deletions(-)
 rename document-ai/{batch_parse_form.js => batch-parse-form.v1beta2.js} (100%)
 rename document-ai/{batch_parse_table.js => batch-parse-table.v1beta2.js} (97%)
 rename document-ai/{batch-process-document.v1beta3.js => batch-process-document.js} (92%)
 rename document-ai/{parse_form.js => parse-form.v1beta2.js} (100%)
 rename document-ai/{parse_table.js => parse-table.v1beta2.js} (100%)
 rename document-ai/{parse_with_model.js => parse-with-model.v1beta2.js} (100%)
 rename document-ai/{process-document.v1beta3.js => process-document.js} (98%)
 rename document-ai/{set_endpoint.js => set-endpoint.v1beta2.js} (100%)
 rename document-ai/test/{batch_parse_form.test.js => batch-parse-form.v1beta2.test.js} (93%)
 rename document-ai/test/{batch_parse_table.test.js => batch-parse-table.v1beta2.test.js} (93%)
 rename document-ai/test/{batch-process-document.v1beta3.test.js => batch-process-document.test.js} (97%)
 rename document-ai/test/{parse_form.test.js => parse-form.v1beta2.test.js} (82%)
 rename document-ai/test/{parse_table.test.js => parse-table.v1beta2.test.js} (82%)
 rename document-ai/test/{parse_with_model.test.js => parse-with-model.v1beta2.test.js} (88%)
 rename document-ai/test/{process-document.v1beta3.test.js => process-document.test.js} (90%)
 rename document-ai/test/{set_endpoint.test.js => set-endpoint.v1beta2.test.js} (84%)

diff --git a/document-ai/batch_parse_form.js b/document-ai/batch-parse-form.v1beta2.js
similarity index 100%
rename from document-ai/batch_parse_form.js
rename to document-ai/batch-parse-form.v1beta2.js
diff --git a/document-ai/batch_parse_table.js b/document-ai/batch-parse-table.v1beta2.js
similarity index 97%
rename from document-ai/batch_parse_table.js
rename to document-ai/batch-parse-table.v1beta2.js
index fdb072522a..98fdbdc5a8 100644
--- a/document-ai/batch_parse_table.js
+++ b/document-ai/batch-parse-table.v1beta2.js
@@ -123,9 +123,6 @@ async function main(
       const [headerRow] = table.headerRows;
 
       console.log('Results from first table processed:');
-      console.log(
-        `First detected language: ${page1.detectedLanguages[0].languageCode}`
-      );
 
       console.log('Header row:');
       for (const tableCell of headerRow.cells) {
diff --git a/document-ai/batch-process-document.v1beta3.js b/document-ai/batch-process-document.js
similarity index 92%
rename from document-ai/batch-process-document.v1beta3.js
rename to document-ai/batch-process-document.js
index 75921524d0..9b67d48d03 100644
--- a/document-ai/batch-process-document.v1beta3.js
+++ b/document-ai/batch-process-document.js
@@ -39,7 +39,7 @@ async function main(
   // Imports the Google Cloud client library
   const {
     DocumentProcessorServiceClient,
-  } = require('@google-cloud/documentai').v1beta3;
+  } = require('@google-cloud/documentai').v1;
   const {Storage} = require('@google-cloud/storage');
 
   // Instantiates Document AI, Storage clients
@@ -54,14 +54,20 @@ async function main(
     // Configure the batch process request.
     const request = {
       name,
-      inputConfigs: [
-        {
-          gcsSource: gcsInputUri,
-          mimeType: 'application/pdf',
+      inputDocuments: {
+        gcsDocuments: {
+          documents: [
+            {
+              gcsUri: gcsInputUri,
+              mimeType: 'application/pdf',
+            },
+          ],
+        },
+      },
+      documentOutputConfig: {
+        gcsOutputConfig: {
+          gcsUri: `${gcsOutputUri}/${gcsOutputUriPrefix}/`,
         },
-      ],
-      outputConfig: {
-        gcsDestination: `${gcsOutputUri}/${gcsOutputUriPrefix}/`,
       },
     };
 
@@ -73,7 +79,6 @@ async function main(
 
     // Wait for operation to complete.
     await operation.promise();
-
     console.log('Document processing complete.');
 
     // Query Storage bucket for the results file(s).
diff --git a/document-ai/parse_form.js b/document-ai/parse-form.v1beta2.js
similarity index 100%
rename from document-ai/parse_form.js
rename to document-ai/parse-form.v1beta2.js
diff --git a/document-ai/parse_table.js b/document-ai/parse-table.v1beta2.js
similarity index 100%
rename from document-ai/parse_table.js
rename to document-ai/parse-table.v1beta2.js
diff --git a/document-ai/parse_with_model.js b/document-ai/parse-with-model.v1beta2.js
similarity index 100%
rename from document-ai/parse_with_model.js
rename to document-ai/parse-with-model.v1beta2.js
diff --git a/document-ai/process-document.v1beta3.js b/document-ai/process-document.js
similarity index 98%
rename from document-ai/process-document.v1beta3.js
rename to document-ai/process-document.js
index 8e16bd7219..68a0ed31a5 100644
--- a/document-ai/process-document.v1beta3.js
+++ b/document-ai/process-document.js
@@ -27,7 +27,7 @@ async function main(projectId, location, processorId, filePath) {
 
   const {
     DocumentProcessorServiceClient,
-  } = require('@google-cloud/documentai').v1beta3;
+  } = require('@google-cloud/documentai').v1;
 
   // Instantiates a client
   const client = new DocumentProcessorServiceClient();
@@ -47,7 +47,7 @@ async function main(projectId, location, processorId, filePath) {
 
     const request = {
       name,
-      document: {
+      rawDocument: {
         content: encodedImage,
         mimeType: 'application/pdf',
       },
diff --git a/document-ai/quickstart.js b/document-ai/quickstart.js
index 6f135c72bc..8f1879bec7 100644
--- a/document-ai/quickstart.js
+++ b/document-ai/quickstart.js
@@ -27,7 +27,7 @@ async function main(projectId, location, processorId, filePath) {
 
   const {
     DocumentProcessorServiceClient,
-  } = require('@google-cloud/documentai').v1beta3;
+  } = require('@google-cloud/documentai').v1;
 
   // Instantiates a client
   const client = new DocumentProcessorServiceClient();
@@ -47,7 +47,7 @@ async function main(projectId, location, processorId, filePath) {
 
     const request = {
       name,
-      document: {
+      rawDocument: {
         content: encodedImage,
         mimeType: 'application/pdf',
       },
diff --git a/document-ai/set_endpoint.js b/document-ai/set-endpoint.v1beta2.js
similarity index 100%
rename from document-ai/set_endpoint.js
rename to document-ai/set-endpoint.v1beta2.js
diff --git a/document-ai/test/batch_parse_form.test.js b/document-ai/test/batch-parse-form.v1beta2.test.js
similarity index 93%
rename from document-ai/test/batch_parse_form.test.js
rename to document-ai/test/batch-parse-form.v1beta2.test.js
index 9c8b57e973..b4be2db82d 100644
--- a/document-ai/test/batch_parse_form.test.js
+++ b/document-ai/test/batch-parse-form.v1beta2.test.js
@@ -24,7 +24,7 @@ const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 
 const storage = new Storage();
 const bucketName = `nodejs-docs-samples-test-${uuid.v4()}`;
-const cmd = 'node batch_parse_form.js';
+const cmd = 'node batch-parse-form.v1beta2.js';
 
 const testParseForm = {
   projectId: process.env.GCLOUD_PROJECT,
@@ -32,7 +32,7 @@ const testParseForm = {
   gcsOutputUriPrefix: uuid.v4(),
 };
 
-describe('Document AI batch parse form', () => {
+describe('Document AI batch parse form (v1beta2)', () => {
   before(async () => {
     await storage.createBucket(bucketName);
   });
diff --git a/document-ai/test/batch_parse_table.test.js b/document-ai/test/batch-parse-table.v1beta2.test.js
similarity index 93%
rename from document-ai/test/batch_parse_table.test.js
rename to document-ai/test/batch-parse-table.v1beta2.test.js
index d36505a994..f0c12fb1ec 100644
--- a/document-ai/test/batch_parse_table.test.js
+++ b/document-ai/test/batch-parse-table.v1beta2.test.js
@@ -24,7 +24,7 @@ const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 
 const storage = new Storage();
 const bucketName = `nodejs-docs-samples-test-${uuid.v4()}`;
-const cmd = 'node batch_parse_table.js';
+const cmd = 'node batch-parse-table.v1beta2.js';
 
 const testParseTable = {
   projectId: process.env.GCLOUD_PROJECT,
@@ -32,7 +32,7 @@ const testParseTable = {
   gcsOutputUriPrefix: uuid.v4(),
 };
 
-describe('Document AI batch parse table', () => {
+describe('Document AI batch parse table (v1beta2)', () => {
   before(async () => {
     await storage.createBucket(bucketName);
   });
diff --git a/document-ai/test/batch-process-document.v1beta3.test.js b/document-ai/test/batch-process-document.test.js
similarity index 97%
rename from document-ai/test/batch-process-document.v1beta3.test.js
rename to document-ai/test/batch-process-document.test.js
index 5cd8b41147..fcb893ba32 100644
--- a/document-ai/test/batch-process-document.v1beta3.test.js
+++ b/document-ai/test/batch-process-document.test.js
@@ -31,7 +31,7 @@ const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 
 const storage = new Storage();
 const bucketName = `nodejs-docs-samples-test-${uuid.v4()}`;
-const cmd = 'node batch-process-document.v1beta3.js';
+const cmd = 'node batch-process-document.js';
 
 const testProcessDocument = {
   projectId: '',
diff --git a/document-ai/test/parse_form.test.js b/document-ai/test/parse-form.v1beta2.test.js
similarity index 82%
rename from document-ai/test/parse_form.test.js
rename to document-ai/test/parse-form.v1beta2.test.js
index 8052ceb632..1aaf3126b6 100644
--- a/document-ai/test/parse_form.test.js
+++ b/document-ai/test/parse-form.v1beta2.test.js
@@ -26,10 +26,13 @@ const projectId = process.env.GCLOUD_PROJECT;
 const LOCATION = 'us';
 
 describe('Document AI parse form', () => {
-  it('should parse the GCS invoice example as a form', async () => {
-    const stdout = execSync(`node ./parse_form.js ${projectId} ${LOCATION}`, {
-      cwd,
-    });
+  it('should parse the GCS invoice example as a form (v1beta2)', async () => {
+    const stdout = execSync(
+      `node ./parse-form.v1beta2.js ${projectId} ${LOCATION}`,
+      {
+        cwd,
+      }
+    );
     assert.match(stdout, /Extracted key value pair:/);
   });
 });
diff --git a/document-ai/test/parse_table.test.js b/document-ai/test/parse-table.v1beta2.test.js
similarity index 82%
rename from document-ai/test/parse_table.test.js
rename to document-ai/test/parse-table.v1beta2.test.js
index 060e825f4d..94b11e0cf3 100644
--- a/document-ai/test/parse_table.test.js
+++ b/document-ai/test/parse-table.v1beta2.test.js
@@ -26,10 +26,13 @@ const projectId = process.env.GCLOUD_PROJECT;
 const LOCATION = 'us';
 
 describe('Document AI parse table', () => {
-  it('should parse the GCS invoice example as as table', async () => {
-    const stdout = execSync(`node ./parse_table.js ${projectId} ${LOCATION}`, {
-      cwd,
-    });
+  it('should parse the GCS invoice example as as table (v1beta2)', async () => {
+    const stdout = execSync(
+      `node ./parse-table.v1beta2.js ${projectId} ${LOCATION}`,
+      {
+        cwd,
+      }
+    );
     assert.match(stdout, /Header row/);
   });
 });
diff --git a/document-ai/test/parse_with_model.test.js b/document-ai/test/parse-with-model.v1beta2.test.js
similarity index 88%
rename from document-ai/test/parse_with_model.test.js
rename to document-ai/test/parse-with-model.v1beta2.test.js
index a2f0afed65..63abbfcf34 100644
--- a/document-ai/test/parse_with_model.test.js
+++ b/document-ai/test/parse-with-model.v1beta2.test.js
@@ -28,10 +28,10 @@ const MODEL_NAME =
   process.env.MODEL_NAME ||
   'projects/1046198160504/locations/us-central1/models/TCN7483069430457434112';
 
-describe('Document AI parse with AutoML model', () => {
+describe('Document AI parse with AutoML model (v1beta2)', () => {
   it('should run use an AutoML model to parse a PDF', async () => {
     const stdout = execSync(
-      `node ./parse_with_model.js ${projectId} ${LOCATION} ${MODEL_NAME}`,
+      `node ./parse-with-model.v1beta2.js ${projectId} ${LOCATION} ${MODEL_NAME}`,
       {
         cwd,
       }
diff --git a/document-ai/test/process-document.v1beta3.test.js b/document-ai/test/process-document.test.js
similarity index 90%
rename from document-ai/test/process-document.v1beta3.test.js
rename to document-ai/test/process-document.test.js
index 48a46f0916..a3e4dd7add 100644
--- a/document-ai/test/process-document.v1beta3.test.js
+++ b/document-ai/test/process-document.test.js
@@ -40,9 +40,9 @@ describe('Process document', () => {
   before(async () => {
     projectId = await client.getProjectId();
   });
-  it('should run document (process invoice)', async () => {
+  it('should run document (process invoice) (v1)', async () => {
     const stdout = execSync(
-      `node ./process-document.v1beta3.js ${projectId} ${LOCATION} ${PROCESSOR_ID} ${filePath}`,
+      `node ./process-document.js ${projectId} ${LOCATION} ${PROCESSOR_ID} ${filePath}`,
       {
         cwd,
       }
diff --git a/document-ai/test/set_endpoint.test.js b/document-ai/test/set-endpoint.v1beta2.test.js
similarity index 84%
rename from document-ai/test/set_endpoint.test.js
rename to document-ai/test/set-endpoint.v1beta2.test.js
index f8b52acdcd..6341669e90 100644
--- a/document-ai/test/set_endpoint.test.js
+++ b/document-ai/test/set-endpoint.v1beta2.test.js
@@ -25,11 +25,14 @@ const cwd = path.join(__dirname, '..');
 const projectId = process.env.GCLOUD_PROJECT;
 const LOCATION = 'eu';
 
-describe('Document AI set endpoint', () => {
+describe('Document AI set endpoint (v1beta2)', () => {
   it('should process a PDF in another region', async () => {
-    const stdout = execSync(`node ./set_endpoint.js ${projectId} ${LOCATION}`, {
-      cwd,
-    });
+    const stdout = execSync(
+      `node ./set-endpoint.v1beta2.js ${projectId} ${LOCATION}`,
+      {
+        cwd,
+      }
+    );
     assert.match(stdout, /Entity/);
   });
 });