update

src/llmfunction.jl

@@ -421,6 +421,7 @@ function extractWineAttributes_1(a::T1, input::T2)::String where {T1<:agent, T2<
 
     try
       response = a.func[:text2textInstructLLM](prompt)
+      response = GeneralUtils.remove_french_accents(response)
 
       # check wheter all attributes are in the response
       for word in attributes
@@ -431,15 +432,13 @@ function extractWineAttributes_1(a::T1, input::T2)::String where {T1<:agent, T2<
 
       responsedict = GeneralUtils.textToDict(response, attributes, rightmarker=":", symbolkey=true)
 
-      #[WORKING] check if winery, wine_name, region, country, wine_type, grape_variety are in the query because sometime AI halucinates
-
       for i ∈ attributes
         if length(JSON3.write(responsedict[Symbol(i)])) == 0
           error("$i is empty ", @__LINE__)
         end
       end
 
-      #[PENDING] check if the following attributes has more than 1 name
+      #check if the following attributes has more than 1 name
       responsedict[:grape_variety] = split(responsedict[:grape_variety], ',')[1]
       responsedict[:grape_variety] = split(responsedict[:grape_variety], '/')[1]
 
@@ -449,33 +448,24 @@ function extractWineAttributes_1(a::T1, input::T2)::String where {T1<:agent, T2<
       responsedict[:region] = split(responsedict[:region], ',')[1]
       responsedict[:region] = split(responsedict[:region], '/')[1]
 
-      # check if grape_variety is mentioned in the input
-      if !occursin("NA", responsedict[:grape_variety]) && !occursin(responsedict[:grape_variety], input)
-        if attempt < maxattempt
-          errornote = "$(responsedict[:grape_variety]) is not mentioned in the user query, you must only use the info from the query."
-          error("$(responsedict[:grape_variety]) is not mentioned in the user query, you must only use the info from the query.")
-        else
-          responsedict[:grape_variety] = "NA"
-        end
-      end
-
-      # check if region is mentioned in the input
-      if !occursin("NA", responsedict[:region]) && !occursin(responsedict[:region], input)
-        if attempt < maxattempt
-          errornote = "$(responsedict[:region]) is not mentioned in the user query, you must only use the info from the query.."
-          error("$(responsedict[:region]) is not mentioned in the user query, you must only use the info from the query..")
-        else
-          responsedict[:region] = "NA"
-        end
-      end
-
-      # delete!(responsedict, :region)
       delete!(responsedict, :reasoning)
-      # delete!(responsedict, :tasting_notes)
-      # delete!(responsedict, :price)
+      delete!(responsedict, :tasting_notes)
       delete!(responsedict, :occasion)
       delete!(responsedict, :food_to_be_paired_with_wine)
 
+      # check if winery, wine_name, region, country, wine_type, grape_variety are in the query because sometime AI halucinates
+      for i in [:grape_variety, :winery, :wine_name, :region]
+        result = check_key_in_input(input, responsedict, attempt, maxattempt, i)
+        if result === nothing
+          # nothing wrong
+        elseif result == "NA"
+          responsedict[i] = "NA"
+        else
+          errornote = result
+          error(errornote)
+        end
+      end
+
       # remove (some text)
       for (k, v) in responsedict
         _v = replace(v, r"\(.*?\)" => "")
@@ -900,6 +890,20 @@ function jsoncorrection(config::T1, input::T2, correctJsonExample::T3;
 end
 
 
+function check_key_in_input(input::String, responsedict, attempt::Int, maxattempt::Int, key::Symbol)
+  if !occursin("NA", responsedict[key]) && !occursin(responsedict[key], input)
+    if attempt < maxattempt
+      errornote = "$(responsedict[key]) is not mentioned in the user query, you must only use the info from the query."
+      return errornote
+    else
+      return "NA"
+    end
+  else
+    return nothing
+  end
+end
+
+
 
 # function isrecommend(state::T1, text2textInstructLLM::Function
 #   ) where {T1<:AbstractDict}