Update relative path

Author: BenConstable9

text_2_sql/autogen/Iteration 5 - Agentic Vector Based Text2SQL.ipynb

@@ -1,10 +1,10 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
-import yaml
 from autogen_core.components.tools import FunctionTool
 from autogen_agentchat.agents import AssistantAgent
 from text_2_sql_core.connectors.sql import SqlConnector
-from llm_model_creator import LLMModelCreator
+from text_2_sql_core.prompts.load import load
+from autogen_text_2_sql.creators.llm_model_creator import LLMModelCreator
 from jinja2 import Template
 from datetime import datetime
 
@@ -21,10 +21,8 @@ def load_agent_file(cls, name: str) -> dict:
         Returns:
         -------
             dict: The agent file."""
-        with open(f"./agents/llm_agents/{name.lower()}.yaml", "r") as file:
-            file = yaml.safe_load(file)
 
-        return file
+        return load(name.lower())
 
     @classmethod
     def get_tool(cls, sql_helper: SqlConnector, tool_name: str):

text_2_sql/autogen/src/autogen_text_2_sql/creators/llm_agent_creator.py

@@ -6,7 +6,7 @@
 from autogen_agentchat.base import Response
 from autogen_agentchat.messages import AgentMessage, ChatMessage, TextMessage
 from autogen_core.base import CancellationToken
-from utils.sql import SqlConnector
+from text_2_sql_core.connectors.sql import SqlConnector
 import json
 import logging
 

text_2_sql/autogen/src/autogen_text_2_sql/custom_agents/sql_query_cache_agent.py

@@ -71,7 +71,7 @@
         ")\n",
         "from semantic_kernel.contents.chat_history import ChatHistory\n",
         "from semantic_kernel.kernel import Kernel\n",
-        "from plugins.prompt_based_sql_plugin.prompt_based_sql_plugin import PromptBasedSQLPlugin\n",
+        "from semantic_kernel_text_2_sql.plugins.prompt_based_sql_plugin.prompt_based_sql_plugin import PromptBasedSQLPlugin\n",
         "from semantic_kernel.functions.kernel_arguments import KernelArguments\n",
         "from semantic_kernel.prompt_template.prompt_template_config import PromptTemplateConfig\n",
         "from IPython.display import display, Markdown\n",
@@ -208,7 +208,7 @@
       "outputs": [],
       "source": [
         "# Load prompt and execution settings from the file\n",
-        "with open(\"./prompt.yaml\", \"r\") as file:\n",
+        "with open(\"./semantic_kernel_text_2_sql/src/prompt.yaml\", \"r\") as file:\n",
         "    data = yaml.safe_load(file.read())\n",
         "    prompt_template_config = PromptTemplateConfig(**data)"
       ]

text_2_sql/semantic_kernel/Iteration 2 - Prompt Based Text2SQL.ipynb

@@ -71,7 +71,7 @@
         ")\n",
         "from semantic_kernel.contents.chat_history import ChatHistory\n",
         "from semantic_kernel.kernel import Kernel\n",
-        "from plugins.vector_based_sql_plugin.vector_based_sql_plugin import VectorBasedSQLPlugin\n",
+        "from semantic_kernel_text_2_sql.plugins.vector_based_sql_plugin.vector_based_sql_plugin import VectorBasedSQLPlugin\n",
         "from semantic_kernel.functions.kernel_arguments import KernelArguments\n",
         "from semantic_kernel.prompt_template.prompt_template_config import PromptTemplateConfig\n",
         "from IPython.display import display, Markdown\n",
@@ -196,7 +196,7 @@
       "outputs": [],
       "source": [
         "# Load prompt and execution settings from the file\n",
-        "with open(\"./prompt.yaml\", \"r\") as file:\n",
+        "with open(\"./semantic_kernel_text_2_sql/src/prompt.yaml\", \"r\") as file:\n",
         "    data = yaml.safe_load(file.read())\n",
         "    prompt_template_config = PromptTemplateConfig(**data)"
       ]

text_2_sql/semantic_kernel/Iterations 3 & 4 - Vector Based Text2SQL.ipynb

@@ -5,10 +5,7 @@
 import os
 import json
 import logging
-from utils.ai_search import (
-    add_entry_to_index,
-    run_ai_search_query,
-)
+from text_2_sql_core.connectors.ai_search import AISearchConnector
 import asyncio
 import aioodbc
 
@@ -36,6 +33,8 @@ def __init__(self, target_engine: str = "Microsoft TSQL Server"):
 
         self.set_mode()
 
+        self.ai_search = AISearchConnector()
+
     def set_mode(self):
         """Set the mode of the plugin based on the environment variables."""
         self.use_query_cache = (
@@ -111,7 +110,7 @@ async def fetch_schemas_from_store(self, search: str) -> list[dict]:
         Returns:
         -------
             list[dict]: The list of schemas fetched from the store."""
-        schemas = await run_ai_search_query(
+        schemas = await self.ai_search.run_ai_search_query(
             search,
             ["DefinitionEmbedding"],
             [
@@ -150,7 +149,7 @@ async def fetch_queries_from_cache(self, question: str) -> str:
         if not self.use_query_cache:
             return None
 
-        cached_schemas = await run_ai_search_query(
+        cached_schemas = await self.ai_search.run_ai_search_query(
             question,
             ["QuestionEmbedding"],
             ["Question", "SqlQueryDecomposition"],
@@ -362,7 +361,7 @@ async def run_sql_query(
                 raise e
             else:
                 if entry is not None:
-                    task = add_entry_to_index(
+                    task = self.ai_search.add_entry_to_index(
                         entry,
                         {"Question": "QuestionEmbedding"},
                         os.environ[

text_2_sql/semantic_kernel/src/semantic_kernel_text_2_sql/plugins/vector_based_sql_plugin/vector_based_sql_plugin.py

@@ -0,0 +1,14 @@
+import yaml
+import os
+
+
+def load(file):
+    # Get the directory containing this module
+    package_dir = os.path.dirname(__file__)
+
+    # Construct the absolute path to the file
+    file_path = os.path.join(package_dir, f"{file}.yaml")
+    with open(file_path, "r") as file:
+        file = yaml.safe_load(file)
+
+    return file