pilot.linkstec 0.0.90__tar.gz → 0.0.91__tar.gz

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

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

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

pilot_linkstec-0.0.91/src/pilot/client/ai_client.py

@@ -0,0 +1,75 @@
+import requests
+
+from pilot.config.config_reader import get_config
+from pilot.logging.logger import get_logger
+
+
+class AIClient:
+    def __init__(self):
+        self.logger = get_logger(__name__)
+        self.config_dto = get_config()
+        self.headers = {"Content-Type": "application/json;charset=utf-8"}
+
+    def call(self, user_prompt: str, system_prompt: str = "") -> str:
+        messages = []
+        if system_prompt:
+            messages.append({"role": "system", "content": system_prompt})
+        messages.append({"role": "user", "content": user_prompt})
+
+        request_data = self._build_request_payload(messages)
+
+        response_data = self._send_post_request(self.api_url, self.headers, request_data)
+        if not isinstance(response_data, dict):
+            self.logger.error("無効なAPI応答またはリクエスト失敗")
+            return ""
+
+        result_text = self._extract_response_content(response_data)
+        return result_text
+
+    def _build_request_payload(self, messages: list[dict]) -> dict:
+        raise NotImplementedError("サブクラスでリクエストペイロードの構築を実装してください")
+
+    def _send_post_request(self, url: str, headers: dict, data: dict) -> dict or str:
+        try:
+            response = requests.post(url, headers=headers, json=data)
+        except Exception as e:
+            self.logger.error(f"リクエスト失敗: {e}")
+            return ""
+        if response.status_code != 200:
+            self.logger.error(f"ステータスコード {response.status_code}: {response.text}")
+            return ""
+        try:
+            return response.json()
+        except Exception as e:
+            self.logger.error(f"JSON解析失敗: {e}")
+            return ""
+
+    def _extract_response_content(self, response: dict) -> str:
+        raise NotImplementedError("サブクラスでレスポンスの解析を実装してください")
+
+
+class LMStudioClient(AIClient):
+    def __init__(self):
+        super().__init__()
+        self.api_url = self.config_dto.lm_studio_api_url
+        self.model_name = self.config_dto.lm_studio_model_name
+
+    def _build_request_payload(self, messages: list[dict]) -> dict:
+        payload = {
+            "model": self.model_name,
+            "stream": False,
+            "temperature": 0.8,
+            "max_tokens": 15000,
+            "messages": messages,
+        }
+        return payload
+
+    def _extract_response_content(self, response: dict) -> str:
+        if not isinstance(response, dict):
+            return str(response)
+        if "usage" in response:
+            self.logger.debug(f"使用状況: {response['usage']}")
+        choices = response.get("choices", [])
+        if choices:
+            return choices[0].get("message", {}).get("content") or str(response)
+        return str(response)

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

@@ -0,0 +1,133 @@
+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/job/base/convert/encodingTransformerJob.py

@@ -0,0 +1,16 @@
+import threading
+
+from pilot.job.impl.base_job import BaseJob
+
+from pilot.conver.converfileEncodding import nkf_convert
+
+
+class EncodingTransformerJob(BaseJob):
+    _begin_file_lock = threading.Lock()
+    def run(self):
+        with self._begin_file_lock:
+            if not self.change_current_trg_to_begin():
+                return
+        nkf_args = ['-w', '--overwrite']
+        nkf_convert(self.file_path, nkf_args)
+        super().run()

pilot_linkstec-0.0.91/src/pilot/job/base/convert/tabReplaceJob.py

@@ -0,0 +1,27 @@
+import threading
+from pathlib import Path
+
+from pilot.job.impl.base_job import BaseJob
+
+class TabReplaceJob(BaseJob):
+    _begin_file_lock = threading.Lock()
+    def run(self):
+        with self._begin_file_lock:
+            if not self.change_current_trg_to_begin():
+                return
+        self.replace_tabs_with_spaces()
+        super().run()
+
+    def replace_tabs_with_spaces(self, tab_width: int = 4):
+        replaced_text =[]
+        src_path = Path(self.file_path)
+        spaces = ' ' * tab_width
+        with open(self.file_path, 'r', encoding='utf-8', newline='') as rf:
+            for line in rf:
+                replaced_text.append(line.replace('\t', spaces))
+
+        tmp_path = src_path.parent / (src_path.name + '.tmp')
+        with open(tmp_path, 'w', encoding='utf-8', newline='') as wf:
+            wf.writelines(replaced_text)
+
+        tmp_path.replace(src_path)

pilot_linkstec-0.0.91/src/pilot/job/base/generate/generateJsonBaseJob.py

@@ -0,0 +1,42 @@
+import json
+import os
+import threading
+import time
+
+from pilot.job.impl.base_job import BaseJob
+
+from pilot.generater.vertexai import VertexAISingleton
+
+class generateJsonBaseJob(BaseJob):
+
+    prompt_content: str
+    result_content: str
+    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()
+        token_count = vertexai.count_tokens(prompt)
+        if token_count == 0:
+            super().run()
+            return
+        if token_count > 900000:
+            print(f"警告: promptのトークン数が900000を超えています ({token_count} tokens)")
+            super().run()
+            return
+        # VertexAI で生成
+        start = time.time()
+        result = vertexai.generate_content(prompt)
+        end = time.time()
+        print(f"Ai 処理時間 {self.file_path}: {end - start:.2f}秒")
+
+        result_content = result.get('response', '')
+        data = json.loads(result_content)
+        with open(self.result_file_path, 'w', encoding='utf-8') as f:
+            json.dump(data, f, ensure_ascii=False, indent=2)
+        super().run()

pilot_linkstec-0.0.91/src/pilot/job/base/generate/generateTextBaseJob.py

@@ -0,0 +1,40 @@
+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):
+
+    prompt_content: str
+    result_content: str
+    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()
+        token_count = vertexai.count_tokens(prompt)
+        if token_count == 0:
+            super().run()
+            return
+        if token_count > 900000:
+            print(f"警告: promptのトークン数が900000を超えています ({token_count} tokens)")
+            super().run()
+            return
+        # VertexAI で生成
+        start = time.time()
+        result = vertexai.generate_content(prompt)
+        end = time.time()
+        print(f"AI 処理時間 {self.file_path}: {end - start:.2f}秒")
+        result_content = result.get('response', '')
+        with open(self.result_file_path, 'w', encoding='utf-8') as f:
+            f.write(result_content)
+        super().run()

{pilot_linkstec-0.0.90 → pilot_linkstec-0.0.91}/src/pilot/job/impl/base_job.py

@@ -67,7 +67,11 @@ class BaseJob(JobInterface):
         self._trg_file_path = value
 
 
+    def prerun(self):
+        pass
 
+    def postrun(self):
+        self.change_current_trg_to_end()
 
     def run(self):
         pass

{pilot_linkstec-0.0.90 → pilot_linkstec-0.0.91}/src/pilot/unit/impl/base_unit.py

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

{pilot_linkstec-0.0.90 → pilot_linkstec-0.0.91}/src/pilot.linkstec.egg-info/PKG-INFO

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

@@ -16,6 +16,8 @@ src/pilot/base/file_operation.py
 src/pilot/base/get_file_encoding.py
 src/pilot/base/make_parsing_java_file_order_base.py
 src/pilot/base/split_file_base.py
+src/pilot/client/__init__.py
+src/pilot/client/ai_client.py
 src/pilot/config/__init__.py
 src/pilot/config/config_reader.py
 src/pilot/control/__init__.py
@@ -50,6 +52,13 @@ src/pilot/generater/__init__.py
 src/pilot/generater/vertexai.py
 src/pilot/job/__init__.py
 src/pilot/job/job_interface.py
+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/impl/__init__.py
 src/pilot/job/impl/base_job.py
 src/pilot/logging/__init__.py

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

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