pilot.linkstec 0.0.10__tar.gz → 0.0.12__tar.gz

{pilot_linkstec-0.0.10 → pilot_linkstec-0.0.12}/PKG-INFO

@@ -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 → pilot_linkstec-0.0.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pilot.linkstec"
-version = "0.0.10"
+version = "0.0.12"
 authors = [
   { name="wanglr", email="wanglr1980@gmail.com" },
 ]

{pilot_linkstec-0.0.10 → pilot_linkstec-0.0.12}/src/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_linkstec-0.0.12/src/pilot/control/impl/base_controller.py

@@ -0,0 +1,56 @@
+from concurrent.futures import ThreadPoolExecutor
+
+
+from pilot.control.control_interface import ControlInterface
+from pilot.unit.impl.base_unit import BaseUnit
+from pilot.config.config_reader import ConfigReader
+
+
+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()
+        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_linkstec-0.0.12/src/pilot/unit/impl/base_unit.py

@@ -0,0 +1,36 @@
+import os
+
+from pilot.unit.unit_interface import UnitInterface
+from pilot.job.impl.base_job import BaseJob
+from pilot.config.config_reader import ConfigReader, ConfigDTO  # 追加
+
+class BaseUnit(UnitInterface):
+    config_dto: ConfigDTO = None  # 型アノテーションを追加
+    joblist = []
+
+    def __init__(self):
+        pass
+
+    def _init_job(self,step):
+        return BaseJob()
+
+    def run(self, index=0):
+        steps = self.config_dto.steps
+        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):
+            for filename in filenames:
+                file_path = os.path.join(dirpath, filename)
+                job = self._init_job(step)
+                job.config_dto = self.config_dto
+                job.current_step = step
+                job.step_index = index
+                job.file_path = file_path
+                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 → pilot_linkstec-0.0.12}/src/pilot.linkstec.egg-info/PKG-INFO

@@ -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/src/pilot/control/impl/base_controller.py

@@ -1,31 +0,0 @@
-from concurrent.futures import ThreadPoolExecutor
-
-
-from pilot.control.control_interface import ControlInterface
-from pilot.unit.impl.base_unit import BaseUnit
-from pilot.config.config_reader import ConfigReader
-
-
-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()

pilot_linkstec-0.0.10/src/pilot/unit/impl/base_unit.py

@@ -1,80 +0,0 @@
-import os
-from concurrent.futures import ThreadPoolExecutor
-import time
-
-from pilot.unit.unit_interface import UnitInterface
-from pilot.job.impl.base_job import BaseJob
-from pilot.config.config_reader import ConfigReader, ConfigDTO  # 追加
-
-class BaseUnit(UnitInterface):
-    config_dto: ConfigDTO = None  # 型アノテーションを追加
-    joblist = []
-
-    def __init__(self):
-        pass
-
-
-    def _init_job(self,step):
-        return BaseJob()
-
-    def run(self):
-        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)
-
-    def _run_jobs_in_step_dir(self, current_step_dir, step, index):
-        for dirpath, _, filenames in os.walk(current_step_dir):
-            for filename in filenames:
-                file_path = os.path.join(dirpath, filename)
-                job = self._init_job(step)
-                job.config_dto = self.config_dto
-                job.current_step = step
-                job.step_index = index
-                job.file_path = file_path
-                if self.job_need_run(job, filename, index):
-                    job.run()
-
-
-    def job_need_run(self, job:BaseJob,filename: str,index):
-        return True