caltechdata-api 1.8.0__tar.gz → 1.8.2__tar.gz

{caltechdata_api-1.8.0 → caltechdata_api-1.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: caltechdata_api
-Version: 1.8.0
+Version: 1.8.2
 Summary: Python wrapper for CaltechDATA API.
 Home-page: https://github.com/caltechlibrary/caltechdata_api
 Author: Thomas E Morrell, Bhattarai Rohan , Won Elizabeth

{caltechdata_api-1.8.0 → caltechdata_api-1.8.2}/caltechdata_api/cli.py

@@ -71,6 +71,11 @@ def get_or_set_token(production=True):
         with open(token_file, "rb") as f:
             encrypted_token = f.read()
             token = decrypt_token(encrypted_token, key)
+            print(
+                "Using saved CaltechDATA production token."
+                if production
+                else "Using saved CaltechDATA test token."
+            )
             return token
     except FileNotFoundError:
         while True:
@@ -140,7 +145,7 @@ def get_funding_entries():
 def validate_funder_identifier(funder_identifier):
     response = requests.get(f"https://api.ror.org/organizations/{funder_identifier}")
     if response.status_code == 200:
-        return True
+        return response.json().get("name")
     else:
         return False
 
@@ -157,7 +162,8 @@ def get_funding_details():
     award_title = get_user_input("Enter the award title for funding: ")
     while True:
         funder_identifier = get_user_input("Enter the funder ROR (https://ror.org): ")
-        if validate_funder_identifier(funder_identifier):
+        name = validate_funder_identifier(funder_identifier)
+        if name:
             break
         else:
             print(
@@ -169,6 +175,7 @@ def get_funding_details():
     return {
         "awardNumber": award_number,
         "awardTitle": award_title,
+        "funderName": name,
         "funderIdentifier": funder_identifier,
         "funderIdentifierType": "ROR",
     }
@@ -194,9 +201,18 @@ def parse_arguments():
         if license_number.isdigit() and 1 <= int(license_number) <= 8:
             # Valid license number selected
             args["license"] = {
-                "1": "cc0-1.0",
-                "2": "cc-by-4.0",
-                "3": "cc-by-nc-4.0",
+                "1": {
+                    "rights": "Creative Commons Zero v1.0 Universal",
+                    "rightsIdentifier": "cc0-1.0",
+                },
+                "2": {
+                    "rights": "Creative Commons Attribution v4.0 Universal",
+                    "rightsIdentifier": "cc-by-4.0",
+                },
+                "3": {
+                    "rights": "Creative Commons Attribution Non-Commercial v4.0 Universal",
+                    "rightsIdentifier": "cc-by-nc-4.0",
+                },
             }[license_number]
             break
         else:
@@ -259,9 +275,11 @@ def get_names(orcid):
     return family_name, given_name
 
 
-def write_s3cmd_config(access_key, secret_key, endpoint):
+def write_s3cmd_config(endpoint):
     configf = os.path.join(home_directory, ".s3cfg")
     if not os.path.exists(configf):
+        access_key = get_user_input("Enter the access key: ")
+        secret_key = get_user_input("Enter the secret key: ")
         with open(configf, "w") as file:
             file.write(
                 f"""[default]
@@ -286,9 +304,7 @@ def upload_supporting_file(record_id=None):
             endpoint = "sdsc.osn.xsede.org"
             path = "ini230004-bucket01/"
             if not record_id:
-                access_key = get_user_input("Enter the access key: ")
-                secret_key = get_user_input("Enter the secret key: ")
-                write_s3cmd_config(access_key, secret_key, endpoint)
+                write_s3cmd_config(endpoint)
                 print("""S3 connection configured.""")
                 break
             endpoint = f"https://{endpoint}/"
@@ -411,8 +427,6 @@ def main():
 
 def create_record(production):
     token = get_or_set_token(production)
-    # keep_file = input("Do you want to keep your existing files? (yes/no): ").lower() == "yes"
-    print("Using CaltechDATA token:", token)
     while True:
         choice = get_user_input(
             "Do you want to use metadata from an existing file or create new metadata? (existing/create): "
@@ -478,9 +492,7 @@ def create_record(production):
                 ],
                 "types": {"resourceType": "", "resourceTypeGeneral": "Dataset"},
                 "rightsList": [
-                    {
-                        "rightsIdentifier": args["license"],
-                    }
+                    args["license"],
                 ],
                 "fundingReferences": args["fundingReferences"],
                 "schemaVersion": "http://datacite.org/schema/kernel-4",

{caltechdata_api-1.8.0 → caltechdata_api-1.8.2}/caltechdata_api/customize_schema.py

@@ -1,5 +1,4 @@
-# Convert a DataCite 4 or 4.3 standard schema json record to the customized internal
-# schema used by TIND in CaltechDATA
+# Convert a DataCite 4.3 standard schema json record to the InvenioRDM schema
 import argparse
 import json
 from datetime import date
@@ -415,24 +414,7 @@ def validate_metadata(json_record):
                     "Each entry in 'titles' must be a dictionary with a 'title' key."
                 )
 
-    # Check for 'publication_date'
-    if "publicationYear" not in json_record and "dates" not in json_record:
-        errors.append(
-            "A publication date is required ('publicationYear' or 'dates' field is missing)."
-        )
-    if "dates" in json_record:
-        if not isinstance(json_record["dates"], list):
-            errors.append("'dates' should be a list.")
-        else:
-            for date_entry in json_record["dates"]:
-                if (
-                    not isinstance(date_entry, dict)
-                    or "dateType" not in date_entry
-                    or "date" not in date_entry
-                ):
-                    errors.append(
-                        "Each entry in 'dates' must be a dictionary with 'dateType' and 'date' keys."
-                    )
+    # Publication date is handled by customize function
 
     # Check for 'creators'
     if "creators" not in json_record:

{caltechdata_api-1.8.0 → caltechdata_api-1.8.2}/caltechdata_api/get_metadata.py

@@ -8,26 +8,43 @@ from datacite import schema43
 
 
 def get_metadata(
-    idv, production=True, validate=True, emails=False, schema="43", token=False
+    idv,
+    production=True,
+    validate=True,
+    emails=False,
+    schema="43",
+    token=False,
+    authors=False,
 ):
     # Returns just DataCite metadata or DataCite metadata with emails
 
     if production == True:
-        url = "https://data.caltech.edu/api/records/"
+        if authors:
+            url = "https://authors.library.caltech.edu/api/records/"
+        else:
+            url = "https://data.caltech.edu/api/records/"
         verify = True
     else:
-        url = "https://data.caltechlibrary.dev/api/records/"
+        if authors:
+            url = "https://authors.caltechlibrary.dev/api/records/"
+        else:
+            url = "https://data.caltechlibrary.dev/api/records/"
         verify = True
 
-    headers = {
-        "accept": "application/vnd.datacite.datacite+json",
-    }
+    if authors:
+        headers = {
+            "accept": "application/json",
+        }
+        validate = False
+    else:
+        headers = {
+            "accept": "application/vnd.datacite.datacite+json",
+        }
 
     if token:
         headers["Authorization"] = "Bearer %s" % token
 
     response = requests.get(url + idv, headers=headers, verify=verify)
-    print(response.headers)
     if response.status_code != 200:
         raise Exception(response.text)
     else:
@@ -59,6 +76,7 @@ if __name__ == "__main__":
         help="The CaltechDATA ID for each record of interest",
     )
     parser.add_argument("-test", dest="production", action="store_false")
+    parser.add_argument("-authors", dest="authors", action="store_true")
     parser.add_argument("-xml", dest="save_xml", action="store_true")
     parser.add_argument(
         "-skip_validate",
@@ -72,6 +90,7 @@ if __name__ == "__main__":
 
     production = args.production
     schema = args.schema
+    authors = args.authors
     skip_validate = args.skip_validate
     if skip_validate:
         validate = False
@@ -79,7 +98,9 @@ if __name__ == "__main__":
         validate = True
 
     for idv in args.ids:
-        metadata = get_metadata(idv, production, validate, schema)
+        metadata = get_metadata(
+            idv, production, validate, schema=schema, authors=authors
+        )
         outfile = open(str(idv) + ".json", "w")
         outfile.write(json.dumps(metadata, indent=4))
         outfile.close()

{caltechdata_api-1.8.0 → caltechdata_api-1.8.2}/caltechdata_api.egg-info/PKG-INFO

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