Merge pull request 'fix tool name' (#35) from v0.7.4-add_vector_search into v0.7.4

Reviewed-on: #35

Manifest.toml

@@ -2,7 +2,7 @@
 
 julia_version = "1.12.6"
 manifest_format = "2.0"
-project_hash = "a5128932115e2d3aa9658af105ac712db061d523"
+project_hash = "1c1379a2cec320abc347f3acb5ee815ba9855aa6"
 
 [[deps.Accessors]]
 deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "MacroTools"]
@@ -97,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"]
@@ -244,11 +244,21 @@ git-tree-sha1 = "27415f162e6028e81c72b82ef756bf321213b6ec"
 uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
 version = "0.1.10"
 
+[[deps.EzXML]]
+deps = ["Printf", "XML2_jll"]
+git-tree-sha1 = "7ea1aa5869e2626ccae84480e4f37185bc6f41d3"
+uuid = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615"
+version = "1.2.3"
+
 [[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"]
@@ -290,11 +300,11 @@ version = "1.1.0"
 
 [[deps.GeneralUtils]]
 deps = ["CSV", "DataFrames", "DataStructures", "Dates", "Distributions", "Graphs", "HTTP", "JSON", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "SHA", "StringDistances", "UUIDs"]
-git-tree-sha1 = "a75a088ee8e5faf10f554ca00748e0e6ca58d1ca"
+git-tree-sha1 = "93293126d24d3929ef6a5067f347bc28c6582c71"
 repo-rev = "main"
 repo-url = "https://git.yiem.cc/ton/GeneralUtils"
 uuid = "c6c72f09-b708-4ac8-ac7c-2084d70108fe"
-version = "0.5.1"
+version = "0.5.10"
 
 [[deps.Graphs]]
 deps = ["ArnoldiMethod", "DataStructures", "Inflate", "LinearAlgebra", "Random", "SimpleTraits", "SparseArrays", "Statistics"]
@@ -311,9 +321,9 @@ version = "1.14.0"
 
 [[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"
@@ -496,6 +506,12 @@ version = "1.11.3+1"
 uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 version = "1.11.0"
 
+[[deps.Libiconv_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "be484f5c92fad0bd8acfef35fe017900b0b73809"
+uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531"
+version = "1.18.0+0"
+
 [[deps.LinearAlgebra]]
 deps = ["Libdl", "OpenBLAS_jll", "libblastrampoline_jll"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -678,15 +694,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"]
@@ -767,9 +785,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"
@@ -822,6 +840,12 @@ git-tree-sha1 = "084c47c7c5ce5cfecefa0a98dff69eb3646b5a80"
 uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c"
 version = "1.4.10"
 
+[[deps.Serde]]
+deps = ["CSV", "Dates", "EzXML", "JSON", "TOML", "UUIDs", "YAML"]
+git-tree-sha1 = "f397fc8779cc53e4677c2708f3802c6996f28d00"
+uuid = "db9b398d-9517-45f8-9a95-92af99003e0e"
+version = "3.7.2"
+
 [[deps.Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 version = "1.11.0"
@@ -926,6 +950,12 @@ git-tree-sha1 = "cd83a04baf746e3b43b83c61b7de77ab0409b80a"
 uuid = "88034a9c-02f8-509d-84a9-84ec65e18404"
 version = "1.0.0"
 
+[[deps.StringEncodings]]
+deps = ["Libiconv_jll"]
+git-tree-sha1 = "b765e46ba27ecf6b44faf70df40c57aa3a547dcb"
+uuid = "69024149-9ee7-55f6-a4c4-859efe599b68"
+version = "0.3.7"
+
 [[deps.StringManipulation]]
 deps = ["PrecompileTools"]
 git-tree-sha1 = "d05693d339e37d6ab134c5ab53c29fce5ee5d7d5"
@@ -1046,11 +1076,23 @@ git-tree-sha1 = "cd1659ba0d57b71a464a29e64dbc67cfe83d54e7"
 uuid = "76eceee3-57b5-4d4a-8e66-0e911cebbf60"
 version = "1.6.1"
 
+[[deps.XML2_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Zlib_jll"]
+git-tree-sha1 = "3f3315d89fc954a28f5b471bce698ed6e27481be"
+uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"
+version = "2.15.3+0"
+
+[[deps.YAML]]
+deps = ["Base64", "Dates", "Printf", "StringEncodings"]
+git-tree-sha1 = "a1c0c7585346251353cddede21f180b96388c403"
+uuid = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
+version = "0.4.16"
+
 [[deps.YiemAgent]]
-deps = ["CSV", "DataFrames", "DataStructures", "Dates", "HTTP", "JSON", "LLMMCTS", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "SQLLLM", "Serialization", "URIs", "UUIDs"]
+deps = ["Base64", "CSV", "DataFrames", "DataStructures", "Dates", "HTTP", "JSON", "LLMMCTS", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "SQLLLM", "Serde", "Serialization", "URIs", "UUIDs"]
 path = "."
 uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2"
-version = "0.6.4"
+version = "0.7.4"
 
 [[deps.Zlib_jll]]
 deps = ["Libdl"]

Project.toml

@@ -1,9 +1,10 @@
 name = "YiemAgent"
 uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2"
-version = "0.6.4"
+version = "0.7.4"
 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"
@@ -18,16 +19,19 @@ PrettyPrinting = "54e16d92-306c-5ea0-a30b-337be88ac337"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Revise = "295af30f-e4ad-537b-8983-00126c2a3abe"
 SQLLLM = "2ebc79c7-cc10-4a3a-9665-d2e1d61e63d3"
+Serde = "db9b398d-9517-45f8-9a95-92af99003e0e"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 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.5.1"
+GeneralUtils = "0.5.10"
 HTTP = "2.4.0"
 JSON = "1.6.1"
 LLMMCTS = "0.1.5"
 NATS = "0.1.0"
 SQLLLM = "0.2.8"
+Serde = "3.7.2"

etc.jl

@@ -1,28 +1,10 @@
-"""
-CREATE TABLE "public"."wine" (
-    "wine_id" uuid DEFAULT gen_random_uuid() NOT NULL,
-    "seo_name" character varying(128) NOT NULL,
-    "wine_name" character varying(128) NOT NULL,
-    "winery" character varying(128) NOT NULL,
-    "vintage" integer NOT NULL,
-    "region" character varying(128) NOT NULL,
-    "country" character varying(128) NOT NULL,
-    "wine_type" character varying(128) NOT NULL,
-    "grape" character varying(128) NOT NULL,
-    "serving_temperature" character varying(128) NOT NULL,
-    "intensity" integer NULL,
-    "sweetness" integer NULL,
-    "tannin" integer NULL,
-    "acidity" integer NULL,
-    "fizziness" integer NULL,
-    "tasting_notes" text NULL,
-    "image_url" jsonb NULL,
-    "manufacturer_sku" text NULL,
-    "note" text NULL,
-    "other_attributes" jsonb NULL,
-    "created_time" timestamp with time zone DEFAULT CURRENT_TIMESTAMP NULL,
-    "updated_time" timestamp with time zone DEFAULT CURRENT_TIMESTAMP NULL,
-    "description" text NULL,
-    PRIMARY KEY (wine_id)
-);
-"""
+# check if this column has vector embedding. if there is one, seach vector version instead
+              column_name_embedding = column_name * "_embedding"
+              if occursin(column_name_embedding, tables_schema[column_name_embedding])
+                vector_column = Dict(
+                  "table_name"=> table_name,
+                  "column_name"=> column_name_embedding,
+                  "operator"=> "vector_similarity",
+                  "value"=> column_obj["value"]
+                )
+              end

src/interface.jl

@@ -4,7 +4,7 @@ export addNewMessage, conversation, decisionMaker, reflector, generatechat,
   generalconversation, detectWineryName, generateSituationReport
 
 using JSON, DataStructures, Dates, UUIDs, HTTP, Random, PrettyPrinting, Serialization,
-      DataFrames, CSV
+      DataFrames, Serde
 using GeneralUtils
 using ..type, ..util, ..llmfunction
 
@@ -73,9 +73,9 @@ OrderedDict{String, Any} with 4 entries:
   "action_result" => "1) winery: Terrazze dell Etna, wine_name: Rose Brut.
 ```
 """
-function decisionMaker(a::T; recentevents::Integer=20, maxattempt=10
+function decisionMaker(a::T; recentevents::Integer=20, maxattempt=3
   ) where {T<:agent}
-
+  @info "YiemAgent decisionMaker() start " @__LINE__
   # lessonDict = copy(JSON.parsefile("lesson.json"))
 
   # lesson =
@@ -122,45 +122,107 @@ function decisionMaker(a::T; recentevents::Integer=20, maxattempt=10
   errornote = "N/A"
   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",
-      "messages" => a.chathistory,
-      "temperature" => 0.7
+  """
+    {
+    "model": "your-model.gguf",
+    "messages": [ ... ],
+    "response_format": {
+      "type": "json_schema",
+      "json_schema": {
+        "name": "agent_action",
+        "strict": true,
+        "schema": {
+          "type": "object",
+          "properties": {
+            "think": {
+              "type": "string",
+              "description": "Your step-by-step reasoning process. Explain why you are choosing this action."
+            },
+            "action_name": {
+              "type": "string",
+              "enum": ["search_web", "get_weather", "calculate_math"],
+              "description": "The exact name of the tool to execute."
+            },
+            "action_input": {
+              "type": "object",
+              "properties": {
+                "query": { "type": ["string", "null"], "description": "For search_web" },
+                "location": { "type": ["string", "null"], "description": "For get_weather" },
+                "equation": { "type": ["string", "null"], "description": "For calculate_math" }
+              },
+              "required": ["query", "location", "equation"],
+              "additionalProperties": false
+            }
+          },
+          "required": ["think", "action_name", "action_input"],
+          "additionalProperties": false
+          }
+        }
+      }
+    }
+  """
+
+  # strict output format
+  response_format = Dict(
+      "type"=> "json_schema",
+      "json_schema"=> Dict(
+        "name"=> "user_profile",
+        "strict"=> true,
+        "schema"=> Dict(
+          "type"=> "object",
+          "properties"=> Dict(
+            "plan"=> Dict("type"=> "string"),
+            "action_name"=> Dict("type"=> "string"),
+            "action_input"=> Dict("type"=> "string"),
+          ),
+          "required"=> ["plan", "action_name", "action_input"],
+          "additionalProperties"=> false
+        )
+      )
     )
 
+  msg = Dict(
+      "model"=> "gemma-4-E4B-it-UD-Q4_K_XL",
+      "messages"=> a.chathistory,
+      "temperature"=> 0.7,
+      "response_format"=> response_format,
+    )
+
+  for attempt in 1:maxattempt
     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)
-    
+    # think, response = GeneralUtils.extractthink(response)
+
     # dollar sign in Julia means string interpolation
     while occursin('$', response)
       response = replace(response, '$' => "USD")
     end
 
-    responsedict = nothing
-    if occursin(requiredKeys[2], response) 
-      try
-        _responsedict = JSON.parse(response)
-        responsedict = GeneralUtils.dictify(_responsedict; keytype=String, sort_order=requiredKeys)
-      catch
-        println("\nERROR YiemAgent decisionMaker() failed to parse response: $response ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
-        continue
-      end
-    end
+    # responsedict = nothing
+    # try
+    #   responsedict = Serde.parse_yaml(response)
+    # catch e
+    #   println("\nERROR YiemAgent decisionMaker() Error: $e --(not qualify response)-> $response ", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
+    #   continue
+    # end
+    
+    # # 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
+
+    responsedict = JSON.parse(response)
+
+    if responsedict["action_input"] == "CHAT_BOX" && 
+      occursin("similar", responsedict["action_input"])
 
-    # 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
 
@@ -172,10 +234,17 @@ 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)
+
+  # in case decisionMaker failed, force to use generatechat!()
+  responsedict = OrderedDict(
+    "plan"=> "N/A",
+    "action_name"=> "CHAT_BOX",
+    "action_input"=> "N/A"
+  )
+  return responsedict
 end
 
 
@@ -304,7 +373,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
 
@@ -347,7 +416,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
@@ -363,7 +432,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)
 
@@ -372,49 +441,119 @@ 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 = think(a)
-      if thoughtdict["action_name"] ∈ ["CHAT_BOX"]
-        @info "YiemAgent conversation() 2-4 think count $loopcount " @__LINE__
+        thoughtdict, result_raw = generatechat!(a)
         assistant_response = Dict{String, Any}(
           "role" => "assistant",
           "content" => [Dict("type" => "text", "text" => thoughtdict["action_input"]),]
         )
         addNewMessage(a, "assistant", assistant_response; maximumMsg=maximumMsg)
-        @info "YiemAgent conversation() 2-5 think count $loopcount " @__LINE__
-        return thoughtdict["action_input"]
-      # elseif 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"]),
-      #         Dict( #WORKING put 1st image here
-      #           "type" => "image_url",
-      #           "image_url" => Dict("url" => image1_data_uri)
-      #         ),
-      #         Dict( #WORKING put 2nd image here
-      #           "type" => "image_url",
-      #           "image_url" => Dict("url" => image2_data_uri)
-      #         ),
-      #       ]
-      #   )
-      #   addNewMessage(a, "assistant", assistant_response; maximumMsg=maximumMsg)
 
-      #   return thoughtdict["action_input"]  #XXX change output from string to dict
-      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"])
+            @info "YiemAgent conversation() shortmem: $(length(a.memory["shortmem"]["items_info"])), items_info: $(length(items_info)), item name: $(item["wine_name"])  " @__LINE__
+            if haskey(item, "wine_name") && occursin(item["wine_name"], thoughtdict["action_input"])
+              push!(items_info, deepcopy(item))
+              push!(send_item_ind, i)
+              @info "YiemAgent conversation() shortmem: $(length(a.memory["shortmem"]["items_info"])), items_info: $(length(items_info)) " @__LINE__
+            end
+          end
+          # remove sent items
+          deleteat!(a.memory["shortmem"]["items_info"], send_item_ind)
+          @info "YiemAgent conversation() shortmem: $(length(a.memory["shortmem"]["items_info"])), items_info: $(length(items_info)) " @__LINE__
+        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"])
+            @info "YiemAgent conversation() shortmem: $(length(a.memory["shortmem"]["items_info"])), items_info: $(length(items_info)), item name: $(item["wine_name"])  " @__LINE__
+            if haskey(item, "wine_name") && occursin(item["wine_name"], thoughtdict["action_input"])
+              push!(items_info, deepcopy(item))
+              push!(send_item_ind, i)
+              @info "YiemAgent conversation() shortmem: $(length(a.memory["shortmem"]["items_info"])), items_info: $(length(items_info)) " @__LINE__
+            end
+          end
+          # remove sent items
+          deleteat!(a.memory["shortmem"]["items_info"], send_item_ind)
+          @info "YiemAgent conversation() shortmem: $(length(a.memory["shortmem"]["items_info"])), items_info: $(length(items_info)) " @__LINE__
+        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"]
@@ -422,7 +561,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
@@ -442,34 +583,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" 
-    @info "YiemAgent think() 5 " @__LINE__
+
     thoughtdict, result_raw = search_wine_database!(a, thoughtdict; useSQLLLM=false)
-    #WORKING result_raw will be a df. i need to get images so i can send to frontend
+    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
+    
   else
-    @info "YiemAgent think() 6 " @__LINE__
+
     error("condition is not defined ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
   end
-  println("\n")
-  @show thoughtdict
-  @info "YiemAgent think() 7 " @__LINE__
+
+  @info "YiemAgent think() end " @__LINE__
+  # @show thoughtdict
+  println("---\n")
   return (thoughtdict=thoughtdict, result_raw=result_raw)
 end
 
@@ -546,7 +704,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 =
@@ -618,18 +776,16 @@ function generatechat!(a::T; maxattempt::Integer=10
       - Processing sales orders or engaging in any other sales-related activities. These are the job of our sales team at the store.
       - Answering questions or offering additional services beyond those related to your store's wine recommendations such as discounts, quantity, rewards programs, promotions, delivery options, shipping, boxes, gift wrapping, packaging, personalized messages or something similar. These are the job of our sales team at the store.
 
-    # you should then respond to the user with interleaving plan, action_name, action_input
+    # you should then respond to the user with interleaving plan, action_name, action_input  in JSON format
       1) "plan", Based on the current situation, state a complete action plan to complete the task and rationale. Be specific.
-      2) "action_name", Must be "CHAT_BOX
+      2) "action_name", action_name must be CHAT_BOX.
       3) "action_input", Dialogue you want to chat with the user according to your plan.
       After the action is executed you gets "action_result". It is the output from the action you selected.
-
-    # you should only respond in JSON format as described below
-      "plan": "...",
-      "action_name": "...",
-      "action_input": "..."
+     
+    # 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.
     """
-  
+
   system_msg = Dict(
       "role" => "system",
       "content" => [
@@ -649,19 +805,46 @@ function generatechat!(a::T; maxattempt::Integer=10
     if attempt > 1
       println("\nYiemAgent generatechat() attempt $attempt/$maxattempt ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
     end
+
+    response_format = Dict(
+      "type"=> "json_schema",
+      "json_schema"=> Dict(
+        "name"=> "user_profile",
+        "strict"=> true,
+        "schema"=> Dict(
+          "type"=> "object",
+          "properties"=> Dict(
+            "plan"=> Dict(
+              "type"=> "string",
+              "description" => "Based on the current situation, state a complete action plan to complete the task and rationale. Be specific.",
+              ),
+            "action_name"=> Dict(
+              "type"=> "string",
+              "description" => "action_name must be CHAT_BOX",
+              ),
+            "action_input"=> Dict(
+              "type"=> "string",
+              "description" => "Dialogue you want to chat with the user according to your plan.",
+              ),
+          ),
+          "required"=> ["plan", "action_name", "action_input"],
+          "additionalProperties"=> false
+        )
+      )
+    )
     
     msg = Dict(
       "model" => "gemma-4-E4B-it-UD-Q4_K_XL",
       "messages" => chathistory,
-      "temperature" => 0.7
+      "temperature" => 0.7,
+      "response_format"=> response_format,
     )
 
     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)
 
     responsedict = nothing
@@ -673,13 +856,17 @@ function generatechat!(a::T; maxattempt::Integer=10
         println("\nERROR YiemAgent generatechat() failed to parse response: $response ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
         continue
       end
+    else
+      println("\nERROR YiemAgent generatechat() $errornote --(not qualify response)> $responsedict ", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
+      continue
     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
 
@@ -691,9 +878,11 @@ 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
+  @info "YiemAgent generatechat() failed to generate a thought " @__LINE__
   error("YiemAgent generatechat() failed to generate a thought ", response)
 end
 

src/type.jl

@@ -23,75 +23,6 @@ end
 
 abstract type agent end
 
-mutable struct companion <: agent
-  name::String  # agent name
-  id::String    # agent id
-  systemmsg::String # system message
-  tools::Dict  # tools
-  maxHistoryMsg::Integer  # e.g. 21th and earlier messages will get summarized
-  chathistory::Vector{Dict{String, Any}}
-  memory::Dict{String, Any}
-  context::NamedTuple  # NamedTuple of functions 
-  llmFormatName::String
-end
-
-function companion(
-  context::agentcontext  # NamedTuple of functions
-  ;
-  name::String= "Assistant",
-  id::String= GeneralUtils.uuid4snakecase(), 
-  maxHistoryMsg::Integer= 20,
-  chathistory::Vector{Dict{String, String}} = Vector{Dict{String, String}}(),
-  llmFormatName::String= "granite3",
-  systemmsg::String=
-    """
-      Your name: $name
-      Your sex: Female
-      Your role: You are a helpful assistant.
-      You should follow the following guidelines:
-      - Focus on the latest conversation.
-      - Your like to be short and concise.
-
-      Let's begin!
-      """,
-  )
-
-  tools = Dict( # update input format
-      "CHAT_BOX"=> Dict(
-        "description" => "- CHAT_BOX which you can use to talk with the user. The input is your intentions for the dialogue. Be specific.",
-      ),
-    )
-
-  """ Memory
-    Ref: Chat prompt format https://huggingface.co/TheBloke/Llama-2-7B-Chat-GGML/discussions/3
-    NO "system" message in chathistory because I want to add it at the inference time
-    chathistory= [
-      Dict("name"=>"user", "text"=> "Wassup!", "timestamp"=> Dates.now()),
-      Dict("name"=>"assistant", "text"=> "Hi I'm your assistant.", "timestamp"=> Dates.now()),
-    ]
-  """
-  memory = Dict{String, Any}(
-            "events"=> Vector{Dict{String, Any}}(),
-            "state"=> Dict{String, Any}(), # state of the agent
-            "recap"=> OrderedDict{String, Any}(),  # recap summary of the conversation
-          )
-
-  newAgent = companion(
-    name,
-    id,
-    systemmsg,
-    tools,
-    maxHistoryMsg,
-    chathistory,
-    memory,
-    context,
-    llmFormatName
-    )
-  
-  return newAgent
-end
-
-
 mutable struct sommelier <: agent
   name::String  # agent name
   id::String    # agent id
@@ -210,11 +141,7 @@ function sommelier(
   memory = Dict{String, Any}(
             "shortmem"=> OrderedDict{String, Any}(),
             "scratchpad"=> "",
-            "events"=> Vector{Dict{String, Any}}(),
-            "state"=> Dict{String, Any}(
-            ),
             "recap"=> OrderedDict{String, Any}(),
-            
           )
 
   newAgent = sommelier(
@@ -237,7 +164,6 @@ function sommelier(
       - You can only recommend wines that are currently in our inventory
       - Before searching the database for wine, ensure you have at least the following information: 1) budget, 2) wine type, and 3) occasion. Additional details are always helpful. If the user is unsure, provide relevant information and gather insights to make reasonable inferences.
       - Ask the user one question at a time.
-      - Do not ask the user about wine's flavor e.g. floral, citrusy, nutty or some thing similar as these terms cannot be used to search the database.
       - Once the user has selected their wine, if you haven't already, ask the user whether they need any further assistance. Do not offer any additional services.
       - Only end the conversation when the user explicitly intends to do so. When ending, ensure a polite farewell and an invitation to return in the future.
       - Spicy foods should be paired only with light red wines.
@@ -252,6 +178,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.
@@ -272,23 +199,18 @@ function sommelier(
       - Processing sales orders or engaging in any other sales-related activities. These are the job of our sales team at the store.
       - Answering questions or offering additional services beyond those related to your store's wine recommendations such as discounts, quantity, rewards programs, promotions, delivery options, shipping, boxes, gift wrapping, packaging, personalized messages or something similar. These are the job of our sales team at the store.
 
-    # you should then respond to the user with interleaving plan, action_name, action_input
+    # you should then respond to the user with interleaving plan, action_name, action_input in JSON format
       1) "plan", Based on the current situation, state a complete action plan to complete the task and rationale. Be specific.
       2) "action_name", (Typically corresponds to the execution of the first step in your plan) Can be one of the available_actions name
       3) "action_input", The input to the action you are about to perform according to your plan.
       After the action is executed you gets "action_result". It is the output from the action you selected.
 
-    # you should only respond in JSON format as described below (not Markdown format)
-      "plan": "...",
-      "action_name": "...",
-      "action_input": "..."
-
     # 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.
-      "SEARCH_WINE_DATABASE", allows you to search information about wines you want in your inventory's database. The input is supported search criteria including: 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."
+      "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 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.
     """
@@ -304,7 +226,7 @@ function sommelier(
   
   return newAgent
 end
-
+ 
 
 mutable struct virtualcustomer <: agent
   name::String  # agent name