pilot.linkstec 0.0.93__tar.gz → 0.0.95__tar.gz

{pilot_linkstec-0.0.93 → pilot_linkstec-0.0.95}/PKG-INFO

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

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

{pilot_linkstec-0.0.93 → pilot_linkstec-0.0.95}/src/pilot/job/base/convert/encodingTransformerJob.py

@@ -1,16 +1,10 @@
-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.93 → pilot_linkstec-0.0.95}/src/pilot/job/base/convert/tabReplaceJob.py

@@ -1,14 +1,10 @@
-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()
 

pilot_linkstec-0.0.95/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.95/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.93 → pilot_linkstec-0.0.95}/src/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.93 → pilot_linkstec-0.0.95}/src/pilot.linkstec.egg-info/PKG-INFO

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

@@ -56,6 +56,9 @@ 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/base/generater/__init__.py
 src/pilot/job/base/generater/generateJsonBaseJob.py
 src/pilot/job/base/generater/generateTextBaseJob.py