caltechdata-api 1.10.2__tar.gz → 1.10.4__tar.gz

{caltechdata_api-1.10.2 → caltechdata_api-1.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: caltechdata_api
-Version: 1.10.2
+Version: 1.10.4
 Summary: Python wrapper for CaltechDATA API.
 Home-page: https://github.com/caltechlibrary/caltechdata_api
 Author: Thomas E Morrell, Rohan Bhattarai, Elizabeth Won, Alexander A Abakah, Kshemaahna Nagi

{caltechdata_api-1.10.2 → caltechdata_api-1.10.4}/caltechdata_api/caltechdata_edit.py

@@ -124,14 +124,22 @@ def caltechdata_edit(
     # Check if file links were provided in the metadata
     descriptions = []
     ex_file_links = []
+    ex_file_descriptions = []
     if "descriptions" in metadata:
         for d in metadata["descriptions"]:
             if d["description"].startswith("Files available via S3"):
                 file_text = d["description"]
                 file_list = file_text.split('href="')
+                # Check if we have file_descriptions
+                split_comma = file_list[0].split(", ")
+                if len(split_comma) == 3:
+                    ex_file_descriptions.append(split_comma[1])
                 # Loop over links in description, skip header text
                 for file in file_list[1:]:
                     ex_file_links.append(file.split('"\n')[0])
+                    split_comma = file.split(", ")
+                    if len(split_comma) == 3:
+                        ex_file_descriptions.append(split_comma[1])
             else:
                 descriptions.append(d)
         # We remove file link descriptions, and re-add below
@@ -145,7 +153,7 @@ def caltechdata_edit(
     # Otherwise we add file links found in the mtadata file
     elif ex_file_links:
         metadata = add_file_links(
-            metadata, ex_file_links, file_descriptions, s3_link=s3_link
+            metadata, ex_file_links, ex_file_descriptions, s3_link=s3_link
         )
 
     if authors == False:

{caltechdata_api-1.10.2 → caltechdata_api-1.10.4}/caltechdata_api/caltechdata_write.py

@@ -9,7 +9,9 @@ from caltechdata_api import customize_schema
 from caltechdata_api.utils import humanbytes
 
 
-def write_files_rdm(files, file_link, headers, f_headers, s3=None, keepfiles=False):
+def write_files_rdm(
+    files, file_link, headers, f_headers, s3=None, keepfiles=False, verify=True
+):
     f_json = []
     f_list = {}
     fnames = []
@@ -24,16 +26,18 @@ def write_files_rdm(files, file_link, headers, f_headers, s3=None, keepfiles=Fal
         f_json.append({"key": filename})
         f_list[filename] = f
     # Now we see if any existing draft files need to be replaced
-    result = requests.get(file_link, headers=f_headers)
+    result = requests.get(file_link, headers=f_headers, verify=verify)
     if result.status_code == 200:
         ex_files = result.json()["entries"]
         for ex in ex_files:
             if ex["key"] in f_list:
-                result = requests.delete(ex["links"]["self"], headers=f_headers)
+                result = requests.delete(
+                    ex["links"]["self"], headers=f_headers, verify=verify
+                )
                 if result.status_code != 204:
                     raise Exception(result.text)
     # Create new file upload links
-    result = requests.post(file_link, headers=headers, json=f_json)
+    result = requests.post(file_link, headers=headers, json=f_json, verify=verify)
     if result.status_code != 201:
         raise Exception(result.text)
     # Now we have the upload links
@@ -49,16 +53,16 @@ def write_files_rdm(files, file_link, headers, f_headers, s3=None, keepfiles=Fal
                 infile = open(name, "rb")
             else:
                 infile = open(f_list[name], "rb")
-            result = requests.put(link, headers=f_headers, data=infile)
+            result = requests.put(link, headers=f_headers, data=infile, verify=verify)
             if result.status_code != 200:
                 raise Exception(result.text)
-            result = requests.post(commit, headers=headers)
+            result = requests.post(commit, headers=headers, verify=verify)
             if result.status_code != 200:
                 raise Exception(result.text)
         else:
             # Delete any files not included in this write command
             if keepfiles == False:
-                result = requests.delete(self, headers=f_headers)
+                result = requests.delete(self, headers=f_headers, verify=verify)
                 if result.status_code != 204:
                     raise Exception(result.text)
 
@@ -77,7 +81,11 @@ def add_file_links(
         size = s3.info(path)["size"]
         size = humanbytes(size)
         try:
-            desc = file_descriptions[index] + ","
+            description = file_descriptions[index]
+            if description != " ":
+                desc = description + ","
+            else:
+                desc = ""
         except IndexError:
             desc = ""
         if link_string == "":
@@ -100,7 +108,9 @@ def add_file_links(
     return metadata
 
 
-def send_to_community(review_link, data, headers, publish, community, message=None):
+def send_to_community(
+    review_link, data, headers, publish, community, message=None, verify=True
+):
     if not message:
         message = "This record is submitted automatically with the CaltechDATA API"
 
@@ -108,7 +118,7 @@ def send_to_community(review_link, data, headers, publish, community, message=No
         "receiver": {"community": community},
         "type": "community-submission",
     }
-    result = requests.put(review_link, json=data, headers=headers)
+    result = requests.put(review_link, json=data, headers=headers, verify=verify)
     if result.status_code != 200:
         raise Exception(result.text)
     submit_link = review_link.replace("/review", "/actions/submit-review")
@@ -118,7 +128,7 @@ def send_to_community(review_link, data, headers, publish, community, message=No
             "format": "html",
         }
     }
-    result = requests.post(submit_link, json=data, headers=headers)
+    result = requests.post(submit_link, json=data, headers=headers, verify=verify)
     if result.status_code != 202:
         raise Exception(result.text)
     if publish:
@@ -129,7 +139,7 @@ def send_to_community(review_link, data, headers, publish, community, message=No
                 "format": "html",
             }
         }
-        result = requests.post(accept_link, json=data, headers=headers)
+        result = requests.post(accept_link, json=data, headers=headers, verify=verify)
         if result.status_code != 200:
             raise Exception(result.text)
     return result
@@ -150,6 +160,7 @@ def caltechdata_write(
     s3_link=None,
     default_preview=None,
     review_message=None,
+    verify=True,
 ):
     """
     File links are links to files existing in external systems that will
@@ -229,7 +240,7 @@ def caltechdata_write(
         if production == True:
             url = "https://authors.library.caltech.edu/"
         else:
-            url = "https://authors.caltechlibrary.dev/"
+            url = "https://127.0.0.1:5000/"
 
     headers = {
         "Authorization": "Bearer %s" % token,
@@ -246,7 +257,9 @@ def caltechdata_write(
         data["files"] = {"enabled": True, "default_preview": default_preview}
 
     # Make draft and publish
-    result = requests.post(url + "/api/records", headers=headers, json=data)
+    result = requests.post(
+        url + "/api/records", headers=headers, json=data, verify=verify
+    )
     if result.status_code != 201:
         if result.status_code == 400 and "Referer checking failed" in result.text:
             raise Exception("Token is incorrect or missing referer.")
@@ -257,17 +270,25 @@ def caltechdata_write(
 
     if files:
         file_link = result.json()["links"]["files"]
-        write_files_rdm(files, file_link, headers, f_headers, s3)
+        write_files_rdm(files, file_link, headers, f_headers, s3, verify=verify)
 
     if community:
         review_link = result.json()["links"]["review"]
         send_to_community(
-            review_link, data, headers, publish, community, review_message
+            review_link,
+            data,
+            headers,
+            publish,
+            community,
+            review_message,
+            verify=verify,
         )
 
     else:
         if publish:
-            result = requests.post(publish_link, json=data, headers=headers)
+            result = requests.post(
+                publish_link, json=data, headers=headers, verify=verify
+            )
             if result.status_code != 202:
                 raise Exception(result.text)
     return idv

{caltechdata_api-1.10.2 → caltechdata_api-1.10.4}/caltechdata_api/cli.py

@@ -159,10 +159,14 @@ def get_funding_entries():
 
 def validate_funder_identifier(funder_identifier):
     response = requests.get(f"https://api.ror.org/organizations/{funder_identifier}")
+    returnv = False
     if response.status_code == 200:
-        return response.json().get("name")
-    else:
-        return False
+        names = response.json().get("names", [])
+        for name in names:
+            types = name.get("types", [])
+            if "ror_display" in types:
+                returnv = name.get("value")
+    return returnv
 
 
 def get_funding_details():

{caltechdata_api-1.10.2 → caltechdata_api-1.10.4}/caltechdata_api/customize_schema.py

@@ -17,7 +17,9 @@ def grid_to_ror(grid):
     elif grid == "grid.465477.3":
         ror = "00em52312"
     else:
-        url = f"https://api.ror.org/organizations?query.advanced=external_ids.all:{grid}"
+        url = (
+            f"https://api.ror.org/organizations?query.advanced=external_ids.all:{grid}"
+        )
         results = requests.get(url).json()
         if len(results["items"]) == 0:
             print(url + "doesn't have a valid ROR")

{caltechdata_api-1.10.2 → caltechdata_api-1.10.4}/caltechdata_api/get_metadata.py

@@ -31,10 +31,12 @@ def get_metadata(
             url = "https://data.caltechlibrary.dev/api/records/"
         verify = True
 
+    base_headers = {
+        "accept": "application/json",
+    }
+
     if authors:
-        headers = {
-            "accept": "application/json",
-        }
+        headers = base_headers
         validate = False
     else:
         headers = {
@@ -42,6 +44,7 @@ def get_metadata(
         }
 
     if token:
+        base_headers["Authorization"] = "Bearer %s" % token
         headers["Authorization"] = "Bearer %s" % token
 
     response = requests.get(url + idv, headers=headers, verify=verify)
@@ -49,7 +52,34 @@ def get_metadata(
         raise Exception(response.text)
     else:
         metadata = response.json()
-
+        if not authors:
+            response = requests.get(url + idv, headers=base_headers, verify=verify)
+            if response.status_code != 200:
+                raise Exception(response.text)
+            else:
+                instance = response.json()
+                base_metadata = instance["metadata"]
+                if "descriptions" in metadata:
+                    metadata["descriptions"][0]["description"] = base_metadata.get(
+                        "description"
+                    )
+                    additional_descriptions = base_metadata.get(
+                        "additional_descriptions", []
+                    )
+                    count = 1
+                    if (
+                        len(metadata["descriptions"])
+                        == len(additional_descriptions) + 1
+                    ):
+                        for desc in additional_descriptions:
+                            metadata["descriptions"][count]["description"] = desc[
+                                "description"
+                            ]
+                            count += 1
+                    else:
+                        print(f"Record {idv} does not have a description.")
+            if "formats" in metadata:
+                metadata["formats"] = list(set(metadata["formats"]))
         if validate:
             if schema == "43":
                 try:

{caltechdata_api-1.10.2 → caltechdata_api-1.10.4}/caltechdata_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: caltechdata-api
-Version: 1.10.2
+Version: 1.10.4
 Summary: Python wrapper for CaltechDATA API.
 Home-page: https://github.com/caltechlibrary/caltechdata_api
 Author: Thomas E Morrell, Rohan Bhattarai, Elizabeth Won, Alexander A Abakah, Kshemaahna Nagi

{caltechdata_api-1.10.2 → caltechdata_api-1.10.4}/setup.cfg

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [metadata]
 name = caltechdata_api
-version = 1.10.2
+version = 1.10.4
 author = Thomas E Morrell, Rohan Bhattarai, Elizabeth Won, Alexander A Abakah, Kshemaahna Nagi
 author_email = tmorrell@caltech.edu, aabakah@caltech.edu, knagi@caltech.edu
 description = Python wrapper for CaltechDATA API.