pilot.linkstec 0.0.100__py3-none-any.whl → 0.0.102__py3-none-any.whl

pilot/control/impl/base_controller.py

@@ -1,5 +1,6 @@
 import os
 import shutil
+import time
 from concurrent.futures import ThreadPoolExecutor
 
 
@@ -19,7 +20,7 @@ class BaseController(ControlInterface):
         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
@@ -83,3 +84,24 @@ class BaseController(ControlInterface):
                         pass
 
 
+    def copy_result_files_to_next_control_without_delete(from_configfile: str,to_configfile: str ):
+        from_config_dto = ConfigReader(from_configfile).get_dto()
+        to_config_dto = ConfigReader(to_configfile).get_dto()
+        from_runsteps = from_config_dto.steps
+        to_runsteps = to_config_dto.steps
+        from_workspace = from_config_dto.work_space
+        to_workspace = to_config_dto.work_space
+        from_fold = os.path.join(from_workspace, from_runsteps[-1])
+        to_fold = os.path.join(to_workspace, to_runsteps[0])
+        os.makedirs(to_fold, exist_ok=True)
+        shutil.copytree(from_fold, to_fold, dirs_exist_ok=True)
+        for root, _, files in os.walk(to_fold):
+            for fname in files:
+                if fname.endswith(('.trg', '.begin', '.end')):
+                    try:
+                        os.remove(os.path.join(root, fname))
+                    except OSError:
+                        pass
+
+
+

pilot/job/base/generate/generateJsonBaseJob.py

@@ -7,7 +7,7 @@ from pilot.job.impl.base_job import BaseJob
 
 from pilot.generater.vertexai import VertexAISingleton
 
-class generateJsonBaseJob(BaseJob):
+class GenerateJsonBaseJob(BaseJob):
 
     prompt_content: str
     result_content: str

pilot/job/base/generate/generateTextBaseJob.py

@@ -7,7 +7,7 @@ from pilot.job.impl.base_job import BaseJob
 
 from pilot.generater.vertexai import VertexAISingleton
 
-class textBaseJob(BaseJob):
+class GenerateTextBaseJob(BaseJob):
 
     prompt_content: str
     result_content: str

pilot/job/base/program/cobol/convert/spitPreDigit.py

@@ -0,0 +1,26 @@
+
+from pilot.job.impl.base_job import BaseJob
+
+class SpitPreDigit(BaseJob):
+    def run(self):
+
+        with open(self.file_path, 'r', encoding='utf-8') as f:
+            lines = f.readlines()
+
+        cleaned_lines = []
+        for line in lines:
+            # 先頭6文字を抽出
+            prefix = line[:6]
+
+            # 先頭6文字がすべて数字（かつ6文字以上ある）かチェック
+            if len(prefix) == 6 and prefix.isdigit():
+                # 数字だった場合は7文字目以降を保存
+                cleaned_lines.append(line[6:])
+            else:
+                # 数字でない（または6文字未満）場合はそのまま保存
+                cleaned_lines.append(line)
+
+        with open(self.file_path, 'w', encoding='utf-8') as f:
+            f.writelines(cleaned_lines)
+
+

pilot/job/impl/base_job.py

@@ -81,7 +81,7 @@ class BaseJob(JobInterface):
 
         try:
             base_dir = os.path.join(self.config_dto.work_space, self.current_step)
-            return os.path.relpath(self._file_path, base_dir)
+            return base_dir
         except ValueError:
             return self._file_path
 
@@ -331,7 +331,9 @@ class BaseJob(JobInterface):
         ジョブ実行前の前処理を行うメソッド。
         必要に応じてサブクラスでオーバーライドして使用する。
         """
-        pass
+        if not self.change_current_trg_to_begin():
+            return False
+        return True
 
     def post_run(self):
         """

pilot/unit/impl/base_unit.py

@@ -30,9 +30,27 @@ class BaseUnit(UnitInterface):
                 job.step_index = index
                 job.file_path = file_path
                 if self.job_need_run(job, filename, index):
+                    if index != 0:
+                        if not job.pre_run():
+                            continue
                     job.run()
                     if index != 0:
                         job.post_run()
 
-    def job_need_run(self, job:BaseJob,filename: str,index):
-        return True
+    def job_need_run(self, job:BaseJob ,filename: str, step_index: int):
+        if step_index == 0:
+            return True
+        file_ext =  file_ext = filename.split('.')[-1]
+        if file_ext == "trg":
+            # ★ trgファイルは、jobのfile_pathに設定する
+            job.current_trg_file_path = job.file_path
+            job.file_path = job.file_path.rsplit('.trg', 1)[0]
+            return True
+        elif file_ext == "end":
+            #job.copy_input_file_to_next_step(job.file_path.rsplit('.', 1)[0])
+            #job.create_next_step_end_trg_file()
+            return False
+        elif file_ext  == "begin":
+            return False
+        else:
+            return False

{pilot_linkstec-0.0.100.dist-info → pilot_linkstec-0.0.102.dist-info}/METADATA

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

@@ -16,11 +16,10 @@ pilot/config/config_reader.py,sha256=MchG-9j-Xfy8AquL_6tlvqQR65MFJ3c3hwWBl6IF2jw
 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=I2_jvTlM7W5GYQEb-Pcc3jTbulIigQK6dppm0ZZ41l4,2778
+pilot/control/impl/base_controller.py,sha256=049WVHCVfKyAiWHD1epLO8nzDbRDDOopXe0E4K401KA,3743
 pilot/conver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/conver/commentRemover.py,sha256=S8uwp9Glp0bdv4EFqf62WIcOTLiJZdracG2FAMKY1EY,3777
 pilot/conver/converfileEncodding.py,sha256=HnP-7o6V4YCEq8SA1iryyGUwbnWBkFbL16DxrTq7N-s,1582
-pilot/conver/nkf_converter.py,sha256=JqgThmXcdnTGMsLIHUEwe8sc0VGMqDaKCIQTg-UE3WE,1148
 pilot/create_python/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/create_python/create_python.py,sha256=VQwL1KKw06ocVi-uRCL_l2rDiSaEr80R1LCt2u4ilOo,8795
 pilot/create_python/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,31 +52,29 @@ pilot/job/base/convert/delimiterSwitcherJob.py,sha256=m5Y92XVbCjVWGBKzYJYX8wgLMn
 pilot/job/base/convert/encodingTransformerJob.py,sha256=P6txCqAcQ4w999ttA_gmA4VKr6klvTz4SrQIYT1gv6U,279
 pilot/job/base/convert/tabReplaceJob.py,sha256=FtPLbWwDPgH1jGsK3y5_sY4lAZ4Lhsv7GQ-1A-QgAFE,743
 pilot/job/base/generate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/job/base/generate/generateJsonBaseJob.py,sha256=5klyS0tj9YTAcLVldcxUe1GXnWYXsQhvpcB7bRjq_n4,1377
-pilot/job/base/generate/generateTextBaseJob.py,sha256=yJVzeM_87T_lqo3x39j9Mi4IuKwGj_Ww3bxXUuY_F6o,1299
+pilot/job/base/generate/generateJsonBaseJob.py,sha256=gFWOOYDkdylW-Ph7R7xFdGr-TSzZycFrW8r-8i10DmA,1377
+pilot/job/base/generate/generateTextBaseJob.py,sha256=PcHXG0-mtAkiQi3Srkdk-4e3ThoSGnwzQ5QY_Nxxn84,1307
 pilot/job/base/program/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/job/base/program/cobol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/job/base/program/cobol/convert/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pilot/job/base/program/cobol/convert/spitPreDigit.py,sha256=uGmIKOSaxNmPkzy45i0wzhxX9wFh82b2nhJVqpHUGsY,858
 pilot/job/base/program/java/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/job/base/program/java/generateDetailDesignPrompt.py,sha256=JcXxRQeJPpFNhli1nWOOxh8ZTdp_IN3-OoFQahHprjs,5651
 pilot/job/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/job/impl/base_job.py,sha256=wTrAp9P6AxyQ98cD6kWa22gUTiXJc6TcTv7-cvize9c,14665
+pilot/job/impl/base_job.py,sha256=xnZrs8xRniUKIltcmLbfoeqzVnOsMf2JVvp80Nq2oyY,14716
 pilot/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/logging/logger.py,sha256=TF7eGr3w8GK5v4sf71lDt97uVoBtCgqrZuCdbMmeQBU,1815
-pilot/processor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/processor/code_processor.py,sha256=aIjRZ3eoiuLL7_g1LyEF0yhC3puVBZou3JJdKF1sQ2E,183
-pilot/processor/code_processor_pipeline.py,sha256=ZW2JQeAUbH_sYmgh3oI2O10FhbRS9ZNNBnNjjImH9GM,406
 pilot/prompt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/splitters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/splitters/cobolsplitter.py,sha256=oPwxKRjA7TyXWaWV3jdy59lJZy1mRn6yxD9ivqFYCuY,5461
 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=UV-RsCrSAknO6a2yZAQA0vD8Uo9yqJsNCXC5e8yZE6A,1348
+pilot/unit/impl/base_unit.py,sha256=h6PMtd4ja0wa6mttFeI7rsv92yy96UgfLIU0QSs6Dmk,2108
 pilot/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/util/files.py,sha256=v9uzfzo3Aq4xgnUIASEZeBJoA2nD9Qz_EA3P-FwzGFQ,1896
-pilot_linkstec-0.0.100.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-pilot_linkstec-0.0.100.dist-info/METADATA,sha256=nKlHiMZkbk9HpQmhYju4bxX0J8YA2a02pGvdkq7AQcc,680
-pilot_linkstec-0.0.100.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pilot_linkstec-0.0.100.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
-pilot_linkstec-0.0.100.dist-info/RECORD,,
+pilot_linkstec-0.0.102.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+pilot_linkstec-0.0.102.dist-info/METADATA,sha256=I5WbKFc5WYdOkKYaPDMdkn6tOMnMIaPzmvJI0Th2meE,680
+pilot_linkstec-0.0.102.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pilot_linkstec-0.0.102.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
+pilot_linkstec-0.0.102.dist-info/RECORD,,

pilot/conver/nkf_converter.py

@@ -1,28 +0,0 @@
-import subprocess
-import sys
-
-class NkfConverter:
-    def __init__(self, nkf_args=None):
-        """
-        コンストラクタ
-        :param nkf_args: nkf に渡す引数のリスト（例: ['-w', '--overwrite']）
-                         指定しない場合はデフォルト値を使用
-        """
-        if nkf_args is None:
-            nkf_args = ['-w', '--overwrite']
-        self.nkf_args = nkf_args
-
-    def convert(self, file_path):
-        """
-        nkf を使ってファイルの文字コード変換を行う
-        :param file_path: 変換対象のファイルパス
-        :return: nkfの変換結果のバイト列、失敗したらNone
-        """
-        cmd = ['nkf32'] + self.nkf_args + [file_path]
-        try:
-            result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True)
-            print(f"nkfの実行完了しました: {file_path}")
-        except subprocess.CalledProcessError as e:
-            print(f"nkfの実行でエラーが発生しました: {e.stderr.decode()}", file=sys.stderr)
-            return None
-        return result.stdout

pilot/processor/code_processor.py

@@ -1,8 +0,0 @@
-from abc import ABC, abstractmethod
-from typing import List
-
-
-class CodeProcessor(ABC):
-    @abstractmethod
-    def process(self, lines: List[str]) -> List[str]:
-        pass

pilot/processor/code_processor_pipeline.py

@@ -1,14 +0,0 @@
-from typing import List
-
-from pilot.processor.code_processor import CodeProcessor
-
-
-class CodeProcessorPipeline:
-    def __init__(self, processors: List[CodeProcessor]):
-        self.processors = processors
-
-    def run(self, lines: List[str]) -> List[str]:
-        result = lines
-        for processor in self.processors:
-            result = processor.process(result)
-        return result