More package changes

Author: BenConstable9

pyproject.toml

@@ -16,4 +16,4 @@ dev = [
 ]
 
 [tool.uv.workspace]
-members = ["text_2_sql/text_2_sql_core", "text_2_sql/autogen", "deploy_ai_search", "adi_function_app"]
+members = ["text_2_sql/text_2_sql_core", "text_2_sql/autogen", "deploy_ai_search", "adi_function_app", "text_2_sql/semantic_kernel"]

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

@@ -19,31 +19,41 @@
         "\n",
         "A multi-shot approach is used for SQL generation for more reliable results and reduced token usage. More details can be found in the README.md.\n",
         "\n",
+        "### Dependencies\n",
+        "\n",
         "To install dependencies:\n",
         "\n",
-        "`uv sync --package autogen`"
+        "`uv sync --package semantic_kernel_text_2_sql`"
       ]
     },
     {
       "cell_type": "code",
-      "execution_count": null,
+      "execution_count": 4,
       "metadata": {},
       "outputs": [
         {
-          "ename": "",
-          "evalue": "",
+          "ename": "ModuleNotFoundError",
+          "evalue": "No module named 'grpc'",
           "output_type": "error",
           "traceback": [
-            "\u001b[1;31mThe kernel failed to start due to the missing module 'pygments.formatters.terminal256'. Consider installing this module.\n",
-            "\u001b[1;31mClick <a href='https://aka.ms/kernelFailuresMissingModule'>here</a> for more info."
+            "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+            "\u001b[0;31mModuleNotFoundError\u001b[0m                       Traceback (most recent call last)",
+            "Cell \u001b[0;32mIn[4], line 4\u001b[0m\n\u001b[1;32m      2\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mlogging\u001b[39;00m\n\u001b[1;32m      3\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mautogen_agentchat\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mtask\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m Console\n\u001b[0;32m----> 4\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01msrc\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mautogen\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mautogen_text_2_sql\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m AutoGenText2Sql\n",
+            "File \u001b[0;32m/workspaces/dstoolkit-text2sql-and-imageprocessing/text_2_sql/autogen/src/autogen/autogen_text_2_sql.py:4\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[38;5;66;03m# Copyright (c) Microsoft Corporation.\u001b[39;00m\n\u001b[1;32m      2\u001b[0m \u001b[38;5;66;03m# Licensed under the MIT License.\u001b[39;00m\n\u001b[1;32m      3\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mautogen_agentchat\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mtask\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m TextMentionTermination, MaxMessageTermination\n\u001b[0;32m----> 4\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mautogen_agentchat\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mteams\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m SelectorGroupChat\n\u001b[1;32m      5\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mcreators\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mllm_model_creator\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m LLMModelCreator\n\u001b[1;32m      6\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mcreators\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mllm_agent_creator\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m LLMAgentCreator\n",
+            "File \u001b[0;32m/workspaces/dstoolkit-text2sql-and-imageprocessing/.venv/lib/python3.12/site-packages/autogen_agentchat/teams/__init__.py:1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_group_chat\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_base_group_chat\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m BaseGroupChat\n\u001b[1;32m      2\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_group_chat\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_magentic_one\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m MagenticOneGroupChat\n\u001b[1;32m      3\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_group_chat\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_round_robin_group_chat\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m RoundRobinGroupChat\n",
+            "File \u001b[0;32m/workspaces/dstoolkit-text2sql-and-imageprocessing/.venv/lib/python3.12/site-packages/autogen_agentchat/teams/_group_chat/_base_group_chat.py:7\u001b[0m\n\u001b[1;32m      4\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mabc\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m ABC, abstractmethod\n\u001b[1;32m      5\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mtyping\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m AsyncGenerator, Callable, List\n\u001b[0;32m----> 7\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mautogen_core\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mapplication\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m SingleThreadedAgentRuntime\n\u001b[1;32m      8\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mautogen_core\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mbase\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m (\n\u001b[1;32m      9\u001b[0m     AgentId,\n\u001b[1;32m     10\u001b[0m     AgentInstantiationContext,\n\u001b[0;32m   (...)\u001b[0m\n\u001b[1;32m     14\u001b[0m     MessageContext,\n\u001b[1;32m     15\u001b[0m )\n\u001b[1;32m     16\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mautogen_core\u001b[39;00m\u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mcomponents\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m ClosureAgent, TypeSubscription\n",
+            "File \u001b[0;32m/workspaces/dstoolkit-text2sql-and-imageprocessing/.venv/lib/python3.12/site-packages/autogen_core/application/__init__.py:6\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[38;5;124;03m\"\"\"\u001b[39;00m\n\u001b[1;32m      2\u001b[0m \u001b[38;5;124;03mThe :mod:`autogen_core.application` module provides implementations of core components that are used to compose an application\u001b[39;00m\n\u001b[1;32m      3\u001b[0m \u001b[38;5;124;03m\"\"\"\u001b[39;00m\n\u001b[1;32m      5\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_single_threaded_agent_runtime\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m SingleThreadedAgentRuntime\n\u001b[0;32m----> 6\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_worker_runtime\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m WorkerAgentRuntime\n\u001b[1;32m      7\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_worker_runtime_host\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m WorkerAgentRuntimeHost\n\u001b[1;32m      9\u001b[0m __all__ \u001b[38;5;241m=\u001b[39m [\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mSingleThreadedAgentRuntime\u001b[39m\u001b[38;5;124m\"\u001b[39m, \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mWorkerAgentRuntime\u001b[39m\u001b[38;5;124m\"\u001b[39m, \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mWorkerAgentRuntimeHost\u001b[39m\u001b[38;5;124m\"\u001b[39m]\n",
+            "File \u001b[0;32m/workspaces/dstoolkit-text2sql-and-imageprocessing/.venv/lib/python3.12/site-packages/autogen_core/application/_worker_runtime.py:53\u001b[0m\n\u001b[1;32m     51\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_helpers\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m SubscriptionManager, get_impl\n\u001b[1;32m     52\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01m_utils\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m GRPC_IMPORT_ERROR_STR\n\u001b[0;32m---> 53\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mprotos\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m agent_worker_pb2, agent_worker_pb2_grpc\n\u001b[1;32m     54\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01m.\u001b[39;00m\u001b[38;5;21;01mtelemetry\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m MessageRuntimeTracingConfig, TraceHelper, get_telemetry_grpc_metadata\n\u001b[1;32m     56\u001b[0m \u001b[38;5;28;01mtry\u001b[39;00m:\n",
+            "File \u001b[0;32m/workspaces/dstoolkit-text2sql-and-imageprocessing/.venv/lib/python3.12/site-packages/autogen_core/application/protos/agent_worker_pb2_grpc.py:3\u001b[0m\n\u001b[1;32m      1\u001b[0m \u001b[38;5;66;03m# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!\u001b[39;00m\n\u001b[1;32m      2\u001b[0m \u001b[38;5;124;03m\"\"\"Client and server classes corresponding to protobuf-defined services.\"\"\"\u001b[39;00m\n\u001b[0;32m----> 3\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01mgrpc\u001b[39;00m\n\u001b[1;32m      5\u001b[0m \u001b[38;5;28;01mimport\u001b[39;00m \u001b[38;5;21;01magent_worker_pb2\u001b[39;00m \u001b[38;5;28;01mas\u001b[39;00m \u001b[38;5;21;01magent__worker__pb2\u001b[39;00m\n\u001b[1;32m      8\u001b[0m \u001b[38;5;28;01mclass\u001b[39;00m \u001b[38;5;21;01mAgentRpcStub\u001b[39;00m(\u001b[38;5;28mobject\u001b[39m):\n",
+            "\u001b[0;31mModuleNotFoundError\u001b[0m: No module named 'grpc'"
           ]
         }
       ],
       "source": [
         "import dotenv\n",
         "import logging\n",
         "from autogen_agentchat.task import Console\n",
-        "from autogen_text_2_sql import AutoGenText2Sql"
+        "from src.autogen.autogen_text_2_sql import AutoGenText2Sql"
       ]
     },
     {

…gins/prompt_based_sql_plugin/__init__.py text_2_sql/autogen/__init__.pytext_2_sql/semantic_kernel/plugins/prompt_based_sql_plugin/__init__.py renamed to text_2_sql/autogen/__init__.py text_2_sql/semantic_kernel/plugins/prompt_based_sql_plugin/__init__.py renamed to text_2_sql/autogen/__init__.py

@@ -1,13 +1,14 @@
 [project]
-name = "autogen"
+name = "autogen_text_2_sql"
 version = "0.1.0"
-description = "Add your description here"
+description = "AutoGen Based Implementation"
 readme = "README.md"
 requires-python = ">=3.12"
 dependencies = [
     "autogen-agentchat==0.4.0.dev7",
     "autogen-core==0.4.0.dev7",
     "autogen-ext[azure,openai]==0.4.0.dev7",
+    "grpcio>=1.68.1",
     "pyyaml>=6.0.2",
 ]
 
@@ -18,6 +19,7 @@ dev = [
     "jupyter>=1.1.1",
     "pre-commit>=4.0.1",
     "pygments>=2.18.0",
+    "python-dotenv>=1.0.1",
     "ruff>=0.8.1",
 ]
 

text_2_sql/autogen/pyproject.toml

@@ -0,0 +1,24 @@
+[project]
+name = "semantic_kernel_text_2_sql"
+version = "0.1.0"
+description = "Semantic Kernel Based Implementation"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "grpcio>=1.68.1",
+    "semantic-kernel==1.9.0",
+]
+
+[dependency-groups]
+dev = [
+    "black>=24.10.0",
+    "ipykernel>=6.29.5",
+    "jupyter>=1.1.1",
+    "pre-commit>=4.0.1",
+    "pygments>=2.18.0",
+    "python-dotenv>=1.0.1",
+    "ruff>=0.8.1",
+]
+
+[tool.uv.sources]
+text_2_sql_core = { path = "text_2_sql/text_2_sql_core" }