1
0
Эх сурвалжийг харах

fix: rename submitted_at run_at finished_at attributes

trgiangdo 7 сар өмнө
parent
commit
95e44a4faf

+ 15 - 15
taipy/core/submission/submission.py

@@ -141,25 +141,25 @@ class Submission(_Entity, _Labeled):
 
 
     @property
     @property
     @_self_reload(_MANAGER_NAME)
     @_self_reload(_MANAGER_NAME)
-    def submitted_time(self) -> Optional[datetime]:
-        jobs_submitted_time = [job.submitted_time for job in self.jobs if job.submitted_time]
-        if jobs_submitted_time:
-            return min(jobs_submitted_time)
+    def submitted_at(self) -> Optional[datetime]:
+        jobs_submitted_at = [job.submitted_at for job in self.jobs if job.submitted_at]
+        if jobs_submitted_at:
+            return min(jobs_submitted_at)
         return None
         return None
 
 
     @property
     @property
     @_self_reload(_MANAGER_NAME)
     @_self_reload(_MANAGER_NAME)
-    def run_time(self) -> Optional[datetime]:
-        jobs_run_time = [job.run_time for job in self.jobs if job.run_time]
-        if jobs_run_time:
-            return min(jobs_run_time)
+    def run_at(self) -> Optional[datetime]:
+        jobs_run_at = [job.run_at for job in self.jobs if job.run_at]
+        if jobs_run_at:
+            return min(jobs_run_at)
         return None
         return None
 
 
     @property
     @property
     @_self_reload(_MANAGER_NAME)
     @_self_reload(_MANAGER_NAME)
-    def finished_time(self) -> Optional[datetime]:
-        if all(job.finished_time for job in self.jobs):
-            return max([job.finished_time for job in self.jobs if job.finished_time])
+    def finished_at(self) -> Optional[datetime]:
+        if all(job.finished_at for job in self.jobs):
+            return max([job.finished_at for job in self.jobs if job.finished_at])
         return None
         return None
 
 
     @property
     @property
@@ -174,10 +174,10 @@ class Submission(_Entity, _Labeled):
                 - If one of the jobs is not finished, the execution time is the duration
                 - If one of the jobs is not finished, the execution time is the duration
                   from the running time of the first job to the current time.
                   from the running time of the first job to the current time.
         """
         """
-        if self.finished_time and self.run_time:
-            return (self.finished_time - self.run_time).total_seconds()
-        elif self.run_time and self.finished_time is None:
-            return (datetime.now() - self.run_time).total_seconds()
+        if self.finished_at and self.run_at:
+            return (self.finished_at - self.run_at).total_seconds()
+        elif self.run_at and self.finished_at is None:
+            return (datetime.now() - self.run_at).total_seconds()
         return None
         return None
 
 
     def get_label(self) -> str:
     def get_label(self) -> str:

+ 6 - 6
tests/core/_orchestrator/test_orchestrator__submit.py

@@ -544,9 +544,9 @@ def test_submit_duration_development_mode():
     assert jobs_2s.execution_duration >= 2
     assert jobs_2s.execution_duration >= 2
 
 
     assert submission.execution_duration >= 3
     assert submission.execution_duration >= 3
-    assert submission.submitted_time == min(jobs_1s.submitted_time, jobs_2s.submitted_time)
-    assert submission.run_time == min(jobs_1s.run_time, jobs_2s.run_time)
-    assert submission.finished_time == max(jobs_1s.finished_time, jobs_2s.finished_time)
+    assert submission.submitted_at == min(jobs_1s.submitted_at, jobs_2s.submitted_at)
+    assert submission.run_at == min(jobs_1s.run_at, jobs_2s.run_at)
+    assert submission.finished_at == max(jobs_1s.finished_at, jobs_2s.finished_at)
 
 
 
 
 @pytest.mark.standalone
 @pytest.mark.standalone
@@ -579,6 +579,6 @@ def test_submit_duration_standalone_mode():
     assert jobs_2s.execution_duration >= 2
     assert jobs_2s.execution_duration >= 2
 
 
     assert submission.execution_duration >= 2  # Both tasks are executed in parallel so the duration may smaller than 3
     assert submission.execution_duration >= 2  # Both tasks are executed in parallel so the duration may smaller than 3
-    assert submission.submitted_time == min(jobs_1s.submitted_time, jobs_2s.submitted_time)
-    assert submission.run_time == min(jobs_1s.run_time, jobs_2s.run_time)
-    assert submission.finished_time == max(jobs_1s.finished_time, jobs_2s.finished_time)
+    assert submission.submitted_at == min(jobs_1s.submitted_at, jobs_2s.submitted_at)
+    assert submission.run_at == min(jobs_1s.run_at, jobs_2s.run_at)
+    assert submission.finished_at == max(jobs_1s.finished_at, jobs_2s.finished_at)

+ 4 - 4
tests/core/submission/test_submission.py

@@ -924,20 +924,20 @@ def test_execution_duration():
         job_1.running()
         job_1.running()
         job_2.pending()
         job_2.pending()
 
 
-    assert submission.run_time == datetime(2024, 9, 25, 13, 30, 35)
+    assert submission.run_at == datetime(2024, 9, 25, 13, 30, 35)
     assert submission.execution_duration > 0
     assert submission.execution_duration > 0
 
 
     with freezegun.freeze_time("2024-09-25 13:33:45"):
     with freezegun.freeze_time("2024-09-25 13:33:45"):
         job_1.completed()
         job_1.completed()
         job_2.running()
         job_2.running()
         assert submission.execution_duration == 190  # = 13:33:45 - 13:30:35
         assert submission.execution_duration == 190  # = 13:33:45 - 13:30:35
-        assert submission.run_time == datetime(2024, 9, 25, 13, 30, 35)
+        assert submission.run_at == datetime(2024, 9, 25, 13, 30, 35)
 
 
         # Job 2 is not completed, so the submission is not completed
         # Job 2 is not completed, so the submission is not completed
-        assert submission.finished_time is None
+        assert submission.finished_at is None
 
 
     with freezegun.freeze_time("2024-09-25 13:35:50"):
     with freezegun.freeze_time("2024-09-25 13:35:50"):
         job_2.completed()
         job_2.completed()
 
 
-    assert submission.finished_time == datetime(2024, 9, 25, 13, 35, 50)
+    assert submission.finished_at == datetime(2024, 9, 25, 13, 35, 50)
     assert submission.execution_duration == 315  # = 13:35:50 - 13:30:35
     assert submission.execution_duration == 315  # = 13:35:50 - 13:30:35