[Clean up] Use yapf to lint files; Remove dangling file links (#187)

* [Clean up] Use yapf to lint files; Remove dangling file links

* indent 2

* comment indent

* more comment indent

Author: shifucun

cloudbuild.yaml

@@ -4,4 +4,4 @@ steps:
     entrypoint: /bin/sh
     args:
       - -c
-      - "pip3 install -r requirements.txt && python3 -m pytest"
+      - "./run_tests.sh -p"

datacommons/core.py

@@ -96,7 +96,7 @@ def get_property_labels(dcids, out=True):
     }
   """
   # Generate the GetProperty query and send the request
-  dcids = filter(lambda v: v==v, dcids)  # Filter out NaN values
+  dcids = filter(lambda v: v == v, dcids)  # Filter out NaN values
   dcids = list(dcids)
   url = utils._API_ROOT + utils._API_ENDPOINTS['get_property_labels']
   payload = utils._send_request(url, req_json={'dcids': dcids})
@@ -153,18 +153,18 @@ def get_property_values(dcids,
     }
   """
   # Convert the dcids field and format the request to GetPropertyValue
-  dcids = filter(lambda v: v==v, dcids)  # Filter out NaN values
+  dcids = filter(lambda v: v == v, dcids)  # Filter out NaN values
   dcids = list(dcids)
   if out:
     direction = 'out'
   else:
     direction = 'in'
 
   req_json = {
-    'dcids': dcids,
-    'property': prop,
-    'limit': limit,
-    'direction': direction
+      'dcids': dcids,
+      'property': prop,
+      'limit': limit,
+      'direction': direction
   }
   if value_type:
     req_json['value_type'] = value_type
@@ -182,8 +182,8 @@ def get_property_values(dcids,
       if dcid in payload and 'out' in payload[dcid]:
         nodes = payload[dcid]['out']
     else:
-       if dcid in payload and 'in' in payload[dcid]:
-          nodes = payload[dcid]['in']
+      if dcid in payload and 'in' in payload[dcid]:
+        nodes = payload[dcid]['in']
 
     # Add nodes to unique_results if it is not empty
     for node in nodes:
@@ -236,7 +236,7 @@ def get_triples(dcids, limit=utils._MAX_LIMIT):
     }
   """
   # Generate the GetTriple query and send the request.
-  dcids = filter(lambda v: v==v, dcids)  # Filter out NaN values
+  dcids = filter(lambda v: v == v, dcids)  # Filter out NaN values
   dcids = list(dcids)
   url = utils._API_ROOT + utils._API_ENDPOINTS['get_triples']
   payload = utils._send_request(url, req_json={'dcids': dcids, 'limit': limit})
@@ -250,9 +250,7 @@ def get_triples(dcids, limit=utils._MAX_LIMIT):
     # Add triples as appropriate
     for t in payload[dcid]:
       if 'objectId' in t:
-        results[dcid].append(
-          (t['subjectId'], t['predicate'], t['objectId']))
+        results[dcid].append((t['subjectId'], t['predicate'], t['objectId']))
       elif 'objectValue' in t:
-        results[dcid].append(
-          (t['subjectId'], t['predicate'], t['objectValue']))
+        results[dcid].append((t['subjectId'], t['predicate'], t['objectValue']))
   return dict(results)

datacommons/examples/core.py

@@ -22,6 +22,7 @@
 
 import datacommons as dc
 
+
 def main():
   # Set the dcid to be that of Santa Clara County.
   dcids = ['geoId/06085', 'dc/p/zsb968m3v1f97']
@@ -36,8 +37,10 @@ def main():
 
   # Print all property values for "containedInPlace" for Santa Clara County.
   print('Property Values for "containedInPlace" of Santa Clara County')
-  prop_vals = dc.get_property_values(
-    dcids, 'containedInPlace', out=False, value_type='City')
+  prop_vals = dc.get_property_values(dcids,
+                                     'containedInPlace',
+                                     out=False,
+                                     value_type='City')
   print('> Cities contained in {}'.format(dcids))
   for dcid in dcids:
     for city_dcid in prop_vals[dcid]:

datacommons/examples/places.py

@@ -42,32 +42,42 @@ def main():
 
   # Get place stats.
   print('Get place stats -- all')
-  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'], 'dc/0hyp6tkn18vcb', obs_dates='all')
+  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'],
+                       'dc/0hyp6tkn18vcb',
+                       obs_dates='all')
   print(stats)
 
   print('Get place stats -- latest')
-  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'], 'dc/0hyp6tkn18vcb')
+  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'],
+                       'dc/0hyp6tkn18vcb')
   print(stats)
 
   print('Get place stats -- 2014')
-  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'], 'dc/0hyp6tkn18vcb', obs_dates=['2014'])
+  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'],
+                       'dc/0hyp6tkn18vcb',
+                       obs_dates=['2014'])
   print(stats)
 
   print('Get place stats -- 2014 badly formatted')
-  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'], 'dc/0hyp6tkn18vcb', obs_dates='2014')
+  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'],
+                       'dc/0hyp6tkn18vcb',
+                       obs_dates='2014')
   print(stats)
 
   print('Get place stats -- 2015-2016')
-  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'], 'dc/0hyp6tkn18vcb', obs_dates=['2015', '2016'])
+  stats = dc.get_stats(['geoId/05', 'geoId/06', 'dc/madDcid'],
+                       'dc/0hyp6tkn18vcb',
+                       obs_dates=['2015', '2016'])
   print(stats)
 
   # Get related places.
+
+
 # TODO(*): Fix the related places example.
 #  print('Get related places')
 #   related_places = dc.get_related_places(['geoId/06085'], 'Person', 'count',
 #       'CensusACS5yrSurvey', "measuredValue", {"gender": "Female"})
 #   print(related_places)
 
-
 if __name__ == '__main__':
   main()