Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dh 4693/column entity checker returns none for big query #172

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Dh 4693/column entity checker returns none for big query #172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
084976e
DH-4693/ColumnEntityChecker returns empty for BigQuery
MohammadrezaPourreza Sep 19, 2023
979b374
DH-4693/lowering the treshold for search result and add like search
MohammadrezaPourreza Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions dataherald/sql_generator/dataherald_sqlagent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import numpy as np
import openai
import pandas as pd
import sqlalchemy
from google.api_core.exceptions import GoogleAPIError
from langchain.agents.agent import AgentExecutor
from langchain.agents.agent_toolkits.base import BaseToolkit
Expand All @@ -23,7 +24,9 @@
from langchain.tools.base import BaseTool
from overrides import override
from pydantic import BaseModel, Extra, Field
from sqlalchemy import MetaData
from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.sql import func

from dataherald.context_store import ContextStore
from dataherald.db import DB
Expand Down Expand Up @@ -263,12 +266,12 @@ class ColumnEntityChecker(BaseSQLDatabaseTool, BaseTool):
"""

def find_similar_strings(
self, input_list: List[tuple], target_string: str, threshold=0.6
self, input_list: List[tuple], target_string: str, threshold=0.4
):
similar_strings = []
for item in input_list:
similarity = difflib.SequenceMatcher(
None, str(item[0]).strip(), target_string
None, str(item[0]).strip().lower(), target_string.lower()
).ratio()
if similarity >= threshold:
similar_strings.append((str(item[0]).strip(), similarity))
Expand All @@ -283,12 +286,28 @@ def _run(
) -> str:
schema, entity = tool_input.split(",")
table_name, column_name = schema.split("->")
query = f"SELECT DISTINCT {column_name} FROM {table_name}" # noqa: S608
results = self.db.run_sql(query)[1]["result"]
search_pattern = f"%{entity.strip().lower()}%"
meta = MetaData(bind=self.db.engine)
table = sqlalchemy.Table(table_name.strip(), meta, autoload=True)
search_query = sqlalchemy.select(
[func.distinct(table.c[column_name.strip()])]
).where(func.lower(table.c[column_name.strip()]).like(search_pattern))
distinct_query = sqlalchemy.select(
[func.distinct(table.c[column_name.strip()])]
)
search_results = self.db.engine.execute(search_query).fetchall()
search_results = search_results[:25]
results = self.db.engine.execute(distinct_query).fetchall()
results = self.find_similar_strings(results, entity)
similar_items = "Similar items:\n"
already_added = {}
for item in results:
similar_items += f"{item[0]}\n"
already_added[item[0]] = True
if len(search_results) > 0:
for item in search_results:
if item[0] not in already_added:
similar_items += f"{item[0]}\n"
return similar_items

async def _arun(
Expand Down