update
This commit is contained in:
+20
-4
@@ -302,16 +302,32 @@ function search_wine_database!(a::T, thoughtdict::AbstractDict; useSQLLLM::Bool=
|
||||
else
|
||||
|
||||
# direct query with possible sql instead of SQLLLM.
|
||||
hard_conditions, vector_search_words = wine_search_term_classification(a, thoughtdict["action_input"])
|
||||
hard_conditions, vector_search = wine_search_term_classification(a, thoughtdict["action_input"])
|
||||
|
||||
# do hard filter
|
||||
# sql = generatesql(a, inventoryquery)
|
||||
sql = predefined_wine_search_sql(hard_conditions)
|
||||
@info "\nsql: $sql, \nvector_search_words: $vector_search_words"
|
||||
@info "\nsql: $sql, \nvector_search: $vector_search"
|
||||
textresult, sql_result_df, success, _ = SQLexecution(a.context.executeSQL, sql)
|
||||
|
||||
#WORKING do vector search
|
||||
GeneralUtils.find_text_vector_similarity(vector_search_words, "wine")
|
||||
# do vector search
|
||||
vector_search_str = ""
|
||||
for i in vector_search
|
||||
vector_search_str = vector_search_str * " " * i["value"]
|
||||
end
|
||||
vector_search_str = String(strip(vector_search_str))
|
||||
vector_search_str = GeneralUtils.removestring(vector_search_str, ["%"])
|
||||
@show vector_search
|
||||
@show vector_search_str
|
||||
|
||||
#WORKING
|
||||
GeneralUtils.find_text_vector_similarity(vector_search_str, "wine", "tasting_notes_embedding",
|
||||
GeneralUtils.execute)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
items = nothing
|
||||
if sql_result_df !== nothing
|
||||
|
||||
Reference in New Issue
Block a user