Add speech 1.1 and gcs (GoogleCloudPlatform#345)

* defaults logger sample to the last 24 hours

* Updates for Speech 1.1 and Cloud Storage integration

* removes async_recognize, speech v1 now requires gcs uri

Author: bshaffer

logging/api/src/ListEntriesCommand.php

@@ -43,11 +43,26 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $entries = list_entries($projectId, $loggerName);
         foreach ($entries as $entry) {
             /* @var $entry \Google\Cloud\Logging\Entry */
+            $entryInfo = $entry->info();
+            if (isset($entryInfo['textPayload'])) {
+                $entryText = $entryInfo['textPayload'];
+            } else {
+                $entryText = $this->formatJsonPayload($entryInfo['jsonPayload']);
+            }
             printf(
                 "%s : %s" . PHP_EOL,
-                $entry->info()['timestamp'],
-                $entry->info()['textPayload']
+                $entryInfo['timestamp'],
+                $entryText
             );
         }
     }
+
+    private function formatJsonPayload(array $jsonPayload)
+    {
+        $entryPayload = [];
+        foreach ($jsonPayload as $key => $value) {
+            $entryPayload[] = "$key=$value";
+        }
+        return '{' . implode(', ', $entryPayload) . '}';
+    }
 }

logging/api/src/functions/log_entry_functions.php

@@ -57,8 +57,14 @@ function list_entries($projectId, $loggerName)
 {
     $logging = new LoggingClient(['projectId' => $projectId]);
     $loggerFullName = sprintf('projects/%s/logs/%s', $projectId, $loggerName);
+    $oneDayAgo = date(\DateTime::RFC3339, strtotime('-24 hours'));
+    $filter = sprintf(
+        'logName = "%s" AND timestamp >= "%s"',
+        $loggerFullName,
+        $oneDayAgo
+    );
     $options = [
-        'filter' => sprintf('logName = "%s"', $loggerFullName)
+        'filter' => $filter,
     ];
     return $logging->entries($options);
 }

speech/api/composer.json

@@ -1,15 +1,17 @@
 {
     "require": {
         "google/cloud-speech": "^0.2",
+        "google/cloud-storage": "^1.0",
         "symfony/console": "^3.0"
     },
     "autoload": {
         "psr-4": {
             "Google\\Cloud\\Samples\\Speech\\": "src/"
         },
         "files": [
-            "src/functions/transcribe_async.php",
-            "src/functions/transcribe_sync.php"
+            "src/functions/transcribe_async_gcs.php",
+            "src/functions/transcribe_sync.php",
+            "src/functions/transcribe_sync_gcs.php"
         ]
     },
     "require-dev": {