pilot.linkstec 0.0.18__tar.gz → 0.0.20__tar.gz

{pilot_linkstec-0.0.18 → pilot_linkstec-0.0.20}/PKG-INFO

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

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

{pilot_linkstec-0.0.18 → pilot_linkstec-0.0.20}/src/pilot/generater/vertexai.py

@@ -46,9 +46,18 @@ class VertexAISingleton:
     def generate_content(self, prompt: str) -> Dict[str, Any]:
         """複数スレッドから安全に呼び出し可能"""
         try:
-            # system_promptがあれば先頭に付与
-            full_prompt = f"{self.system_prompt}\n{prompt}" if getattr(self, "system_prompt", None) else prompt
-            response = self.model.generate_content(self.exchange_prompt(full_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),
@@ -87,8 +96,7 @@ class VertexAISingleton:
 
     def exchange_prompt(self, prompt: str) -> str:
         # EXEC SQL ... END-EXEC. のSQL部分を抽出してフラット化
-        rtn_prompt = ""
-        rtn_prompt = self.fix_initialize(rtn_prompt)
+        rtn_prompt = self.fix_initialize(prompt)
         rtn_prompt = self.extract_and_flatten_sql(rtn_prompt)
         return rtn_prompt
 
@@ -119,19 +127,6 @@ class VertexAISingleton:
 
         return text
 
-    def replace_aaa_in_section(code: str) -> str:
-        """
-        SECTION.～EXIT.ブロック中のAAAをBBBに置換し、全体をstrで返す
-        """
-        pattern = r"SECTION.(.*?)(EXIT.)"
-
-        def repl(m):
-            block = m.group(1)
-            block_modified = block.replace("AAA", "BBB")
-            return f"SECTION.{block_modified}EXIT."
-
-        result = re.sub(pattern, repl, code, flags=re.DOTALL | re.IGNORECASE)
-        return result
 
     def extract_and_flatten_sql(self, code):
         # EXEC SQL ... END-EXEC. にマッチ

{pilot_linkstec-0.0.18 → pilot_linkstec-0.0.20}/src/pilot.linkstec.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.18
+Version: 0.0.20
 Summary: pilot of the ship, a tool for managing and deploying Python projects.
 Author-email: wanglr <wanglr1980@gmail.com>
 License-Expression: MIT