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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: caltechdata_api
-Version: 1.8.1
+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.1 → 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:
@@ -422,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): "

{caltechdata_api-1.8.1 → 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

{caltechdata_api-1.8.1 → 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.1 → 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.1
+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