update

Reviewed-on: #2

Project.toml

@@ -1,7 +1,7 @@
 name = "YiemAgent"
 uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2"
 authors = ["narawat lamaiin <narawat@outlook.com>"]
-version = "0.1.1"
+version = "0.1.4"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
@@ -22,6 +22,6 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 DataFrames = "1.7.0"
-GeneralUtils = "0.1.0"
+GeneralUtils = "0.1, 0.2"
 LLMMCTS = "0.1.2"
 SQLLLM = "0.2.0"

src/type.jl

@@ -11,8 +11,8 @@ abstract type agent end
 
 
 mutable struct companion <: agent
-  name::String  # agent name
   id::String    # agent id
+  systemmsg::Union{String, Nothing}
   maxHistoryMsg::Integer  # e.g. 21th and earlier messages will get summarized
 
   """ Memory
@@ -34,8 +34,8 @@ end
 function companion(
   text2textInstructLLM::Function
   ;
-  name::String= "Assistant",
   id::String= string(uuid4()),
+  systemmsg::Union{String, Nothing}= nothing,
   maxHistoryMsg::Integer= 20,
   chathistory::Vector{Dict{Symbol, String}} = Vector{Dict{Symbol, String}}(),
   )
@@ -48,13 +48,13 @@ function companion(
             )
 
   newAgent = companion(
-    name,
-    id,
-    maxHistoryMsg,
-    chathistory,
-    memory,
-    text2textInstructLLM
-    )
+                        id,
+                        systemmsg,
+                        maxHistoryMsg,
+                        chathistory,
+                        memory,
+                        text2textInstructLLM
+                      )
   
   return newAgent
 end
@@ -146,7 +146,6 @@ mutable struct sommelier <: agent
   """
   chathistory::Vector{Dict{Symbol, Any}}
   memory::Dict{Symbol, Any}
-
   func  # NamedTuple of functions 
 end
 
@@ -179,14 +178,17 @@ function sommelier(
       # ),
     )
 
-    memory = Dict{Symbol, Any}(
-              :chatbox=> "",
-              :shortmem=> OrderedDict{Symbol, Any}(),
-              :events=> Vector{Dict{Symbol, Any}}(),
-              :state=> Dict{Symbol, Any}(
-                :wine_presented_to_user=> "None",
-              ),
-            )
+  memory = Dict{Symbol, Any}(
+            :chatbox=> "",
+            :shortmem=> OrderedDict{Symbol, Any}(
+              :available_wine=> [],
+              :found_wine=> [], # used by decisionMaker(). This is to prevent decisionMaker() keep presenting the same wines
+            ),
+            :events=> Vector{Dict{Symbol, Any}}(),
+            :state=> Dict{Symbol, Any}(
+            ),
+            :recap=> OrderedDict{Symbol, Any}(),
+          )
 
   newAgent = sommelier(
     name,

src/util.jl

@@ -1,6 +1,7 @@
 module util
 
-export clearhistory, addNewMessage, vectorOfDictToText, eventdict, noises
+export clearhistory, addNewMessage, chatHistoryToText, eventdict, noises, createTimeline,
+        availableWineToText
 
 using UUIDs, Dates, DataStructures, HTTP, JSON3
 using GeneralUtils
@@ -106,7 +107,7 @@ function addNewMessage(a::T1, name::String, text::T2;
     error("name is not in agent.availableRole $(@__LINE__)")
   end
 
-  #[] summarize the oldest 10 message
+  #[PENDING] summarize the oldest 10 message
   if length(a.chathistory) > maximumMsg
     summarize(a.chathistory)
   else
@@ -121,47 +122,53 @@ This function takes in a vector of dictionaries and outputs a single string wher
 
 # Arguments
   - `vecd::Vector`
-    a vector of dictionaries
+    A vector of dictionaries containing chat messages
   - `withkey::Bool` 
-    whether to include the key in the output text. Default is true
+    Whether to include the name as a prefix in the output text. Default is true
+  - `range::Union{Nothing,UnitRange,Int}` 
+    Optional range of messages to include. If nothing, includes all messages
 
-# Return
-  a string with the formatted dictionaries
+# Returns
+  A formatted string where each line contains either:
+  - If withkey=true: "name> message\n"
+  - If withkey=false: "message\n"
 
 # Example
-```jldoctest
+
 julia> using Revise
 julia> using GeneralUtils
 julia> vecd = [Dict(:name => "John", :text => "Hello"), Dict(:name => "Jane", :text => "Goodbye")]
 julia> GeneralUtils.vectorOfDictToText(vecd, withkey=true)
 "John> Hello\nJane> Goodbye\n"
 ```
-# Signature
 """
-function vectorOfDictToText(vecd::Vector; withkey=true)::String
+function chatHistoryToText(vecd::Vector; withkey=true, range=nothing)::String
   # Initialize an empty string to hold the final text
   text = ""
   
+  # Get the elements within the specified range, or all elements if no range provided
+  elements = isnothing(range) ? vecd : vecd[range]
+  
   # Determine whether to include the key in the output text or not
   if withkey
-      # Loop through each dictionary in the input vector
-      for d in vecd
-          # Extract the 'name' and 'text' keys from the dictionary
-          name = d[:name]
-          _text = d[:text]
+    # Loop through each dictionary in the input vector
+    for d in elements
+        # Extract the 'name' and 'text' keys from the dictionary
+        name = d[:name]
+        _text = d[:text]
         
-          # Append the formatted string to the text variable
-          text *= "$name> $_text \n"
+        # Append the formatted string to the text variable
+        text *= "$name:> $_text \n"
       end
   else
-      # Loop through each dictionary in the input vector
-      for d in vecd
-          # Iterate over all key-value pairs in the dictionary
-          for (k, v) in d
-              # Append the formatted string to the text variable
-              text *= "$v \n"
-          end
-      end
+    # Loop through each dictionary in the input vector
+    for d in elements
+        # Iterate over all key-value pairs in the dictionary
+        for (k, v) in d
+            # Append the formatted string to the text variable
+            text *= "$v \n"
+        end
+    end
   end
   
   # Return the final text
@@ -169,11 +176,63 @@ function vectorOfDictToText(vecd::Vector; withkey=true)::String
 end
 
 
+function availableWineToText(vecd::Vector)::String
+  # Initialize an empty string to hold the final text
+  rowtext = ""
+  # Loop through each dictionary in the input vector
+  for (i, d) in enumerate(vecd)
+    # Iterate over all key-value pairs in the dictionary
+    temp = []
+    for (k, v) in d
+      # Append the formatted string to the text variable
+      t = "$k:$v"
+      push!(temp, t)
+    end
+    _rowtext = join(temp, ',')
+    rowtext *= "$i) $_rowtext "
+  end
+  
+  return rowtext
+end
+
+
+
+""" Create a dictionary representing an event with optional details.
+
+# Arguments
+  - `event_description::Union{String, Nothing}`
+    A description of the event
+  - `timestamp::Union{DateTime, Nothing}`
+    The time when the event occurred
+  - `subject::Union{String, Nothing}`
+    The subject or entity associated with the event
+  - `thought::Union{AbstractDict, Nothing}`
+    Any associated thoughts or metadata
+  - `actionname::Union{String, Nothing}`
+    The name of the action performed (e.g., "CHAT", "CHECKINVENTORY")
+  - `actioninput::Union{String, Nothing}`
+    Input or parameters for the action
+  - `location::Union{String, Nothing}`
+    Where the event took place
+  - `equipment_used::Union{String, Nothing}`
+    Equipment involved in the event
+  - `material_used::Union{String, Nothing}`
+    Materials used during the event
+  - `outcome::Union{String, Nothing}`
+    The result or consequence of the event after action execution
+  - `note::Union{String, Nothing}`
+    Additional notes or comments
+
+# Returns
+  A dictionary with event details as symbol-keyed key-value pairs
+"""
 function eventdict(;
   event_description::Union{String, Nothing}=nothing,
   timestamp::Union{DateTime, Nothing}=nothing,
   subject::Union{String, Nothing}=nothing,
-  action_or_dialogue::Union{String, Nothing}=nothing,
+  thought::Union{AbstractDict, Nothing}=nothing,
+  actionname::Union{String, Nothing}=nothing, # "CHAT", "CHECKINVENTORY", "PRESENTBOX", etc
+  actioninput::Union{String, Nothing}=nothing,
   location::Union{String, Nothing}=nothing,
   equipment_used::Union{String, Nothing}=nothing,
   material_used::Union{String, Nothing}=nothing,
@@ -184,7 +243,9 @@ function eventdict(;
       :event_description=> event_description,
       :timestamp=> timestamp,
       :subject=> subject,
-      :action_or_dialogue=> action_or_dialogue,
+      :thought=> thought,
+      :actionname=> actionname,
+      :actioninput=> actioninput,
       :location=> location,
       :equipment_used=> equipment_used,
       :material_used=> material_used,
@@ -194,6 +255,61 @@ function eventdict(;
 end
 
 
+""" Create a formatted timeline string from a sequence of events.
+
+# Arguments
+  - `events::T1`
+    Vector of event dictionaries containing subject, actioninput and optional outcome fields
+    Each event dictionary should have the following keys:
+    - :subject - The subject or entity performing the action
+    - :actioninput - The action or input performed by the subject
+    - :outcome - (Optional) The result or outcome of the action
+
+# Returns
+  - `timeline::String`
+    A formatted string representing the events with their subjects, actions, and optional outcomes
+    Format: "{index}) {subject}> {actioninput} {outcome}\n" for each event
+
+# Example
+
+events = [
+  Dict(:subject => "User", :actioninput => "Hello", :outcome => nothing),
+  Dict(:subject => "Assistant", :actioninput => "Hi there!", :outcome => "with a smile")
+]
+timeline = createTimeline(events)
+# 1) User> Hello
+# 2) Assistant> Hi there! with a smile
+
+"""
+function createTimeline(events::T1; eventindex::Union{UnitRange, Nothing}=nothing
+  ) where {T1<:AbstractVector}
+  # Initialize empty timeline string
+  timeline = ""
+  
+  # Determine which indices to use - either provided range or full length
+  ind = 
+    if eventindex !== nothing
+      [eventindex...]
+    else
+      1:length(events)
+    end
+
+  # Iterate through events and format each one
+  for (i, event) in zip(ind, events)
+    # If no outcome exists, format without outcome
+    if event[:outcome] === nothing
+      timeline *= "Event_$i $(event[:subject])> $(event[:actioninput])\n"
+    # If outcome exists, include it in formatting  
+    else
+      timeline *= "Event_$i $(event[:subject])> $(event[:actioninput]) $(event[:outcome])\n"
+    end
+  end
+
+  # Return formatted timeline string
+  return timeline
+end
+
+
 
 # """ Convert a single chat dictionary into LLM model instruct format.
 

test/Manifest.toml

@@ -0,0 +1,41 @@
+# This file is machine-generated - editing it directly is not advised
+
+julia_version = "1.11.4"
+manifest_format = "2.0"
+project_hash = "71d91126b5a1fb1020e1098d9d492de2a4438fd2"
+
+[[deps.Base64]]
+uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
+version = "1.11.0"
+
+[[deps.InteractiveUtils]]
+deps = ["Markdown"]
+uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+version = "1.11.0"
+
+[[deps.Logging]]
+uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
+version = "1.11.0"
+
+[[deps.Markdown]]
+deps = ["Base64"]
+uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
+version = "1.11.0"
+
+[[deps.Random]]
+deps = ["SHA"]
+uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+version = "1.11.0"
+
+[[deps.SHA]]
+uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
+version = "0.7.0"
+
+[[deps.Serialization]]
+uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
+version = "1.11.0"
+
+[[deps.Test]]
+deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
+uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+version = "1.11.0"

test/Project.toml

@@ -0,0 +1,2 @@
+[deps]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/config.json

@@ -27,30 +27,50 @@
       "description": "agent role"
   },
   "organization": {
-      "value": "yiem_hq",
+      "value": "yiem_branch_1",
       "description": "organization name"
   },
   "externalservice": {
-      "text2textinstruct": {
-          "mqtttopic": "/loadbalancer/requestingservice",
-          "description": "text to text service with instruct LLM",
-          "llminfo": {
-              "name": "llama3instruct"
-          }
-      },
-      "virtualWineCustomer_1": {
-          "mqtttopic": "/virtualenvironment/winecustomer",
-          "description": "text to text service with instruct LLM that act as wine customer",
-          "llminfo": {
-              "name": "llama3instruct"
-          }
-      },
-      "text2textchat": {
-          "mqtttopic": "/loadbalancer/requestingservice",
-          "description": "text to text service with instruct LLM",
-          "llminfo": {
-              "name": "llama3instruct"
-          }
-      }
+    "loadbalancer": {
+      "mqtttopic": "/loadbalancer/requestingservice",
+      "description": "text to text service with instruct LLM"
+    },
+    "text2textinstruct": {
+        "mqtttopic": "/loadbalancer/requestingservice",
+        "description": "text to text service with instruct LLM",
+        "llminfo": {
+            "name": "llama3instruct"
+        }
+    },
+    "virtualWineCustomer_1": {
+        "mqtttopic": "/virtualenvironment/winecustomer",
+        "description": "text to text service with instruct LLM that act as wine customer",
+        "llminfo": {
+            "name": "llama3instruct"
+        }
+    },
+    "text2textchat": {
+        "mqtttopic": "/loadbalancer/requestingservice",
+        "description": "text to text service with instruct LLM",
+        "llminfo": {
+            "name": "llama3instruct"
+        }
+    },
+    "wineDB" : {
+      "description": "A wine database connection info for LibPQ client",
+      "host": "192.168.88.12",
+      "port": 10201,
+      "dbname": "wineDB",
+      "user": "yiemtechnologies",
+      "password": "yiemtechnologies@Postgres_0.0"
+    },
+    "SQLVectorDB" : {
+      "description": "A wine database connection info for LibPQ client",
+      "host": "192.168.88.12",
+      "port": 10203,
+      "dbname": "SQLVectorDB",
+      "user": "yiemtechnologies",
+      "password": "yiemtechnologies@Postgres_0.0"
+    }
   }
 }

test/etc.jl

@@ -1,9 +0,0 @@
-using GeneralUtils
-
-response = "trajectory_evaluation:\nThe trajectory is correct so far. The thought accurately reflects the user's question, and the action taken is a valid attempt to retrieve data from the database that matches the specified criteria.\n\nanswer_evaluation:\nThe observation provides information about two red wines from Bordeaux rive droite in France, which partially answers the question. However, it does not provide a complete answer as it only lists the wine names and characteristics, but does not explicitly state whether there are any other wines that match the criteria.\n\naccepted_as_answer: No\n\nscore: 6\nThe trajectory is mostly correct, but the observation does not fully address the question.\n\nsuggestion: Consider adding more filters or parameters to the database query to retrieve a complete list of wines that match the specified criteria."
-
-responsedict = GeneralUtils.textToDict(response,
-            ["trajectory_evaluation", "answer_evaluation", "accepted_as_answer", "score", "suggestion"], 
-            rightmarker=":", symbolkey=true)
-
-

test/test_1.jl

@@ -8,31 +8,41 @@ using Base.Threads
 
 
 # load config
-config = JSON3.read("./test/config.json")
+config = JSON3.read("/appfolder/app/dev/YiemAgent/test/config.json")
 # config = copy(JSON3.read("../mountvolume/config.json"))
 
 
 function executeSQL(sql::T) where {T<:AbstractString}
-  DBconnection = LibPQ.Connection("host=192.168.88.12 port=10201 dbname=wineDB user=yiemtechnologies password=yiemtechnologies@Postgres_0.0")
+  host = config[:externalservice][:wineDB][:host]
+  port = config[:externalservice][:wineDB][:port]
+  dbname = config[:externalservice][:wineDB][:dbname]
+  user = config[:externalservice][:wineDB][:user]
+  password = config[:externalservice][:wineDB][:password]
+  DBconnection = LibPQ.Connection("host=$host port=$port dbname=$dbname user=$user password=$password")
   result = LibPQ.execute(DBconnection, sql)
   close(DBconnection)
   return result
 end
 
 function executeSQLVectorDB(sql)
-  DBconnection = LibPQ.Connection("host=192.168.88.12 port=10203 dbname=SQLVectorDB user=yiemtechnologies password=yiemtechnologies@Postgres_0.0")
+  host = config[:externalservice][:SQLVectorDB][:host]
+  port = config[:externalservice][:SQLVectorDB][:port]
+  dbname = config[:externalservice][:SQLVectorDB][:dbname]
+  user = config[:externalservice][:SQLVectorDB][:user]
+  password = config[:externalservice][:SQLVectorDB][:password]
+  DBconnection = LibPQ.Connection("host=$host port=$port dbname=$dbname user=$user password=$password")
   result = LibPQ.execute(DBconnection, sql)
   close(DBconnection)
   return result
 end
 
-function text2textInstructLLM(prompt::String)
+function text2textInstructLLM(prompt::String; maxattempt::Integer=2, modelsize::String="medium")
   msgMeta = GeneralUtils.generate_msgMeta(
-    config[:externalservice][:text2textinstruct][:mqtttopic];
+    config[:externalservice][:loadbalancer][:mqtttopic];
     msgPurpose="inference",
     senderName="yiemagent",
-    senderId=string(uuid4()),
-    receiverName="text2textinstruct",
+    senderId=sessionId,
+    receiverName="text2textinstruct_$modelsize",
     mqttBrokerAddress=config[:mqttServerInfo][:broker],
     mqttBrokerPort=config[:mqttServerInfo][:port],
   )
@@ -48,8 +58,20 @@ function text2textInstructLLM(prompt::String)
     )
   )
 
-  _response = GeneralUtils.sendReceiveMqttMsg(outgoingMsg; timeout=6000)
-  response = _response[:response][:text]
+  response = nothing
+  for attempts in 1:maxattempt
+    _response = GeneralUtils.sendReceiveMqttMsg(outgoingMsg; timeout=180, maxattempt=maxattempt)
+    payload = _response[:response]
+    if _response[:success] && payload[:text] !== nothing
+      response = _response[:response][:text]
+      break
+    else
+      println("\n<text2textInstructLLM()> attempt $attempts/$maxattempt failed ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
+      pprintln(outgoingMsg)
+      println("</text2textInstructLLM()> attempt $attempts/$maxattempt failed ", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
+      sleep(3)
+    end
+  end
 
   return response
 end
@@ -57,11 +79,11 @@ end
 # get text embedding from a LLM service
 function getEmbedding(text::T) where {T<:AbstractString}
   msgMeta = GeneralUtils.generate_msgMeta(
-    config[:externalservice][:text2textinstruct][:mqtttopic];
+    config[:externalservice][:loadbalancer][:mqtttopic];
     msgPurpose="embedding",
     senderName="yiemagent",
-    senderId=string(uuid4()),
-    receiverName="text2textinstruct",
+    senderId=sessionId,
+    receiverName="textembedding",
     mqttBrokerAddress=config[:mqttServerInfo][:broker],
     mqttBrokerPort=config[:mqttServerInfo][:port],
   )
@@ -72,18 +94,17 @@ function getEmbedding(text::T) where {T<:AbstractString}
       :text => [text] # must be a vector of string
     )
   )
-  response = GeneralUtils.sendReceiveMqttMsg(outgoingMsg; timeout=6000)
+
+  response = GeneralUtils.sendReceiveMqttMsg(outgoingMsg; timeout=120, maxattempt=3)
   embedding = response[:response][:embeddings]
   return embedding
 end
 
 function findSimilarTextFromVectorDB(text::T1, tablename::T2, embeddingColumnName::T3,
-   vectorDB::Function; limit::Integer=1
-   )::DataFrame where {T1<:AbstractString, T2<:AbstractString, T3<:AbstractString}
-
+  vectorDB::Function; limit::Integer=1
+  )::DataFrame where {T1<:AbstractString, T2<:AbstractString, T3<:AbstractString}
   # get embedding from LLM service
   embedding = getEmbedding(text)[1]
-
   # check whether there is close enough vector already store in vectorDB. if no, add, else skip 
   sql = """
         SELECT *, $embeddingColumnName <-> '$embedding' as distance
@@ -95,29 +116,29 @@ function findSimilarTextFromVectorDB(text::T1, tablename::T2, embeddingColumnNam
   return df
 end
 
-
 function similarSQLVectorDB(query; maxdistance::Integer=100)
   tablename = "sqlllm_decision_repository"
   # get embedding of the query
   df = findSimilarTextFromVectorDB(query, tablename, 
                                   "function_input_embedding", executeSQLVectorDB)
+  # println(df[1, [:id, :function_output]])
   row, col = size(df)
   distance = row == 0 ? Inf : df[1, :distance]  
+  # distance = 100  # CHANGE this is for testing only
   if row != 0 && distance < maxdistance
     # if there is usable SQL, return it.
     output_b64 = df[1, :function_output_base64]   # pick the closest match
     output_str = String(base64decode(output_b64))
     rowid = df[1, :id]
-    println("\n~~~ found similar sql. row id $rowid, distance $distance ", @__FILE__, " ", @__LINE__)
+    println("\n~~~ found similar sql. row id $rowid, distance $distance ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
     return (dict=output_str, distance=distance)
   else
-    println("\n~~~ similar sql not found, max distance $maxdistance ", @__FILE__, " ", @__LINE__)
+    println("\n~~~ similar sql not found, max distance $maxdistance ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
     return (dict=nothing, distance=nothing)
   end
 end
 
-
-function insertSQLVectorDB(query::T1, SQL::T2; maxdistance::Integer=1) where {T1<:AbstractString, T2<:AbstractString}
+function insertSQLVectorDB(query::T1, SQL::T2; maxdistance::Integer=3) where {T1<:AbstractString, T2<:AbstractString}
   tablename = "sqlllm_decision_repository"
   # get embedding of the query
   # query = state[:thoughtHistory][:question]
@@ -134,14 +155,14 @@ function insertSQLVectorDB(query::T1, SQL::T2; maxdistance::Integer=1) where {T1
     sql = """
           INSERT INTO $tablename (function_input, function_output, function_output_base64, function_input_embedding) VALUES ('$query', '$sql_', '$sql_base64', '$query_embedding');
           """
-    println("\n~~~ added new decision to vectorDB ", @__FILE__, " ", @__LINE__)
-    println(sql)
+    # println("\n~~~ added new decision to vectorDB ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
+    # println(sql)
     _ = executeSQLVectorDB(sql)
   end
 end
 
 
-function similarSommelierDecision(recentevents::T1; maxdistance::Integer=5
+function similarSommelierDecision(recentevents::T1; maxdistance::Integer=3
   )::Union{AbstractDict, Nothing} where {T1<:AbstractString}
   tablename = "sommelier_decision_repository"
   # find similar
@@ -214,7 +235,7 @@ a = YiemAgent.sommelier(
 )
 
 while true
-  println("your respond: ")
+  print("\nyour respond: ")
   user_answer = readline()
   response = YiemAgent.conversation(a, Dict(:text=> user_answer))
   println("\n$response")
@@ -224,14 +245,13 @@ end
 # response = YiemAgent.conversation(a, Dict(:text=> "I want to get a French red wine under 100."))
 
 
-
-
-
-
-
-
-
-
+"""
+hello I want to get a bottle of red wine for my boss. I have a budget around 50 dollars. Show me some options.
+
+I have no idea about his wine taste but he likes spicy food.
+
+
+"""