update

src/llmfunction.jl

@@ -326,7 +326,7 @@ julia>
 
 # TODO
   - [] update docstring
-  - [x] implement the function
+  - [WORKING] implement the function
 
 # Signature
 """
@@ -336,31 +336,41 @@ function extractWineAttributes_1(a::T1, input::T2)::String where {T1<:agent, T2<
   """
   As a helpful sommelier, your task is to extract the user information from the user's query as much as possible to fill out user's preference form.
 
-  At each round of conversation, the user will give you the current situation:
+  At each round of conversation, the user will give you the following:
   User's query: ...
 
   You must follow the following guidelines:
-    1) If specific information required in the preference form is not available in the query or there isn't any, mark with "NA" to indicate this.
+    - If specific information required in the preference form is not available in the query or there isn't any, mark with "NA" to indicate this.
       Additionally, words like 'any' or 'unlimited' mean no information is available.
-    2) Do not generate other comments.
+    - Do not generate other comments.
 
-  You should then respond to the user with the following points:
-  - reasoning: state your understanding of the current situation
-  - wine_name: name of the wine
-  - winery: name of the winery
-  - vintage: the year of the wine
-  - region: a region (NOT a country) where the wine is produced, such as Burgundy, Napa Valley, etc
-  - country: a country where the wine is produced. Can be "Austria", "Australia", "France", "Germany", "Italy", "Portugal", "Spain", "United States"
-  - wine_type: can be one of: "red", "white", "sparkling", "rose", "dessert" or "fortified"
-  - grape_varietal: the name of the primary grape used to make the wine
-  - tasting_notes: a brief description of the wine's taste, such as "butter", "oak", "fruity", etc
-  - wine_price: price range of wine.
-  - occasion: the occasion the user is having the wine for
-  - food_to_be_paired_with_wine: food that the user will be served with the wine such as poultry, fish, steak, etc
-  
+  You should then respond to the user with:
+    Comprehension: state your understanding of the current situation
+    Wine_name: name of the wine
+    Winery: name of the winery
+    Vintage: the year of the wine
+    Region: a region (NOT a country) where the wine is produced, such as Burgundy, Napa Valley, etc
+    Country: a country where the wine is produced. Can be "Austria", "Australia", "France", "Germany", "Italy", "Portugal", "Spain", "United States"
+    Wine_type: can be one of: "red", "white", "sparkling", "rose", "dessert" or "fortified"
+    Grape_varietal: the name of the primary grape used to make the wine
+    Tasting_notes: a brief description of the wine's taste, such as "butter", "oak", "fruity", etc
+    Wine_price: price range of wine.
+    Occasion: the occasion the user is having the wine for
+    Food_to_be_paired_with_wine: food that the user will be served with the wine such as poultry, fish, steak, etc
 
-  You should only respond in the user's preference form (JSON) as described below:
-  {"reasoning": ..., "winery": ..., "wine_name": ..., "vintage": ..., "region": ..., "country": ..., "wine_type": ..., "grape_varietal": ..., "tasting_notes": ..., "wine_price": ..., "occasion": ..., "food_to_be_paired_with_wine": ...}
+  You should only respond in format as described below:
+  Comprehension: ...
+  Wine_name: ...
+  Winery: ...
+  Vintage: ...
+  Region: ...
+  Country: ...
+  Wine_type:
+  Grape_varietal: ...
+  Tasting_notes: ...
+  Wine_price: ...
+  Occasion: ...
+  Food_to_be_paired_with_wine: ...
   
   Here are some example:
   User's query: red, Chenin Blanc, Riesling, 20 USD
@@ -372,7 +382,9 @@ function extractWineAttributes_1(a::T1, input::T2)::String where {T1<:agent, T2<
   Let's begin!
   """
 
-  attributes = ["reasoning", "winery", "wine_name", "vintage", "region", "country", "wine_type", "grape_varietal", "tasting_notes", "wine_price", "occasion", "food_to_be_paired_with_wine"]
+  attributes = 
+  header = ["Comprehension:", "Wine_name:", "Winery:", "Vintage:", "Region:", "Country:", "Wine_type:", "Grape_varietal:", "Tasting_notes:", "Wine_price:", "Occasion:", "Food_to_be_paired_with_wine:"]
+  dictkey = ["comprehension", "wine_name", "winery", "vintage", "region", "country", "wine_type", "grape_varietal", "tasting_notes", "wine_price", "occasion", "food_to_be_paired_with_wine"]
   errornote = ""
   
   for attempt in 1:5
@@ -389,12 +401,7 @@ function extractWineAttributes_1(a::T1, input::T2)::String where {T1<:agent, T2<
     ]
 
     # put in model format
-    prompt = GeneralUtils.formatLLMtext(_prompt; formatname="llama3instruct")
-    prompt *=
-      """
-      <|start_header_id|>assistant<|end_header_id|>
-      """
-
+    prompt = GeneralUtils.formatLLMtext(_prompt; formatname="qwen")
     response = a.func[:text2textInstructLLM](prompt)
     response = GeneralUtils.remove_french_accents(response)
 
@@ -753,8 +760,11 @@ function paraphrase(text2textInstructLLM::Function, text::String)
       response = replace(response, '$' => "USD")
       response = replace(response, '`' => "")
       response = GeneralUtils.remove_french_accents(response)
-      responsedict = GeneralUtils.textToDict(response, ["Paraphrase"],
-        rightmarker=":", symbolkey=true, lowercasekey=true)
+
+      header = ["Paraphrase:"]
+      dictkey = ["paraphrase"]
+      responsedict = GeneralUtils.textToDict(response, header; 
+                                            dictKey=dictkey, symbolkey=true)
 
       for i ∈ [:paraphrase]
         if length(JSON3.write(responsedict[i])) == 0