datacommonsorg · tjann · Jul 22, 2020 · Jul 21, 2020 · Jul 21, 2020 · Jul 22, 2020
diff --git a/.github/ISSUE_TEMPLATE/python-api-v1-0-0-feedback.md b/.github/ISSUE_TEMPLATE/python-api-v1-0-0-feedback.md
@@ -1,6 +1,6 @@
 ---
 name: Python API v1.0.0 Feedback
-about: Feedback for the new Python Client API
+about: Feedback for the new Python API
 title: "[API v1.0.0 Feedback] description of feedback"
 labels: python api feedback
 assignees: ACscooter

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@
 
 **Release Status** - Current head of branch [`master`](https://github.com/datacommonsorg/api-python/tree/master)
 
-New features added to the Python Client API
+New features added to the Python API
 
 -   Add get_stats API to get observations given a StatisticalVariable and place dcids.
 
@@ -25,7 +25,7 @@ Bugs fixed in new release
 
 **Release Status** - Current head of branch [`master`](https://github.com/datacommonsorg/api-python/tree/master)
 
-New features added to the Python Client API
+New features added to the Python API
 
 -   Handle and ignore NaN in API argument.
 
@@ -41,7 +41,7 @@ Bugs fixed in new release
 
 **Release Status** - Current head of branch [`master`](https://github.com/datacommonsorg/api-python/tree/master)
 
-New features added to the Python Client API
+New features added to the Python API
 
 -   Use six package for urllib.
 
@@ -53,7 +53,7 @@ New features added to the Python Client API
 
 **Release Status** - Current head of branch [`master`](https://github.com/datacommonsorg/api-python/tree/master)
 
-New features added to the Python Client API
+New features added to the Python API
 
 -   Support python 2.7.
 
@@ -65,7 +65,7 @@ New features added to the Python Client API
 
 **Release Status** - Current head of branch [`master`](https://github.com/datacommonsorg/api-python/tree/master)
 
-New features added to the Python Client API
+New features added to the Python API
 
 -   Add a new API for getting related places.
 
@@ -79,7 +79,7 @@ New features added to the Python Client API
 
 **Release Status** - Current head of branch [`master`](https://github.com/datacommonsorg/api-python/tree/master)
 
-New features added to the Python Client API
+New features added to the Python API
 
 -   Remove the dependency on Pandas and Numpy in package dependency.
 -   Replace requests with urllib.
@@ -93,7 +93,7 @@ New features added to the Python Client API
 
 **Release Status** - Current head of branch [`master`](https://github.com/datacommonsorg/api-python/tree/master)
 
-New features added to the Python Client API
+New features added to the Python API
 
 -   Remove the dependency on Pandas.
 
@@ -106,7 +106,7 @@ New features added to the Python Client API
 
 **Release Status** - Current head of branch [`stable-1.x`](https://github.com/datacommonsorg/api-python/tree/stable-1.x)
 
-New features added to the Python Client API
+New features added to the Python API
 
 -   Added two new functions `get_pop_obs` and `get_place_obs`
 -   SPARQL query is now supported as a function `query` instead of a class.
@@ -123,7 +123,7 @@ Bugs fixed in new release
 
 **Release Tag** - [v1.0.0](https://github.com/datacommonsorg/api-python/releases/tag/v1.0.0)
 
-New release of the Python Client API.
+New release of the Python API.
 
 -   New functions in the API built on top of the [Data Commons REST API](https://github.com/datacommonsorg/mixer).
     -   `get_property_labels`

diff --git a/README.md b/README.md
@@ -9,11 +9,6 @@ Once the package is installed, import `datacommons`.
 
     import datacommons as dc
 
-You will also need to provision an API key by enabling the Data Commons API on
-GCP. Once you have the API key, simply add the following line to your code.
-
-    dc.set_api_key('YOUR-API-KEY')
-
 For more detail on getting started with the API, please visit
 [Getting Started](http://docs.datacommons.org/api/).
 

diff --git a/datacommons/__init__.py b/datacommons/__init__.py
@@ -15,10 +15,10 @@
 # Data Commons SPARQL query support
 from datacommons.query import query
 
-# Data Commons Python Client API
+# Data Commons Python API
 from datacommons.core import get_property_labels, get_property_values, get_triples
 from datacommons.places import get_places_in, get_related_places, get_stats
 from datacommons.populations import get_populations, get_observations, get_pop_obs, get_place_obs
 
-# Other utilities
-from .utils import set_api_key
+# Other utilities	
+from .utils import set_api_key
diff --git a/datacommons/core.py b/datacommons/core.py
@@ -11,7 +11,7 @@
 # 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.
-""" Data Commons Python Client API Core.
+""" Data Commons Python API Core.
 
 Provides primitive operations for working with collections of nodes. For a
 collection of nodes identified by their dcids, this submodule implements the

diff --git a/datacommons/examples/core.py b/datacommons/examples/core.py
@@ -11,7 +11,7 @@
 # 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.
-""" Data Commons Python Client API examples.
+""" Data Commons Python API examples.
 
 Basic demo for get_property_labels, get_property_values, and get_triples.
 """

diff --git a/datacommons/examples/places.py b/datacommons/examples/places.py
@@ -11,7 +11,7 @@
 # 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.
-""" Data Commons Python Client API examples.
+""" Data Commons Python API examples.
 
 Basic demo for get_places_in
 """

diff --git a/datacommons/examples/populations.py b/datacommons/examples/populations.py
@@ -11,7 +11,7 @@
 # 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.
-""" Data Commons Python Client API examples.
+""" Data Commons Python API examples.
 
 Basic demo for get_populations and get_observations.
 """

diff --git a/datacommons/examples/query.py b/datacommons/examples/query.py
@@ -11,7 +11,7 @@
 # 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.
-""" Data Commons Python Client API examples.
+""" Data Commons Python API examples.
 
 Example on how to use the Client API SPARQL query wrapper.
 """

diff --git a/datacommons/places.py b/datacommons/places.py
@@ -11,7 +11,7 @@
 # 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.
-""" Data Commons Python Client API Places Module.
+""" Data Commons Python API Places Module.
 
 Provides convenience functions for working with Places in the Data Commons
 Graph. This submodule implements the ability to access :obj:`Place`'s

diff --git a/datacommons/populations.py b/datacommons/populations.py
@@ -11,7 +11,7 @@
 # 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.
-""" Data Commons Python Client API Populations Module.
+""" Data Commons Python API Populations Module.
 
 Provides convenience functions for accessing :obj:`StatisticalPopulation`'s and
 :obj:`Observation`'s in the Data Commons Graph. Implements the

diff --git a/datacommons/query.py b/datacommons/query.py
@@ -11,7 +11,7 @@
 # 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.
-""" Data Commons Python Client API Query Module.
+""" Data Commons Python API Query Module.
 
 Implements functions for sending graph queries to the Data Commons Graph.
 """
@@ -20,7 +20,7 @@
 from __future__ import division
 from __future__ import print_function
 
-from datacommons.utils import _API_ROOT, _API_ENDPOINTS, _ENV_VAR_API_KEY
+from datacommons.utils import _API_ROOT, _API_ENDPOINTS
 
 import json
 import os
@@ -85,14 +85,9 @@ def query(query_string, select=None):
     ...   print(r)
     {"?name": "Maryland", "?dcid": "geoId/24"}
   """
-  # Get the API Key and perform the POST request.
-  if not os.environ.get(_ENV_VAR_API_KEY, None):
-    raise ValueError(
-        'Request error: Must set an API key before using the API!')
-  req_url = _API_ROOT + _API_ENDPOINTS['query']
 
+  req_url = _API_ROOT + _API_ENDPOINTS['query']
   headers = {
-    'x-api-key': os.environ[_ENV_VAR_API_KEY],
     'Content-Type': 'application/json'
   }
   req = six.moves.urllib.request.Request(

diff --git a/datacommons/test/core_test.py b/datacommons/test/core_test.py
@@ -11,9 +11,9 @@
 # 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.
-""" Data Commons Python Client API unit tests.
+""" Data Commons Python API unit tests.
 
-Unit tests for core methods in the Data Commons Python Client API.
+Unit tests for core methods in the Data Commons Python API.
 """
 
 from __future__ import absolute_import
@@ -43,11 +43,6 @@ def read(self):
   req = args[0]
   data = json.loads(req.data)
 
-  # If the API key does not match, then return 403 Forbidden
-  api_key = req.get_header('X-api-key')
-  if api_key != 'TEST-API-KEY':
-    return urllib.error.HTTPError
-
   # Mock responses for urlopen requests to get_property_labels.
   if req.full_url == utils._API_ROOT + utils._API_ENDPOINTS['get_property_labels']:
     if data['dcids'] == ['geoId/0649670']:
@@ -323,9 +318,6 @@ def test_single_dcid(self, urlopen_mock):
     """ Calling get_property_labels with a single dcid returns a valid
     result.
     """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     # Test for outgoing property labels
     out_props = dc.get_property_labels(['geoId/0649670'])
     self.assertDictEqual(out_props,
@@ -340,9 +332,6 @@ def test_multiple_dcids(self, urlopen_mock):
     """ Calling get_property_labels returns valid results with multiple
     dcids.
     """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     dcids = ['State', 'County', 'City']
     expected_in = ["typeOf"]
     expected_out = ["name", "provenance", "subClassOf", "typeOf", "url"]
@@ -368,9 +357,6 @@ def test_bad_dcids(self, urlopen_mock):
     """ Calling get_property_labels with dcids that do not exist returns empty
     results.
     """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     # Test for outgoing property labels
     out_props = dc.get_property_labels(['dc/MadDcid'])
     self.assertDictEqual(out_props, {'dc/MadDcid': []})
@@ -382,8 +368,6 @@ def test_bad_dcids(self, urlopen_mock):
   @mock.patch('six.moves.urllib.request.urlopen', side_effect=request_mock)
   def test_no_dcids(self, urlopen_mock):
     """ Calling get_property_labels with no dcids returns empty results. """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
 
     # Test for outgoing property labels
     out_props = dc.get_property_labels([])
@@ -404,9 +388,6 @@ def test_multiple_dcids(self, urlopen_mock):
     """ Calling get_property_values with multiple dcids returns valid
     results.
     """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     dcids = ['geoId/06085', 'geoId/24031']
 
     # Get the containedInPlace Towns for Santa Clara and Montgomery County.
@@ -444,9 +425,6 @@ def test_bad_dcids(self, urlopen_mock):
     """ Calling get_property_values with dcids that do not exist returns empty
     results.
     """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     bad_dcids_1 = ['geoId/06085', 'dc/MadDcid']
     bad_dcids_2 = ['dc/MadDcid', 'dc/MadderDcid']
 
@@ -470,9 +448,6 @@ def test_bad_property(self, urlopen_mock):
     """ Calling get_property_values with a property that does not exist returns
     empty results.
     """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     # Get propery values for a property that does not exist.
     prop_vals = dc.get_property_values(
       ['geoId/06085', 'geoId/24031'], 'madProperty')
@@ -484,9 +459,6 @@ def test_bad_property(self, urlopen_mock):
   @mock.patch('six.moves.urllib.request.urlopen', side_effect=request_mock)
   def test_no_dcids(self, urlopen_mock):
     """ Calling get_property_values with no dcids returns empty results. """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     # Get property values with an empty list of dcids.
     prop_vals = dc.get_property_values([], 'containedInPlace')
     self.assertDictEqual(prop_vals, {})
@@ -497,9 +469,6 @@ class TestGetTriples(unittest.TestCase):
   @mock.patch('six.moves.urllib.request.urlopen', side_effect=request_mock)
   def test_multiple_dcids(self, urlopen_mock):
     """ Calling get_triples with proper dcids returns valid results. """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     # Call get_triples
     triples = dc.get_triples(['geoId/06085', 'geoId/24031'])
     self.assertDictEqual(triples, {
@@ -520,9 +489,6 @@ def test_bad_dcids(self, urlopen_mock):
     """ Calling get_triples with dcids that do not exist returns empty
     results.
     """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     # Call get_triples where one dcid does not exist
     triples_1 = dc.get_triples(['geoId/06085', 'dc/MadDcid'])
     self.assertDictEqual(triples_1, {
@@ -544,9 +510,6 @@ def test_bad_dcids(self, urlopen_mock):
   @mock.patch('six.moves.urllib.request.urlopen', side_effect=request_mock)
   def test_no_dcids(self, urlopen_mock):
     """ Calling get_triples with no dcids returns empty results. """
-    # Set the API key
-    dc.set_api_key('TEST-API-KEY')
-
     # Call get_triples with no dcids
     triples_1 = dc.get_triples([])
     self.assertDictEqual(triples_1, {})