pilot.linkstec 0.0.17__py3-none-any.whl → 0.0.19__py3-none-any.whl

pilot/config/config_reader.py

@@ -14,8 +14,6 @@ class ConfigDTO:
     runsteps: list[str]
     multisteps: list[str]
 
-
-
 class ConfigReader:
     def __init__(self, filename = None):
         filepath = None

pilot/generater/vertexai.py

@@ -1,3 +1,4 @@
+import re
 import threading
 from typing import Dict, Any, Optional
 
@@ -11,7 +12,13 @@ class VertexAISingleton:
     _tokenizer_cache = {}
     encoding = None
 
-    def __new__(cls, model_name: str = "gemini-2.5-pro"):
+    SQL_SYSTEM_PROMPT_EN = (
+        "If there is any SQL-related processing　\n"
+        "1. If there is an SQL statement like \"SELECT COUNT(X) INTO :COLUMN FROM TABLE_NAME;\"　please recognize TABLE_NAME as a table."
+    )
+
+
+    def __new__(cls, model_name: str = "gemini-2.5-pro", system_prompt: Optional[str] = None):
         if cls._instance is None:
             with cls._lock:
                 if cls._instance is None:
@@ -19,18 +26,38 @@ class VertexAISingleton:
                     cls._instance._initialized = False
         return cls._instance
 
-    def __init__(self, model_name: str = "gemini-2.5-pro"):
+    def __init__(self, model_name: str = "gemini-2.5-pro", system_prompt: Optional[str] = None):
         if not self._initialized:
             with self._lock:
                 if not self._initialized:
                     self.model = GenerativeModel(model_name)
                     self.encoding = tiktoken.get_encoding("cl100k_base")
+                    # system_promptにSQL_SYSTEM_PROMPT_ENを追加
+                    if system_prompt:
+                        self.system_prompt = f"{system_prompt.rstrip()}\n\n{self.SQL_SYSTEM_PROMPT_EN}"
+                    else:
+                        self.system_prompt = self.SQL_SYSTEM_PROMPT_EN
                     self._initialized = True
+        else:
+            # 既存インスタンスでもsystem_promptを更新可能に
+            if system_prompt is not None:
+                self.system_prompt = f"{system_prompt.rstrip()}\n\n{self.SQL_SYSTEM_PROMPT_EN}" if system_prompt else self.SQL_SYSTEM_PROMPT_EN
 
     def generate_content(self, prompt: str) -> Dict[str, Any]:
         """複数スレッドから安全に呼び出し可能"""
         try:
-            response = self.model.generate_content(prompt)
+            # システムプロンプトをconfigとして渡す
+            genai_config = None
+            if getattr(self, "system_prompt", None):
+                # Vertex AI SDK公式: config引数にsystem_instructionを指定
+                genai_config = {
+                    "system_instruction": self.system_prompt
+                }
+            newprompt = self.exchange_prompt(prompt)
+            response = self.model.generate_content(
+                contents=newprompt,  # 引数名を明示
+                generation_config=genai_config  # 正しい名前で渡す
+            )
             return {
                 "prompt": prompt,
                 "response": self._remove_code_fence(response.text),
@@ -66,7 +93,62 @@ class VertexAISingleton:
             lines = lines[:-1]
         return "\n".join(lines)
 
+
+    def exchange_prompt(self, prompt: str) -> str:
+        # EXEC SQL ... END-EXEC. のSQL部分を抽出してフラット化
+        rtn_prompt = ""
+        rtn_prompt = self.fix_initialize(rtn_prompt)
+        rtn_prompt = self.extract_and_flatten_sql(rtn_prompt)
+        return rtn_prompt
+
+    def fix_initialize(self, text: str) -> str:
+        # SECTION ... EXIT. ブロック内のINITIALIZE文を処理
+        def process_section_block(match):
+            section_content = match.group(0)
+
+            # INITIALIZE の行を結合する（SECTION-EXIT間のみ）
+            # INITIALIZEで始まる行の次の行が空白+文字列の場合に結合
+            pattern_init = r'^(\s*INITIALIZE\s+[^\n]*)\n(\s+[^\n]+(?:\s+[^\n]+)*)'
+
+            def repl_init(m):
+                init_line = m.group(1).rstrip()
+                next_lines = m.group(2).strip()
+                return f'{init_line} {next_lines}'
+
+            section_content = re.sub(pattern_init, repl_init, section_content, flags=re.MULTILINE)
+
+            # ブロック内　COUNT(*) → COUNT(1) へ置換する
+            section_content = re.sub(r'COUNT\(\s*\*\s*\)', 'COUNT(1)', section_content, flags=re.IGNORECASE)
+
+            return section_content
+
+        # SECTION から EXIT. までのブロックを検索して処理
+        section_pattern = r'(\w+\s+SECTION\s*\..*?EXIT\s*\.)'
+        text = re.sub(section_pattern, process_section_block, text, flags=re.DOTALL | re.IGNORECASE)
+
+        return text
+
+
+    def extract_and_flatten_sql(self, code):
+        # EXEC SQL ... END-EXEC. にマッチ
+        pattern = r"EXEC SQL(.*?)END-EXEC\.?"
+
+        def repl(m):
+            # .*?でSQL部分取得
+            raw_sql = m.group(1)
+            # コメント（*以降）除去（複数行まとめてOK）
+            no_comment = re.sub(r"\*.*", "", raw_sql)
+            # 改行/連続スペースを単一スペースに
+            flattened = re.sub(r"\s+", " ", no_comment).strip()
+            # 置換内容
+            return f"EXEC SQL {flattened} END-EXEC."
+
+        # 全て置換
+        result = re.sub(pattern, repl, code, flags=re.DOTALL | re.IGNORECASE)
+        return result
+
+
     @classmethod
-    def get_instance(cls, model_name: str = "gemini-2.5-pro") -> 'VertexAISingleton':
+    def get_instance(cls, model_name: str = "gemini-2.5-pro", system_prompt: Optional[str] = None) -> 'VertexAISingleton':
         """インスタンスを取得"""
-        return cls(model_name)
+        return cls(model_name, system_prompt)

{pilot_linkstec-0.0.17.dist-info → pilot_linkstec-0.0.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.17
+Version: 0.0.19
 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.17.dist-info → pilot_linkstec-0.0.19.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pilot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/config/config_reader.py,sha256=zG_CFIgeTvrcXCtKmOgXC39625XFFIPGuw4u9lzkeEs,3754
+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
@@ -9,7 +9,7 @@ pilot/conver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/conver/converfileEncodding.py,sha256=UqjcWO0bzkuTRHLEWrWJkeo3p-P7WuYE7jFKveyPekA,2781
 pilot/conver/nkf_converter.py,sha256=JqgThmXcdnTGMsLIHUEwe8sc0VGMqDaKCIQTg-UE3WE,1148
 pilot/generater/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pilot/generater/vertexai.py,sha256=v-hEvPwsUtrxP57yu9f5pUBj7BGImegO4lv10QWM1XA,2591
+pilot/generater/vertexai.py,sha256=6jYfYuNj5hLaYXtm5GQpTOfJwXhdgkhDbw-8fVW-_kU,6353
 pilot/job/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/job/job_interface.py,sha256=LL0hfuFfnKnkpQD99jv1hkaAIAFM-JJPrX3PFxN6O_A,120
 pilot/job/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -27,8 +27,8 @@ pilot/unit/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/unit/impl/base_unit.py,sha256=LsFPpL28aSNv5rsZhfKv6CWhAw1XR4n-A6FOn2RBrZo,1272
 pilot/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pilot/util/files.py,sha256=v9uzfzo3Aq4xgnUIASEZeBJoA2nD9Qz_EA3P-FwzGFQ,1896
-pilot_linkstec-0.0.17.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-pilot_linkstec-0.0.17.dist-info/METADATA,sha256=I1C8EXOcmoJ4Pz2Hx-K_RSpzo94SpjUoXone8hbVkO0,679
-pilot_linkstec-0.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pilot_linkstec-0.0.17.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
-pilot_linkstec-0.0.17.dist-info/RECORD,,
+pilot_linkstec-0.0.19.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+pilot_linkstec-0.0.19.dist-info/METADATA,sha256=oAYLNwMjJVqZdT23O7QasoGgJC-SDRx71c6wId9FVr4,679
+pilot_linkstec-0.0.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pilot_linkstec-0.0.19.dist-info/top_level.txt,sha256=BijnVJdXnIPxxx3s60M848seL4Z12gNUPod6KPJxK9c,6
+pilot_linkstec-0.0.19.dist-info/RECORD,,