pilot.linkstec 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

pilot/config/config_reader.py

@@ -11,6 +11,8 @@ class ConfigDTO:
     project: str
     steps: list[str]
     skipsteps: list[str]
+    runsteps: list[str]
+    multisteps: list[str]
 
 
 
@@ -79,11 +81,17 @@ 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 = [s.strip() for s in runsteps_str.split(',')] if runsteps_str else []
+        multisteps_str = self.get('DEFAULT', 'multistep', fallback='')
+        multisteps = [s.strip() for s in multisteps_str.split(',')] if multisteps_str else []
 
         return ConfigDTO(
             work_space=work_space,
             threads=threads,
             project=project,
             steps=steps,
-            skipsteps=skipsteps
+            skipsteps=skipsteps,
+            runsteps=runsteps,
+            multisteps=multisteps
         )

pilot/generater/vertexai.py

@@ -66,6 +66,7 @@ class VertexAISingleton:
             lines = lines[:-1]
         return "\n".join(lines)
 
+    @classmethod
     def get_instance(cls, model_name: str = "gemini-2.5-pro") -> 'VertexAISingleton':
         """インスタンスを取得"""
         return cls(model_name)

pilot/unit/impl/base_unit.py

@@ -1,11 +1,13 @@
 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
+from pilot.config.config_reader import ConfigReader, ConfigDTO  # 追加
 
 class BaseUnit(UnitInterface):
-    config_dto = None
+    config_dto: ConfigDTO = None  # 型アノテーションを追加
     joblist = []
 
     def __init__(self):
@@ -18,12 +20,43 @@ class BaseUnit(UnitInterface):
     def run(self):
         steps = self.config_dto.steps
         skipsteps = self.config_dto.skipsteps
-        for index, step in enumerate(steps):
+
+        runsteps = self.config_dto.runsteps
+
+        def run_step(index):
+            if index >= len(steps):
+                return
+            step = steps[index]
             if step in skipsteps:
-                continue
-            self._run_jobs_in_step_dir(self.config_dto.work_space+ "/" +step,step,index)
+                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_multisteps = self.config_dto.multisteps
+            if step in unit_multisteps:
+                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を実行
+                run_step(index + 1)
+
+        run_step(0)
 
-    def _run_jobs_in_step_dir(self, 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)
@@ -32,7 +65,7 @@ class BaseUnit(UnitInterface):
                 job.current_step = step
                 job.step_index = index
                 job.file_path = file_path
-                if self.job_need_run(job,filename,index):
+                if self.job_need_run(job, filename, index):
                     job.run()
 
 

{pilot_linkstec-0.0.7.dist-info → pilot_linkstec-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.7
+Version: 0.0.9
 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.7.dist-info → pilot_linkstec-0.0.9.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pilot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/config/config_reader.py,sha256=RL9925CIjKyimvcspzmZkPzJUJe6z28cfz5nGhZ3g3k,3308
+pilot/config/config_reader.py,sha256=wrb6bIDMYqZfp0KtoYIzoRMLmbKVEFaRhydm-csJaKM,3752
 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
@@ -9,7 +9,7 @@ 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
 pilot/generater/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/generater/vertexai.py,sha256=1WiecrEE05u7nEpW7G9iZL-CzXJqhyrQgluCk8bPQCo,2573
+pilot/generater/vertexai.py,sha256=v-hEvPwsUtrxP57yu9f5pUBj7BGImegO4lv10QWM1XA,2591
 pilot/job/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/job/job_interface.py,sha256=LL0hfuFfnKnkpQD99jv1hkaAIAFM-JJPrX3PFxN6O_A,120
 pilot/job/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=fD9WI5L80m9d1qqr5-I7Bw0jtzK66Ql5Rj2rrQjjZ-Q,1275
+pilot/unit/impl/base_unit.py,sha256=WFs_NUfIqvsvcPMDCV4iRnGMZ3u-QXOvw2H1f-ru7XM,2389
 pilot/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/util/files.py,sha256=v9uzfzo3Aq4xgnUIASEZeBJoA2nD9Qz_EA3P-FwzGFQ,1896
-pilot_linkstec-0.0.7.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-pilot_linkstec-0.0.7.dist-info/METADATA,sha256=A_N8TQe3dWEYfCDrRwkOyVA7Kx7ba4KhMa0Q4QoQ2iY,678
-pilot_linkstec-0.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pilot_linkstec-0.0.7.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
-pilot_linkstec-0.0.7.dist-info/RECORD,,
+pilot_linkstec-0.0.9.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+pilot_linkstec-0.0.9.dist-info/METADATA,sha256=8WOt5vvtpKqljRZJIEedu0RaJ1cG6U9pEva2BUwg06k,678
+pilot_linkstec-0.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pilot_linkstec-0.0.9.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
+pilot_linkstec-0.0.9.dist-info/RECORD,,