Merge pull request 'v0.7.1-fix_single_items_info_frontend' (#26) from v0.7.1-fix_single_items_info_frontend into v0.7.1

Reviewed-on: #26

Manifest.toml

@@ -2,7 +2,7 @@
 
 julia_version = "1.12.6"
 manifest_format = "2.0"
-project_hash = "a2c996ffe370e277cbff80af974d2701698f1b6c"
+project_hash = "1e317787f914f6d857feb7c23bb910d1185caed9"
 
 [[deps.Accessors]]
 deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "MacroTools"]
@@ -38,6 +38,12 @@ version = "1.1.3"
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
 version = "1.1.2"
 
+[[deps.ArnoldiMethod]]
+deps = ["LinearAlgebra", "Random", "StaticArrays"]
+git-tree-sha1 = "d57bd3762d308bded22c3b82d033bff85f6195c6"
+uuid = "ec485272-7323-5ecc-a04f-4719b315124d"
+version = "0.4.0"
+
 [[deps.ArrowTypes]]
 deps = ["Sockets", "UUIDs"]
 git-tree-sha1 = "404265cd8128a2515a81d5eae16de90fdef05101"
@@ -91,9 +97,9 @@ uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
 version = "0.7.8"
 
 [[deps.CommonSolve]]
-git-tree-sha1 = "99ee296f88c12485402e37c2fd025f95ae097637"
+git-tree-sha1 = "eeaad7cef88554c2fa56b5a3f71cfd5cb708c662"
 uuid = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
-version = "0.2.9"
+version = "0.2.11"
 
 [[deps.Compat]]
 deps = ["TOML", "UUIDs"]
@@ -181,6 +187,20 @@ git-tree-sha1 = "e98abef36d02a0ec385d68cd7dadbce9b28cbd88"
 uuid = "abce61dc-4473-55a0-ba07-351d65e31d42"
 version = "0.4.1"
 
+[[deps.Distances]]
+deps = ["LinearAlgebra", "Statistics", "StatsAPI"]
+git-tree-sha1 = "c7e3a542b999843086e2f29dac96a618c105be1d"
+uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
+version = "0.10.12"
+
+    [deps.Distances.extensions]
+    DistancesChainRulesCoreExt = "ChainRulesCore"
+    DistancesSparseArraysExt = "SparseArrays"
+
+    [deps.Distances.weakdeps]
+    ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
+    SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
 [[deps.Distributed]]
 deps = ["Random", "Serialization", "Sockets"]
 uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
@@ -226,9 +246,13 @@ version = "0.1.10"
 
 [[deps.FileIO]]
 deps = ["Pkg", "Requires", "UUIDs"]
-git-tree-sha1 = "91e0e5c68d02bcdaae76d3c8ceb4361e8f28d2e9"
+git-tree-sha1 = "6621fef488e496356c9c9625d0562c12a6070819"
 uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
-version = "1.16.5"
+version = "1.20.0"
+weakdeps = ["HTTP"]
+
+    [deps.FileIO.extensions]
+    HTTPExt = "HTTP"
 
 [[deps.FilePathsBase]]
 deps = ["Compat", "Dates"]
@@ -250,6 +274,7 @@ deps = ["LinearAlgebra"]
 git-tree-sha1 = "2f979084d1e13948a3352cf64a25df6bd3b4dca3"
 uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
 version = "1.16.0"
+weakdeps = ["PDMats", "SparseArrays", "StaticArrays", "Statistics"]
 
     [deps.FillArrays.extensions]
     FillArraysPDMatsExt = "PDMats"
@@ -257,12 +282,6 @@ version = "1.16.0"
     FillArraysStaticArraysExt = "StaticArrays"
     FillArraysStatisticsExt = "Statistics"
 
-    [deps.FillArrays.weakdeps]
-    PDMats = "90014a1f-27ba-587c-ab20-58faa44d9150"
-    SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
-    StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
-    Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
-
 [[deps.Future]]
 deps = ["Random"]
 uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820"
@@ -274,18 +293,31 @@ uuid = "a0844989-3bd2-4988-8bea-c9407ab0941b"
 version = "1.1.0"
 
 [[deps.GeneralUtils]]
-deps = ["CSV", "DataFrames", "DataStructures", "Dates", "Distributions", "HTTP", "JSON", "NATS", "PrettyPrinting", "Random", "Revise", "SHA", "UUIDs"]
+deps = ["CSV", "DataFrames", "DataStructures", "Dates", "Distributions", "Graphs", "HTTP", "JSON", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "SHA", "StringDistances", "UUIDs"]
-git-tree-sha1 = "7c0600c166a5deb2c607018a491c04eb25969c2e"
+git-tree-sha1 = "a75a088ee8e5faf10f554ca00748e0e6ca58d1ca"
 repo-rev = "main"
 repo-url = "https://git.yiem.cc/ton/GeneralUtils"
 uuid = "c6c72f09-b708-4ac8-ac7c-2084d70108fe"
-version = "0.4.9"
+version = "0.5.1"
+
+[[deps.Graphs]]
+deps = ["ArnoldiMethod", "DataStructures", "Inflate", "LinearAlgebra", "Random", "SimpleTraits", "SparseArrays", "Statistics"]
+git-tree-sha1 = "7eb45fe833a5b7c51cf6d89c5a841d5967e44be3"
+uuid = "86223c79-3864-5bf0-83f7-82e725a168b6"
+version = "1.14.0"
+
+    [deps.Graphs.extensions]
+    GraphsSharedArraysExt = "SharedArrays"
+
+    [deps.Graphs.weakdeps]
+    Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
+    SharedArrays = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
 
 [[deps.HTTP]]
 deps = ["Base64", "CodecZlib", "Dates", "EnumX", "PrecompileTools", "Random", "Reseau", "SHA", "URIs", "UUIDs", "Zlib_jll"]
-git-tree-sha1 = "eda1d37cb55d90a17d0957c75841138c88b361a1"
+git-tree-sha1 = "c2c808326222b6dc4bec295a83b55f79aeec98e0"
 uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
-version = "2.5.4"
+version = "2.5.5"
 
 [[deps.HashArrayMappedTries]]
 git-tree-sha1 = "2eaa69a7cab70a52b9687c8bf950a5a93ec895ae"
@@ -310,6 +342,11 @@ git-tree-sha1 = "cf8234411cbeb98676c173f930951ea29dca3b23"
 uuid = "a303e19e-6eb4-11e9-3b09-cd9505f79100"
 version = "0.2.4"
 
+[[deps.Inflate]]
+git-tree-sha1 = "d1b1b796e47d94588b3757fe84fbf65a5ec4a80d"
+uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9"
+version = "0.1.5"
+
 [[deps.InlineStrings]]
 git-tree-sha1 = "8f3d257792a522b4601c24a577954b0a8cd7334d"
 uuid = "842dd82b-1e85-43dc-bf29-5d0ee9dffc48"
@@ -645,15 +682,17 @@ version = "0.4.2"
 
 [[deps.PrettyTables]]
 deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "REPL", "Reexport", "StringManipulation", "Tables"]
-git-tree-sha1 = "624de6279ab7d94fc9f672f0068107eb6619732c"
+git-tree-sha1 = "ebf455bb866ee6737030e3d3816bb6a0683c4325"
 uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
-version = "3.3.2"
+version = "3.4.0"
 
     [deps.PrettyTables.extensions]
+    PrettyTablesExcelExt = "XLSX"
     PrettyTablesTypstryExt = "Typstry"
 
     [deps.PrettyTables.weakdeps]
     Typstry = "f0ed7684-a786-439e-b1e3-3b82803b501e"
+    XLSX = "fdbf4ff8-1666-58a4-91e7-1b58723a45e0"
 
 [[deps.Printf]]
 deps = ["Unicode"]
@@ -734,9 +773,9 @@ version = "0.5.1+0"
 
 [[deps.Roots]]
 deps = ["Accessors", "CommonSolve", "Printf"]
-git-tree-sha1 = "ed45bcc7cf3c8887595b973f2b1efbe91dcc50ec"
+git-tree-sha1 = "a7caaf7ba8cf307112ca443784d1b56b4a591455"
 uuid = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
-version = "3.0.1"
+version = "3.0.5"
 
     [deps.Roots.extensions]
     RootsChainRulesCoreExt = "ChainRulesCore"
@@ -760,11 +799,11 @@ version = "0.7.0"
 
 [[deps.SQLLLM]]
 deps = ["CSV", "DataFrames", "DataStructures", "Dates", "FileIO", "GeneralUtils", "HTTP", "JSON", "LLMMCTS", "LibPQ", "PrettyPrinting", "Random", "Revise", "StatsBase", "Tables", "URIs", "UUIDs"]
-git-tree-sha1 = "2807a768907f59308d8d71ece599037b0a66b0a5"
+git-tree-sha1 = "bae2fd2e2b087753fbb3415896be41df1ae0eb90"
 repo-rev = "main"
 repo-url = "https://git.yiem.cc/ton/SQLLLM"
 uuid = "2ebc79c7-cc10-4a3a-9665-d2e1d61e63d3"
-version = "0.2.7"
+version = "0.2.8"
 
 [[deps.SQLStrings]]
 git-tree-sha1 = "55de0530689832b1d3d43491ee6b67bd54d3323c"
@@ -793,6 +832,12 @@ version = "1.4.10"
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 version = "1.11.0"
 
+[[deps.SimpleTraits]]
+deps = ["InteractiveUtils", "MacroTools"]
+git-tree-sha1 = "7ddb0b49c109481b046972c0e4ab02b2127d6a75"
+uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d"
+version = "0.9.6"
+
 [[deps.Sockets]]
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 version = "1.11.0"
@@ -826,6 +871,25 @@ version = "2.8.0"
     [deps.SpecialFunctions.weakdeps]
     ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 
+[[deps.StaticArrays]]
+deps = ["LinearAlgebra", "PrecompileTools", "Random", "StaticArraysCore"]
+git-tree-sha1 = "246a8bb2e6667f832eea063c3a56aef96429a3db"
+uuid = "90137ffa-7385-5640-81b9-e52037218182"
+version = "1.9.18"
+
+    [deps.StaticArrays.extensions]
+    StaticArraysChainRulesCoreExt = "ChainRulesCore"
+    StaticArraysStatisticsExt = "Statistics"
+
+    [deps.StaticArrays.weakdeps]
+    ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
+    Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
+
+[[deps.StaticArraysCore]]
+git-tree-sha1 = "6ab403037779dae8c514bad259f32a447262455a"
+uuid = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
+version = "1.4.4"
+
 [[deps.Statistics]]
 deps = ["LinearAlgebra"]
 git-tree-sha1 = "ae3bb1eb3bba077cd276bc5cfc337cc65c3075c0"
@@ -862,6 +926,12 @@ version = "2.2.0"
     ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
     InverseFunctions = "3587e190-3f89-42d0-90ee-14403ec27112"
 
+[[deps.StringDistances]]
+deps = ["Distances", "StatsAPI"]
+git-tree-sha1 = "cd83a04baf746e3b43b83c61b7de77ab0409b80a"
+uuid = "88034a9c-02f8-509d-84a9-84ec65e18404"
+version = "1.0.0"
+
 [[deps.StringManipulation]]
 deps = ["PrecompileTools"]
 git-tree-sha1 = "d05693d339e37d6ab134c5ab53c29fce5ee5d7d5"
@@ -983,10 +1053,10 @@ uuid = "76eceee3-57b5-4d4a-8e66-0e911cebbf60"
 version = "1.6.1"
 
 [[deps.YiemAgent]]
-deps = ["CSV", "DataFrames", "DataStructures", "Dates", "GeneralUtils", "HTTP", "JSON", "LLMMCTS", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "Serialization", "URIs", "UUIDs"]
+deps = ["CSV", "DataFrames", "DataStructures", "Dates", "GeneralUtils", "HTTP", "JSON", "LLMMCTS", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "SQLLLM", "Serialization", "URIs", "UUIDs"]
 path = "."
 uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2"
-version = "0.5.0"
+version = "0.6.5"
 
 [[deps.Zlib_jll]]
 deps = ["Libdl"]

Project.toml

@@ -1,9 +1,10 @@
 name = "YiemAgent"
 uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2"
-version = "0.5.0"
+version = "0.7.0"
 authors = ["narawat lamaiin <narawat@outlook.com>"]
 
 [deps]
+Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -23,11 +24,12 @@ URIs = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
+Base64 = "1.11.0"
 CSV = "0.10.15"
 DataFrames = "1.7.0"
-GeneralUtils = "0.4.9"
+GeneralUtils = "0.5.1"
 HTTP = "2.4.0"
 JSON = "1.6.1"
 LLMMCTS = "0.1.5"
 NATS = "0.1.0"
-SQLLLM = "0.2.7"
+SQLLLM = "0.2.8"

aisystemprompt.md

@@ -54,7 +54,7 @@ Your name is $(newAgent.name). You are a helpful sommelier for website-based $(n
 # Available Actions
 
 - **CHAT_BOX** which you can use to talk with the user.
-- **CHECK_WINE** allows you to check information about wines you want in your inventory's database. The input is text that specify supported search criteria includeing: retailer_name, wine price, winery, name, vintage, region, country, type, grape varietal, tasting notes, occasion, food pairing, intensity, tannin, sweetness, and acidity.
+- **SEARCH_WINE_DATABASE** allows you to check information about wines you want in your inventory's database. The input is text that specify supported search criteria includeing: retailer_name, wine price, winery, name, vintage, region, country, type, grape varietal, tasting notes, occasion, food pairing, intensity, tannin, sweetness, and acidity.
     - Example query 1: "Dry, full-bodied red wine from 1) region: Burgundy, country: France or 2) region: Tuscany, country: Italy. Grape varietal: Merlot or Syrah. price 100 to 1000 USD."
     - Example query 2: "Red or white wine, medium tannin, price under 700 USD"
     - Example query 3: "white wine, region: Tuscany or Bordeaux, country: Italy or France

appconfig.json

@@ -6,6 +6,7 @@
   "testingOrProduction": "testing",
   "agentId": "2b74b87a-5413-4fe2-a4d3-405891051680",
   "agentCentralConfigSubject": "/yiem/hq/agent/sommelier/backend/config/api/v1.1",
+  "this_service_name": "agent_backend",
   "this_service_input_channel": {
     "mqtt": [
         "/yiem/hq/agent/sommpanion/backend/db/api_v1"
@@ -16,7 +17,7 @@
   },
   "agentRole": "sommelier",
   "organization": "yiem_hq",
-  "externalService": {
+  "externalservice": {
     "servicesloadbalancer": {
       "nats": "sommpanion.backend.servicesloadbalancer.v1.inbox" 
     },
@@ -35,15 +36,15 @@
       "description": "A database connection info for LibPQ client",
       "url": "192.168.88.106:5432",
       "dbname": "winedb",
-      "user": "yiemtechnologies@gmail.com",
+      "user": "admin",
-      "password": "yiemtechnologies@Postgres_0.0"
+      "password": "admin@Sommpanion_0.0"
     },
     "sommpanion_vectordb" : {
       "description": "A wine database connection info for LibPQ client",
       "url": "192.168.88.106:5433",
       "dbname": "vectordb",
-      "user": "yiemtechnologies@gmail.com",
+      "user": "admin",
-      "password": "yiemtechnologies@Postgres_0.0"
+      "password": "admin@Sommpanion_0.0"
     },
     "fileserver": {
     "description": "temporary file server",

etc.jl

@@ -1,13 +1,111 @@
+using HTTP, JSON, URIs, Random, PrettyPrinting, UUIDs, Dates, DataFrames, DataStructures
+using GeneralUtils, SQLLLM, YiemAgent
+
+config = JSON.parsefile("./appconfig.json")
+host_url, _port = split(config["externalservice"]["sommpanion_db"]["url"], ':')
+port = parse(Int, _port)
+dbname = "winedb"
+user = config["externalservice"]["sommpanion_db"]["user"]
+password = config["externalservice"]["sommpanion_db"]["password"]
+pg_conn_str = "host=$host_url port=$port dbname=$dbname user=$user password=$password"
+
+  function execute_sql_winedb(sql::T) where {T<:AbstractString}
+    host_url, _port = split(config["externalservice"]["sommpanion_db"]["url"], ':')
+    port = parse(Int, _port)
+    dbname = "winedb"
+    user = config["externalservice"]["sommpanion_db"]["user"]
+    password = config["externalservice"]["sommpanion_db"]["password"]
+    db_connection = LibPQ.Connection("host=$host_url port=$port dbname=$dbname user=$user password=$password")
+    result = nothing
+    try
+      result = LibPQ.execute(db_connection, sql)  
+    catch e
+      LibPQ.close(db_connection)
+    end
+    
+    LibPQ.close(db_connection)
+    return result
+  end
+
+
+
+sql =
+"""
+SELECT T1.winery, T1.wine_name, T1.wine_id, T1.vintage, T1.region, T1.country, T1.wine_type, T1.grape, T1.serving_temperature, T1.sweetness, T1.intensity, T1.tannin, T1.acidity, T1.tasting_notes, T2.price, T2.currency, T1.image_url, T3.retailer_name, T3.retailer_id FROM "wine" AS T1 JOIN "retailer_wine" AS T2 ON T1.wine_id = T2.wine_id JOIN "retailer" AS T3 ON T2.retailer_id = T3.retailer_id WHERE T1.wine_name = 'Montrachet Grand Cru' AND T1.winery = 'Domaine Jacques Prieur' AND T3.retailer_name = 'Yiem Wines Ltd' AND T3.retailer_id = 'f54eab6b-7650-4448-b009-c53f3efbcc3b';
+"""
+
+textresult, sql_result_raw, _, _ = YiemAgent.SQLexecution(execute_sql_winedb, sql)
+result_vec = GeneralUtils.dfToVectorDict(sql_result_raw)
+
+for d in result_vec
+  wine_name = d["wine_name"]
+  image_url_json_str = d["image_url"]
+  image_url_json_obj = JSON.parse(image_url_json)
+  base_url = "http://192.168.88.106:8080/"
+  image_base64 =
+    if haskey(image_url_json_obj, "bottle")
+      url = base_url * image_url_json_obj["bottle"]
+      image_data = HTTP.get(url)  # vector{int} data
+      image_base64_string = base64encode(image_data)
+    else
+      nothing
+    end
+  d["image"] = image_base64
+end
+
+
+
+
+
+
+
+
+
+
+using LibPQ
+using Tables
+
+"""
+    update_car_regions_one_by_one(conn::LibPQ.Connection, target_word::String)
+
+Iterates through all rows in the 'car' table where the region is "German", 
+and updates them one-by-one to the `target_word`.
+"""
+function update_car_regions_one_by_one(pg_conn_str::String, replace_word::String , target_word::String)
+  conn = LibPQ.Connection(pg_conn_str)
+    # 1. Fetch the target rows. Assumes 'id' is the primary key.
+    # We select the ID to target rows individually during the update step.
+    select_query = "SELECT id FROM car WHERE region = '$replace_word';"
+    
+    result = execute(conn, select_query)
+    rows = Tables.rows(result)
+    
+    # 2. Prepare the update statement for execution reuse
+    # Using explicit types for parameter placeholders ($1, $2)
+    update_query = "UPDATE car SET region = \$1 WHERE id = \$2;"
+    
+    println("Starting one-by-one update...")
+    updated_count = 0
+
+    # 3. Iterate through rows one-by-one
+    for row in rows
+        # LibPQ row values are accessed via properties or column names
+        row_id = row.id 
+        
+        # Execute the parameterized statement safely
+        execute(conn, update_query, [target_word, row_id])
+        updated_count += 1
+    end
+
+    println("Successfully updated \$updated_count rows.")
+    return updated_count
+end
+
+
+
+
 
 
 
-d = Dict(
-  "hello"=> 555,
-  "world"=> Dict(
-    "name"=> "ton"
-  )
-)
 
-x = 55
 
-@info "YiemAgent think() 1 " d x @__LINE__

src/interface.jl

@@ -68,14 +68,14 @@ julia> result = decisionMaker(agent)
 
 OrderedDict{String, Any} with 4 entries:
   "plan"          => "The user provided an image of a sparkling white wine (Asolo Prosecco Bella Principessa from Italy) and requested a search for similar wines in the inventory. According to store guidelines, I must st…
-  "action_name"   => "CHECK_WINE"
+  "action_name"   => "SEARCH_WINE_DATABASE"
   "action_input"  => "Sparkling white wine from Italy"
   "action_result" => "1) winery: Terrazze dell Etna, wine_name: Rose Brut.
 ```
 """
 function decisionMaker(a::T; recentevents::Integer=20, maxattempt=10
   ) where {T<:agent}
-
+  @info "YiemAgent decisionMaker() start " @__LINE__
   # lessonDict = copy(JSON.parsefile("lesson.json"))
 
   # lesson =
@@ -123,9 +123,7 @@ function decisionMaker(a::T; recentevents::Integer=20, maxattempt=10
   response = nothing # placeholder for show when error msg show up
 
   for attempt in 1:maxattempt
-    if attempt > 1
+
-      println("\nYiemAgent decisionMaker() attempt $attempt/$maxattempt ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
-    end
     
     msg = Dict(
       "model" => "gemma-4-E4B-it-UD-Q4_K_XL",
@@ -134,12 +132,13 @@ function decisionMaker(a::T; recentevents::Integer=20, maxattempt=10
     )
 
     response = a.context.text2textInstructLLM(a.id, msg)
+
     response = GeneralUtils.clean_json_response(response)
     response = GeneralUtils.remove_french_accents(response)
     think, response = GeneralUtils.extractthink(response)
     response = String(split(response, ", observation")[1])  # in case LLM generate observation key which it isn't supposed to
     response = strip(response)
-    
+
     # dollar sign in Julia means string interpolation
     while occursin('$', response)
       response = replace(response, '$' => "USD")
@@ -154,30 +153,30 @@ function decisionMaker(a::T; recentevents::Integer=20, maxattempt=10
         println("\nERROR YiemAgent decisionMaker() failed to parse response: $response ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
         continue
       end
-
+    else
-    # fall back to normal text because LLM default to natural chat when it didn't use action_call
+      println("\nERROR YiemAgent decisionMaker() $errornote --(not qualify response)-> $responsedict ", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
-    else  
-      try
-        responsedict = OrderedDict(
-          "plan"=> "I will talk to the user",
-          "action_name"=> "CHAT_BOX",
-          "action_input"=> response[2:end-1]  # remove { } at the front and back that added by clean_json_response
-          )
-      catch e
-        println("\nERROR YiemAgent decisionMaker(). $e --(not qualify response)-> $response", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
-        continue
-      end
-    end
-
-    # check whether all answer's key points are in responsedict
-    ispass, errormsg = GeneralUtils.checkAgentResponse_JSON(responsedict, requiredKeys)
-    if !ispass
-      errornote = errormsg
-      println("\nERROR YiemAgent decisionMaker() $errornote --(not qualify response)-> $responsedict", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
       continue
     end
 
-    # if responsedict["action_name"] ∉ ["CHAT_BOX", "CHECK_WINE", "PRESENT_WINE_GUIDELINE", "END_CONVER_GUIDELINE"]
+    # check whether all answer's key points are in responsedict
+    println("\n---")
+    println(responsedict)
+    println("---\n")
+    ispass, errormsg = GeneralUtils.checkAgentResponse_JSON(responsedict, requiredKeys)
+
+    if !ispass
+      errornote = errormsg
+      println("\nERROR YiemAgent decisionMaker() $errornote --(not qualify response)-> $responsedict ", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
+      continue
+    end
+
+    if responsedict["action_input"] == "CHAT_BOX" && 
+      occursin("similar", responsedict["action_input"])
+
+      continue
+    end
+
+    # if responsedict["action_name"] ∉ ["CHAT_BOX", "SEARCH_WINE_DATABASE", "PRESENT_WINE_GUIDELINE", "END_CONVER_GUIDELINE"]
     #   errornote = "Your previous attempt didn't use the given functions"
     #   println("\nERROR YiemAgent decisionMaker() $errornote --(not qualify response)--> $(responsedict["action_name"])", @__FILE__, ":", @__LINE__, " $(Dates.now())")
     #   continue
@@ -185,7 +184,7 @@ function decisionMaker(a::T; recentevents::Integer=20, maxattempt=10
 
     # println("\nYiem decisionMaker() ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
     # pprintln(responsedict)
-
+    @info "YiemAgent decisionMaker() end " @__LINE__
     return responsedict
   end
   error("DecisionMaker failed to generate a thought ", response)
@@ -317,7 +316,7 @@ function evaluator(a::T1, timeline, decisiondict, evaluateecontext
     ispass, errormsg = checkAgentResponse_JSON(responsedict, requiredKeys)
     if !ispass
       errornote = errormsg
-      println("\nERROR YiemAgent evaluator() $errornote --(not qualify response)> $responsedict", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
+      println("\nERROR YiemAgent evaluator() $errornote --(not qualify response)> $responsedict ", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
       continue
     end
 
@@ -360,7 +359,7 @@ message => Dict(
 function conversation(a::sommelier; userinput::Union{Dict{String, Any}, JSON.Object{String, Any}},
                       maximumMsg=50, max_think_loop::Integer=3)
   
-  @info "YiemAgent conversation() 1 " @__LINE__
+  @info "YiemAgent conversation() start " @__LINE__
   userinput = GeneralUtils.dictify(userinput; keytype=String, sort_order=["text"])
 
   # find text in usermsg
@@ -376,7 +375,7 @@ function conversation(a::sommelier; userinput::Union{Dict{String, Any}, JSON.Obj
     clearhistory(a)
     return "Okay. What shall we talk about?"
   else
-    @info "YiemAgent conversation() 2 " @__LINE__
+
     # add usermsg to a.chathistory but how do I handle images?
     addNewMessage(a, "user", userinput; maximumMsg=maximumMsg)
 
@@ -385,30 +384,123 @@ function conversation(a::sommelier; userinput::Union{Dict{String, Any}, JSON.Obj
     while true
       loopcount += 1
       if loopcount > max_think_loop
-        @info "YiemAgent conversation() 2-1 think count $loopcount " @__LINE__
-        r = generatechat!(a)
-        @info "YiemAgent conversation() 2-2 think count $loopcount " @__LINE__
-        return r
-      end
 
-      @info "YiemAgent conversation() 2-3 think count $loopcount " @__LINE__
+        thoughtdict, result_raw = generatechat!(a)
-      thoughtdict, _ = think(a)
+
-      if thoughtdict["action_name"] ∈ ["CHAT_BOX"]
+
-        @info "YiemAgent conversation() 2-4 think count $loopcount " @__LINE__
         assistant_response = Dict{String, Any}(
           "role" => "assistant",
           "content" => [Dict("type" => "text", "text" => thoughtdict["action_input"]),]
         )
         addNewMessage(a, "assistant", assistant_response; maximumMsg=maximumMsg)
-        return thoughtdict["action_input"]
 
-      else
+        items_info = []
+        send_item_ind = []  # index of the item being send to frontend
+        if haskey(a.memory["shortmem"], "items_info")
+
+          for (i, item) in enumerate(a.memory["shortmem"]["items_info"])
+            if haskey(item, "wine_name") && occursin(item["wine_name"], thoughtdict["action_input"])
+              push!(items_info, deepcopy(item))
+              push!(send_item_ind, i)
+
+            end
+          end
+          # remove sent items
+          deleteat!(a.memory["shortmem"]["items_info"], send_item_ind)
+
+        end
+        
+        response_to_frontend = Dict{String, Any}(
+          "role" => "assistant",
+          "content" => [
+              Dict("type" => "text", "text" => thoughtdict["action_input"]),
+              Dict(
+                "type" => "items_info",
+                "items_info" => items_info
+              ),
+            ]
+        )
+
+        return response_to_frontend
+      end
+
+
+      thoughtdict, result_raw = think(a)
+
+      if thoughtdict["action_name"] ∈ ["CHAT_BOX"]
+
+        
+        assistant_response = Dict{String, Any}(
+          "role" => "assistant",
+          "content" => [Dict("type" => "text", "text" => thoughtdict["action_input"]),]
+        )
+        addNewMessage(a, "assistant", assistant_response; maximumMsg=maximumMsg)
+
+        items_info = []
+        send_item_ind = []  # index of the item being send to frontend
+        if haskey(a.memory["shortmem"], "items_info")
+
+          for (i, item) in enumerate(a.memory["shortmem"]["items_info"])
+            if haskey(item, "wine_name") && occursin(item["wine_name"], thoughtdict["action_input"])
+              push!(items_info, deepcopy(item))
+              push!(send_item_ind, i)
+
+            end
+          end
+          # remove sent items
+          deleteat!(a.memory["shortmem"]["items_info"], send_item_ind)
+
+        end
+        
+        response_to_frontend = Dict{String, Any}(
+          "role" => "assistant",
+          "content" => [
+              Dict("type" => "text", "text" => thoughtdict["action_input"]),
+              Dict(
+                "type" => "items_info",
+                "items_info" => items_info
+              ),
+            ]
+        )
+
+        """ intended message to send to frontend should have the following format. 
+        response_to_frontend = Dict{String, Any}(
+          "role" => "assistant",
+          "content" => [
+            Dict("type" => "text", "text" => "assistant_text_response"),
+            Dict(
+              "type" => "items_info",
+              "items_info" => [
+                          Dict(
+                            "wine_name"=> "wine name 1",
+                            "wine_id"=> "...",
+                            "image"=> base64 encoded image,
+                            ...
+                          ),
+                          Dict(
+                            "wine_name"=> "wine name 2",
+                            "wine_id"=> "...",
+                            "image"=> base64 encoded image,
+                            ...
+                          ),
+                        ]
+            ),
+          ]
+        )
+        """
+        
+
+        return response_to_frontend
+      else  # still in action
+
         action_name = thoughtdict["action_name"]
         action_input = thoughtdict["action_input"]
+
         action_call = Dict{String, Any}(
             "role" => "action_call",
             "content" => [Dict("type" => "text", "text" => "{action_name: $action_name, action_input: $action_input}"),]
           )
+
         addNewMessage(a, "action_call", action_call; maximumMsg=maximumMsg)
 
         action_result = thoughtdict["action_result"]
@@ -416,7 +508,9 @@ function conversation(a::sommelier; userinput::Union{Dict{String, Any}, JSON.Obj
             "role" => "action_result",
             "content" => [Dict("type" => "text", "text" => "$action_result"),]
           )
+
         addNewMessage(a, "actionresult", actionresult; maximumMsg=maximumMsg)
+        @info "YiemAgent conversation() end think count $loopcount " @__LINE__
       end
     end
   end
@@ -436,44 +530,51 @@ julia>
 """
 function think(a::T)::NamedTuple{(:thoughtdict, :result_raw), Tuple{OrderedDict, Any}} where {T<:agent}
   # a.memory[:recap] = generateSituationReport(a, a.context["text"2textInstructLLM]; skiprecent=0)
+  @info "YiemAgent think() start " @__LINE__
   thoughtdict = decisionMaker(a)
   @info "YiemAgent think() 1 " @__LINE__
-  # pprintln(thoughtdict)
+  @show thoughtdict
+  println("---\n")
 
   result_raw = nothing
   if thoughtdict["action_name"] ∈ ["CHAT_BOX"]
-    @info "YiemAgent think() 2 " @__LINE__
+
-    thoughtdict, result_raw = generatechat!(a)
+    # sometime CHAT_BOX input is too short. 
-    
+    # if thoughtdict["action_input] < 20 character, use generatechat!()
+    if length(thoughtdict["action_input"]) < 20 
+      thoughtdict, result_raw = generatechat!(a)   
+    else
+      thoughtdict["action_result"] = "Action result is the next user dialogue."
+      result_raw = thoughtdict["action_input"]
+    end 
+
   elseif thoughtdict["action_name"] == "END_CONVER_GUIDELINE"
-    @info "YiemAgent think() 3 " @__LINE__
+
     thoughtdict, result_raw = end_conversation_guideline!(a, thoughtdict)
     
   elseif thoughtdict["action_name"] ∈ ["WINE_PRESENTATION_GUIDELINE"]
-    @info "YiemAgent think() 4 " @__LINE__
+
     thoughtdict, result_raw =  wine_presentation_guideline!(a, thoughtdict)
+
+  elseif thoughtdict["action_name"] == "SEARCH_WINE_DATABASE" 
+
+    thoughtdict, result_raw = search_wine_database!(a, thoughtdict; useSQLLLM=false)
+    if result_raw !== nothing && result_raw isa Vector
+      if haskey(a.memory["shortmem"], "items_info")
+        append!(a.memory["shortmem"]["items_info"], result_raw)
+      else
+        a.memory["shortmem"]["items_info"] = result_raw
+      end
+    end
     
-
-  elseif thoughtdict["action_name"] == "CHECK_WINE" 
-    @info "YiemAgent think() 5 " @__LINE__
-    thoughtdict, result_raw = checkwine!(a, thoughtdict; useSQLLLM=false)
-
   else
-    @info "YiemAgent think() 6 " @__LINE__
+
     error("condition is not defined ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
   end
 
-  # max_ind =
+  @info "YiemAgent think() end " @__LINE__
-  #   if length(a.memory["shortmem"]) == 0
+  @show thoughtdict
-  #     0
+  println("---\n")
-  #   else
-  #     k = keys(a.memory["shortmem"])
-  #     maximum(parse.(Int, k))
-  #   end
-  # a.memory["shortmem"]["$(max_ind + 1)"] = thoughtdict
-
-  pprintln(thoughtdict)
-  @info "YiemAgent think() 7 " @__LINE__
   return (thoughtdict=thoughtdict, result_raw=result_raw)
 end
 
@@ -550,7 +651,7 @@ end
 #PENDING
 function generatechat!(a::T; maxattempt::Integer=10
   )::NamedTuple{(:thoughtdict, :result_raw), Tuple{OrderedDict, Any}} where {T<:agent}
-
+  @info "YiemAgent generatechat!() start " @__LINE__
   # lessonDict = copy(JSON.parsefile("lesson.json"))
 
   # lesson =
@@ -633,7 +734,7 @@ function generatechat!(a::T; maxattempt::Integer=10
       "action_name": "...",
       "action_input": "..."
     """
-  
+
   system_msg = Dict(
       "role" => "system",
       "content" => [
@@ -664,8 +765,7 @@ function generatechat!(a::T; maxattempt::Integer=10
     response = GeneralUtils.clean_json_response(response)
     response = GeneralUtils.remove_french_accents(response)
     think, response = GeneralUtils.extractthink(response)
-    response = String(split(response, ", observation")[1])  # in case LLM generate observation key which it isn't supposed to
+
-    
     response = strip(response)
 
     responsedict = nothing
@@ -677,30 +777,21 @@ function generatechat!(a::T; maxattempt::Integer=10
         println("\nERROR YiemAgent generatechat() failed to parse response: $response ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
         continue
       end
-
+    else
-    # fall back to normal text because LLM default to natural chat when it didn't use action_call
+      println("\nERROR YiemAgent generatechat() $errornote --(not qualify response)> $responsedict ", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
-    else  
+      continue
-      try
-        responsedict = OrderedDict(
-          "plan"=> "I will talk to the user",
-          "action_name"=> "CHAT_BOX",
-          "action_input"=> response[2:end-1]  # remove { } at the front and back that added by clean_json_response
-          )
-      catch e
-        println("\nERROR YiemAgent decisionMaker(). $e --(not qualify response)-> $response", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
-        continue
-      end
     end
 
+
     # check whether all answer's key points are in responsedict
     ispass, errormsg = GeneralUtils.checkAgentResponse_JSON(responsedict, requiredKeys)
     if !ispass
       errornote = errormsg
-      println("\nERROR YiemAgent generatechat() $errornote --(not qualify response)> $responsedict", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
+      println("\nERROR YiemAgent generatechat() $errornote --(not qualify response)> $responsedict ", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
       continue
     end
 
-    # if responsedict["action_name"] ∉ ["CHAT_BOX", "CHECK_WINE", "PRESENT_WINE_GUIDELINE", "END_CONVER_GUIDELINE"]
+    # if responsedict["action_name"] ∉ ["CHAT_BOX", "SEARCH_WINE_DATABASE", "PRESENT_WINE_GUIDELINE", "END_CONVER_GUIDELINE"]
     #   errornote = "Your previous attempt didn't use the given functions"
     #   println("\nERROR YiemAgent decisionMaker() $errornote --(not qualify response)--> $(responsedict["action_name"])", @__FILE__, ":", @__LINE__, " $(Dates.now())")
     #   continue
@@ -708,7 +799,8 @@ function generatechat!(a::T; maxattempt::Integer=10
 
     # println("\nYiem decisionMaker() ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
     # pprintln(responsedict)
-
+    responsedict["action_result"] = "Action result is the next user dialogue."
+    @info "YiemAgent generatechat!() end " @__LINE__
     return (thoughtdict=responsedict, result_raw=responsedict["action_input"])
   end
   error("YiemAgent generatechat() failed to generate a thought ", response)

src/llmfunction.jl

@@ -1,10 +1,11 @@
 module llmfunction
 
-export  virtualWineUserChatbox, jsoncorrection, checkwine!, # recommendbox,
+export  virtualWineUserChatbox, jsoncorrection, search_wine_database!, # recommendbox,
         virtualWineUserRecommendbox, userChatbox, userRecommendbox, extractWineAttributes_1,
-        extractWineAttributes_2, paraphrase
+        extractWineAttributes_2, paraphrase, SQLexecution
 
-using HTTP, JSON, URIs, Random, PrettyPrinting, UUIDs, Dates, DataFrames, DataStructures
+using HTTP, JSON, URIs, Random, PrettyPrinting, UUIDs, Dates, DataFrames, DataStructures,
+      Base64
 using GeneralUtils, SQLLLM
 using ..type, ..util
 
@@ -211,7 +212,7 @@ pushfirst!(virtualCustomerChatHistory, Dict("name"=> "system", "text"=> systemms
     receiverName= "text2textinstruct",
     mqttBroker= config["mqttServerInfo"]["broker"],
     mqttBrokerPort= config["mqttServerInfo"]["port"],
-    msgId = string(uuid4()) #CHANGE remove after testing finished
+    msgId = string(uuid4()) # remove after testing finished
   )
 
   outgoingMsg = Dict(
@@ -282,15 +283,15 @@ julia> result = checkinventory(agent, input)
 "{"wine 1": {\"Winery\": \"Pichon Baron\", \"wine name\": \"Pauillac (Grand Cru Classé)\", \"grape variety\": \"Cabernet Sauvignon\", \"year\": 2010, \"price\": \"125 USD\", \"stock ID\": \"ar-17\"}, }"
 ```
 """
-function checkwine!(a::T, thoughtdict::AbstractDict; useSQLLLM::Bool=false
+function search_wine_database!(a::T, thoughtdict::AbstractDict; useSQLLLM::Bool=false
   )::NamedTuple{(:thoughtdict, :result_raw), Tuple{OrderedDict, Any}} where {T<:agent}
 
   println("\ncheckinventory order: $(thoughtdict["action_input"]) ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
   wineattributes_1 = extractWineAttributes_1(a, thoughtdict["action_input"])
   wineattributes_2 = extractWineAttributes_2(a, thoughtdict["action_input"])
 
-  retrieve_attributes = ["winery", "wine_name", "wine_id", "vintage", "region", "country", "wine_type", "grape", "serving_temperature", "sweetness", "intensity", "tannin", "acidity", "tasting_notes", "price", "currency"]
+  retrieve_attributes = ["winery", "wine_name", "wine_id", "vintage", "region", "country", "wine_type", "grape", "serving_temperature", "sweetness", "intensity", "tannin", "acidity", "tasting_notes", "price", "currency", "image_url", "retailer_name", "retailer_id"]
-  _inventoryquery = "$wineattributes_1, $wineattributes_2"
+  _inventoryquery = "$(thoughtdict["action_input"]), $wineattributes_1, $wineattributes_2, retailer_name: $(a.retailername), retailerid: $(a.retailerid)"
   inventoryquery = "Retrieves $retrieve_attributes of wines that match the following criteria - {$_inventoryquery}"
   println("\ncheckinventory input: $inventoryquery ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
 
@@ -308,11 +309,34 @@ function checkwine!(a::T, thoughtdict::AbstractDict; useSQLLLM::Bool=false
 
     # direct query with possible sql instead of SQLLLM. 
     sql = generatesql(a, inventoryquery)
-    textresult, result_raw, _, _ = SQLexecution(a.context.executeSQL, sql)
+    println("\nSQL: $sql ", @__FILE__, ":", @__LINE__, " $(Dates.now()) \n")
+    textresult, sql_result_df, success, _ = SQLexecution(a.context.executeSQL, sql)
+
+    items = nothing
+    if sql_result_df !== nothing
+      result_vec = GeneralUtils.dfToVectorDict(sql_result_df)
+
+      # get image
+      for d in result_vec
+        image_url_json_str = d["image_url"]
+        image_url_json_obj = JSON.parse(image_url_json_str)
+        base_url = "http://192.168.88.106:8080/"
+        if haskey(image_url_json_obj, "bottle")
+          url = base_url * image_url_json_obj["bottle"]
+          image_data = HTTP.get(url)  # vector{int} data
+          image_base64_string = base64encode(image_data.body)
+          d["image"] = image_base64_string
+        else
+          d["image"] = nothing
+        end
+      end
+      items = result_vec  # image is added to each item
+    end
+
     thoughtdict["action_result"] = textresult
   end
 
-  return (thoughtdict=thoughtdict, result_raw=result_raw)
+  return (thoughtdict=thoughtdict, result_raw=items)
 end
 
 
@@ -324,11 +348,12 @@ function generatesql(a::T, searchterm::String,
     """
     # database_search_guidelines
       - Keep SQL queries focused only on the provided information.
-      - Do not create any table in the database
+      - Use wildcard character (%) to search more effectively.
+      - Do not create any table in the database.
       - A junction table can be used to link tables together. Another use case is for filtering data.
       - If you can't find a single table that can be used to answer the user's search term, try joining multiple tables to see if you can obtain the answer.
       - Text information in the database usually stored in lower case. If your search returns empty, try using lower case to search.
-      - If there is no search result from the database, remove the restrictive criteria until a search result is available, and proceed from there.
+      - Overly strict condition usually yields empth result
 
     # situation
       At each round of conversation, you will be given the following:
@@ -358,133 +383,143 @@ function generatesql(a::T, searchterm::String,
         Do not wrap the SQL as it will be executed against the database directly and SQL must be ended with ';'.
     """
 
-  table_schema =
+  # table_schema =
-    """
+  #   """
-    create table customer (
+  #   create table customer (
-      customer_id uuid primary key default gen_random_uuid (),
+  #     customer_id uuid primary key default gen_random_uuid (),
-      customer_firstname varchar(128),
+  #     customer_firstname varchar(128),
-      customer_lastname varchar(128),
+  #     customer_lastname varchar(128),
-      customer_displayname varchar(128) not null,
+  #     customer_displayname varchar(128) not null,
-      customer_username varchar(128),
+  #     customer_username varchar(128),
-      customer_password varchar(128),
+  #     customer_password varchar(128),
-      customer_gender varchar(128),
+  #     customer_gender varchar(128),
-      country	varchar(128),
+  #     country	varchar(128),
-      telephone varchar(128),
+  #     telephone varchar(128),
-      email varchar(128) not null,
+  #     email varchar(128) not null,
-      customer_birthdate varchar(128),
+  #     customer_birthdate varchar(128),
-      note text,
+  #     note text,
       
-      other_attributes jsonb,
+  #     other_attributes jsonb,
-      created_time timestamptz default current_timestamp,
+  #     created_time timestamptz default current_timestamp,
-      updated_time timestamptz default current_timestamp,
+  #     updated_time timestamptz default current_timestamp,
-      description	text
+  #     description	text
-    );
+  #   );
 
-    create table retailer (
+  #   create table retailer (
-      retailer_id uuid primary key default gen_random_uuid (),
+  #     retailer_id uuid primary key default gen_random_uuid (),
-      retailer_name varchar(128) not null,
+  #     retailer_name varchar(128) not null,
-      retailer_username varchar(128) not null,
+  #     retailer_username varchar(128) not null,
-      retailer_password varchar(128) not null,
+  #     retailer_password varchar(128) not null,
-      retailer_address	text not null,
+  #     retailer_address	text not null,
-      country	varchar(128) not null,
+  #     country	varchar(128) not null,
-      contact_person varchar(128) not null,
+  #     contact_person varchar(128) not null,
-      telephone	varchar(128) not null,
+  #     telephone	varchar(128) not null,
-      email	varchar(128) not null,
+  #     email	varchar(128) not null,
-      note text,
+  #     note text,
       
-      other_attributes jsonb,
+  #     other_attributes jsonb,
-      created_time timestamptz default current_timestamp,
+  #     created_time timestamptz default current_timestamp,
-      updated_time timestamptz default current_timestamp,
+  #     updated_time timestamptz default current_timestamp,
-      description	text
+  #     description	text
-    ); 
+  #   ); 
 
-    create table food (
+  #   create table food (
-      food_id uuid primary key default gen_random_uuid (),
+  #     food_id uuid primary key default gen_random_uuid (),
-      food_name varchar(128) not null,
+  #     food_name varchar(128) not null,
-      country	varchar(128),
+  #     country	varchar(128),
-      spiciness	integer,
+  #     spiciness	integer,
-      sweetness	integer,
+  #     sweetness	integer,
-      sourness	integer,
+  #     sourness	integer,
-      savoriness	integer, 
+  #     savoriness	integer, 
-      bitterness	integer,
+  #     bitterness	integer,
-      serving_temperature	integer,
+  #     serving_temperature	integer,
-      image_url jsonb,
+  #     image_url jsonb,
-      note text,
+  #     note text,
-      other_attributes jsonb,
+  #     other_attributes jsonb,
 
-      created_time timestamptz default current_timestamp,
+  #     created_time timestamptz default current_timestamp,
-      updated_time timestamptz default current_timestamp,
+  #     updated_time timestamptz default current_timestamp,
-      description	text
+  #     description	text
-    );
+  #   );
 
-    create table wine (
+  #   create table wine (
-      wine_id uuid primary key default gen_random_uuid (),
+  #     wine_id uuid primary key default gen_random_uuid (),
-      seo_name varchar(128) not null,
+  #     seo_name varchar(128) not null,
-      wine_name varchar(128) not null,
+  #     wine_name varchar(128) not null,
-      winery varchar(128) not null,
+  #     winery varchar(128) not null,
-      vintage integer not null,
+  #     vintage integer not null,
-      region varchar(128) not null,
+  #     region varchar(128) not null,
-      country	varchar(128) not null,
+  #     country	varchar(128) not null,
-      wine_type	varchar(128) not null,
+  #     wine_type	varchar(128) not null,
-      grape	varchar(128) not null,
+  #     grape	varchar(128) not null,
-      serving_temperature	varchar(128) not null,
+  #     serving_temperature	varchar(128) not null,
-      intensity	integer,
+  #     intensity	integer,
-      sweetness	integer,
+  #     sweetness	integer,
-      tannin integer,
+  #     tannin integer,
-      acidity integer,
+  #     acidity integer,
-      fizziness	integer,
+  #     fizziness	integer,
-      tasting_notes text,
+  #     tasting_notes text,
-      image_url jsonb,
+  #     image_url jsonb,
-      manufacturer_sku text,
+  #     manufacturer_sku text,
-      note text,
+  #     note text,
-      other_attributes jsonb,
+  #     other_attributes jsonb,
       
-      created_time timestamptz default current_timestamp,
+  #     created_time timestamptz default current_timestamp,
-      updated_time timestamptz default current_timestamp,
+  #     updated_time timestamptz default current_timestamp,
-      description	text
+  #     description	text
-    );
+  #   );
 
-    create table wine_food (
+  #   create table wine_food (
-      wine_id uuid references wine(wine_id),
+  #     wine_id uuid references wine(wine_id),
-      food_id uuid references food(food_id),
+  #     food_id uuid references food(food_id),
-      constraint wine_food_id primary key (wine_id, food_id),
+  #     constraint wine_food_id primary key (wine_id, food_id),
 
-      created_time timestamptz default current_timestamp,
+  #     created_time timestamptz default current_timestamp,
-      updated_time timestamptz default current_timestamp
+  #     updated_time timestamptz default current_timestamp
-    );
+  #   );
 
-    CREATE TABLE retailer_wine (
+  #   CREATE TABLE retailer_wine (
-      retailer_id uuid references retailer(retailer_id),
+  #     retailer_id uuid references retailer(retailer_id),
-      wine_id uuid references wine(wine_id),
+  #     wine_id uuid references wine(wine_id),
-      constraint retailer_wine_id primary key (retailer_id, wine_id),
+  #     constraint retailer_wine_id primary key (retailer_id, wine_id),
-      price NUMERIC(10, 2),
+  #     price NUMERIC(10, 2),
-      currency varchar(3) not null,
+  #     currency varchar(3) not null,
       
-      created_time timestamptz default current_timestamp,
+  #     created_time timestamptz default current_timestamp,
-      updated_time timestamptz default current_timestamp
+  #     updated_time timestamptz default current_timestamp
-    );
+  #   );
 
-    CREATE TABLE retailer_food (
+  #   CREATE TABLE retailer_food (
-      retailer_id uuid references retailer(retailer_id),
+  #     retailer_id uuid references retailer(retailer_id),
-      food_id uuid references food(food_id),
+  #     food_id uuid references food(food_id),
-      constraint retailer_food_id primary key (retailer_id, food_id),
+  #     constraint retailer_food_id primary key (retailer_id, food_id),
-      price NUMERIC(10, 2),
+  #     price NUMERIC(10, 2),
-      currency varchar(3) not null,
+  #     currency varchar(3) not null,
       
-      created_time timestamptz default current_timestamp,
+  #     created_time timestamptz default current_timestamp,
-      updated_time timestamptz default current_timestamp
+  #     updated_time timestamptz default current_timestamp
-    );
+  #   );
-    """
+  #   """
 
   requiredKeys = ["plan", "action_name", "action_input"]
   errornote = ""
   # provide similar sql only for the first attempt
-  sql, distance = a.context.similarSQLVectorDB(searchterm)
+  # sql, distance = a.context.similarSQLVectorDB(searchterm)
 
-  similarSQL_ = sql !== nothing ? sql : "None"
+  # similarSQL_ = sql !== nothing ? sql : "None"
-  # if sql is really close, just use it
+  # # if sql is really close, just use it
-  if similarSQL_ != "None" && distance <= 0.1
+  # if similarSQL_ != "None" && distance <= 0.1
-    return similarSQL_
+  #   return similarSQL_
+  # end
+
+  #CHANGE use find_related_tables_for_user_question and inject only related table schema instead
+  # of hard code table schema. CPU embedding is too slow. use embedding service on GPU. 
+  related_tables = a.context.find_related_tables_for_user_question(searchterm)
+  table_schema = ""
+  for table in related_tables
+    _table_schema_str = GeneralUtils.get_db_table_schema_simple(a.context.pg_conn_str, table)
+    table_schema_str = sprint(show, _table_schema_str) * "\n"
+    table_schema = table_schema * table_schema_str
   end
 
   context = 
@@ -493,12 +528,6 @@ function generatesql(a::T, searchterm::String,
       <database_table_schema>
         $table_schema
       </database_table_schema>
-      <possible SQL for user's search term>
-        $similarSQL_
-      </possible SQL for user's search term>
-      <error_note>
-        $errornote
-      <error_note>
     </internal_context_for_assistant>
     """
   input = context * searchterm
@@ -603,7 +632,7 @@ function SQLexecution(executeSQL::Function, sql::T
     tablesize = size(df)
     row, column = tablesize
     if row == 0
-      return (result_str="No records found.", result_raw=df, success=true, errormsg=nothing)
+      return (result_str="No records found. Try loosening your search criteria.", result_raw=nothing, success=true, errormsg=nothing)
     elseif column > 30
       return (result_str="There are more than 30 columns. Please be more specific.", result_raw=df, success=true, errormsg=nothing)
     else
@@ -669,7 +698,6 @@ function extractWineAttributes_1(a::T1, input::T2; maxattempt=10
     wine_name: name of the wine
     winery: name of the winery
     vintage: the year of the wine
-    region: a region, such as Burgundy, Bordeaux, Champagne, Napa Valley, Tuscany, California, Oregon, etc. Use "or" if there are multiple regions.
     country: a country where wine is produced. Can be "Austria", "Australia", "France", "Germany", "Italy", "Portugal", "Spain", "United States". Use "or" if there are multiple countries.
     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
@@ -678,12 +706,12 @@ function extractWineAttributes_1(a::T1, input::T2; maxattempt=10
     wine_price_max: maximum price range of wine. Example: For wine price 20, wine_price_max will be 20. For wine price 10 to 100, wine_price_max will be 100.
     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
+    _keyword suffice is the related keyword that appears in user's query.
   </you should then respond to the user with>
   <you should only respond in JSON format as described below>
     "wine_name": "...",
     "winery": "...",
     "vintage": "...",
-    "region": "...",
     "country": "...",
     "wine_type": "...",
     "grape_varietal": "...",
@@ -698,7 +726,6 @@ function extractWineAttributes_1(a::T1, input::T2; maxattempt=10
       "wine_name": "N/A",
       "winery": "N/A",
       "vintage": "N/A",
-      "region": "Tuscany or Napa Valley",
       "country": "Italy or United States",
       "wine_type": "red or white",
       "grape_varietal": "Chenin Blanc or Riesling",
@@ -712,18 +739,17 @@ function extractWineAttributes_1(a::T1, input::T2; maxattempt=10
       "wine_name": "Saumur Blanc",
       "winery": "Domaine du Collier",
       "vintage": "2019",
-      "region": "Saumur",
       "country": "France",
       "wine_type": "white",
       "grape_varietal": "Merlot",
-      "tasting_notes": "plum",
+      "tasting_notes": "N/A",
       "wine_price_min": "N/A",
       "wine_price_max": "N/A",
       "occasion": "N/A",
       "food_to_be_paired_with_wine": "N/A"
   </here are some examples>
   """
-  requiredKeys = ["wine_name", "winery", "vintage", "region", "country", "wine_type", "grape_varietal", "tasting_notes", "wine_price_min", "wine_price_max", "occasion", "food_to_be_paired_with_wine"]
+  requiredKeys = ["wine_name", "winery", "vintage", "country", "wine_type", "grape_varietal", "tasting_notes", "wine_price_min", "wine_price_max", "occasion", "food_to_be_paired_with_wine"]
   errornote = ""
   context = 
   """
@@ -756,9 +782,6 @@ function extractWineAttributes_1(a::T1, input::T2; maxattempt=10
   for attempt in 1:maxattempt
     response = a.context.text2textInstructLLM(a.id, msg)
     response = GeneralUtils.clean_json_response(response)
-    println("\n--- extractWineAttributes_1-1()")
-    println(response)
-    println("--- \n")
 
     response = GeneralUtils.remove_french_accents(response)
     think, response = GeneralUtils.extractthink(response)
@@ -786,6 +809,20 @@ function extractWineAttributes_1(a::T1, input::T2; maxattempt=10
       _v = replace(v, r"\(.*?\)" => "")
       responsedict[k] = _v
     end
+
+    @info "YiemAgent extractWineAttributes_1() " @__LINE__
+    @show responsedict
+    @info "---\n" @__LINE__
+
+    # check each attributes against each column in a database table with BM25
+    for (k, v) in responsedict
+      if k ∉ ["wine_price_min", "wine_price_max"]
+        words_catalog = GeneralUtils.harvest_entity_catalog(a.context.pg_conn_str, "wine", k)
+        resolved_word = GeneralUtils.resolve_entity(v, words_catalog; threshold=0.9)
+        responsedict[k] = resolved_word
+      end
+    end
+
     result = ""
     for (k, v) in responsedict
       # some time LLM generate text with "(some comment)". this line removes it
@@ -793,10 +830,13 @@ function extractWineAttributes_1(a::T1, input::T2; maxattempt=10
         result *= "$k: $v, "
       end
     end
+
     result = result[1:end-2]  # remove the ending ", "
-    println("\n--- extractWineAttributes_1-2()")
+
-    println(result)
+    @info "YiemAgent extractWineAttributes_1() " @__LINE__
-    println("--- \n")
+    @show result
+    @info "---\n" @__LINE__
+
     return result
   end
   error("extractWineAttributes_1() failed to get a response")
@@ -949,9 +989,6 @@ function extractWineAttributes_2(a::T1, input::T2)::String where {T1<:agent, T2<
   for attempt in 1:10
     response = a.context.text2textInstructLLM(a.id, msg)
     response = GeneralUtils.clean_json_response(response)
-    println("\n--- extractWineAttributes_2-1()")
-    println(response)
-    println("--- \n")
 
     response = GeneralUtils.remove_french_accents(response)
     think, response = GeneralUtils.extractthink(response)
@@ -989,9 +1026,11 @@ function extractWineAttributes_2(a::T1, input::T2)::String where {T1<:agent, T2<
       end
     end
     result = result[1:end-2]  # remove the ending ", "
-    println("\n--- extractWineAttributes_2-2()")
+
-    println(result)
+    @info "YiemAgent extractWineAttributes_2() " @__LINE__
-    println("--- \n")
+    @show result
+    @info "---\n" @__LINE__
+
     return result
   end
   error("extractWineAttributes_2() failed to get a response")

src/type.jl

@@ -16,6 +16,9 @@ mutable struct agentcontext
   insertSQLVectorDB::Function
   similarSommelierDecision::Function
   insertSommelierDecision::Function
+  find_related_tables_for_user_question::Function
+  pg_conn_str::String
+  agentconfig::AbstractDict
 end
 
 abstract type agent end
@@ -93,6 +96,7 @@ mutable struct sommelier <: agent
   name::String  # agent name
   id::String    # agent id
   retailername::String
+  retailerid::String
   tools::Dict   
   maxHistoryMsg::Integer  # e.g. 21th and earlier messages will get summarized
   chathistory::Vector{Dict{String, Any}}
@@ -140,11 +144,12 @@ julia> agent = sommelier(context, name="WineExpert", id="123", retailername="MyW
 ```
 """
 function sommelier(
-  context::agentcontext,  # app context
+  context::agentcontext,  # agent functions, db connect and other context
   ;
   name::String= "Assistant",
   id::String= string(uuid4()),
-  retailername::String= "retailer_name",
+  retailername::String= "not specified",
+  retailerid::String= "not specified",
   maxHistoryMsg::Integer= 20,
   chathistory::Vector{Dict{String, Any}} = Vector{Dict{String, Any}}(),
   llmFormatName::String= "granite3"
@@ -216,6 +221,7 @@ function sommelier(
     name,
     id,
     retailername,
+    retailerid,
     tools,
     maxHistoryMsg,
     chathistory,
@@ -246,6 +252,7 @@ function sommelier(
       - Your store carries only wine.
       - Vintage 0 means non-vintage.
       - Start searching the database as broadly as possible within the given information boundary to maximize the chances of finding. Avoid unnecessary parameters unless specified by the user. Refine the search subsequently.
+      - User usually ask for something similar. This means you should use the search term based on the profile they like.
 
     # situation
       You are having conversation with a customer.
@@ -279,10 +286,10 @@ function sommelier(
 
     # available actions
       "CHAT_BOX", which you can use to talk with the user. The input is dialogue you want to chat with the user according to your plan.
-      "CHECK_WINE", allows you to check information about wines you want in your inventory's database. The input is text that specify supported search criteria includeing: retailer_name, wine price, winery, name, vintage, region, country, type, grape varietal, tasting notes, occasion, food pairing, intensity, tannin, sweetness, and acidity.
+      "SEARCH_WINE_DATABASE", allows you to search information about wines you want in your inventory's database. The input is strictly supported search term including: retailer_name, wine price, winery, name, vintage, region, country, type of wine, grape varietal, tasting notes, occasion, food pairing, intensity, tannin, sweetness, and acidity.
-        Example query 1: "Dry, full-bodied red wine from 1) region: Burgundy, country: France or 2) region: Tuscany, country: Italy. Grape varietal: Merlot or Syrah. price 100 to 1000 USD."
+        Example query 1: "Dry, full-bodied red wine from Burgundy, France. Grape varietal could be Merlot or Syrah. price 100 to 1000 USD."
         Example query 2: "Red or white wine, medium tannin, price under 700 USD"
-        Example query 3: "white wine, region: Tuscany or Bordeaux, country: Italy or France
+        Example query 3: "white wine from Tuscany, Italy or Bordeaux, France
       "WINE_PRESENTATION_GUIDELINE", which you can use to check the store guidelines about how to present wines you have found to the user. The input is "nothing" keyword. The output is the guidelines that you can follow.
       "END_CONVER_GUIDELINE", which you can use to check the store guidelines about how to end the conversation with the user. The input is "nothing" keyword. The output is the guidelines that you can follow.
     """

src/util.jl

@@ -297,7 +297,7 @@ function createTimeline(events::T1; eventindex::Union{UnitRange, Nothing}=nothin
     #   timeline *= "Event_$i $(event["subject"])> action_name: $(event["action_name"]), action_input: $(event["action_input"])\n"
     # elseif event["action_name"] == "CHECKINVENTORY" && event["observation"] === nothing
     #   timeline *= "Event_$i $(event["subject"])> action_name: $(event["action_name"]), action_input: $(event["action_input"]), observation: Not done yet.\n"
-    if event["action_name"] == "CHECK_WINE"
+    if event["action_name"] == "SEARCH_WINE_DATABASE"
       timeline *= "Event_$i $(event["subject"])> action_name: $(event["action_name"]), action_input: $(event["action_input"]), observation: $(event["observation"])\\n"
     else
       timeline *= "Event_$i $(event["subject"])> action_name: $(event["action_name"]), action_input: $(event["action_input"])\\n"

test/runtests.jl

@@ -128,7 +128,7 @@ systemmsg =
 
   # Available Actions
   - **CHAT_BOX** which you can use to talk with the user.
-  - **CHECK_WINE** allows you to check information about wines you want in your inventory's database. The input is text that specify supported search criteria includeing: retailer_name, wine price, winery, name, vintage, region, country, type, grape varietal, tasting notes, occasion, food pairing, intensity, tannin, sweetness, and acidity.
+  - **SEARCH_WINE_DATABASE** allows you to check information about wines you want in your inventory's database. The input is text that specify supported search criteria includeing: retailer_name, wine price, winery, name, vintage, region, country, type, grape varietal, tasting notes, occasion, food pairing, intensity, tannin, sweetness, and acidity.
       - Example query 1: "Dry, full-bodied red wine from 1) region: Burgundy, country: France or 2) region: Tuscany, country: Italy. Grape varietal: Merlot or Syrah. price 100 to 1000 USD."
       - Example query 2: "Red or white wine, medium tannin, price under 700 USD"
       - Example query 3: "white wine, region: Tuscany or Bordeaux, country: Italy or France
@@ -157,7 +157,7 @@ openai_msg = Dict(
       "content" => [
         Dict("type" => "text", "text" => 
         """
-        " <plan>I will greet the customer warmly as Janie, acknowledge their request to find a similar wine for their wedding party based on the image, identify the wine type and country (Italian Sparkling Wine), and then use the CHECK_WINE action to search the inventory for suitable options.</plan>\n <action_name>CHAT_BOX</action_name>\n <action_input>Hello! I'm Janie, and I'd be delighted to help you find the perfect wine for your wedding party. That beautiful wine in the image appears to be an Italian sparkling wine, which is wonderful for a celebration like a wedding! Since you have an unlimited budget, I can certainly look for some truly exceptional options. To start, I will check our inventory for similar Italian sparkling wines that are perfect for a wedding celebration.</action_input><action_result> User response in the next message </action_result>"
+        " <plan>I will greet the customer warmly as Janie, acknowledge their request to find a similar wine for their wedding party based on the image, identify the wine type and country (Italian Sparkling Wine), and then use the SEARCH_WINE_DATABASE action to search the inventory for suitable options.</plan>\n <action_name>CHAT_BOX</action_name>\n <action_input>Hello! I'm Janie, and I'd be delighted to help you find the perfect wine for your wedding party. That beautiful wine in the image appears to be an Italian sparkling wine, which is wonderful for a celebration like a wedding! Since you have an unlimited budget, I can certainly look for some truly exceptional options. To start, I will check our inventory for similar Italian sparkling wines that are perfect for a wedding celebration.</action_input><action_result> User response in the next message </action_result>"
         """
         ),
       ]