update

src/type.jl

@@ -9,11 +9,53 @@ using GeneralUtils
 
 abstract type agent end
 
-
 mutable struct companion <: agent
+  name::String  # agent name
   id::String    # agent id
-  systemmsg::Union{String, Nothing}
+  systemmsg::String # system message
+  tools::Dict  # tools
   maxHistoryMsg::Integer  # e.g. 21th and earlier messages will get summarized
+  chathistory::Vector{Dict{Symbol, Any}}
+  memory::Dict{Symbol, Any}
+  func::NamedTuple  # NamedTuple of functions 
+end
+
+function companion(
+  func::NamedTuple  # NamedTuple of functions
+  ;
+  systemmsg::Union{String, Nothing}= nothing,
+  name::String= "Assistant",
+  id::String= string(uuid4()),
+  maxHistoryMsg::Integer= 20,
+  chathistory::Vector{Dict{Symbol, String}} = Vector{Dict{Symbol, String}}(),
+  )
+
+  if systemmsg === nothing
+    systemmsg = 
+      """
+      Your name: $name
+
+      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.
+
+      You should then respond to the user with:
+      Dialogue: Given the situation, what would you say to the sommelier?
+
+      You should only respond format as described below:
+      Dialogue: ...
+
+      Let's begin!
+      """
+  end
+
+  tools = Dict( # update input format
+      "CHATBOX"=> Dict(
+        :description => "- CHATBOX 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
@@ -22,45 +64,30 @@ mutable struct companion <: agent
       Dict(:name=>"user", :text=> "Wassup!", :timestamp=> Dates.now()),
       Dict(:name=>"assistant", :text=> "Hi I'm your assistant.", :timestamp=> Dates.now()),
     ]
-
   """
-  chathistory::Vector{Dict{Symbol, Any}}
-  memory::Dict{Symbol, Any}
-
-  # communication function
-  text2textInstructLLM::Function
-end
-
-function companion(
-  text2textInstructLLM::Function
-  ;
-  id::String= string(uuid4()),
-  systemmsg::Union{String, Nothing}= nothing,
-  maxHistoryMsg::Integer= 20,
-  chathistory::Vector{Dict{Symbol, String}} = Vector{Dict{Symbol, String}}(),
-  )
-
   memory = Dict{Symbol, Any}(
-              :chatbox=> "",
-              :shortmem=> OrderedDict{Symbol, Any}(),
-              :events=> Vector{Dict{Symbol, Any}}(),
-              :state=> Dict{Symbol, Any}(),
-            )
+            :events=> Vector{Dict{Symbol, Any}}(),
+            :state=> Dict{Symbol, Any}(), # state of the agent
+            :recap=> OrderedDict{Symbol, Any}(),  # recap summary of the conversation
+          )
 
   newAgent = companion(
-                        id,
-                        systemmsg,
-                        maxHistoryMsg,
-                        chathistory,
-                        memory,
-                        text2textInstructLLM
-                      )
+    name,
+    id,
+    systemmsg,
+    tools,
+    maxHistoryMsg,
+    chathistory,
+    memory,
+    func
+    )
   
   return newAgent
 end
 
 
 
+
 """ A sommelier agent.
 
 # Arguments
@@ -134,16 +161,6 @@ mutable struct sommelier <: agent
   retailername::String
   tools::Dict   
   maxHistoryMsg::Integer  # e.g. 21th and earlier messages will get summarized
-
-  """ 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()),
-    ]
-
-  """
   chathistory::Vector{Dict{Symbol, Any}}
   memory::Dict{Symbol, Any}
   func  # NamedTuple of functions 
@@ -170,16 +187,17 @@ function sommelier(
         :input => """<input>Input is a JSON-formatted string that contains a detailed and precise search query.</input><input example>{\"wine type\": \"rose\", \"price\": \"max 35\", \"sweetness level\": \"sweet\", \"intensity level\": \"light bodied\", \"Tannin level\": \"low\", \"Acidity level\": \"low\"}</input example>""",
         :output => """<output>Output are wines that match the search query in JSON format.""",
       ),
-      # "finalanswer"=> Dict(
-      #   :description => "<tool description>Useful for when you are ready to recommend wines to the user.</tool description>",
-      #   :input => """<input format>{\"finalanswer\": \"some text\"}.</input format><input example>{\"finalanswer\": \"I recommend Zena Crown Vista\"}</input example>""",
-      #   :output => "" ,
-      #   :func => nothing,
-      # ),
     )
 
+  """ 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{Symbol, Any}(
-            :chatbox=> "",
             :shortmem=> OrderedDict{Symbol, Any}(
               :available_wine=> [],
               :found_wine=> [], # used by decisionMaker(). This is to prevent decisionMaker() keep presenting the same wines