Language API changes (in progress) - DO NOT MERGE before Nov 15

language/api/README.rst

@@ -0,0 +1,98 @@
+.. 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
+-------------------------------------------------------------------------------
+
+Analyze syntax
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+
+
+To run this sample:
+
+.. code-block:: bash
+
+    $ python analyze.py
+
+    usage: analyze.py [-h] {entities,sentiment,syntax} text
+
+    Analyzes text using the Google Cloud Natural Language API.
+
+    positional arguments:
+      {entities,sentiment,syntax}
+      text
+
+    optional arguments:
+      -h, --help            show this help message and exit
+
+
+
+
+.. _Google Cloud SDK: https://cloud.google.com/sdk/

language/api/analyze.py

@@ -31,7 +31,9 @@ def get_service():
         ['https://www.googleapis.com/auth/cloud-platform'])
     http = httplib2.Http()
     scoped_credentials.authorize(http)
-    return discovery.build('language', 'v1beta1', http=http)
+    return discovery.build('language', 'v1',
+                           http=http,
+                           credentials=credentials)
 
 
 def get_native_encoding_type():
@@ -48,7 +50,7 @@ def analyze_entities(text, encoding='UTF32'):
             'type': 'PLAIN_TEXT',
             'content': text,
         },
-        'encodingType': encoding,
+        'encoding_type': encoding,
     }
 
     service = get_service()
@@ -59,12 +61,13 @@ def analyze_entities(text, encoding='UTF32'):
     return response
 
 
-def analyze_sentiment(text):
+def analyze_sentiment(text, encoding='UTF32'):
     body = {
         'document': {
             'type': 'PLAIN_TEXT',
             'content': text,
-        }
+        },
+        'encoding_type': encoding
     }
 
     service = get_service()
@@ -81,15 +84,12 @@ def analyze_syntax(text, encoding='UTF32'):
             'type': 'PLAIN_TEXT',
             'content': text,
         },
-        'features': {
-            'extract_syntax': True,
-        },
-        'encodingType': encoding,
+        'encoding_type': encoding
     }
 
     service = get_service()
 
-    request = service.documents().annotateText(body=body)
+    request = service.documents().analyzeSyntax(body=body)
     response = request.execute()
 
     return response
@@ -108,7 +108,7 @@ def analyze_syntax(text, encoding='UTF32'):
     if args.command == 'entities':
         result = analyze_entities(args.text, get_native_encoding_type())
     elif args.command == 'sentiment':
-        result = analyze_sentiment(args.text)
+        result = analyze_sentiment(args.text, get_native_encoding_type())
     elif args.command == 'syntax':
         result = analyze_syntax(args.text, get_native_encoding_type())
 

language/api/analyze_test.py

@@ -33,15 +33,15 @@ def test_analyze_sentiment(capsys):
         'your face is really ugly and i hate it.')
 
     sentiment = result['documentSentiment']
-    assert sentiment['polarity'] < 0
+    assert sentiment['score'] < 0
     assert sentiment['magnitude'] < 1
 
     result = analyze.analyze_sentiment(
         'cheerio, mate - I greatly admire the pallor of your visage, and your '
         'angle of repose leaves little room for improvement.')
 
     sentiment = result['documentSentiment']
-    assert sentiment['polarity'] > 0
+    assert sentiment['score'] > 0
     assert sentiment['magnitude'] < 1
 
 

language/cloud-client/README.rst

@@ -0,0 +1,102 @@
+.. 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
+
+
+
+
+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/