pilot.linkstec 0.0.13__tar.gz → 0.0.27__tar.gz

{pilot_linkstec-0.0.13 → pilot_linkstec-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.13
+Version: 0.0.27
 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.13 → pilot_linkstec-0.0.27}/pyproject.toml

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

{pilot_linkstec-0.0.13 → pilot_linkstec-0.0.27}/src/pilot/config/config_reader.py

@@ -14,8 +14,6 @@ class ConfigDTO:
     runsteps: list[str]
     multisteps: list[str]
 
-
-
 class ConfigReader:
     def __init__(self, filename = None):
         filepath = None

pilot_linkstec-0.0.27/src/pilot/conver/commentRemover.py

@@ -0,0 +1,100 @@
+import re
+from pathlib import Path
+import sys
+
+class CommentRemover:
+    """
+    ColdFusion (.cfm, .cfc) と JavaScript (.js) のコメント削除クラス
+    """
+
+    def __init__(self, file_path: str):
+        self.file_path = Path(file_path)
+        self.text = ''
+        self.cleaned_text = ''
+
+    def load(self, encoding='utf-8'):
+        try:
+            with self.file_path.open('r', encoding=encoding) as f:
+                self.text = f.read()
+        except Exception as e:
+            print(f"Failed to load file {self.file_path}: {e}", file=sys.stderr)
+            raise
+
+    def save(self, output_path: str, encoding='utf-8'):
+        try:
+            with open(output_path, 'w', encoding=encoding) as f:
+                f.write(self.cleaned_text)
+        except Exception as e:
+            print(f"Failed to save file {output_path}: {e}", file=sys.stderr)
+            raise
+
+    def remove_comments(self):
+        ext = self.file_path.suffix.lower()
+        if ext in ['.cfm', '.cfc']:
+            self.cleaned_text = self.remove_coldfusion_comments(self.text)
+        elif ext == '.js':
+            self.cleaned_text = self.remove_js_comments(self.text)
+        elif ext in ['.cbl', '.cob', '.cobol']:
+            self.cleaned_text = self.remove_cobol_comments(self.text)
+        else:
+            print(f"Unsupported file extension: {ext}, no comment removal applied.", file=sys.stderr)
+            self.cleaned_text = self.text
+
+    def remove_coldfusion_comments(self, text: str) -> str:
+        pattern_cftag = r'<!---(?:.|\n)*?--->'
+        pattern_block = r'/\*(?:.|\n)*?\*/'
+        pattern_line = r'//.*?$'
+
+        text = re.sub(pattern_cftag, '', text, flags=re.MULTILINE)
+        text = re.sub(pattern_block, '', text, flags=re.MULTILINE)
+        text = re.sub(pattern_line, '', text, flags=re.MULTILINE)
+        return text
+
+    def remove_js_comments(self, text: str) -> str:
+        pattern_block = r'/\*(?:.|\n)*?\*/'
+        pattern_line = r'//.*?$'
+
+        text = re.sub(pattern_block, '', text, flags=re.MULTILINE)
+        text = re.sub(pattern_line, '', text, flags=re.MULTILINE)
+        return text
+
+    def remove_cobol_comments(self, text: str) -> str:
+        """
+        COBOLのコメント行、および方言の行内コメント *>以降を削除
+
+        ・固定形式コメント行
+          行頭が '*'（先頭1文字目が*）の行はコメント → 削除
+          または7文字目が '*'の行もコメント → 削除
+
+        ・行内コメント (方言)
+          '*> '以降はコメント → 削除
+        """
+
+        lines = text.splitlines()
+        cleaned_lines = []
+
+        for line in lines:
+            # 固定長形式にあわせて7文字目 (index 6)を判定
+            # 行長が7未満でも対応 (存在しなければFalse)
+            is_comment_line = False
+
+            if line.startswith('*'):
+                is_comment_line = True
+            elif len(line) >= 7 and line[6] == '*':
+                is_comment_line = True
+
+            if is_comment_line:
+                # コメント行なのでスキップ
+                continue
+
+            # 行内コメント *> の扱い
+            # 行の途中に '*> ' (*>に続く空白も含む) があればその位置で切り捨てる
+            comment_pos = line.find('*>')
+            if comment_pos != -1:
+                # 行内コメント開始位置でカット（空白も含め全部削除）
+                # 例えば 'MOVE X TO Y *> このコメント' => 'MOVE X TO Y '
+                line = line[:comment_pos].rstrip()
+
+            cleaned_lines.append(line)
+
+        return '\n'.join(cleaned_lines)

pilot_linkstec-0.0.27/src/pilot/conver/converfileEncodding.py

@@ -0,0 +1,49 @@
+import subprocess
+import sys
+import os
+
+def nkf_convert(file_path, nkf_args):
+    """
+    nkf を使ってファイルの文字コード変換を行う
+
+    :param file_path: 変換対象のファイルパス
+    :param nkf_args: nkf に渡す引数のリスト（例: ['-w']）
+    """
+    # nkfコマンドの引数にファイルパスを追加
+    cmd = ['nkf'] + nkf_args + [file_path]
+
+    #cmd = 'nkf32' + ' ' + arg1 + ' '+ arg2 +' '+ file_path
+
+
+    try:
+        # nkfを実行し標準出力を取得
+        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
+
+    # nkfの変換結果（バイト列）を返す
+    return result.stdout
+
+
+#if __name__ == "__main__":
+    # 処理対象のルートフォルダパスを指定（適宜変更してください）
+#    root_folder = r"d:\work2\src"
+#    nkf_convert(root_folder, ['-v'])
+
+
+
+#if __name__ == "__main__":
+#   if len(sys.argv) < 3:
+    #        print(f"使い方: python {sys.argv[0]} <ファイルパス> <nkf引数...>", file=sys.stderr)
+    #    print(f"例: python {sys.argv[0]} test.txt -w --overwrite", file=sys.stderr)
+    #    sys.exit(1)
+
+#    file_path = [r"D:\test\CHKCONST.cpy"]
+#    nkf_args = ['-w','--overwrite']
+    #nkf_args = ['-g']
+#    output = nkf_convert(file_path, nkf_args)
+
+

{pilot_linkstec-0.0.13 → pilot_linkstec-0.0.27}/src/pilot/generater/vertexai.py

@@ -7,6 +7,8 @@ import os
 
 class VertexAISingleton:
     _instance: Optional['VertexAISingleton'] = None
+
+    
     _lock = threading.Lock()
     _tokenizer_cache = {}
     encoding = None
@@ -24,7 +26,7 @@ class VertexAISingleton:
             with self._lock:
                 if not self._initialized:
                     self.model = GenerativeModel(model_name)
-
+                    self.encoding = tiktoken.get_encoding("cl100k_base")
                     self._initialized = True
 
     def generate_content(self, prompt: str) -> Dict[str, Any]:
@@ -52,7 +54,6 @@ class VertexAISingleton:
     def count_tokens(self, text: str) -> int:
         """与えられたテキストのトークン数を返す（bert-base-uncasedのみ使用）"""
         try:
-            self.encoding = tiktoken.get_encoding("cl100k_base")
             tokens = self.encoding.encode(text)
             return len(tokens)
         except Exception as e:

{pilot_linkstec-0.0.13 → pilot_linkstec-0.0.27}/src/pilot/job/impl/base_job.py

@@ -2,11 +2,12 @@ import os
 import shutil
 
 from pilot.job.job_interface import JobInterface
-from pilot.config.config_reader import ConfigReader
+from pilot.logging.logger import get_logger
 
 
 class BaseJob(JobInterface):
     def __init__(self):
+        self.logger = get_logger(__name__)
         self.config_dto = None
         self._current_step = None
         self._file_path = None
@@ -15,6 +16,7 @@ class BaseJob(JobInterface):
         self._next_step_file_path = None
         self._content = None
 
+
     @property
     def current_step(self):
         return self._current_step
@@ -325,4 +327,20 @@ class BaseJob(JobInterface):
             open(end_file, 'w', encoding='utf-8').close()
             return end_file
 
-        return None
+        return None
+
+    def pre_run(self):
+        """
+        ジョブ実行前の前処理を行うメソッド。
+        必要に応じてサブクラスでオーバーライドして使用する。
+        """
+        pass
+
+    def post_run(self):
+        """
+        ジョブ実行後の後処理を行うメソッド。
+        必要に応じてサブクラスでオーバーライドして使用する。
+        """
+        pass
+
+

{pilot_linkstec-0.0.13 → pilot_linkstec-0.0.27}/src/pilot/job/job_interface.py

@@ -4,3 +4,4 @@ class JobInterface(ABC):
     @abstractmethod
     def run(self):
         pass
+    

pilot_linkstec-0.0.27/src/pilot/logging/logger.py

@@ -0,0 +1,57 @@
+import logging
+import sys
+import threading
+
+# コンソールカラーのコード定義
+RESET = "\x1b[0m"
+COLOR_MAP = {
+    logging.DEBUG: "\x1b[37m",  # 白色
+    logging.INFO: "\x1b[32m",  # 緑色
+    logging.WARNING: "\x1b[33m",  # 黄色
+    logging.ERROR: "\x1b[31m",  # 赤色
+    logging.CRITICAL: "\x1b[41m",  # 赤背景白文字
+}
+
+
+class ColoredFormatter(logging.Formatter):
+    def format(self, record):
+        color = COLOR_MAP.get(record.levelno, RESET)
+        # スレッド名を取得
+        thread_name = threading.current_thread().name
+        thread_name = thread_name.split('_', 1)[1] if '_' in thread_name else thread_name
+        # クラス名、メソッド名、行番号
+        prefix = f"{self.formatTime(record, '%Y-%m-%d %H:%M:%S')} " \
+                 f"[{record.levelname}] " \
+                 f"[{thread_name}] " \
+                 f"[{record.module}.{record.funcName}:{record.lineno}]"
+        message = super().format(record)
+        return f"{color}{prefix} {message}{RESET}"
+
+
+_global_logger_configured = False
+
+
+def setup_global_logger(log_level: int = logging.INFO):
+    global _global_logger_configured
+
+    if not _global_logger_configured:
+        logging.basicConfig(
+            level=log_level,
+            format='%(message)s'
+        )
+
+        root_logger = logging.getLogger()
+        if root_logger.handlers:
+            root_logger.handlers.clear()
+
+        handler = logging.StreamHandler(sys.stdout)
+        formatter = ColoredFormatter('%(message)s')
+        handler.setFormatter(formatter)
+        root_logger.addHandler(handler)
+        root_logger.setLevel(log_level)
+
+        _global_logger_configured = True
+
+
+def get_logger(name: str) -> logging.Logger:
+    return logging.getLogger(name)

pilot_linkstec-0.0.27/src/pilot/processor/code_processor.py

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

pilot_linkstec-0.0.27/src/pilot/processor/code_processor_pipeline.py

@@ -0,0 +1,14 @@
+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

{pilot_linkstec-0.0.13 → pilot_linkstec-0.0.27}/src/pilot.linkstec.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.13
+Version: 0.0.27
 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.13 → pilot_linkstec-0.0.27}/src/pilot.linkstec.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ src/pilot/control/control_interface.py
 src/pilot/control/impl/__init__.py
 src/pilot/control/impl/base_controller.py
 src/pilot/conver/__init__.py
+src/pilot/conver/commentRemover.py
 src/pilot/conver/converfileEncodding.py
 src/pilot/conver/nkf_converter.py
 src/pilot/generater/__init__.py
@@ -21,6 +22,11 @@ src/pilot/job/__init__.py
 src/pilot/job/job_interface.py
 src/pilot/job/impl/__init__.py
 src/pilot/job/impl/base_job.py
+src/pilot/logging/__init__.py
+src/pilot/logging/logger.py
+src/pilot/processor/__init__.py
+src/pilot/processor/code_processor.py
+src/pilot/processor/code_processor_pipeline.py
 src/pilot/splitters/__init__.py
 src/pilot/splitters/cobolsplitter.py
 src/pilot/unit/__init__.py

pilot_linkstec-0.0.13/src/pilot/conver/converfileEncodding.py

@@ -1,77 +0,0 @@
-import subprocess
-import sys
-import os
-
-def nkf_convert(file_path, nkf_args):
-    """
-    nkf を使ってファイルの文字コード変換を行う
-
-    :param file_path: 変換対象のファイルパス
-    :param nkf_args: nkf に渡す引数のリスト（例: ['-w']）
-    """
-    # nkfコマンドの引数にファイルパスを追加
-    #cmd = ['nkf'] + nkf_args + [file_path]
-
-    cmd = ['nkf32'] + nkf_args + file_path
-
-
-    try:
-        # nkfを実行し標準出力を取得
-        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
-
-    # nkfの変換結果（バイト列）を返す
-    return result.stdout
-
-
-#if __name__ == "__main__":
-    # 処理対象のルートフォルダパスを指定（適宜変更してください）
-#    root_folder = r"d:\work2\src"
-#    nkf_convert(root_folder, ['-v'])
-
-
-
-#if __name__ == "__main__":
-#   if len(sys.argv) < 3:
-    #        print(f"使い方: python {sys.argv[0]} <ファイルパス> <nkf引数...>", file=sys.stderr)
-    #    print(f"例: python {sys.argv[0]} test.txt -w --overwrite", file=sys.stderr)
-    #    sys.exit(1)
-
-#    file_path = [r"D:\test\CHKCONST.cpy"]
-#    nkf_args = ['-w','--overwrite']
-    #nkf_args = ['-g']
-#    output = nkf_convert(file_path, nkf_args)
-
-
-if __name__ == "__main__":
-
-
-    target_dir = r'D:\work\fullsource'
-    nkf_args = ['-w', '--overwrite']
-    #extensions = (
-    #    '.cfc', '.cfm', '.cob', '.cobol', '.cpy', '.csh', '.css', '.ctl',
-    #    '.htm', '.html', '.js', '.sh', '.sql', '.tpl', '.txt'
-    #)
-    extensions = ('.cnd','.cng','int')
-    for root, dirs, files in os.walk(target_dir):
-        for file in files:
-            if file.lower().endswith(extensions):
-                filepath = os.path.join(root, file)
-                output = nkf_convert([filepath], nkf_args)
-
-
-    #if output is not None:
-        # 結果を標準出力にバイナリのまま書き出す場合
-        # sys.stdout.buffer.write(output)
-
-        # あるいはUTF-8等に応じてデコードして表示する場合
-        # 一旦utf-8デコードを試みる例（必要に応じて変更してください）
-    #    try:
-    #        decoded_output = output.decode('utf-8')
-    #        print(decoded_output)
-    #    except UnicodeDecodeError:
-    #        print("utf-8へのデコードに失敗しました。バイナリデータとして出力します。", file=sys.stderr)
-#        sys.stdout.buffer.write(output)