NL v1beta2 (#908)

* Reorganizes samples, adds new snippet, and demonstrates switching API versions using GAPIC manual layer.

* Corrects beta version in link

* Copyright dates on new files

* Removes README with nav, changes all snippets to use v1beta2 in beta folder

* Fixes v1beta2 test on GCS sentiment.

Author: gguuss

language/cloud-client/README.rst renamed to language/cloud-client/v1/README.rst

@@ -0,0 +1,144 @@
+.. This file is automatically generated. Do not edit this file directly.
+
+Google Cloud Natural Language API Python Samples
+===============================================================================
+
+This directory contains samples for Google Cloud Natural Language API. The `Google Cloud Natural Language API`_ provides natural language understanding technologies to developers, including sentiment analysis, entity recognition, and syntax analysis. This API is part of the larger Cloud Machine Learning API.
+
+
+
+
+.. _Google Cloud Natural Language API: https://cloud.google.com/natural-language/docs/ 
+
+Setup
+-------------------------------------------------------------------------------
+
+
+Authentication
+++++++++++++++
+
+Authentication is typically done through `Application Default Credentials`_,
+which means you do not have to change the code to authenticate as long as
+your environment has credentials. You have a few options for setting up
+authentication:
+
+#. When running locally, use the `Google Cloud SDK`_
+
+    .. code-block:: bash
+
+        gcloud beta auth application-default login
+
+
+#. When running on App Engine or Compute Engine, credentials are already
+   set-up. However, you may need to configure your Compute Engine instance
+   with `additional scopes`_.
+
+#. You can create a `Service Account key file`_. This file can be used to
+   authenticate to Google Cloud Platform services from any environment. To use
+   the file, set the ``GOOGLE_APPLICATION_CREDENTIALS`` environment variable to
+   the path to the key file, for example:
+
+    .. code-block:: bash
+
+        export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service_account.json
+
+.. _Application Default Credentials: https://cloud.google.com/docs/authentication#getting_credentials_for_server-centric_flow
+.. _additional scopes: https://cloud.google.com/compute/docs/authentication#using
+.. _Service Account key file: https://developers.google.com/identity/protocols/OAuth2ServiceAccount#creatinganaccount
+
+Install Dependencies
+++++++++++++++++++++
+
+#. Install `pip`_ and `virtualenv`_ if you do not already have them.
+
+#. Create a virtualenv. Samples are compatible with Python 2.7 and 3.4+.
+
+    .. code-block:: bash
+
+        $ virtualenv env
+        $ source env/bin/activate
+
+#. Install the dependencies needed to run the samples.
+
+    .. code-block:: bash
+
+        $ pip install -r requirements.txt
+
+.. _pip: https://pip.pypa.io/
+.. _virtualenv: https://virtualenv.pypa.io/
+
+Samples
+-------------------------------------------------------------------------------
+
+Quickstart
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+
+To run this sample:
+
+.. code-block:: bash
+
+    $ python quickstart.py
+
+
+Snippets
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+
+To run this sample:
+
+.. code-block:: bash
+
+    $ python snippets.py
+
+    usage: snippets.py [-h]
+                       {sentiment-entities-text,sentiment-entities-file,sentiment-text,sentiment-file,entities-text,entities-file,syntax-text,syntax-file}
+                       ...
+    
+    This application demonstrates how to perform basic operations with the
+    Google Cloud Natural Language API
+    
+    For more information, the documentation at
+    https://cloud.google.com/natural-language/docs.
+    
+    positional arguments:
+      {sentiment-entities-text,sentiment-entities-file,sentiment-text,sentiment-file,entities-text,entities-file,syntax-text,syntax-file}
+        sentiment-entities-text
+                            Detects entity sentiment in the provided text.
+        sentiment-entities-file
+                            Detects entity sentiment in a Google Cloud Storage
+                            file.
+        sentiment-text      Detects sentiment in the text.
+        sentiment-file      Detects sentiment in the file located in Google Cloud
+                            Storage.
+        entities-text       Detects entities in the text.
+        entities-file       Detects entities in the file located in Google Cloud
+                            Storage.
+        syntax-text         Detects syntax in the text.
+        syntax-file         Detects syntax in the file located in Google Cloud
+                            Storage.
+    
+    optional arguments:
+      -h, --help            show this help message and exit
+
+
+
+
+The client library
+-------------------------------------------------------------------------------
+
+This sample uses the `Google Cloud Client Library for Python`_.
+You can read the documentation for more details on API usage and use GitHub
+to `browse the source`_ and  `report issues`_.
+
+.. Google Cloud Client Library for Python:
+    https://googlecloudplatform.github.io/google-cloud-python/
+.. browse the source:
+    https://github.com/GoogleCloudPlatform/google-cloud-python
+.. report issues:
+    https://github.com/GoogleCloudPlatform/google-cloud-python/issues
+
+
+.. _Google Cloud SDK: https://cloud.google.com/sdk/

language/cloud-client/README.rst.in renamed to language/cloud-client/v1/README.rst.in

@@ -0,0 +1,24 @@
+# This file is used to generate README.rst
+
+product:
+  name: Google Cloud Natural Language API
+  short_name: Cloud Natural Language API
+  url: https://cloud.google.com/natural-language/docs/
+  description: >
+    The `Google Cloud Natural Language API`_ provides natural language
+    understanding technologies to developers, including sentiment analysis,
+    entity recognition, and syntax analysis. This API is part of the larger
+    Cloud Machine Learning API.
+
+setup:
+- auth
+- install_deps
+
+samples:
+- name: Quickstart
+  file: quickstart.py
+- name: Snippets
+  file: snippets.py
+  show_help: true
+
+cloud_client_library: true

language/cloud-client/quickstart.py renamed to language/cloud-client/v1/quickstart.py

@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+
+# Copyright 2017 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+def run_quickstart():
+    # [START language_quickstart]
+    # Imports the Google Cloud client library
+    from google.cloud import language
+
+    # Instantiates a client with they v1beta2 version
+    language_client = language.Client(api_version='v1beta2')
+
+    # The text to analyze
+    text = 'Hallo Welt!'
+    document = language_client.document_from_text(text, language='DE')
+
+    # Detects the sentiment of the text
+    sentiment = document.analyze_sentiment().sentiment
+
+    print('Text: {}'.format(text))
+    print('Sentiment: {}, {}'.format(sentiment.score, sentiment.magnitude))
+    # [END language_quickstart]
+
+
+if __name__ == '__main__':
+    run_quickstart()

language/cloud-client/quickstart_test.py renamed to language/cloud-client/v1/quickstart_test.py

@@ -0,0 +1,22 @@
+# Copyright 2017 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+import quickstart
+
+
+def test_quickstart(capsys):
+    quickstart.run_quickstart()
+    out, _ = capsys.readouterr()
+    assert 'Sentiment' in out

language/cloud-client/requirements.txt renamed to language/cloud-client/v1/requirements.txt

@@ -0,0 +1,2 @@
+gapic-google-cloud-language-v1beta2==0.15.3
+google-cloud-language==0.24.1

language/cloud-client/resources/text.txt renamed to language/cloud-client/v1/resources/text.txt

@@ -0,0 +1 @@
+President Obama is speaking at the White House.