pilot.linkstec 0.0.10__py3-none-any.whl → 0.0.12__py3-none-any.whl

pilot/config/config_reader.py

@@ -81,9 +81,9 @@ class ConfigReader:
         steps = [s.strip() for s in steps_str.split(',')] if steps_str else []
         skipsteps_str = self.get('DEFAULT', 'skipsteps', fallback='')
         skipsteps = [s.strip() for s in skipsteps_str.split(',')] if skipsteps_str else []
-        runsteps_str = self.get('DEFAULT', 'runstep', fallback='')
+        runsteps_str = self.get('DEFAULT', 'runsteps', fallback='')
         runsteps = [s.strip() for s in runsteps_str.split(',')] if runsteps_str else []
-        multisteps_str = self.get('DEFAULT', 'multistep', fallback='')
+        multisteps_str = self.get('DEFAULT', 'multisteps', fallback='')
         multisteps = [s.strip() for s in multisteps_str.split(',')] if multisteps_str else []
 
         return ConfigDTO(

pilot/control/impl/base_controller.py

@@ -11,21 +11,46 @@ class BaseController(ControlInterface):
     def __init__(self):
         pass
 
-
     def _init_unit(self):
         return BaseUnit()
 
     def run(self,configfile: str = None):
         import time
         config_dto = ConfigReader(configfile).get_dto()
-        def worker():
-            unit = self._init_unit()
-            unit.config_dto = config_dto
-            unit.run()
-        with ThreadPoolExecutor(max_workers=config_dto.threads) as executor:
-            futures = []
-            for _ in range(config_dto.threads):
-                futures.append(executor.submit(worker))
-                time.sleep(0.2)
-            for future in futures:
-                future.result()
+        unit = self._init_unit()
+        unit.config_dto = config_dto
+
+        steps = config_dto.steps
+        runsteps = config_dto.runsteps
+
+        def run_step(index):
+            if index >= len(steps):
+                return
+            step = steps[index]
+            if step in config_dto.skipsteps:
+                run_step(index + 1)
+                return
+
+            if len(runsteps) == 0:
+                pass
+            elif len(runsteps) != 0 and step not in runsteps:
+                run_step(index + 1)
+                return
+
+            max_workers = 1
+            if step in config_dto.multisteps:
+                max_workers = config_dto.threads
+
+            def step_worker():
+                unit.run(index)
+
+            with ThreadPoolExecutor(max_workers=max_workers) as executor:
+                futures = []
+                for _ in range(max_workers):
+                    futures.append(executor.submit(step_worker))
+                    time.sleep(0.5)
+                for future in futures:
+                    future.result()
+                run_step(index + 1)
+
+        run_step(0)

pilot/unit/impl/base_unit.py

@@ -1,6 +1,4 @@
 import os
-from concurrent.futures import ThreadPoolExecutor
-import time
 
 from pilot.unit.unit_interface import UnitInterface
 from pilot.job.impl.base_job import BaseJob
@@ -13,55 +11,14 @@ class BaseUnit(UnitInterface):
     def __init__(self):
         pass
 
-
     def _init_job(self,step):
         return BaseJob()
 
-    def run(self):
+    def run(self, index=0):
         steps = self.config_dto.steps
-        skipsteps = self.config_dto.skipsteps
-
-        runsteps = self.config_dto.runsteps
-
-        def run_step(index):
-            if index >= len(steps):
-                return
-            step = steps[index]
-            if step in skipsteps:
-                run_step(index + 1)
-                return
-
-            if len(runsteps)  == 0 :
-                pass
-            elif len(runsteps) != 0 and step not in runsteps:
-                run_step(index + 1)
-                return
-
-            current_step_dir = self.config_dto.work_space + "/" + step
-
-            max_workers = self.config_dto.threads
-            unit_multiset = self.config_dto.multisteps
-            if step in unit_multiset:
-                max_workers = self.config_dto.threads
-            else:
-                max_workers = 1
-            def step_worker():
-                self._run_jobs_in_step_dir(current_step_dir, step, index)
-
-            #with ThreadPoolExecutor(max_workers=max_workers) as executor:
-            #    future = executor.submit(step_worker)
-            #    future.result()
-                # STEP完了後、次のSTEPを実行
-            with ThreadPoolExecutor(max_workers=max_workers) as executor:
-                futures = []
-                for _ in range(max_workers):
-                    futures.append(executor.submit(step_worker))
-                    time.sleep(0.5)
-                for future in futures:
-                    future.result()
-                run_step(index + 1)
-
-        run_step(0)
+        step = steps[index]
+        current_step_dir = self.config_dto.work_space + "/" + step
+        self._run_jobs_in_step_dir(current_step_dir, step, index)
 
     def _run_jobs_in_step_dir(self, current_step_dir, step, index):
         for dirpath, _, filenames in os.walk(current_step_dir):
@@ -75,6 +32,5 @@ class BaseUnit(UnitInterface):
                 if self.job_need_run(job, filename, index):
                     job.run()
 
-
     def job_need_run(self, job:BaseJob,filename: str,index):
         return True

{pilot_linkstec-0.0.10.dist-info → pilot_linkstec-0.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.10
+Version: 0.0.12
 Summary: pilot of the ship, a tool for managing and deploying Python projects.
 Author-email: wanglr <wanglr1980@gmail.com>
 License-Expression: MIT

{pilot_linkstec-0.0.10.dist-info → pilot_linkstec-0.0.12.dist-info}/RECORD

@@ -1,10 +1,10 @@
 pilot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/config/config_reader.py,sha256=wrb6bIDMYqZfp0KtoYIzoRMLmbKVEFaRhydm-csJaKM,3752
+pilot/config/config_reader.py,sha256=zG_CFIgeTvrcXCtKmOgXC39625XFFIPGuw4u9lzkeEs,3754
 pilot/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/control/control_interface.py,sha256=zGv380oQgAKPAIHDHeFdPYzhj2Ngo2T66NWlNloA7vY,124
 pilot/control/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/control/impl/base_controller.py,sha256=XdqpoyO6mw7sNp14hZo5BP1Eel39W8Q_VWmTMFYy4Wo,924
+pilot/control/impl/base_controller.py,sha256=h-A2X4BD_4GGQ0BjCXv_tcO8XdM8_YjXHDIZzvdzyjQ,1634
 pilot/conver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/conver/converfileEncodding.py,sha256=UqjcWO0bzkuTRHLEWrWJkeo3p-P7WuYE7jFKveyPekA,2781
 pilot/conver/nkf_converter.py,sha256=JqgThmXcdnTGMsLIHUEwe8sc0VGMqDaKCIQTg-UE3WE,1148
@@ -19,11 +19,11 @@ pilot/splitters/cobolsplitter.py,sha256=oPwxKRjA7TyXWaWV3jdy59lJZy1mRn6yxD9ivqFY
 pilot/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/unit/unit_interface.py,sha256=fE8N4h_rZU-dWLHy9o0EE3yyErGmRyIuGUDb-zqe7qo,167
 pilot/unit/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/unit/impl/base_unit.py,sha256=lSQiP9NuHgapO8PJGrsTkejFwJhernbk6qPYH_8thi8,2719
+pilot/unit/impl/base_unit.py,sha256=LsFPpL28aSNv5rsZhfKv6CWhAw1XR4n-A6FOn2RBrZo,1272
 pilot/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/util/files.py,sha256=v9uzfzo3Aq4xgnUIASEZeBJoA2nD9Qz_EA3P-FwzGFQ,1896
-pilot_linkstec-0.0.10.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-pilot_linkstec-0.0.10.dist-info/METADATA,sha256=ge675xquQ47T08TWMZz0LXx-C9xWohZ9eDlChc85-9E,679
-pilot_linkstec-0.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pilot_linkstec-0.0.10.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
-pilot_linkstec-0.0.10.dist-info/RECORD,,
+pilot_linkstec-0.0.12.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+pilot_linkstec-0.0.12.dist-info/METADATA,sha256=ELdi7kuau5JI1tVRE6HooTPRHTBvZbcyY_K6g0xAoaM,679
+pilot_linkstec-0.0.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pilot_linkstec-0.0.12.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
+pilot_linkstec-0.0.12.dist-info/RECORD,,