pilot.linkstec 0.0.93__py3-none-any.whl → 0.0.95__py3-none-any.whl

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/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/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.93.dist-info → pilot_linkstec-0.0.95.dist-info}/METADATA

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

@@ -47,8 +47,11 @@ 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/convert/encodingTransformerJob.py,sha256=P6txCqAcQ4w999ttA_gmA4VKr6klvTz4SrQIYT1gv6U,279
+pilot/job/base/convert/tabReplaceJob.py,sha256=FtPLbWwDPgH1jGsK3y5_sY4lAZ4Lhsv7GQ-1A-QgAFE,743
+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.93.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-pilot_linkstec-0.0.93.dist-info/METADATA,sha256=Ty1Ol3qT93jIibsagJ-5yMMuSam8mY0J_65wxJWR9Mk,679
-pilot_linkstec-0.0.93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pilot_linkstec-0.0.93.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
-pilot_linkstec-0.0.93.dist-info/RECORD,,
+pilot_linkstec-0.0.95.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+pilot_linkstec-0.0.95.dist-info/METADATA,sha256=oZGxmKBaFeI6-rZmMMs7PGAJ6sCoTN6w6H7QX6x5H4k,679
+pilot_linkstec-0.0.95.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pilot_linkstec-0.0.95.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
+pilot_linkstec-0.0.95.dist-info/RECORD,,