Another method to prioritize precalculated duration

RolnickLab · Nov 30, 2023 · 65135bc · 65135bc
1 parent 68c207f
commit 65135bc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ami/main/models.py b/ami/main/models.py
@@ -515,7 +515,7 @@ def duration_label(self) -> str:
         If duration was populated by a query annotation, use that
         otherwise call the duration() method to calculate it.
         """
-        duration = self.duration if isinstance(self.duration, datetime.timedelta) else self.duration()
+        duration = self.duration() if callable(self.duration) else self.duration
         return ami.utils.dates.format_timedelta(duration)
 
     # These are now loaded with annotations in EventViewSet
@@ -1475,7 +1475,7 @@ def duration_label(self) -> str | None:
         If duration has been calculated by a query annotation, use that value
         otherwise call the duration() method to calculate it.
         """
-        duration = self.duration if isinstance(self.duration, datetime.timedelta) else self.duration()
+        duration = self.duration() if callable(self.duration) else self.duration
         return ami.utils.dates.format_timedelta(duration)
 
     def detection_images(self, limit=None):