pilot.linkstec 0.0.92__py3-none-any.whl → 0.0.94__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/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/unit/impl/base_unit.py

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

{pilot_linkstec-0.0.92.dist-info → pilot_linkstec-0.0.94.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.92
+Version: 0.0.94
 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.92.dist-info → pilot_linkstec-0.0.94.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
@@ -49,6 +49,9 @@ 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
@@ -68,11 +71,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=pF3R1TxoJtDIt5MCggSPO1H5jFI-wO1gQosz4haYTQo,1308
+pilot/unit/impl/base_unit.py,sha256=UV-RsCrSAknO6a2yZAQA0vD8Uo9yqJsNCXC5e8yZE6A,1348
 pilot/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/util/files.py,sha256=v9uzfzo3Aq4xgnUIASEZeBJoA2nD9Qz_EA3P-FwzGFQ,1896
-pilot_linkstec-0.0.92.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-pilot_linkstec-0.0.92.dist-info/METADATA,sha256=wybOFFLfloJoPHK_ZTdcmDl5-PiR-esNp_N1GajX_tM,679
-pilot_linkstec-0.0.92.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pilot_linkstec-0.0.92.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
-pilot_linkstec-0.0.92.dist-info/RECORD,,
+pilot_linkstec-0.0.94.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+pilot_linkstec-0.0.94.dist-info/METADATA,sha256=14rmXXR-afQoozUrbiOtP-qihKBQK3rSvLLEtWoCEic,679
+pilot_linkstec-0.0.94.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pilot_linkstec-0.0.94.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
+pilot_linkstec-0.0.94.dist-info/RECORD,,