caltechdata-api 1.6.1__tar.gz → 1.7.0__tar.gz

{caltechdata_api-1.6.1 → caltechdata_api-1.7.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: caltechdata_api
-Version: 1.6.1
+Version: 1.7.0
 Summary: Python wrapper for CaltechDATA API.
 Home-page: https://github.com/caltechlibrary/caltechdata_api
-Author: Thomas E Morrell
-Author-email: tmorrell@caltech.edu
+Author: Thomas E Morrell, Bhattarai Rohan , Won Elizabeth
+Author-email: tmorrell@caltech.edu, , 
 License: https://data.caltech.edu/license
 Platform: UNKNOWN
 Classifier: License :: OSI Approved :: BSD License

{caltechdata_api-1.6.1 → caltechdata_api-1.7.0}/caltechdata_api/caltechdata_edit.py

@@ -65,6 +65,7 @@ def caltechdata_edit(
     s3_link=None,
     default_preview=None,
     authors=False,
+    keepfiles=False,
 ):
     # Make a copy of the metadata to make sure our local changes don't leak
     metadata = copy.deepcopy(metadata)
@@ -246,7 +247,7 @@ def caltechdata_edit(
         if result.status_code != 200:
             raise Exception(result.text)
         file_link = result.json()["links"]["files"]
-        write_files_rdm(files, file_link, headers, f_headers)
+        write_files_rdm(files, file_link, headers, f_headers, keepfiles=keepfiles)
 
     else:
         # Check for existing draft

{caltechdata_api-1.6.1 → caltechdata_api-1.7.0}/caltechdata_api/caltechdata_write.py

@@ -9,7 +9,7 @@ from caltechdata_api import customize_schema
 from caltechdata_api.utils import humanbytes
 
 
-def write_files_rdm(files, file_link, headers, f_headers, s3=None):
+def write_files_rdm(files, file_link, headers, f_headers, s3=None, keepfiles=False):
     f_json = []
     f_list = {}
     fnames = []
@@ -59,9 +59,10 @@ def write_files_rdm(files, file_link, headers, f_headers, s3=None):
                 raise Exception(result.text)
         else:
             # Delete any files not included in this write command
-            result = requests.delete(self, headers=f_headers)
-            if result.status_code != 204:
-                raise Exception(result.text)
+            if keepfiles == False:
+                result = requests.delete(self, headers=f_headers)
+                if result.status_code != 204:
+                    raise Exception(result.text)
 
 
 def add_file_links(

{caltechdata_api-1.6.1 → caltechdata_api-1.7.0}/caltechdata_api/cli.py

@@ -21,6 +21,7 @@ funderIdentifier = ""
 funderIdentifierType = ""
 funderName = ""
 
+
 home_directory = os.path.expanduser("~")
 caltechdata_directory = os.path.join(home_directory, ".caltechdata")
 
@@ -60,6 +61,7 @@ def decrypt_token(encrypted_token, key):
 
 # Function to get or set token
 def get_or_set_token():
+
     key = load_or_generate_key()
     token_file = os.path.join(caltechdata_directory, "token.txt")
     try:
@@ -267,6 +269,7 @@ def write_s3cmd_config(access_key, secret_key, endpoint):
 def upload_supporting_file(record_id=None):
     filepath = ""
     filepaths = []
+    file_link = ""
     file_links = []
     while True:
         choice = get_user_input(
@@ -285,7 +288,6 @@ def upload_supporting_file(record_id=None):
             s3 = s3fs.S3FileSystem(anon=True, client_kwargs={"endpoint_url": endpoint})
             # Find the files
             files = s3.glob(path + record_id + "/*")
-
             for link in files:
                 fname = link.split("/")[-1]
                 if "." not in fname:
@@ -335,16 +337,16 @@ def upload_supporting_file(record_id=None):
                     print(
                         f"Error: File '{filename}' not found. Please enter a valid filename."
                     )
-
-            add_more = get_user_input("Do you want to add more files? (y/n): ").lower()
-            if add_more != "y":
-                break
-
+                add_more = get_user_input(
+                    "Do you want to add more files? (y/n): "
+                ).lower()
+                if add_more != "y":
+                    break
+            break
         elif choice == "n":
             break
         else:
             print("Invalid input. Please enter 'link' or 'upload' or 'n'.")
-
     return filepaths, file_links
 
 
@@ -399,7 +401,7 @@ def create_record():
             if existing_data:
                 if filepath != "":
                     response = caltechdata_write(
-                        existing_data, token, filepath, production=False, publish=False
+                        existing_data, token, filepath, production=True, publish=False
                     )
                 elif file_link != "":
                     response = caltechdata_write(
@@ -407,16 +409,17 @@ def create_record():
                         token,
                         file_links=[file_link],
                         s3_link=file_link,
-                        production=False,
+                        production=True,
                         publish=False,
                     )
                 else:
                     response = caltechdata_write(
-                        existing_data, token, production=False, publish=False
+                        existing_data, token, production=True, publish=False
                     )
                 rec_id = response
                 print(
-                    f"""You can view and publish this record at https://data.caltechlibrary.dev/uploads/{rec_id}
+                    f"""You can view and publish this record at
+                    https://data.caltech.edu/uploads/{rec_id}
                     If you need to upload large files to S3, you can type
                     `s3cmd put DATA_FILE s3://ini230004-bucket01/{rec_id}/"""
                 )
@@ -465,23 +468,24 @@ def create_record():
             if confirm_upload():
                 if filepath != "":
                     response = caltechdata_write(
-                        metadata, token, filepath, production=False, publish=False
+                        metadata, token, filepath, production=True, publish=False
                     )
                 elif file_link != "":
                     response = caltechdata_write(
                         metadata,
                         token,
                         file_links=[file_link],
-                        production=False,
+                        production=True,
                         publish=False,
                     )
                 else:
                     response = caltechdata_write(
-                        metadata, token, production=False, publish=False
+                        metadata, token, production=True, publish=False
                     )
                 rec_id = response
                 print(
-                    f"""You can view and publish this record at https://data.caltechlibrary.dev/uploads/{rec_id}
+                    f"""You can view and publish this record at
+                    https://data.caltech.edu/uploads/{rec_id}
                     If you need to upload large files to S3, you can type
                     `s3cmd put DATA_FILE s3://ini230004-bucket01/{rec_id}/"""
                 )
@@ -504,7 +508,7 @@ def edit_record():
             with open(file_name, "r") as file:
                 metadata = json.load(file)
             response = caltechdata_edit(
-                record_id, metadata, token, production=False, publish=False
+                record_id, metadata, token, production=True, publish=False
             )
             if response:
                 print("Metadata edited successfully.")
@@ -516,11 +520,33 @@ def edit_record():
         print("No metadata file found.")
     choice = get_user_input("Do you want to add files? (y/n): ").lower()
     if choice == "y":
+        API_URL_TEMPLATE = "https://data.caltech.edu/api/records/{record_id}/files"
+        url = API_URL_TEMPLATE.format(record_id=record_id)
+
+        API_URL_TEMPLATE2 = (
+            "https://data.caltech.edu/api/records/{record_id}/draft/files"
+        )
+        url2 = API_URL_TEMPLATE2.format(record_id=record_id)
+        response = requests.get(url)
+        response2 = requests.get(url2)
         filepath, file_link = upload_supporting_file(record_id)
         print(file_link)
+        if response.status_code == 404 and response2.status_code == 404:
+            keepfile = False
+        else:
+            keepfile = input("Do you want to keep existing files? y/n: ")
+            if keepfile == "y":
+                keepfile = True
+            else:
+                keepfile = False
         if filepath != "":
             response = caltechdata_edit(
-                record_id, token=token, files=filepath, production=False, publish=False
+                record_id,
+                token=token,
+                files=filepath,
+                production=True,
+                publish=False,
+                keepfiles=keepfile,
             )
         elif file_link != "":
             response = caltechdata_edit(
@@ -528,17 +554,18 @@ def edit_record():
                 metadata,
                 token=token,
                 file_links=file_link,
-                production=False,
+                production=True,
                 publish=False,
+                keepfile=keepfile,
             )
         rec_id = response
         print(
-            f"You can view and publish this record at https://data.caltechlibrary.dev/uploads/{rec_id}\n"
+            f"You can view and publish this record at https://data.caltech.edu/uploads/{rec_id}\n"
         )
 
 
 def download_file_by_id(record_id, token=None):
-    url = f"https://data.caltechlibrary.dev/api/records/{record_id}"
+    url = f"https://data.caltech.edu/api/records/{record_id}"
 
     headers = {
         "accept": "application/vnd.datacite.datacite+json",
@@ -549,6 +576,7 @@ def download_file_by_id(record_id, token=None):
 
     try:
         response = requests.get(url, headers=headers)
+
         if response.status_code != 200:
             # Might have a draft
             response = requests.get(

{caltechdata_api-1.6.1 → caltechdata_api-1.7.0}/caltechdata_api/md_to_json.py

@@ -157,7 +157,8 @@ def parse_readme_to_json(readme_path):
                 link_match = link_pattern.search(value)
                 if link_match:
                     value = link_match.group(1)
-                current_object[key] = value
+
+            current_object[key] = value
 
         elif line.strip() and not section_match:
             raise ReadmeFormatException(

{caltechdata_api-1.6.1 → caltechdata_api-1.7.0}/caltechdata_api.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: caltechdata-api
-Version: 1.6.1
+Version: 1.7.0
 Summary: Python wrapper for CaltechDATA API.
 Home-page: https://github.com/caltechlibrary/caltechdata_api
-Author: Thomas E Morrell
-Author-email: tmorrell@caltech.edu
+Author: Thomas E Morrell, Bhattarai Rohan , Won Elizabeth
+Author-email: tmorrell@caltech.edu, , 
 License: https://data.caltech.edu/license
 Platform: UNKNOWN
 Classifier: License :: OSI Approved :: BSD License

{caltechdata_api-1.6.1 → caltechdata_api-1.7.0}/setup.py

@@ -40,9 +40,9 @@ version = meta["version"]
 author = ""
 author_email = ""
 for obj in meta["author"]:
-    given = obj["givenName"]
-    family = obj["familyName"]
-    email = obj["email"]
+    given = obj.get("givenName", "")
+    family = obj.get("familyName", "")
+    email = obj.get("email", "")
     if len(author) == 0:
         author = given + " " + family
     else: