fix: coderabbit

Author: Integer-Ctrl

databusclient/api/delete.py

@@ -20,11 +20,11 @@ def _confirm_delete(databusURI: str) -> str:
     print("\nThis action is irreversible and will permanently remove the resource and all its data.")
     while True:
         choice = input("Type 'yes'/'y' to confirm, 'skip'/'s' to skip this resource, or 'cancel'/'c' to abort: ").strip().lower()
-        if choice == "yes" or choice == "y":
+        if choice in ("yes", "y"):
             return "confirm"
-        elif choice == "skip" or choice == "s":
+        elif choice in ("skip", "s"):
             return "skip"
-        elif choice == "cancel" or choice == "c":
+        elif choice in ("cancel", "c"):
             return "cancel"
         else:
             print("Invalid input. Please type 'yes'/'y', 'skip'/'s', or 'cancel'/'c'.")
@@ -107,12 +107,14 @@ def _delete_artifact(databusURI: str, databus_key: str, dry_run: bool = False, f
         versions = [versions]
     # Multiple versions case [{}, {}]
 
-    version_uris = [v["@id"] for v in versions if "@id" in v]
-    if not version_uris:
-        raise ValueError("No versions found in artifact JSON-LD")
+    # If versions is None or empty skip
+    if not versions:
+        version_uris = [v["@id"] for v in versions if "@id" in v]
+        if not version_uris:
+            raise ValueError("No versions found in artifact JSON-LD")
 
-    # Delete all versions
-    _delete_list(version_uris, databus_key, dry_run=dry_run, force=force)
+        # Delete all versions
+        _delete_list(version_uris, databus_key, dry_run=dry_run, force=force)
 
     # Finally, delete the artifact itself
     _delete_resource(databusURI, databus_key, dry_run=dry_run, force=force)
@@ -150,7 +152,6 @@ def _delete_group(databusURI: str, databus_key: str, dry_run: bool = False, forc
     # Finally, delete the group itself
     _delete_resource(databusURI, databus_key, dry_run=dry_run, force=force)
 
-# TODO: add to README.md
 def delete(databusURIs: List[str], databus_key: str, dry_run: bool, force: bool):
     """
     Delete a dataset from the databus.

databusclient/client.py

@@ -522,7 +522,7 @@ def __download_file__(url, filename, vault_token_file=None, databus_key=None, au
         print("Redirects url: ", url)
 
     # --- 2. Try direct GET ---
-    response = requests.get(url, stream=True, allow_redirects=True)
+    response = requests.get(url, stream=True, allow_redirects=True, timeout=30)
     www = response.headers.get('WWW-Authenticate', '')  # get WWW-Authenticate header if present to check for Bearer auth
 
     # Vault token required if 401 Unauthorized with Bearer challenge
@@ -536,7 +536,7 @@ def __download_file__(url, filename, vault_token_file=None, databus_key=None, au
         headers = {"Authorization": f"Bearer {vault_token}"}
 
         # --- 4. Retry with token ---
-        response = requests.get(url, headers=headers, stream=True)
+        response = requests.get(url, headers=headers, stream=True, timeout=30)
 
     # Databus API key required if only 401 Unauthorized
     elif response.status_code == 401:
@@ -545,7 +545,7 @@ def __download_file__(url, filename, vault_token_file=None, databus_key=None, au
             raise ValueError("Databus API key not given for protected download")
 
         headers = {"X-API-KEY": databus_key}
-        response = requests.get(url, headers=headers, stream=True)
+        response = requests.get(url, headers=headers, stream=True, timeout=30)
 
     try:
         response.raise_for_status()  # Raise if still failing
@@ -718,12 +718,12 @@ def wsha256(raw: str):
     return sha256(raw.encode('utf-8')).hexdigest()
 
 
-def __handle_databus_collection__(uri: str, databus_key: str = None) -> str:
+def __handle_databus_collection__(uri: str, databus_key: str | None = None) -> str:
     headers = {"Accept": "text/sparql"}
     if databus_key is not None:
         headers["X-API-KEY"] = databus_key
 
-    return requests.get(uri, headers=headers).text
+    return requests.get(uri, headers=headers, timeout=30).text
 
 
 def __download_list__(urls: List[str],
@@ -735,7 +735,7 @@ def __download_list__(urls: List[str],
     fileLocalDir = localDir
     for url in urls:
         if localDir is None:
-            host, account, group, artifact, version, file = get_databus_id_parts_from_uri(url)
+            _host, account, group, artifact, version, file = get_databus_id_parts_from_uri(url)
             fileLocalDir = os.path.join(os.getcwd(), account, group, artifact, version if version is not None else "latest")
             print(f"Local directory not given, using {fileLocalDir}")