Merge pull request GoogleCloudPlatform#789 from gogasca/syntax

[syntax] Migrate to new client LanguageServiceClient in 0.16.2

Author: gogasca

language/language.php

@@ -213,7 +213,7 @@
         // Regex to match a Cloud Storage path as the first argument
         // e.g "gs://my-bucket/file_with_text.txt"
         if (preg_match('/^gs:\/\/([a-z0-9\._\-]+)\/(\S+)$/', $content, $matches)) {
-            analyze_syntax_from_file($matches[1], $matches[2], $projectId);
+            analyze_syntax_from_file($content, $projectId);
         } else {
             analyze_syntax($content, $projectId);
         }

language/src/analyze_syntax.php

@@ -24,7 +24,9 @@
 # [START language_syntax_text]
 namespace Google\Cloud\Samples\Language;
 
-use Google\Cloud\Language\LanguageClient;
+use Google\Cloud\Language\V1beta2\Document;
+use Google\Cloud\Language\V1beta2\Document\Type;
+use Google\Cloud\Language\V1beta2\LanguageServiceClient;
 
 /**
  * Find the syntax in text.
@@ -39,20 +41,40 @@
 function analyze_syntax($text, $projectId = null)
 {
     // Create the Natural Language client
-    $language = new LanguageClient([
-        'projectId' => $projectId,
-    ]);
+    $languageServiceClient = new LanguageServiceClient(['projectId' => $projectId]);
 
-    // Call the analyzeSyntax function
-    $annotation = $language->analyzeSyntax($text);
-
-    // Print syntax information. See https://cloud.google.com/natural-language/docs/reference/rest/v1/Token
-    // to learn about more information you can extract from Token objects.
-    $tokens = $annotation->tokens();
-    foreach ($tokens as $token) {
-        printf('Token text: %s' . PHP_EOL, $token['text']['content']);
-        printf('Token part of speech: %s' . PHP_EOL, $token['partOfSpeech']['tag']);
-        printf(PHP_EOL);
+    try {
+        $tag_types = [
+            0 => 'UNKNOWN',
+            1 => 'ADJ',
+            2 => 'ADP',
+            3 => 'ADV',
+            4 => 'CONJ',
+            5 => 'DET',
+            6 => 'NOUN',
+            7 => 'NUM',
+            8 => 'PRON',
+            9 => 'PRT',
+            10 => 'PUNCT',
+            11 => 'VERB',
+            12 => 'X',
+            13 => 'AFFIX',
+        ];
+        // Create a new Document
+        $document = new Document();
+        // Add text as content and set document type to PLAIN_TEXT
+        $document->setContent($text)->setType(Type::PLAIN_TEXT);
+        // Call the analyzeEntities function
+        $response = $languageServiceClient->analyzeSyntax($document, []);
+        $tokens = $response->getTokens();
+        // Print out information about each entity
+        foreach ($tokens as $token) {
+            printf('Token text: %s' . PHP_EOL, $token->getText()->getContent());
+            printf('Token part of speech: %s' . PHP_EOL, $tag_types[$token->getPartOfSpeech()->getTag()]);
+            print(PHP_EOL);
+        }
+    } finally {
+        $languageServiceClient->close();
     }
 }
 # [END language_syntax_text]

language/src/analyze_syntax_from_file.php

@@ -24,42 +24,57 @@
 # [START language_syntax_gcs]
 namespace Google\Cloud\Samples\Language;
 
-use Google\Cloud\Language\LanguageClient;
-use Google\Cloud\Storage\StorageClient;
+use Google\Cloud\Language\V1beta2\Document;
+use Google\Cloud\Language\V1beta2\Document\Type;
+use Google\Cloud\Language\V1beta2\LanguageServiceClient;
 
 /**
  * Find the syntax in text stored in a Cloud Storage bucket.
  * ```
  * analyze_syntax_from_file('my-bucket', 'file_with_text.txt');
  * ```
  *
- * @param string $bucketName The Cloud Storage bucket.
- * @param string $objectName The Cloud Storage object with text.
+ * @param string $gcsUri The Cloud Storage path with text.
  * @param string $projectId (optional) Your Google Cloud Project ID
  *
  */
-function analyze_syntax_from_file($bucketName, $objectName, $projectId = null)
+function analyze_syntax_from_file($gcsUri, $projectId = null)
 {
-    // Create the Cloud Storage object
-    $storage = new StorageClient();
-    $bucket = $storage->bucket($bucketName);
-    $storageObject = $bucket->object($objectName);
-
     // Create the Natural Language client
-    $language = new LanguageClient([
-        'projectId' => $projectId,
-    ]);
-
-    // Call the analyzeSyntax function
-    $annotation = $language->analyzeSyntax($storageObject);
+    $languageServiceClient = new LanguageServiceClient(['projectId' => $projectId]);
 
-    // Print syntax information. See https://cloud.google.com/natural-language/docs/reference/rest/v1/Token
-    // to learn about more information you can extract from Token objects.
-    $tokens = $annotation->tokens();
-    foreach ($tokens as $token) {
-        printf('Token text: %s' . PHP_EOL, $token['text']['content']);
-        printf('Token part of speech: %s' . PHP_EOL, $token['partOfSpeech']['tag']);
-        printf(PHP_EOL);
+    try {
+        $tag_types = [
+            0 => 'UNKNOWN',
+            1 => 'ADJ',
+            2 => 'ADP',
+            3 => 'ADV',
+            4 => 'CONJ',
+            5 => 'DET',
+            6 => 'NOUN',
+            7 => 'NUM',
+            8 => 'PRON',
+            9 => 'PRT',
+            10 => 'PUNCT',
+            11 => 'VERB',
+            12 => 'X',
+            13 => 'AFFIX',
+        ];
+        // Create a new Document
+        $document = new Document();
+        // Pass GCS URI and set document type to PLAIN_TEXT
+        $document->setGcsContentUri($gcsUri)->setType(Type::PLAIN_TEXT);
+        // Call the analyzeEntities function
+        $response = $languageServiceClient->analyzeSyntax($document, []);
+        $tokens = $response->getTokens();
+        // Print out information about each entity
+        foreach ($tokens as $token) {
+            printf('Token text: %s' . PHP_EOL, $token->getText()->getContent());
+            printf('Token part of speech: %s' . PHP_EOL, $tag_types[$token->getPartOfSpeech()->getTag()]);
+            print(PHP_EOL);
+        }
+    } finally {
+        $languageServiceClient->close();
     }
 }
 # [END language_syntax_gcs]