Prechádzať zdrojové kódy

update gui-core and minor changes

Toan Quach 1 rok pred
rodič
commit
48e4f300ca

+ 13 - 0
taipy/core/taipy.py

@@ -171,15 +171,23 @@ def is_readable(
         Sequence,
         Scenario,
         Cycle,
+<<<<<<< HEAD
         Submission,
+=======
+>>>>>>> 7b7fef75 (update gui-core and minor changes)
         DataNodeId,
         TaskId,
         JobId,
         SequenceId,
         ScenarioId,
+<<<<<<< HEAD
         CycleId,
         SubmissionId
     ],
+=======
+        CycleId
+    ]
+>>>>>>> 7b7fef75 (update gui-core and minor changes)
 ) -> bool:
     """Indicate if an entity can be read.
 
@@ -242,6 +250,7 @@ def submit(
         timeout (Union[float, int]): The optional maximum number of seconds to wait
             for the jobs to be finished before returning.
         **properties (dict[str, any]): A keyworded variable length list of additional arguments.
+
     Returns:
         The created `Submission^` containing the information about the submission.
     """
@@ -746,6 +755,7 @@ def delete_job(job: Job, force: Optional[bool] = False):
         job (Job^): The job to delete.
         force (Optional[bool]): If True, forces the deletion of _job_, even
             if it is not completed yet.
+
     Raises:
         JobNotDeletedException^: If the job is not finished.
     """
@@ -775,6 +785,7 @@ def get_latest_job(task: Task) -> Optional[Job]:
 
     Parameters:
         task (Task^): The task to retrieve the latest job from.
+
     Returns:
         The latest job created from _task_, or None if no job has been created from _task_.
     """
@@ -789,6 +800,7 @@ def get_latest_submission(entity: Union[Scenario, Sequence, Task]) -> Optional[S
     Parameters:
         entity (Union[Scenario^, Sequence^, Task^]): The scenario, sequence or task to
         retrieve the latest submission from.
+
     Returns:
         The latest submission created from _scenario_, _sequence_ and _task_, or None
         if no submission has been created from _scenario_, _sequence_ and _task_.
@@ -829,6 +841,7 @@ def create_scenario(
         creation_date (Optional[datetime.datetime]): The creation date of the scenario.
             If None, the current date time is used.
         name (Optional[str]): The displayable name of the scenario.
+
     Returns:
         The new scenario.
     """

+ 1 - 2
taipy/gui_core/_context.py

@@ -431,8 +431,7 @@ class _GuiCoreContext(CoreEventConsumerBase):
         entity = core_get(entity_id)
         if entity:
             try:
-                jobs = core_submit(entity)
-                submission_entity = core_get_submission(jobs[0].submit_id if isinstance(jobs, list) else jobs.submit_id)
+                submission_entity = core_submit(entity)
                 if submission_cb := data.get("on_submission_change"):
                     submission_fn = self.gui._get_user_function(submission_cb)
                     if callable(submission_fn):

+ 5 - 0
tests/core/_orchestrator/test_orchestrator__submit.py

@@ -117,6 +117,7 @@ def test_submit_scenario_development_mode():
 
     # submission is created and correct
     assert len(_SubmissionManagerFactory._build_manager()._get_all()) == 1
+    submission = _SubmissionManagerFactory._build_manager()._get(job_1.submit_id)
     assert submission.submission_status == SubmissionStatus.COMPLETED
     assert submission.jobs == jobs
     assert submission.creation_date == submit_time
@@ -198,6 +199,7 @@ def test_submit_scenario_development_mode_blocked_jobs():
 
     # submission is created and correct
     assert len(_SubmissionManagerFactory._build_manager()._get_all()) == 1
+    submission = _SubmissionManagerFactory._build_manager()._get(job_1.submit_id)
     assert submission.submission_status == SubmissionStatus.BLOCKED
     assert submission.jobs == jobs
     assert submission.creation_date == s_time
@@ -280,6 +282,7 @@ def test_submit_scenario_standalone_mode():
 
     # submission is created and correct
     assert len(_SubmissionManagerFactory._build_manager()._get_all()) == 1
+    submission = _SubmissionManagerFactory._build_manager()._get(job_1.submit_id)
     assert submission.submission_status == SubmissionStatus.PENDING
     assert submission.jobs == jobs
     assert submission.creation_date == submit_time
@@ -378,6 +381,7 @@ def test_submit_sequence_development_mode():
 
     # submission is created and correct
     assert len(_SubmissionManagerFactory._build_manager()._get_all()) == 1
+    submission = _SubmissionManagerFactory._build_manager()._get(job_1.submit_id)
     assert submission.entity_type == "SEQUENCE"
     assert submission.submission_status == SubmissionStatus.COMPLETED
     assert submission.entity_config_id is None
@@ -446,6 +450,7 @@ def test_submit_sequence_standalone_mode():
 
     # submission is created and correct
     assert len(_SubmissionManagerFactory._build_manager()._get_all()) == 1
+    submission = _SubmissionManagerFactory._build_manager()._get(job_1.submit_id)
     assert submission.submission_status == SubmissionStatus.PENDING
     assert submission.entity_type == "SEQUENCE"
     assert submission.entity_config_id is None

+ 4 - 0
tests/core/_orchestrator/test_orchestrator__submit_task.py

@@ -66,6 +66,7 @@ def test_submit_task_development_mode():
 
     # submission is created and correct
     assert len(_SubmissionManagerFactory._build_manager()._get_all()) == 1
+    submission = _SubmissionManagerFactory._build_manager()._get(job.submit_id)
     assert submission.creation_date == submit_time
     assert submission.submission_status == SubmissionStatus.COMPLETED
     assert submission.jobs == [job]
@@ -103,6 +104,7 @@ def test_submit_task_development_mode_blocked_job():
     assert job.stacktrace == []
 
     # submission is created and correct
+    assert len(_SubmissionManagerFactory._build_manager()._get_all()) == 1
     submission = _SubmissionManagerFactory._build_manager()._get(job.submit_id)
     assert submission.submission_status == SubmissionStatus.BLOCKED
     assert submission.creation_date == submit_time
@@ -146,6 +148,7 @@ def test_submit_task_standalone_mode():
     assert job.stacktrace == []
 
     # submission is created and correct
+    assert len(_SubmissionManagerFactory._build_manager()._get_all()) == 1
     submission = _SubmissionManagerFactory._build_manager()._get(job.submit_id)
     assert submission.creation_date == submit_time
     assert submission.submission_status == SubmissionStatus.PENDING
@@ -189,6 +192,7 @@ def test_submit_task_standalone_mode_blocked_job():
     assert job.submit_entity_id == sc.t2.id
 
     # submission is created and correct
+    assert len(_SubmissionManagerFactory._build_manager()._get_all()) == 1
     submission = _SubmissionManagerFactory._build_manager()._get(job.submit_id)
     assert submission.creation_date == submit_time
     assert submission.submission_status == SubmissionStatus.BLOCKED