Remove databricks fixes

Author: BenConstable9

text_2_sql/text_2_sql_core/src/text_2_sql_core/connectors/ai_search.py

@@ -198,21 +198,19 @@ async def get_entity_schemas(
         logging.info("Search Text: %s", text)
 
         retrieval_fields = [
-            # "FQN",
+            "FQN",
             "Entity",
             "EntityName",
-            # "Schema",
-            # "Definition",
-            "Description",
+            "Schema",
+            "Definition",
             "Columns",
             "EntityRelationships",
             "CompleteEntityRelationshipsGraph",
         ] + engine_specific_fields
 
         schemas = await self.run_ai_search_query(
             text,
-            # ["DefinitionEmbedding"],
-            ["DescriptionEmbedding"],
+            ["DefinitionEmbedding"],
             retrieval_fields,
             os.environ["AIService__AzureSearchOptions__Text2SqlSchemaStore__Index"],
             os.environ[
@@ -227,7 +225,7 @@ async def get_entity_schemas(
         for schema in schemas:
             filtered_schemas = []
 
-            # del schema["FQN"]
+            del schema["FQN"]
 
             if (
                 schema["CompleteEntityRelationshipsGraph"] is not None

text_2_sql/text_2_sql_core/src/text_2_sql_core/connectors/databricks_sql.py

@@ -98,13 +98,12 @@ async def get_entity_schemas(
         )
 
         for schema in schemas:
-            # schema["SelectFromEntity"] = ".".join(
-            #     [schema["Catalog"], schema["Schema"], schema["Entity"]]
-            # )
-            schema["SelectFromEntity"] = schema["Entity"]
+            schema["SelectFromEntity"] = ".".join(
+                [schema["Catalog"], schema["Schema"], schema["Entity"]]
+            )
 
             del schema["Entity"]
-            # del schema["Schema"]
+            del schema["Schema"]
             del schema["Catalog"]
 
         if as_json:

text_2_sql/text_2_sql_core/src/text_2_sql_core/prompts/sql_disambiguation_agent.yaml

@@ -48,6 +48,7 @@ system_message:
       <unsuccessful_mapping_entry>
         - If you cannot map it to a column, add en entry to the disambiguation list with the clarification question you need from the user:
         - If there are multiple possible options, or you are unsure how it maps, make sure to ask a clarification question.
+        - If there are no possible options, ask a clarification question for more detail.
 
         {
           \"disambiguation\": [