Browse Source

refactor: rename _get_by_tag to _get_all_by_cycle_tag

trgiangdo 9 months ago
parent
commit
03bbf78bf5
2 changed files with 4 additions and 8 deletions
  1. 3 6
      taipy/core/scenario/_scenario_manager.py
  2. 1 2
      taipy/core/taipy.py

+ 3 - 6
taipy/core/scenario/_scenario_manager.py

@@ -268,12 +268,9 @@ class _ScenarioManager(_Manager[Scenario], _VersionMixin):
         return None
         return None
 
 
     @classmethod
     @classmethod
-    def _get_by_tag(cls, cycle: Cycle, tag: str) -> Optional[Scenario]:
-        scenarios = cls._get_all_by_cycle(cycle)
-        for scenario in scenarios:
-            if scenario.has_tag(tag):
-                return scenario
-        return None
+    def _get_all_by_cycle_tag(cls, cycle: Cycle, tag: str) -> List[Scenario]:
+        cycles_scenarios = cls._get_all_by_cycle(cycle)
+        return [scenario for scenario in cycles_scenarios if scenario.has_tag(tag)]
 
 
     @classmethod
     @classmethod
     def _get_all_by_tag(cls, tag: str) -> List[Scenario]:
     def _get_all_by_tag(cls, tag: str) -> List[Scenario]:

+ 1 - 2
taipy/core/taipy.py

@@ -548,8 +548,7 @@ def get_scenarios(
     elif not cycle and tag:
     elif not cycle and tag:
         scenarios = scenario_manager._get_all_by_tag(tag)
         scenarios = scenario_manager._get_all_by_tag(tag)
     elif cycle and tag:
     elif cycle and tag:
-        cycles_scenarios = scenario_manager._get_all_by_cycle(cycle)
-        scenarios = [scenario for scenario in cycles_scenarios if scenario.has_tag(tag)]
+        scenarios = scenario_manager._get_all_by_cycle_tag(cycle, tag)
     else:
     else:
         scenarios = []
         scenarios = []