black formatting

Author: tmorrell

caltechdata_api/caltechdata_write.py

@@ -17,8 +17,8 @@ def send_s3(filepath, token, production=False):
 
     c = session()
 
-    #print(s3surl)
-    #print(headers)
+    # print(s3surl)
+    # print(headers)
     response = c.get(s3surl, headers=headers)
     jresp = response.json()
     data = jresp["data"]
@@ -56,8 +56,8 @@ def send_s3(filepath, token, production=False):
     if response.text:
         raise Exception(response.text)
 
-    #print(chkurl + "/" + bucket + "/" + key + "/")
-    #print(headers)
+    # print(chkurl + "/" + bucket + "/" + key + "/")
+    # print(headers)
     response = c.get(chkurl + "/" + bucket + "/" + key + "/", headers=headers)
     print(response)
     md5 = response.json()["md5"]

get_geo.py

@@ -7,51 +7,47 @@
         description="get_metadata queries the caltechDATA (Invenio 3) API\
     and returns DataCite-compatable metadata"
     )
-    parser.add_argument(
-        "output",
-        help="Output file name",
-    )
+    parser.add_argument("output", help="Output file name")
     parser.add_argument("-keywords", nargs="*")
 
     args = parser.parse_args()
 
-    url = 'https://data.caltech.edu/api/records/?size=5000'
+    url = "https://data.caltech.edu/api/records/?size=5000"
 
-    search = ''
+    search = ""
     if args.keywords:
         for key in args.keywords:
-            if search == '':
+            if search == "":
                 search = f'&q=subjects:"{key}"'
             else:
-                search = search+f'+"{key}"'
+                search = search + f'+"{key}"'
         url = url + search
 
     response = requests.get(url)
     hits = response.json()
 
-    outfile = open(args.output,'w')
+    outfile = open(args.output, "w")
     writer = csv.writer(outfile)
-    writer.writerow(['wkt','name','year','doi'])
-
-    for h in hits['hits']['hits']:
-        metadata = decustomize_schema(h['metadata'])
-        if 'geoLocations' in metadata:
-            doi = 'https://doi.org/'+metadata['identifier']['identifier']
-            title=metadata['titles'][0]['title'].split(':')[0]
-            geo = metadata['geoLocations']
-            year = metadata['publicationYear']
+    writer.writerow(["wkt", "name", "year", "doi"])
+
+    for h in hits["hits"]["hits"]:
+        metadata = decustomize_schema(h["metadata"])
+        if "geoLocations" in metadata:
+            doi = "https://doi.org/" + metadata["identifier"]["identifier"]
+            title = metadata["titles"][0]["title"].split(":")[0]
+            geo = metadata["geoLocations"]
+            year = metadata["publicationYear"]
             for g in geo:
-                if 'geoLocationBox' in g:
-                    box = g['geoLocationBox']
+                if "geoLocationBox" in g:
+                    box = g["geoLocationBox"]
                     p1 = f"{box['eastBoundLongitude']} {box['northBoundLatitude']}"
                     p2 = f"{box['westBoundLongitude']} {box['northBoundLatitude']}"
                     p3 = f"{box['westBoundLongitude']} {box['southBoundLatitude']}"
                     p4 = f"{box['eastBoundLongitude']} {box['southBoundLatitude']}"
-                    wkt = f'POLYGON (({p1}, {p2}, {p3}, {p4}, {p1}))'
-                    writer.writerow([wkt,title,year,doi])
-                    
-                if 'geoLocationPoint' in g:
-                    point = g['geoLocationPoint']
-                    wkt = f"POINT ({point['pointLongitude']} {point['pointLatitude']})"
-                    writer.writerow([wkt,title,year,doi])
+                    wkt = f"POLYGON (({p1}, {p2}, {p3}, {p4}, {p1}))"
+                    writer.writerow([wkt, title, year, doi])
 
+                if "geoLocationPoint" in g:
+                    point = g["geoLocationPoint"]
+                    wkt = f"POINT ({point['pointLongitude']} {point['pointLatitude']})"
+                    writer.writerow([wkt, title, year, doi])