pilot.linkstec 0.0.91__tar.gz → 0.0.93__tar.gz

{pilot_linkstec-0.0.91 → pilot_linkstec-0.0.93}/PKG-INFO

@@ -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 → pilot_linkstec-0.0.93}/pyproject.toml

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

pilot_linkstec-0.0.93/src/pilot/config/config_reader.py

@@ -0,0 +1,95 @@
+import configparser
+import os
+import inspect
+from dataclasses import dataclass
+from typing import List
+
+@dataclass
+class ConfigDTO:
+    work_space: str
+    threads: int
+    project: str
+    steps: list[str]
+    skipsteps: list[str]
+    runsteps: list[str]
+    multisteps: list[str]
+
+class ConfigReader:
+    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):
+        cwd = os.getcwd()
+        candidate_path = os.path.join(cwd, 'config', 'control.properties')
+        if os.path.exists(candidate_path):
+            return candidate_path
+
+        stack = inspect.stack()
+        for frame in stack:
+            caller_file = frame.filename
+            caller_dir = os.path.dirname(os.path.abspath(caller_file))
+            possible_path = os.path.abspath(os.path.join(caller_dir, '..', '..', 'config', 'control.properties'))
+            if os.path.exists(possible_path):
+                return possible_path
+
+        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 not found in expected locations")
+
+    def get(self, section, option, fallback=None, cast_type=str):
+        try:
+            if cast_type == bool:
+                return self.config.getboolean(section, option)
+            elif cast_type == int:
+                return self.config.getint(section, option)
+            elif cast_type == float:
+                return self.config.getfloat(section, option)
+            else:
+                return self.config.get(section, option)
+        except (configparser.NoSectionError, configparser.NoOptionError):
+            return fallback
+
+    def get_dto(self) -> ConfigDTO:
+        input_path = self.get('DEFAULT', 'input_path', fallback='.')
+        work_space = self.get('DEFAULT', 'work_space', 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(
+            work_space=work_space,
+            threads=threads,
+            project=project,
+            steps=steps,
+            skipsteps=skipsteps,
+            runsteps=runsteps,
+            multisteps=multisteps
+        )

pilot_linkstec-0.0.93/src/pilot/generater/vertexai.py

@@ -0,0 +1,124 @@
+import threading
+from typing import Dict, Any, Optional
+import requests
+
+class VertexAISingleton:
+    _instance: Optional['VertexAISingleton'] = None
+    _lock = threading.Lock()
+
+    def __new__(cls, model_name: str = "openai/gpt-oss-20b"):
+        if cls._instance is None:
+            with cls._lock:
+                if cls._instance is None:
+                    cls._instance = super(VertexAISingleton, cls).__new__(cls)
+                    cls._instance._initialized = False
+        return cls._instance
+
+    def __init__(self, model_name: str = "openai/gpt-oss-20b"):
+        if not self._initialized:
+            with self._lock:
+                if not self._initialized:
+                    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:
+            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(content),
+                "success": True,
+                "error": None
+            }
+
+        except Exception as e:
+            return {
+                "prompt": prompt,
+                "response": None,
+                "success": False,
+                "error": str(e)
+            }
+
+    def start_chat(self):
+        """
+        VertexAI の ChatSession と完全互換は不可能だが、
+        既存コードを壊さないために「退化実装」を提供
+        """
+        return _LMStudioChatSession(self)
+
+    def count_tokens(self, text: str) -> int:
+        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()
+        if lines and lines[0].startswith("```"):
+            lines = lines[1:]
+        if lines and lines[-1].startswith("```"):
+            lines = lines[:-1]
+        return "\n".join(lines)
+
+    @classmethod
+    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_linkstec-0.0.91/src/pilot/job/base/generate → pilot_linkstec-0.0.93/src/pilot/job/base/generater}/generateJsonBaseJob.py

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

{pilot_linkstec-0.0.91/src/pilot/job/base/generate → pilot_linkstec-0.0.93/src/pilot/job/base/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_linkstec-0.0.91 → pilot_linkstec-0.0.93}/src/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_linkstec-0.0.91 → pilot_linkstec-0.0.93}/src/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 → pilot_linkstec-0.0.93}/src/pilot.linkstec.egg-info/PKG-INFO

@@ -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 → pilot_linkstec-0.0.93}/src/pilot.linkstec.egg-info/SOURCES.txt

@@ -56,9 +56,12 @@ src/pilot/job/base/__init__.py
 src/pilot/job/base/convert/__init__.py
 src/pilot/job/base/convert/encodingTransformerJob.py
 src/pilot/job/base/convert/tabReplaceJob.py
-src/pilot/job/base/generate/__init__.py
-src/pilot/job/base/generate/generateJsonBaseJob.py
-src/pilot/job/base/generate/generateTextBaseJob.py
+src/pilot/job/base/generater/__init__.py
+src/pilot/job/base/generater/generateJsonBaseJob.py
+src/pilot/job/base/generater/generateTextBaseJob.py
+src/pilot/job/base/program/__init__.py
+src/pilot/job/base/program/cobol/__init__.py
+src/pilot/job/base/program/cobol/convert/__init__.py
 src/pilot/job/impl/__init__.py
 src/pilot/job/impl/base_job.py
 src/pilot/logging/__init__.py

pilot_linkstec-0.0.91/src/pilot/config/config_reader.py

@@ -1,133 +0,0 @@
-import configparser
-import inspect
-import os
-from dataclasses import dataclass
-from typing import Optional
-
-
-@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
-    steps: 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
-
-    @classmethod
-    def find_config_path(cls):
-        cwd = os.getcwd()
-        candidate_path = os.path.join(cwd, 'config', 'control.properties')
-        if os.path.exists(candidate_path):
-            return candidate_path
-
-        stack = inspect.stack()
-        for frame in stack:
-            caller_file = frame.filename
-            caller_dir = os.path.dirname(os.path.abspath(caller_file))
-            possible_path = os.path.abspath(os.path.join(caller_dir, '..', '..', 'config', 'control.properties'))
-            if os.path.exists(possible_path):
-                return possible_path
-
-        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 が期待される場所に見つかりません")
-
-    def get(self, section, option, fallback=None, cast_type=str):
-        try:
-            if cast_type == bool:
-                return self.config.getboolean(section, option)
-            elif cast_type == int:
-                return self.config.getint(section, option)
-            elif cast_type == float:
-                return self.config.getfloat(section, option)
-            else:
-                return self.config.get(section, option)
-        except (configparser.NoSectionError, configparser.NoOptionError):
-            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='.')
-        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='.')
-        steps_str = self.get('DEFAULT', 'steps', fallback='')
-
-        steps = [s.strip() for s in steps_str.split(',')] if steps_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

pilot_linkstec-0.0.91/src/pilot/generater/vertexai.py

@@ -1,74 +0,0 @@
-import threading
-from typing import Dict, Any, Optional
-
-import tiktoken
-from vertexai.generative_models import GenerativeModel, ChatSession
-import os
-
-class VertexAISingleton:
-    _instance: Optional['VertexAISingleton'] = None
-
-    
-    _lock = threading.Lock()
-    _tokenizer_cache = {}
-    encoding = None
-
-    def __new__(cls, model_name: str = "gemini-2.5-pro"):
-        if cls._instance is None:
-            with cls._lock:
-                if cls._instance is None:
-                    cls._instance = super(VertexAISingleton, cls).__new__(cls)
-                    cls._instance._initialized = False
-        return cls._instance
-
-    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")
-                    self._initialized = True
-
-    def generate_content(self, prompt: str) -> Dict[str, Any]:
-        """複数スレッドから安全に呼び出し可能"""
-        try:
-            response = self.model.generate_content(prompt)
-            return {
-                "prompt": prompt,
-                "response": self._remove_code_fence(response.text),
-                "success": True,
-                "error": None
-            }
-        except Exception as e:
-            return {
-                "prompt": prompt,
-                "response": None,
-                "success": False,
-                "error": str(e)
-            }
-
-    def start_chat(self) -> ChatSession:
-        """新しいチャットセッションを開始"""
-        return self.model.start_chat()
-
-    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
-
-    def _remove_code_fence(self, text: str) -> str:
-        lines = text.splitlines()
-        if lines and lines[0].startswith("```"):
-            lines = lines[1:]
-        if lines and lines[-1].startswith("```"):
-            lines = lines[:-1]
-        return "\n".join(lines)
-
-    @classmethod
-    def get_instance(cls, model_name: str = "gemini-2.5-pro") -> 'VertexAISingleton':
-        """インスタンスを取得"""
-        return cls(model_name)