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

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/config/config_reader.py

@@ -1,39 +1,54 @@
 import configparser
-import os
 import inspect
+import os
 from dataclasses import dataclass
-from typing import List
+from typing import Optional
+
 
 @dataclass
 class ConfigDTO:
-    work_space: str
-    threads: int
     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]
-    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)
+    _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):
@@ -52,10 +67,11 @@ 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 not found in expected locations")
+        raise FileNotFoundError("control.properties が期待される場所に見つかりません")
 
     def get(self, section, option, fallback=None, cast_type=str):
         try:
@@ -71,25 +87,47 @@ class ConfigReader:
             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='')
+        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 []
-        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
-        )
+            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/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/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/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/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/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/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.dist-info → pilot_linkstec-0.0.91.dist-info}/METADATA

@@ -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.dist-info → pilot_linkstec-0.0.91.dist-info}/RECORD

@@ -9,8 +9,10 @@ pilot/base/file_operation.py,sha256=SEguSMtkwKnOLX1KgMmFSLlPjm2IOhgUuRy07fKFCxk,
 pilot/base/get_file_encoding.py,sha256=U118_SxBXz69hhY8FGZWNQDxB1zfMG5_7gkAb6O3uG0,400
 pilot/base/make_parsing_java_file_order_base.py,sha256=mK4tIN2EIHPm7CkPrYkfVI2xA8nW1kKPsGWC4A9zat4,6310
 pilot/base/split_file_base.py,sha256=CuPI9XHlSTTkLRNXW6SNEKkdSZBOMuy685e2TcnWPkY,12625
+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=MchG-9j-Xfy8AquL_6tlvqQR65MFJ3c3hwWBl6IF2jw,3750
+pilot/config/config_reader.py,sha256=DxTkCft9s9iuVoApWJ276ATIgM5vSiYjha4nhRVUuM0,4703
 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
@@ -43,8 +45,15 @@ pilot/generater/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/generater/vertexai.py,sha256=SOFfl0qCuLhfjeIoSU7Tk-I7ZB6ZrOyGme2rXDYCGzk,2599
 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/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/job/impl/base_job.py,sha256=7jxh4wREvlhFruCHA0VTnBrcg1f1sleMYo5gcvK8hdg,14642
+pilot/job/impl/base_job.py,sha256=PpV4g7NiWPICojp9cSv4iDWnONHWQYYjYdYfzengxBg,14745
 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
@@ -56,11 +65,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=LsFPpL28aSNv5rsZhfKv6CWhAw1XR4n-A6FOn2RBrZo,1272
+pilot/unit/impl/base_unit.py,sha256=GO5tXlyDLgYXhgQL1u910Kd9LyvHFq0Kj1zATOL4Gw0,1307
 pilot/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/util/files.py,sha256=v9uzfzo3Aq4xgnUIASEZeBJoA2nD9Qz_EA3P-FwzGFQ,1896
-pilot_linkstec-0.0.90.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-pilot_linkstec-0.0.90.dist-info/METADATA,sha256=iSPnwKqO0yHZW8_WqwTvUl_Ta6HUmJkXZcbJjOxMSS4,679
-pilot_linkstec-0.0.90.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pilot_linkstec-0.0.90.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
-pilot_linkstec-0.0.90.dist-info/RECORD,,
+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,,