samples: updates v1beta3 to v1; renames v1beta2 samples (#198)

telpirion · Ace Nassri · commit 79cbb092142c · 2022-11-11T16:02:27.000-08:00
diff --git a/document-ai/batch-parse-form.v1beta2.js b/document-ai/batch-parse-form.v1beta2.js
diff --git a/document-ai/batch-parse-table.v1beta2.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.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.v1beta2.js b/document-ai/parse-form.v1beta2.js
diff --git a/document-ai/parse-table.v1beta2.js b/document-ai/parse-table.v1beta2.js
diff --git a/document-ai/parse-with-model.v1beta2.js b/document-ai/parse-with-model.v1beta2.js
diff --git a/document-ai/process-document.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
@@ -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.v1beta2.js b/document-ai/set-endpoint.v1beta2.js
diff --git a/document-ai/test/batch-parse-form.v1beta2.test.js b/document-ai/test/batch-parse-form.v1beta2.test.js
@@ -24,15 +24,15 @@ 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,
   location: 'us',
   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.v1beta2.test.js b/document-ai/test/batch-parse-table.v1beta2.test.js
@@ -24,15 +24,15 @@ 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,
   location: 'us',
   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.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.v1beta2.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.v1beta2.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.v1beta2.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.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.v1beta2.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/);
   });
 });
