pilot.linkstec 0.0.107__tar.gz → 0.0.109__tar.gz

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

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

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

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

@@ -0,0 +1,38 @@
+import json
+import os
+import threading
+import time
+
+from pilot.job.impl.base_job import BaseJob
+
+from pilot.generater.vera import VeraSingleton
+
+class GenerateJsonBaseJob(BaseJob):
+
+    prompt_content: str
+    result_content: str
+    result_file_path: str
+
+    def run(self):
+        prompt = self.prompt_content
+        # トークン数チェック
+        vera_ai = VeraSingleton.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 = vera_ai.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.107 → pilot_linkstec-0.0.109}/src/pilot/job/base/generate/generateTextBaseJob.py

@@ -5,7 +5,7 @@ import time
 
 from pilot.job.impl.base_job import BaseJob
 
-from pilot.generater.vertexai import VertexAISingleton
+from pilot.generater.vera import VeraSingleton
 
 class GenerateTextBaseJob(BaseJob):
 
@@ -16,18 +16,18 @@ class GenerateTextBaseJob(BaseJob):
     def run(self):
         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
+        vera_ai = VeraSingleton.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)
+        result = vera_ai.generate_content(prompt)
         end = time.time()
         print(f"AI 処理時間 {self.file_path}: {end - start:.2f}秒")
         result_content = result.get('response', '')

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

@@ -1,6 +1,7 @@
 import json
 import os
 import shutil
+from pathlib import Path
 
 from pilot.job.job_interface import JobInterface
 from pilot.logging.logger import get_logger
@@ -368,4 +369,8 @@ class BaseJob(JobInterface):
         return os.path.splitext(os.path.basename(file_name))[0]
 
 
-
+    def change_extension_pathlib(file_path: str, new_ext: str) -> str:
+        p = Path(file_path)
+        new_path = p.with_suffix(new_ext)  # 例: ".csv"
+        p.rename(new_path)
+        return str(new_path)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.107
+Version: 0.0.109
 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.107/src/pilot/job/base/generate/generateJsonBaseJob.py

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