pilot.linkstec 0.0.22__py3-none-any.whl → 0.0.26__py3-none-any.whl

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/conver/converfileEncodding.py

@@ -10,14 +10,15 @@ def nkf_convert(file_path, nkf_args):
     :param nkf_args: nkf に渡す引数のリスト（例: ['-w']）
     """
     # nkfコマンドの引数にファイルパスを追加
-    #cmd = ['nkf'] + nkf_args + [file_path]
+    cmd = ['nkf'] + nkf_args + [file_path]
 
-    cmd = ['nkf32'] + nkf_args + file_path
+    #cmd = 'nkf32' + ' ' + arg1 + ' '+ arg2 +' '+ file_path
 
 
     try:
         # nkfを実行し標準出力を取得
-        result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True)
+        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)
@@ -46,32 +47,3 @@ def nkf_convert(file_path, nkf_args):
 #    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)

pilot/generater/vertexai.py

@@ -1,24 +1,19 @@
-import re
 import threading
 from typing import Dict, Any, Optional
 
 import tiktoken
-from vertexai.generative_models import GenerativeModel, ChatSession, GenerationConfig
-from google.genai import types
+from vertexai.generative_models import GenerativeModel, ChatSession
+import os
 
 class VertexAISingleton:
     _instance: Optional['VertexAISingleton'] = None
+
+    
     _lock = threading.Lock()
     _tokenizer_cache = {}
     encoding = None
 
-    SQL_SYSTEM_PROMPT_EN = (
-        "If there is any SQL-related processing　\n"
-        "1. If there is an SQL statement like \"SELECT COUNT(X) INTO :COLUMN FROM TABLE_NAME;\"　please recognize TABLE_NAME as a table."
-    )
-
-
-    def __new__(cls, model_name: str = "gemini-2.5-pro", system_prompt: Optional[str] = None):
+    def __new__(cls, model_name: str = "gemini-2.5-pro"):
         if cls._instance is None:
             with cls._lock:
                 if cls._instance is None:
@@ -26,36 +21,18 @@ class VertexAISingleton:
                     cls._instance._initialized = False
         return cls._instance
 
-    def __init__(self, model_name: str = "gemini-2.5-pro", system_prompt: Optional[str] = None):
+    def __init__(self, model_name: str = "gemini-2.5-pro"):
         if not self._initialized:
             with self._lock:
                 if not self._initialized:
                     self.model = GenerativeModel(model_name)
                     self.encoding = tiktoken.get_encoding("cl100k_base")
-                    # system_promptにSQL_SYSTEM_PROMPT_ENを追加
-                    if system_prompt:
-                        self.system_prompt = f"{system_prompt.rstrip()}\n\n{self.SQL_SYSTEM_PROMPT_EN}"
-                    else:
-                        self.system_prompt = self.SQL_SYSTEM_PROMPT_EN
                     self._initialized = True
-        else:
-            # 既存インスタンスでもsystem_promptを更新可能に
-            if system_prompt is not None:
-                self.system_prompt = f"{system_prompt.rstrip()}\n\n{self.SQL_SYSTEM_PROMPT_EN}" if system_prompt else self.SQL_SYSTEM_PROMPT_EN
 
     def generate_content(self, prompt: str) -> Dict[str, Any]:
         """複数スレッドから安全に呼び出し可能"""
         try:
-            # システムプロンプトをconfigとして渡す
-
-            generation_config = types.GenerateContentConfig(
-                system_instruction = self.system_prompt
-            )
-            prompt = self.exchange_prompt(prompt)
-            response = self.model.generate_content(
-                contents=prompt,  # 引数名を明示
-                generation_config = generation_config  # 正しい名前で渡す
-            )
+            response = self.model.generate_content(prompt)
             return {
                 "prompt": prompt,
                 "response": self._remove_code_fence(response.text),
@@ -91,61 +68,7 @@ class VertexAISingleton:
             lines = lines[:-1]
         return "\n".join(lines)
 
-
-    def exchange_prompt(self, prompt: str) -> str:
-        # EXEC SQL ... END-EXEC. のSQL部分を抽出してフラット化
-        rtn_prompt = self.fix_initialize(prompt)
-        rtn_prompt = self.extract_and_flatten_sql(rtn_prompt)
-        return rtn_prompt
-
-    def fix_initialize(self, text: str) -> str:
-        # SECTION ... EXIT. ブロック内のINITIALIZE文を処理
-        def process_section_block(match):
-            section_content = match.group(0)
-
-            # INITIALIZE の行を結合する（SECTION-EXIT間のみ）
-            # INITIALIZEで始まる行の次の行が空白+文字列の場合に結合
-            pattern_init = r'^(\s*INITIALIZE\s+[^\n]*)\n(\s+[^\n]+(?:\s+[^\n]+)*)'
-
-            def repl_init(m):
-                init_line = m.group(1).rstrip()
-                next_lines = m.group(2).strip()
-                return f'{init_line} {next_lines}'
-
-            section_content = re.sub(pattern_init, repl_init, section_content, flags=re.MULTILINE)
-
-            # ブロック内　COUNT(*) → COUNT(1) へ置換する
-            section_content = re.sub(r'COUNT\(\s*\*\s*\)', 'COUNT(1)', section_content, flags=re.IGNORECASE)
-
-            return section_content
-
-        # SECTION から EXIT. までのブロックを検索して処理
-        section_pattern = r'(\w+\s+SECTION\s*\..*?EXIT\s*\.)'
-        text = re.sub(section_pattern, process_section_block, text, flags=re.DOTALL | re.IGNORECASE)
-
-        return text
-
-
-    def extract_and_flatten_sql(self, code):
-        # EXEC SQL ... END-EXEC. にマッチ
-        pattern = r"EXEC SQL(.*?)END-EXEC\.?"
-
-        def repl(m):
-            # .*?でSQL部分取得
-            raw_sql = m.group(1)
-            # コメント（*以降）除去（複数行まとめてOK）
-            no_comment = re.sub(r"\*.*", "", raw_sql)
-            # 改行/連続スペースを単一スペースに
-            flattened = re.sub(r"\s+", " ", no_comment).strip()
-            # 置換内容
-            return f"EXEC SQL {flattened} END-EXEC."
-
-        # 全て置換
-        result = re.sub(pattern, repl, code, flags=re.DOTALL | re.IGNORECASE)
-        return result
-
-
     @classmethod
-    def get_instance(cls, model_name: str = "gemini-2.5-pro", system_prompt: Optional[str] = None) -> 'VertexAISingleton':
+    def get_instance(cls, model_name: str = "gemini-2.5-pro") -> 'VertexAISingleton':
         """インスタンスを取得"""
-        return cls(model_name, system_prompt)
+        return cls(model_name)

pilot/job/job_interface.py

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

{pilot_linkstec-0.0.22.dist-info → pilot_linkstec-0.0.26.dist-info}/METADATA

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

@@ -6,12 +6,13 @@ pilot/control/control_interface.py,sha256=zGv380oQgAKPAIHDHeFdPYzhj2Ngo2T66NWlNl
 pilot/control/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/commentRemover.py,sha256=S8uwp9Glp0bdv4EFqf62WIcOTLiJZdracG2FAMKY1EY,3777
+pilot/conver/converfileEncodding.py,sha256=EK2zrVbRjSPEljR3myq_ZEDJkM7i79ol9lbVM_Khbok,1596
 pilot/conver/nkf_converter.py,sha256=JqgThmXcdnTGMsLIHUEwe8sc0VGMqDaKCIQTg-UE3WE,1148
 pilot/generater/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/generater/vertexai.py,sha256=rEy8_i-DSm_7MbsRlKdPrDBsf8ECk0EyiAaIny3FRj8,6215
+pilot/generater/vertexai.py,sha256=SOFfl0qCuLhfjeIoSU7Tk-I7ZB6ZrOyGme2rXDYCGzk,2599
 pilot/job/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/job/job_interface.py,sha256=LL0hfuFfnKnkpQD99jv1hkaAIAFM-JJPrX3PFxN6O_A,120
+pilot/job/job_interface.py,sha256=EKtuj0IcdolP494aAgTtctgamyQIoFXVwRORwOQck7A,124
 pilot/job/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/job/impl/base_job.py,sha256=iojwBJApivsCmHG9HRCJrWUwtbBc_GrCI31xac0JYtE,14053
 pilot/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,8 +28,8 @@ pilot/unit/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.22.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-pilot_linkstec-0.0.22.dist-info/METADATA,sha256=ylEtRen-5bTEybxoLmCBFD3gQZzB_aQHRy_Wab4x-BU,679
-pilot_linkstec-0.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pilot_linkstec-0.0.22.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
-pilot_linkstec-0.0.22.dist-info/RECORD,,
+pilot_linkstec-0.0.26.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+pilot_linkstec-0.0.26.dist-info/METADATA,sha256=VFQ5kT7gvl2A7WrXJaw5iiBoQLrCohvC5Klq6mmcis4,679
+pilot_linkstec-0.0.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pilot_linkstec-0.0.26.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
+pilot_linkstec-0.0.26.dist-info/RECORD,,