Update the uploading script to account for the Zenodo API changes

https://help.zenodo.org/docs/about/whats-new/ https://inveniordm.docs.cern.ch/reference/metadata/
nsls2-conda-envs · Oct 30, 2023 · ce84962 · ce84962
1 parent 71528c0
commit ce84962
Showing 1 changed file with 86 additions and 21 deletions.
diff --git a/test-upload.py b/test-upload.py
@@ -24,36 +24,57 @@ def upload_files(bucket_url, files, token):
             "as keys and access mode as values"
         )
 
+    ret_declare = requests.post(
+        bucket_url,
+        headers={
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {token}",
+        },
+        data=json.dumps([{"key": os.path.basename(file)} for file in files]),
+    )
+    print_now(ret_declare.status_code, ret_declare.text)
+
     for file, mode in files.items():
         print_now(f"Uploading {file}...")
-        ret = requests.put(
-            f"{bucket_url}/{os.path.basename(file)}",
-            params={"access_token": token},
+
+        basename = os.path.basename(file)
+
+        ret_content = requests.put(
+            f"{bucket_url}/{basename}/content",
             headers={
                 "Accept": "application/json",
                 "Content-Type": "application/octet-stream",
                 "Authorization": f"Bearer {token}",
             },
             data=open(file, mode),
         )
-        print_now(ret.status_code, ret.text)
+        print_now(ret_content.status_code, ret_content.text)
+
+        ret_commit = requests.post(
+            f"{bucket_url}/{basename}/commit",
+            headers={
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {token}",
+            },
+        )
+        print_now(ret_commit.status_code, ret_commit.text)
 
 
 def create_new_version(
     conceptrecid=None, version=None, extra_files=None, token=None
 ):
     rec = requests.get(
-        f"{BASE_URL}/records/{conceptrecid}",
+        f"{BASE_URL}/records/{conceptrecid}/versions/latest",
         headers={"Authorization": f"Bearer {token}"},
     )
 
     ret_newver = requests.post(
-        f"{BASE_URL}/deposit/depositions/{rec.json()['id']}/actions/newversion",
+        f"{BASE_URL}/records/{rec.json()['id']}/versions",
         params={"access_token": token},
     )
     print_now(ret_newver.url, ret_newver.status_code, ret_newver.json())
 
-    newver_draft = ret_newver.json()["links"]["latest_draft"]
+    newver_draft = ret_newver.json()["links"]["self"]
 
     notes_urls = [
         # non-tiled
@@ -70,7 +91,6 @@ def create_new_version(
                                      for url in notes_urls])
 
     unpack_instructions = """
-Unpacking instructions:
 <br>
 <pre>
 mkdir -p ~/conda_envs/&lt;env-name&gt;
@@ -85,9 +105,10 @@ def create_new_version(
         "metadata": {
             "version": version,
             "title": f"NSLS-II collection conda environment {version} with Python 3.10",
-            "description": f"NSLS-II collection environment deployed to the experimental floor.<br><br>{unpack_instructions}",
-            "upload_type": "software",
+            "description": f"NSLS-II collection environment deployed to the experimental floor.<br><br>{notes_urls_strs}",
+            "resource_type": {"id": "software"},
             "publication_date": datetime.datetime.now().strftime("%Y-%m-%d"),
+            "publisher": "NSLS-II, Brookhaven National Laboratory",
             "prereserve_doi": True,
             "keywords": [
                 "conda",
@@ -97,22 +118,65 @@ def create_new_version(
                 "conda-forge",
                 "conda-pack",
             ],
-            "notes": notes_urls_strs,
+            "additional_descriptions": [
+                {
+                    "description": unpack_instructions,
+                    "type": {
+                        "id": "notes",
+                        "title": {
+                            "en": "Unpacking instructions"
+                        }
+                    },
+                },
+            ],
             "creators": [
                 {
-                    "name": "Rakitin, Max",
-                    "affiliation": "NSLS-II, Brookhaven National Laboratory",
-                    "orcid": "0000-0003-3685-852X",
+                    "person_or_org": {
+                        "name": "Rakitin, Max",
+                        "given_name": "Max",
+                        "family_name": "Rakitin",
+                        "type": "personal",
+                        "identifiers": [{
+                            "scheme": "orcid",
+                            "identifier": "0000-0003-3685-852X",
+                        }],
+                    },
+                    "affiliations": [{
+                        "id": "01q47ea17",
+                        "name": "NSLS-II, Brookhaven National Laboratory",
+                    }],
                 },
                 {
-                    "name": "Bischof, Garrett",
-                    "affiliation": "NSLS-II, Brookhaven National Laboratory",
-                    "orcid": "0000-0001-9351-274X",
+                    "person_or_org": {
+                        "name": "Bischof, Garrett",
+                        "given_name": "Bischof",
+                        "family_name": "Garrett",
+                        "type": "personal",
+                        "identifiers": [{
+                            "scheme": "orcid",
+                            "identifier": "0000-0001-9351-274X",
+                        }],
+                    },
+                    "affiliations": [{
+                        "id": "01q47ea17",
+                        "name": "NSLS-II, Brookhaven National Laboratory",
+                    }],
                 },
                 {
-                    "name": "Aishima, Jun",
-                    "affiliation": "NSLS-II, Brookhaven National Laboratory",
-                    "orcid": "0000-0003-4710-2461",
+                    "person_or_org": {
+                        "name": "Aishima, Jun",
+                        "given_name": "Jun",
+                        "family_name": "Aishima",
+                        "type": "personal",
+                        "identifiers": [{
+                            "scheme": "orcid",
+                            "identifier": "0000-0003-4710-2461",
+                        }],
+                    },
+                    "affiliations": [{
+                        "id": "01q47ea17",
+                        "name": "NSLS-II, Brookhaven National Laboratory",
+                    }],
                 },
             ],
         }
@@ -131,7 +195,7 @@ def create_new_version(
         r = requests.delete(self_file, params={"access_token": token})
         print_now(r.status_code, r.text)
 
-    bucket_url = resp_update.json()["links"]["bucket"]
+    bucket_url = resp_update.json()["links"]["files"]
 
     all_files = {}
     if extra_files is not None:
@@ -182,6 +246,7 @@ def update_deposition_with_files(conceptrecid=None, files=None, token=None):
         # version=f"{version}-tiled",
         version=f"{version}",
         token=token,
+        # extra_files={"README.md": "r", "LICENSE": "r"}  # used for testing purposes
         extra_files={
             # # Python 3.8 (non-tiled)
             # f"{version}-py38-md5sum.txt": "r",