pilot.linkstec 0.0.17__tar.gz → 0.0.18__tar.gz

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

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

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

{pilot_linkstec-0.0.17 → pilot_linkstec-0.0.18}/src/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_linkstec-0.0.18/src/pilot/generater/vertexai.py

@@ -0,0 +1,158 @@
+import re
+import threading
+from typing import Dict, Any, Optional
+
+import tiktoken
+from vertexai.generative_models import GenerativeModel, ChatSession
+import os
+
+class VertexAISingleton:
+    _instance: Optional['VertexAISingleton'] = None
+    _lock = threading.Lock()
+    _tokenizer_cache = {}
+    encoding = None
+
+    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:
+                    cls._instance = super(VertexAISingleton, cls).__new__(cls)
+                    cls._instance._initialized = False
+        return cls._instance
+
+    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:
+            # 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))
+            return {
+                "prompt": prompt,
+                "response": self._remove_code_fence(response.text),
+                "success": True,
+                "error": None
+            }
+        except Exception as e:
+            return {
+                "prompt": prompt,
+                "response": None,
+                "success": False,
+                "error": str(e)
+            }
+
+    def start_chat(self) -> ChatSession:
+        """新しいチャットセッションを開始"""
+        return self.model.start_chat()
+
+    def count_tokens(self, text: str) -> int:
+        """与えられたテキストのトークン数を返す（bert-base-uncasedのみ使用）"""
+        try:
+            tokens = self.encoding.encode(text)
+            return len(tokens)
+        except Exception as e:
+            print(f"トークン計算失敗: {e}")
+            return 0
+
+    def _remove_code_fence(self, text: str) -> str:
+        lines = text.splitlines()
+        if lines and lines[0].startswith("```"):
+            lines = lines[1:]
+        if lines and lines[-1].startswith("```"):
+            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 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. にマッチ
+        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", system_prompt: Optional[str] = None) -> 'VertexAISingleton':
+        """インスタンスを取得"""
+        return cls(model_name, system_prompt)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pilot.linkstec
-Version: 0.0.17
+Version: 0.0.18
 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/src/pilot/generater/vertexai.py

@@ -1,72 +0,0 @@
-import threading
-from typing import Dict, Any, Optional
-
-import tiktoken
-from vertexai.generative_models import GenerativeModel, ChatSession
-import os
-
-class VertexAISingleton:
-    _instance: Optional['VertexAISingleton'] = None
-    _lock = threading.Lock()
-    _tokenizer_cache = {}
-    encoding = None
-
-    def __new__(cls, model_name: str = "gemini-2.5-pro"):
-        if cls._instance is None:
-            with cls._lock:
-                if cls._instance is None:
-                    cls._instance = super(VertexAISingleton, cls).__new__(cls)
-                    cls._instance._initialized = False
-        return cls._instance
-
-    def __init__(self, model_name: str = "gemini-2.5-pro"):
-        if not self._initialized:
-            with self._lock:
-                if not self._initialized:
-                    self.model = GenerativeModel(model_name)
-                    self.encoding = tiktoken.get_encoding("cl100k_base")
-                    self._initialized = True
-
-    def generate_content(self, prompt: str) -> Dict[str, Any]:
-        """複数スレッドから安全に呼び出し可能"""
-        try:
-            response = self.model.generate_content(prompt)
-            return {
-                "prompt": prompt,
-                "response": self._remove_code_fence(response.text),
-                "success": True,
-                "error": None
-            }
-        except Exception as e:
-            return {
-                "prompt": prompt,
-                "response": None,
-                "success": False,
-                "error": str(e)
-            }
-
-    def start_chat(self) -> ChatSession:
-        """新しいチャットセッションを開始"""
-        return self.model.start_chat()
-
-    def count_tokens(self, text: str) -> int:
-        """与えられたテキストのトークン数を返す（bert-base-uncasedのみ使用）"""
-        try:
-            tokens = self.encoding.encode(text)
-            return len(tokens)
-        except Exception as e:
-            print(f"トークン計算失敗: {e}")
-            return 0
-
-    def _remove_code_fence(self, text: str) -> str:
-        lines = text.splitlines()
-        if lines and lines[0].startswith("```"):
-            lines = lines[1:]
-        if lines and lines[-1].startswith("```"):
-            lines = lines[:-1]
-        return "\n".join(lines)
-
-    @classmethod
-    def get_instance(cls, model_name: str = "gemini-2.5-pro") -> 'VertexAISingleton':
-        """インスタンスを取得"""
-        return cls(model_name)