fix: delete and logging bugs

scribe_python_client/client.py

@@ -11,7 +11,7 @@ import pathlib
 import socket, os
 
 
-from .utils import convert_timestamps, send_post_request, send_get_request, decode_jwt_token, querystr_to_json, att2statement
+from .utils import convert_timestamps, send_post_request, send_get_request, decode_jwt_token, querystr_to_json, att2statement, send_delete_request
 from .lineage_graph import create_lineage_graph 
 
 from .constants import (
@@ -1573,30 +1573,35 @@ class ScribeClient:
         Delete an attestation by its ID using the DELETE /evidence/{file_id} endpoint.
         Returns True if successful, False otherwise. Logs the deletion event.
         """
-        from .utils import send_delete_request
-        url = f"{self.base_url}/evidence/{attestation_id}"
-        response = send_delete_request(url, token=self.jwt_token)
-        user = None
-        if hasattr(self, "decoded_token") and self.decoded_token:
-            user = self.decoded_token.get("name") or self.decoded_token.get("preferred_username")
-        if response:
-            logging.info(f"Successfully deleted attestation {attestation_id}")
-            event = Event(
-                severity="INFO",
-                messageid="Att-Deletion",
-                message=f"Attestation deleted (attestation_id={attestation_id})",
-                user=user,
-            )
-            self.log_event(event)
-            return True
-        else:
-            logging.error(f"Failed to delete attestation {attestation_id}")
-            event = Event(
-                severity="ERROR",
-                messageid="Att-Deletion",
-                message=f"Attestation deletion failed (attestation_id={attestation_id})",
-                user=user,
-                metadata={"result": {"status": f"{response.status}"}, "error": f"{response.text}"}
-            )
-            self.log_event(event)
+        try:
+            url = f"{self.base_url}/evidence/{attestation_id}"
+            response = send_delete_request(url, token=self.jwt_token)
+            user = None
+            if hasattr(self, "decoded_token") and self.decoded_token:
+                user = self.decoded_token.get("name") or self.decoded_token.get("preferred_username")
+            
+            if response.status_code == 204 or response.status_code == 200:
+                logging.info(f"Successfully deleted attestation {attestation_id}")
+                event = Event(
+                    severity="INFO",
+                    messageid="Att-Deletion",
+                    message=f"Attestation deleted (attestation_id={attestation_id})",
+                    user=user,
+                )
+                self.log_event(event)
+                return True
+            else:
+                logging.warning(f"Failed to delete attestation {attestation_id}")
+                event = Event(
+                    severity="WARNING",
+                    messageid="Att-Deletion",
+                    message=f"Attestation deletion failed (attestation_id={attestation_id})",
+                    user=user,
+                    metadata={"result": {"status": f"{response.status}"}, "error": f"{response.text}"}
+                )
+                self.log_event(event)
+                return False
+            
+        except Exception as e:
+            logging.warning(f"Error occurred while deleting attestation {attestation_id}: {e}")
             return False

scribe_python_client/utils.py

@@ -83,7 +83,7 @@ def send_delete_request(url, token=None):
             return response
         else:
             logging.warning(f"DELETE request to {url} failed with status code: {response.status_code}, {response.text}")
-            return None
+            return response
 
     except requests.exceptions.RequestException as e:
         logging.error(f"An error occurred: {e}")

scribe_python_client/version.py

@@ -1 +1 @@
-__version__ = "0.2.23"
+__version__ = "0.2.24"