pilot.linkstec 0.0.91__py3-none-any.whl → 0.0.93__py3-none-any.whl

pilot/config/config_reader.py

@@ -1,54 +1,39 @@
 import configparser
-import inspect
 import os
+import inspect
 from dataclasses import dataclass
-from typing import Optional
-
+from typing import List
 
 @dataclass
 class ConfigDTO:
-    project: str
-    log_level: str
-    threads: int
-    lm_studio_api_url: str
-    lm_studio_model_name: str
     work_space: str
-    copy_path: str
-    json_file_path:str
+    threads: int
+    project: str
     steps: list[str]
-
+    skipsteps: list[str]
+    runsteps: list[str]
+    multisteps: list[str]
 
 class ConfigReader:
-    _instance = None
-    _loaded = False
-
-    def __new__(cls, filepath=None):
-        if cls._instance is None:
-            cls._instance = super().__new__(cls)
-        return cls._instance
-
-    def __init__(self, filepath=None):
-        if self._loaded:
-            return
-
-        try:
-            if filepath is None:
-                filepath = self.find_config_path()
-            if not os.path.exists(filepath):
-                raise FileNotFoundError(f"設定ファイルが見つかりません: {filepath}")
-
-            self.config = configparser.ConfigParser()
-            self.config.optionxform = str
-            with open(filepath, 'r', encoding='utf-8') as f:
-                content = f.read()
-            if not content.lstrip().startswith('['):
-                content = '[DEFAULT]\n' + content
-            self.config.read_string(content)
-
-            self._loaded = True
-        except Exception as e:
-            print(f"設定ファイル読み込みエラー: {e}")
-            raise
+    def __init__(self, filename = None):
+        filepath = None
+        if filename is None:
+            filepath = self.find_config_path()
+
+        if filename is not None:
+            cwd = os.getcwd()
+            filepath = os.path.join(cwd, 'config', filename)
+        if not os.path.exists(filepath):
+            raise FileNotFoundError(f"Configuration file not found: {filepath}")
+
+        self.config = configparser.ConfigParser()
+        self.config.optionxform = str
+
+        with open(filepath, 'r', encoding='utf-8') as f:
+            content = f.read()
+        if not content.lstrip().startswith('['):
+            content = '[DEFAULT]\n' + content
+        self.config.read_string(content)
 
     @classmethod
     def find_config_path(cls):
@@ -67,11 +52,10 @@ class ConfigReader:
 
         base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
         fallback_path = os.path.join(base_dir, 'config', 'control.properties')
-
         if os.path.exists(fallback_path):
             return fallback_path
 
-        raise FileNotFoundError("control.properties が期待される場所に見つかりません")
+        raise FileNotFoundError("control.properties not found in expected locations")
 
     def get(self, section, option, fallback=None, cast_type=str):
         try:
@@ -87,47 +71,25 @@ class ConfigReader:
             return fallback
 
     def get_dto(self) -> ConfigDTO:
-        project = self.get('DEFAULT', 'project', fallback='')
-        log_level = self.get('DEFAULT', 'log_level', fallback='INFO')
-        threads = self.get('DEFAULT', 'threads', fallback=1, cast_type=int)
-        lm_studio_api_url = self.get('DEFAULT', 'lm_studio_api_url', fallback='.')
-        lm_studio_model_name = self.get('DEFAULT', 'lm_studio_model_name', fallback='.')
+        input_path = self.get('DEFAULT', 'input_path', fallback='.')
         work_space = self.get('DEFAULT', 'work_space', fallback='.')
-        copy_path = self.get('DEFAULT', 'copy_file_path', fallback='.')
-        json_file_path = self.get('DEFAULT', 'json_file_path', fallback='.')
+        threads = int(self.get('DEFAULT', 'threads', fallback=1))
+        project = self.get('DEFAULT', 'project', fallback='')
         steps_str = self.get('DEFAULT', 'steps', fallback='')
-
         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', 'runsteps', fallback='')
+        runsteps = [s.strip() for s in runsteps_str.split(',')] if runsteps_str else []
+        multisteps_str = self.get('DEFAULT', 'multisteps', fallback='')
+        multisteps = [s.strip() for s in multisteps_str.split(',')] if multisteps_str else []
 
         return ConfigDTO(
-            project=project,
-            log_level=log_level,
-            threads=threads,
-            lm_studio_api_url=lm_studio_api_url,
-            lm_studio_model_name=lm_studio_model_name,
             work_space=work_space,
-            copy_path=copy_path,
-            json_file_path=json_file_path,
-            steps=steps
-        )
-
-
-# 全局設定管理用の変数
-_global_config: Optional[ConfigDTO] = None
-
-
-def init_config(filepath=None):
-    global _global_config
-    try:
-        config_reader = ConfigReader(filepath)
-        _global_config = config_reader.get_dto()
-    except Exception as e:
-        print(f"設定初期化エラー: {e}")
-        raise
-
-
-def get_config() -> ConfigDTO:
-    global _global_config
-    if _global_config is None:
-        raise RuntimeError("設定が初期化されていません。init_config() を最初に呼び出してください。")
-    return _global_config
+            threads=threads,
+            project=project,
+            steps=steps,
+            skipsteps=skipsteps,
+            runsteps=runsteps,
+            multisteps=multisteps
+        )

pilot/generater/vertexai.py

@@ -1,19 +1,12 @@
 import threading
 from typing import Dict, Any, Optional
-
-import tiktoken
-from vertexai.generative_models import GenerativeModel, ChatSession
-import os
+import requests
 
 class VertexAISingleton:
     _instance: Optional['VertexAISingleton'] = None
-
-    
     _lock = threading.Lock()
-    _tokenizer_cache = {}
-    encoding = None
 
-    def __new__(cls, model_name: str = "gemini-2.5-pro"):
+    def __new__(cls, model_name: str = "openai/gpt-oss-20b"):
         if cls._instance is None:
             with cls._lock:
                 if cls._instance is None:
@@ -21,24 +14,47 @@ class VertexAISingleton:
                     cls._instance._initialized = False
         return cls._instance
 
-    def __init__(self, model_name: str = "gemini-2.5-pro"):
+    def __init__(self, model_name: str = "openai/gpt-oss-20b"):
         if not self._initialized:
             with self._lock:
                 if not self._initialized:
-                    self.model = GenerativeModel(model_name)
-                    self.encoding = tiktoken.get_encoding("cl100k_base")
+                    self.model_name = model_name
+                    self.base_url = "http://127.0.0.1:3000/v1"
+
+                    #self.encoding = tiktoken.get_encoding("cl100k_base")
+
+                    self._session = requests.Session()
+
                     self._initialized = True
 
     def generate_content(self, prompt: str) -> Dict[str, Any]:
         """複数スレッドから安全に呼び出し可能"""
         try:
-            response = self.model.generate_content(prompt)
+            payload = {
+                "model": self.model_name,
+                "messages": [
+                    {"role": "user", "content": prompt}
+                ],
+                "temperature": 0.7
+            }
+
+            resp = self._session.post(
+                f"{self.base_url}/chat/completions",
+                json=payload,
+                timeout=600
+            )
+            resp.raise_for_status()
+            data = resp.json()
+
+            content = data["choices"][0]["message"]["content"]
+
             return {
                 "prompt": prompt,
-                "response": self._remove_code_fence(response.text),
+                "response": self._remove_code_fence(content),
                 "success": True,
                 "error": None
             }
+
         except Exception as e:
             return {
                 "prompt": prompt,
@@ -47,18 +63,20 @@ class VertexAISingleton:
                 "error": str(e)
             }
 
-    def start_chat(self) -> ChatSession:
-        """新しいチャットセッションを開始"""
-        return self.model.start_chat()
+    def start_chat(self):
+        """
+        VertexAI の ChatSession と完全互換は不可能だが、
+        既存コードを壊さないために「退化実装」を提供
+        """
+        return _LMStudioChatSession(self)
 
     def count_tokens(self, text: str) -> int:
-        """与えられたテキストのトークン数を返す（bert-base-uncasedのみ使用）"""
-        try:
-            tokens = self.encoding.encode(text)
-            return len(tokens)
-        except Exception as e:
-            print(f"トークン計算失敗: {e}")
-            return 0
+        return 1
+        #try:
+        #    return len(self.encoding.encode(text))
+        #except Exception as e:
+        #    print(f"トークン計算失敗: {e}")
+        #    return 0
 
     def _remove_code_fence(self, text: str) -> str:
         lines = text.splitlines()
@@ -69,6 +87,38 @@ class VertexAISingleton:
         return "\n".join(lines)
 
     @classmethod
-    def get_instance(cls, model_name: str = "gemini-2.5-pro") -> 'VertexAISingleton':
-        """インスタンスを取得"""
-        return cls(model_name)
+    def get_instance(cls, model_name: str = "openai/gpt-oss-20b") -> 'VertexAISingleton':
+        return cls(model_name)
+
+class _LMStudioChatSession:
+    """
+    VertexAI ChatSession の「最低限互換」
+    """
+    def __init__(self, client: VertexAISingleton):
+        self._client = client
+        self._messages = []
+
+    def send_message(self, message: str):
+        self._messages.append({"role": "user", "content": message})
+
+        payload = {
+            "model": self._client.model_name,
+            "messages": self._messages
+        }
+
+        resp = self._client._session.post(
+            f"{self._client.base_url}/chat/completions",
+            json=payload,
+            timeout=60
+        )
+        resp.raise_for_status()
+        data = resp.json()
+
+        reply = data["choices"][0]["message"]["content"]
+        self._messages.append({"role": "assistant", "content": reply})
+
+        class _Resp:
+            def __init__(self, text):
+                self.text = text
+
+        return _Resp(reply)

pilot/job/base/{generate → generater}/generateJsonBaseJob.py

@@ -1,6 +1,4 @@
 import json
-import os
-import threading
 import time
 
 from pilot.job.impl.base_job import BaseJob

pilot/job/base/{generate → generater}/generateTextBaseJob.py

@@ -1,13 +1,10 @@
-import json
-import os
-import threading
 import time
 
 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/impl/base_job.py

@@ -66,13 +66,6 @@ class BaseJob(JobInterface):
     def current_trg_file_path(self, value):
         self._trg_file_path = value
 
-
-    def prerun(self):
-        pass
-
-    def postrun(self):
-        self.change_current_trg_to_end()
-
     def run(self):
         pass
 
@@ -162,7 +155,7 @@ class BaseJob(JobInterface):
                     return True
                 except Exception:
                     # 例外が発生した場合は False を返す
-                    print("!!!!!!!!!!!!!!!!!!!!change_current_trg_to_end erro")
+                    #print("!!!!!!!!!!!!!!!!!!!!change_current_trg_to_end erro")
                     return False
         # trgファイルが存在しなければ何もしないので、そのままreturn
         return False
@@ -345,7 +338,7 @@ class BaseJob(JobInterface):
         ジョブ実行後の後処理を行うメソッド。
         必要に応じてサブクラスでオーバーライドして使用する。
         """
-        pass
+        self.change_current_trg_to_end()
 
     def generate_basedir_file(self, ext):
         dir_path = os.path.dirname(self.file_path)

pilot/unit/impl/base_unit.py

@@ -31,7 +31,7 @@ class BaseUnit(UnitInterface):
                 job.file_path = file_path
                 if self.job_need_run(job, filename, index):
                     job.run()
-                    job.postrun()
+                    job.post_run()
 
     def job_need_run(self, job:BaseJob,filename: str,index):
         return True

{pilot_linkstec-0.0.91.dist-info → pilot_linkstec-0.0.93.dist-info}/METADATA

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

@@ -12,7 +12,7 @@ pilot/base/split_file_base.py,sha256=CuPI9XHlSTTkLRNXW6SNEKkdSZBOMuy685e2TcnWPkY
 pilot/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/client/ai_client.py,sha256=0n_YbjEb_QbgDAnUt_d1fJ4xYVzZmMxfJBNE5Yff9io,2919
 pilot/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/config/config_reader.py,sha256=DxTkCft9s9iuVoApWJ276ATIgM5vSiYjha4nhRVUuM0,4703
+pilot/config/config_reader.py,sha256=MchG-9j-Xfy8AquL_6tlvqQR65MFJ3c3hwWBl6IF2jw,3750
 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
@@ -42,18 +42,21 @@ pilot/file_tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/file_tool/create_prompt_file.py,sha256=pvmBm_iRWRvm5Qr8gaZwSAzJ_1vrqG9Xi_UJ-NgdwV8,1994
 pilot/file_tool/json_file_tool.py,sha256=v-qVcyKVhFfwEg4uJWDFMZU0EWvOwkYhrwhm-obMlUU,3637
 pilot/generater/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/generater/vertexai.py,sha256=SOFfl0qCuLhfjeIoSU7Tk-I7ZB6ZrOyGme2rXDYCGzk,2599
+pilot/generater/vertexai.py,sha256=gkf8ToDVGfD2j7JbR1ZtVurM7D7aZ0HLP6Vx7-Vjy7c,3939
 pilot/job/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/job/job_interface.py,sha256=EKtuj0IcdolP494aAgTtctgamyQIoFXVwRORwOQck7A,124
 pilot/job/base/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/job/base/convert/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/job/base/convert/encodingTransformerJob.py,sha256=tJI2JcBK3869pIgJxf9WFa7D-wCnHHO1aU8vQo7qjds,457
 pilot/job/base/convert/tabReplaceJob.py,sha256=ev5uoPbiwhVCSDPdonvFDnWI-vi4R-4Adoa4eJddL9w,917
-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/generater/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pilot/job/base/generater/generateJsonBaseJob.py,sha256=Nea0GUvILgYyBiFpMOb3ZctYlxbE0pwGeJfeEWFjveQ,1348
+pilot/job/base/generater/generateTextBaseJob.py,sha256=UCEkoDGN9qdHPSXrP_zpFDOpHtfjse1SskMuS31uOwk,1265
+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/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/job/impl/base_job.py,sha256=PpV4g7NiWPICojp9cSv4iDWnONHWQYYjYdYfzengxBg,14745
+pilot/job/impl/base_job.py,sha256=wTrAp9P6AxyQ98cD6kWa22gUTiXJc6TcTv7-cvize9c,14665
 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
@@ -65,11 +68,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=GO5tXlyDLgYXhgQL1u910Kd9LyvHFq0Kj1zATOL4Gw0,1307
+pilot/unit/impl/base_unit.py,sha256=pF3R1TxoJtDIt5MCggSPO1H5jFI-wO1gQosz4haYTQo,1308
 pilot/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/util/files.py,sha256=v9uzfzo3Aq4xgnUIASEZeBJoA2nD9Qz_EA3P-FwzGFQ,1896
-pilot_linkstec-0.0.91.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-pilot_linkstec-0.0.91.dist-info/METADATA,sha256=m_dqJdh5Rw5Q1urOdL-y8u8uDxigGKmEaO51dtEV-jY,679
-pilot_linkstec-0.0.91.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pilot_linkstec-0.0.91.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
-pilot_linkstec-0.0.91.dist-info/RECORD,,
+pilot_linkstec-0.0.93.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+pilot_linkstec-0.0.93.dist-info/METADATA,sha256=Ty1Ol3qT93jIibsagJ-5yMMuSam8mY0J_65wxJWR9Mk,679
+pilot_linkstec-0.0.93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pilot_linkstec-0.0.93.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
+pilot_linkstec-0.0.93.dist-info/RECORD,,