Touch up delete_session function (#414)

Author: ebrahimebrahim

src/openlifu/db/database.py

@@ -220,7 +220,13 @@ def write_session(self, subject:Subject, session:Session, on_conflict=OnConflict
         self.logger.info(f"Added session with ID {session_id} for subject {subject.id} to the database.")
 
     def delete_session(self, subject_id: str, session_id: str, on_conflict: OnConflictOpts = OnConflictOpts.ERROR):
+        """Delete a session and its associated data from the database.
 
+        Args:
+            subject_id: ID of the subject the session belongs to
+            session_id: ID of the session to delete
+            on_conflict: Behavior when session doesn't exist ('error' or 'skip')
+        """
         # Check if the session ID exists in the database for this subject
         session_ids = self.get_session_ids(subject_id)
 
@@ -235,14 +241,13 @@ def delete_session(self, subject_id: str, session_id: str, on_conflict: OnConfli
 
         # Delete the session file
         session_filename = self.get_session_filename(subject_id, session_id)
-        if Path.is_file(session_filename):
+        if session_filename.parent.is_dir():
             shutil.rmtree(session_filename.parent)
 
-        if session_id in session_ids:
-            session_ids.remove(session_id)
-            self.write_session_ids(subject_id, session_ids)
+        session_ids.remove(session_id)
+        self.write_session_ids(subject_id, session_ids)
 
-        self.logger.info(f"Removed Session with ID {session_id} from the database.")
+        self.logger.info(f"Removed session with ID {session_id} from the database.")
 
     def write_run(self, run:Run, session:Session = None, protocol:Protocol = None, on_conflict=OnConflictOpts.ERROR):
         """Write a run with a snapshot of session and a snapshot of protocol if provided

tests/test_database.py

@@ -347,14 +347,14 @@ def test_delete_session(example_database: Database, example_subject: Subject):
 
     # Error option
     with pytest.raises(ValueError, match="does not exist in the database"):
-        example_database.delete_session(subject_id, "non_existent_protocol", on_conflict=OnConflictOpts.ERROR)
+        example_database.delete_session(subject_id, "non_existent_session", on_conflict=OnConflictOpts.ERROR)
 
     # Skip option
-    example_database.delete_session(subject_id, "non_existent_protocol", on_conflict=OnConflictOpts.SKIP)
+    example_database.delete_session(subject_id, "non_existent_session", on_conflict=OnConflictOpts.SKIP)
 
     # Invalid option
     with pytest.raises(ValueError, match="Invalid"):
-        example_database.delete_session(subject_id, "non_existent_protocol", on_conflict=OnConflictOpts.OVERWRITE)
+        example_database.delete_session(subject_id, "non_existent_session", on_conflict=OnConflictOpts.OVERWRITE)
 
 def test_write_run(example_database: Database, tmp_path:Path):
     subject_id = "example_subject"