Remove unneeded SSL option and fix ROR bug

Author: tmorrell

caltechdata_api/caltechdata_edit.py

@@ -24,10 +24,8 @@ def caltechdata_accept(ids, token=None, production=False):
 
     if production == True:
         url = "https://data.caltech.edu"
-        verify = True
     else:
         url = "https://data.caltechlibrary.dev"
-        verify = True
 
     headers = {
         "Authorization": "Bearer %s" % token,
@@ -83,10 +81,8 @@ def caltechdata_edit(
     data = customize_schema.customize_schema(copy.deepcopy(metadata), schema=schema)
     if production == True:
         url = "https://data.caltech.edu"
-        verify = True
     else:
         url = "https://data.caltechlibrary.dev"
-        verify = True
 
     headers = {
         "Authorization": "Bearer %s" % token,
@@ -106,7 +102,6 @@ def caltechdata_edit(
             result = requests.post(
                 url + "/api/records/" + idv + "/versions",
                 headers=headers,
-                verify=verify,
             )
             if result.status_code != 201:
                 raise Exception(result.text)
@@ -117,32 +112,28 @@ def caltechdata_edit(
                 url + "/api/records/" + idv + "/draft",
                 headers=headers,
                 json=data,
-                verify=verify,
             )
 
             file_link = result.json()["links"]["files"]
-            write_files_rdm(files, file_link, headers, f_headers, verify)
+            write_files_rdm(files, file_link, headers, f_headers)
 
         else:
             # Check for existing draft
             result = requests.get(
                 url + "/api/records/" + idv + "/draft",
                 headers=headers,
-                verify=verify,
             )
             if result.status_code != 200:
                 # We make a draft
                 result = requests.post(
                     url + "/api/records/" + idv + "/draft",
                     headers=headers,
-                    verify=verify,
                 )
                 if result.status_code != 201:
                     raise Exception(result.text)
                 result = requests.get(
                     url + "/api/records/" + idv,
                     headers=headers,
-                    verify=verify,
                 )
                 if result.status_code != 200:
                     raise Exception(result.text)
@@ -152,21 +143,20 @@ def caltechdata_edit(
                 url + "/api/records/" + idv + "/draft",
                 headers=headers,
                 json=data,
-                verify=verify,
             )
             if result.status_code != 200:
                 raise Exception(result.text)
 
         if community:
             review_link = result.json()["links"]["review"]
             result = send_to_community(
-                review_link, data, headers, verify, publish, community
+                review_link, data, headers, publish, community
             )
             doi = result.json()["pids"]["doi"]["identifier"]
             completed.append(doi)
         elif publish:
             publish_link = f"{url}/api/records/{idv}/draft/actions/publish"
-            result = requests.post(publish_link, headers=headers, verify=verify)
+            result = requests.post(publish_link, headers=headers)
             if result.status_code != 202:
                 raise Exception(result.text)
             doi = result.json()["pids"]["doi"]["identifier"]

caltechdata_api/caltechdata_write.py

@@ -9,14 +9,14 @@
 from caltechdata_api import customize_schema
 
 
-def write_files_rdm(files, file_link, headers, f_headers, verify, s3=None):
+def write_files_rdm(files, file_link, headers, f_headers, s3=None):
     f_json = []
     f_list = {}
     for f in files:
         filename = f.split("/")[-1]
         f_json.append({"key": filename})
         f_list[filename] = f
-    result = requests.post(file_link, headers=headers, json=f_json, verify=verify)
+    result = requests.post(file_link, headers=headers, json=f_json)
     if result.status_code != 201:
         raise Exception(result.text)
     # Now we have the upload links
@@ -30,10 +30,10 @@ def write_files_rdm(files, file_link, headers, f_headers, verify, s3=None):
             infile = open(f_list[name], "rb")
         # size = infile.seek(0, 2)
         # infile.seek(0, 0)  # reset at beginning
-        result = requests.put(link, headers=f_headers, verify=verify, data=infile)
+        result = requests.put(link, headers=f_headers, data=infile)
         if result.status_code != 200:
             raise Exception(result.text)
-        result = requests.post(commit, headers=headers, verify=verify)
+        result = requests.post(commit, headers=headers)
         if result.status_code != 200:
             raise Exception(result.text)
 
@@ -64,13 +64,13 @@ def add_file_links(metadata, file_links):
     return metadata
 
 
-def send_to_community(review_link, data, headers, verify, publish, community):
+def send_to_community(review_link, data, headers, publish, community):
 
     data = {
         "receiver": {"community": community},
         "type": "community-submission",
     }
-    result = requests.put(review_link, json=data, headers=headers, verify=verify)
+    result = requests.put(review_link, json=data, headers=headers)
     if result.status_code != 200:
         raise Exception(result.text)
     submit_link = result.json()["links"]["actions"]["submit"]
@@ -80,7 +80,7 @@ def send_to_community(review_link, data, headers, verify, publish, community):
             "format": "html",
         }
     }
-    result = requests.post(submit_link, json=data, headers=headers, verify=verify)
+    result = requests.post(submit_link, json=data, headers=headers)
     if result.status_code != 200:
         raise Exception(result.text)
     if publish:
@@ -91,7 +91,7 @@ def send_to_community(review_link, data, headers, verify, publish, community):
                 "format": "html",
             }
         }
-        result = requests.post(accept_link, json=data, headers=headers, verify=verify)
+        result = requests.post(accept_link, json=data, headers=headers)
         if result.status_code != 200:
             raise Exception(result.text)
     return result
@@ -128,10 +128,8 @@ def caltechdata_write(
     data = customize_schema.customize_schema(copy.deepcopy(metadata), schema=schema)
     if production == True:
         url = "https://data.caltech.edu/"
-        verify = True
     else:
         url = "https://data.caltechlibrary.dev/"
-        verify = False
 
     headers = {
         "Authorization": "Bearer %s" % token,
@@ -150,7 +148,7 @@ def caltechdata_write(
 
     # Make draft and publish
     result = requests.post(
-        url + "/api/records", headers=headers, json=data, verify=verify
+        url + "/api/records", headers=headers, json=data
     )
     if result.status_code != 201:
         raise Exception(result.text)
@@ -159,15 +157,15 @@ def caltechdata_write(
 
     if files:
         file_link = result.json()["links"]["files"]
-        write_files_rdm(files, file_link, headers, f_headers, verify, s3)
+        write_files_rdm(files, file_link, headers, f_headers, s3)
 
     if community:
         review_link = result.json()["links"]["review"]
-        send_to_community(review_link, data, headers, verify, publish, community)
+        send_to_community(review_link, data, headers, publish, community)
 
     else:
         if publish:
-            result = requests.post(publish_link, headers=headers, verify=verify)
+            result = requests.post(publish_link, headers=headers)
             if result.status_code != 202:
                 raise Exception(result.text)
     return idv

caltechdata_api/customize_schema.py

@@ -12,13 +12,14 @@ def grid_to_ror(grid):
     # Temporary until InvenioRDM stops spitting out GRIDS
     # We manually handle some incorrect/redundant GRID Ids
     if grid == "grid.451078.f":
-        ror = "https://ror.org/00hm6j694"
+        ror = "00hm6j694"
     elif grid == "grid.5805.8":
-        ror = "https://ror.org/02en5vm52"
+        ror = "02en5vm52"
     else:
         url = f"https://api.ror.org/organizations?query.advanced=external_ids.GRID.all:{grid}"
         results = requests.get(url)
         ror = results.json()["items"][0]["id"]
+        ror = ror.split('ror.org/')[1]
     return ror
 
 

caltechdata_api/vocabularies/resource_types.yaml

@@ -467,29 +467,11 @@
     - linkable
   title:
     en: Drawing
-- id: image-diagram
-  props:
-    csl: figure
-    datacite_general: Image
-    datacite_type: Diagram
-    openaire_resourceType: '25'
-    openaire_type: dataset
-    eurepo: info:eu-repo/semantics/other
-    schema.org: https://schema.org/ImageObject
-    subtype: image-diagram
-    subtype_name: Diagram
-    type: image
-    type_icon: chart bar outline
-    type_name: Image
-  tags:
-    - linkable
-  title:
-    en: Diagram
 - id: image-map
   props:
     csl: figure
     datacite_general: Image
-    datacite_type: Map
+    datacite_type: Diagram
     openaire_resourceType: '25'
     openaire_type: dataset
     eurepo: info:eu-repo/semantics/other