pilot.linkstec 0.0.105__tar.gz → 0.0.107__tar.gz

{pilot_linkstec-0.0.105 → pilot_linkstec-0.0.107}/PKG-INFO

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

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

{pilot_linkstec-0.0.105 → pilot_linkstec-0.0.107}/src/pilot/control/impl/base_controller.py

@@ -7,6 +7,7 @@ from concurrent.futures import ThreadPoolExecutor
 from pilot.control.control_interface import ControlInterface
 from pilot.unit.impl.base_unit import BaseUnit
 from pilot.config.config_reader import ConfigReader
+from pilot.generater.vera import VeraSingleton
 
 
 class BaseController(ControlInterface):
@@ -14,6 +15,9 @@ class BaseController(ControlInterface):
     config_dto = None
 
     def __init__(self):
+        #try:
+        #    VeraSingleton.get_instance()
+        #except FileNotFoundError:
         pass
 
     def _init_unit(self):

pilot_linkstec-0.0.107/src/pilot/generater/ai_base.py

@@ -0,0 +1,7 @@
+from typing import Dict, Any
+
+from pilot.generater.ai_interface import AIInterface
+
+class AIBase(AIInterface):
+    def generate_content(self, prompt: str) -> Dict[str, Any]:
+        pass

pilot_linkstec-0.0.107/src/pilot/generater/ai_interface.py

@@ -0,0 +1,8 @@
+from abc import ABC, abstractmethod
+from typing import Dict, Any
+
+
+class AIInterface(ABC):
+    @abstractmethod
+    def generate_content(self, prompt: str) -> Dict[str, Any]:
+        pass

pilot_linkstec-0.0.107/src/pilot/generater/lmstudioai.py

@@ -0,0 +1,121 @@
+import threading
+from typing import Dict, Any, Optional
+from pilot.generater.ai_base import AIBase
+
+import requests
+
+class lmstudioAISingleton(AIBase):
+    _instance: Optional['lmstudioAISingleton'] = None
+    _lock = threading.Lock()
+
+    def __new__(cls):
+        if cls._instance is None:
+            with cls._lock:
+                if cls._instance is None:
+                    cls._instance = super(lmstudioAISingleton, cls).__new__(cls)
+                    cls._instance._initialized = False
+        return cls._instance
+
+    def __init__(self, model_name: str = "openai/gpt-oss-20b",base_url:str="http://127.0.0.1:3000/v1"):
+        if not self._initialized:
+            with self._lock:
+                if not self._initialized:
+                    self.model_name = model_name
+                    self.base_url = base_url
+                    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}
+                ]
+            }
+
+            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,base_url) -> 'lmstudioAISingleton':
+        return cls(model_name,base_url)
+
+class _LMStudioChatSession:
+    """
+    VertexAI ChatSession の「最低限互換」
+    """
+    def __init__(self, client: lmstudioAISingleton):
+        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.107/src/pilot/generater/vera.py

@@ -0,0 +1,101 @@
+import configparser
+import os
+import threading
+from dataclasses import dataclass
+from typing import Dict, Any, Optional
+
+from pilot.generater.lmstudioai import lmstudioAISingleton
+from pilot.generater.ai_base import AIBase
+
+@dataclass
+class AIConfigDTO:
+    veraApi: str
+    veraModel: str
+    verUrl: str
+    timeOut: int
+
+class VeraSingleton:
+    _instance: Optional['VeraSingleton'] = None
+    _lock = threading.Lock()
+
+    def __new__(cls):
+        if cls._instance is None:
+            with cls._lock:
+                if cls._instance is None:
+                    cls._instance = super(VeraSingleton, cls).__new__(cls)
+                    cls._instance._initialized = False
+        return cls._instance
+
+    def __init__(self):
+        if not self._initialized:
+            with self._lock:
+
+                cwd = os.getcwd()
+                filepath = os.path.join(cwd, 'config', 'vera.properties')
+                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.config_dto = self.create_ai_dto()
+                self.veraApi = self.config_dto.veraApi
+                self.model_name = self.config_dto.veraModel
+                self.base_url = self.config_dto.verUrl
+                self.timeout = self.config_dto.timeOut
+                self.ai_instance: AIBase  = self.get_ai_instance()
+                self._initialized = True
+
+    def get_ai_instance(self) :
+        match self.veraApi:
+            case "lmstudio":
+                return lmstudioAISingleton.get_instance(model_name=self.model_name,base_url= self.base_url)
+            case "ollama":
+                return AIBase()
+            case "gemini":
+                return AIBase()
+            case "gemini":
+                return AIBase()
+            case "gemini":
+                return AIBase()
+            case "qwen":
+                return AIBase()
+            case "azure":
+                return AIBase()
+        return AIBase()
+
+    def generate_content(self, prompt: str) -> Dict[str, Any]:
+        return self.ai_instance.generate_content(prompt)
+
+    @classmethod
+    def get_instance(cls) -> 'VeraSingleton':
+        return cls()
+
+    def create_ai_dto(self) -> AIConfigDTO:
+        vera_api = self.get('DEFAULT', 'vera_api', fallback='.')
+        vera_model = self.get('DEFAULT', 'vera_model', fallback='.')
+        ver_url = self.get('DEFAULT', 'ver_url', fallback='.')
+        time_out = int(self.get('DEFAULT', 'time_out', fallback=1))
+
+        return AIConfigDTO(
+            veraApi = vera_api,
+            veraModel = vera_model,
+            verUrl = ver_url,
+            timeOut = time_out
+        )
+
+    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
+

{pilot_linkstec-0.0.105 → pilot_linkstec-0.0.107}/src/pilot/job/base/generate/generateTextBaseJob.py

@@ -14,10 +14,6 @@ class GenerateTextBaseJob(BaseJob):
     result_file_path: str
 
     def run(self):
-        #with self._begin_file_lock:
-        #    if not self.change_current_trg_to_begin():
-        #        return
-        #prompt = self.get_file_content()
         prompt = self.prompt_content
         # トークン数チェック
         vertexai = VertexAISingleton.get_instance()

{pilot_linkstec-0.0.105 → pilot_linkstec-0.0.107}/src/pilot/job/impl/base_job.py

@@ -1,3 +1,4 @@
+import json
 import os
 import shutil
 
@@ -80,6 +81,11 @@ class BaseJob(JobInterface):
             _lines = f.readlines()
         return _lines
 
+    def read_json_file(self,json_file_path):
+        with open(json_file_path, 'r', encoding='utf-8') as json_file:
+            data = json.load(json_file)  # 解析 JSON 文件内容
+        return data
+
     def get_current_step_relative_path(self):
         if not self._file_path:
             return self._file_path
@@ -179,15 +185,15 @@ class BaseJob(JobInterface):
         return False
 
     def copy_input_file_to_next_step(self, input_file_path):
-            """
-            input_file_pathで指定されたファイルを、next stepフォルダにコピーする。
-            コピー先に同名ファイルがあればNone、存在しなければコピー先ファイルパスを返す。
-            """
-            if not input_file_path or not self.next_step:
-                return None
-            base_dir = os.path.join(self.config_dto.work_space, self.current_step)
-            step_dir = os.path.join(self.config_dto.work_space, self.next_step)
-            return self._copy_file_to_step_dir(input_file_path, base_dir, step_dir)
+        """
+        input_file_pathで指定されたファイルを、next stepフォルダにコピーする。
+        コピー先に同名ファイルがあればNone、存在しなければコピー先ファイルパスを返す。
+        """
+        if not input_file_path or not self.next_step:
+            return None
+        base_dir = os.path.join(self.config_dto.work_space, self.current_step)
+        step_dir = os.path.join(self.config_dto.work_space, self.next_step)
+        return self._copy_file_to_step_dir(input_file_path, base_dir, step_dir)
 
     def create_next_step_todo_trg_file_from_input(self, input_file_path):
         """

{pilot_linkstec-0.0.105 → pilot_linkstec-0.0.107}/src/pilot.linkstec.egg-info/PKG-INFO

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

@@ -50,6 +50,10 @@ src/pilot/file_tool/__init__.py
 src/pilot/file_tool/create_prompt_file.py
 src/pilot/file_tool/json_file_tool.py
 src/pilot/generater/__init__.py
+src/pilot/generater/ai_base.py
+src/pilot/generater/ai_interface.py
+src/pilot/generater/lmstudioai.py
+src/pilot/generater/vera.py
 src/pilot/generater/vertexai.py
 src/pilot/job/__init__.py
 src/pilot/job/job_interface.py