Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c0edf7dadf | ||
|
|
c21f943b12 | ||
|
|
b8fd772a28 | ||
|
|
883f581b2a | ||
|
|
5a890860a6 | ||
| 7d5bc14a09 | |||
|
|
37ba3a9d31 | ||
| bfadd53033 | |||
| 8fc3afe348 | |||
| c60037226a | |||
|
|
db6c9c5f2b | ||
|
|
6504099959 | ||
| 724b092bdb | |||
| c56c3d02b0 | |||
|
|
a7f3e29e9c | ||
|
|
b8fc23b41e | ||
|
|
cf4cd13b14 | ||
|
|
29adc077d5 | ||
|
|
d89d425885 | ||
|
|
bb81b973d3 | ||
|
|
4197625e57 | ||
|
|
3fdc0adf99 | ||
|
|
c7000f66b8 | ||
|
|
2206831bab | ||
|
|
a29e8049a7 | ||
|
|
944d9eaf2b | ||
|
|
616c159336 | ||
|
|
022cb5caf0 | ||
| cff0d31ae6 | |||
| 82167fe006 | |||
| 814a0ecc6a |
@@ -1,7 +1,7 @@
|
|||||||
name = "YiemAgent"
|
name = "YiemAgent"
|
||||||
uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2"
|
uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2"
|
||||||
authors = ["narawat lamaiin <narawat@outlook.com>"]
|
authors = ["narawat lamaiin <narawat@outlook.com>"]
|
||||||
version = "0.1.1"
|
version = "0.1.4"
|
||||||
|
|
||||||
[deps]
|
[deps]
|
||||||
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
|
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
|
||||||
@@ -22,6 +22,6 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
|
|||||||
|
|
||||||
[compat]
|
[compat]
|
||||||
DataFrames = "1.7.0"
|
DataFrames = "1.7.0"
|
||||||
GeneralUtils = "0.1.0"
|
GeneralUtils = "0.1, 0.2"
|
||||||
LLMMCTS = "0.1.2"
|
LLMMCTS = "0.1.2"
|
||||||
SQLLLM = "0.2.0"
|
SQLLLM = "0.2.0"
|
||||||
|
|||||||
1984
src/interface.jl
1984
src/interface.jl
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
38
src/type.jl
38
src/type.jl
@@ -11,8 +11,8 @@ abstract type agent end
|
|||||||
|
|
||||||
|
|
||||||
mutable struct companion <: agent
|
mutable struct companion <: agent
|
||||||
name::String # agent name
|
|
||||||
id::String # agent id
|
id::String # agent id
|
||||||
|
systemmsg::Union{String, Nothing}
|
||||||
maxHistoryMsg::Integer # e.g. 21th and earlier messages will get summarized
|
maxHistoryMsg::Integer # e.g. 21th and earlier messages will get summarized
|
||||||
|
|
||||||
""" Memory
|
""" Memory
|
||||||
@@ -34,8 +34,8 @@ end
|
|||||||
function companion(
|
function companion(
|
||||||
text2textInstructLLM::Function
|
text2textInstructLLM::Function
|
||||||
;
|
;
|
||||||
name::String= "Assistant",
|
|
||||||
id::String= string(uuid4()),
|
id::String= string(uuid4()),
|
||||||
|
systemmsg::Union{String, Nothing}= nothing,
|
||||||
maxHistoryMsg::Integer= 20,
|
maxHistoryMsg::Integer= 20,
|
||||||
chathistory::Vector{Dict{Symbol, String}} = Vector{Dict{Symbol, String}}(),
|
chathistory::Vector{Dict{Symbol, String}} = Vector{Dict{Symbol, String}}(),
|
||||||
)
|
)
|
||||||
@@ -48,13 +48,13 @@ function companion(
|
|||||||
)
|
)
|
||||||
|
|
||||||
newAgent = companion(
|
newAgent = companion(
|
||||||
name,
|
id,
|
||||||
id,
|
systemmsg,
|
||||||
maxHistoryMsg,
|
maxHistoryMsg,
|
||||||
chathistory,
|
chathistory,
|
||||||
memory,
|
memory,
|
||||||
text2textInstructLLM
|
text2textInstructLLM
|
||||||
)
|
)
|
||||||
|
|
||||||
return newAgent
|
return newAgent
|
||||||
end
|
end
|
||||||
@@ -146,7 +146,6 @@ mutable struct sommelier <: agent
|
|||||||
"""
|
"""
|
||||||
chathistory::Vector{Dict{Symbol, Any}}
|
chathistory::Vector{Dict{Symbol, Any}}
|
||||||
memory::Dict{Symbol, Any}
|
memory::Dict{Symbol, Any}
|
||||||
|
|
||||||
func # NamedTuple of functions
|
func # NamedTuple of functions
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -179,14 +178,17 @@ function sommelier(
|
|||||||
# ),
|
# ),
|
||||||
)
|
)
|
||||||
|
|
||||||
memory = Dict{Symbol, Any}(
|
memory = Dict{Symbol, Any}(
|
||||||
:chatbox=> "",
|
:chatbox=> "",
|
||||||
:shortmem=> OrderedDict{Symbol, Any}(),
|
:shortmem=> OrderedDict{Symbol, Any}(
|
||||||
:events=> Vector{Dict{Symbol, Any}}(),
|
:available_wine=> [],
|
||||||
:state=> Dict{Symbol, Any}(
|
:found_wine=> [], # used by decisionMaker(). This is to prevent decisionMaker() keep presenting the same wines
|
||||||
:wine_presented_to_user=> "None",
|
),
|
||||||
),
|
:events=> Vector{Dict{Symbol, Any}}(),
|
||||||
)
|
:state=> Dict{Symbol, Any}(
|
||||||
|
),
|
||||||
|
:recap=> OrderedDict{Symbol, Any}(),
|
||||||
|
)
|
||||||
|
|
||||||
newAgent = sommelier(
|
newAgent = sommelier(
|
||||||
name,
|
name,
|
||||||
|
|||||||
170
src/util.jl
170
src/util.jl
@@ -1,6 +1,7 @@
|
|||||||
module util
|
module util
|
||||||
|
|
||||||
export clearhistory, addNewMessage, vectorOfDictToText, eventdict, noises
|
export clearhistory, addNewMessage, chatHistoryToText, eventdict, noises, createTimeline,
|
||||||
|
availableWineToText
|
||||||
|
|
||||||
using UUIDs, Dates, DataStructures, HTTP, JSON3
|
using UUIDs, Dates, DataStructures, HTTP, JSON3
|
||||||
using GeneralUtils
|
using GeneralUtils
|
||||||
@@ -106,7 +107,7 @@ function addNewMessage(a::T1, name::String, text::T2;
|
|||||||
error("name is not in agent.availableRole $(@__LINE__)")
|
error("name is not in agent.availableRole $(@__LINE__)")
|
||||||
end
|
end
|
||||||
|
|
||||||
#[] summarize the oldest 10 message
|
#[PENDING] summarize the oldest 10 message
|
||||||
if length(a.chathistory) > maximumMsg
|
if length(a.chathistory) > maximumMsg
|
||||||
summarize(a.chathistory)
|
summarize(a.chathistory)
|
||||||
else
|
else
|
||||||
@@ -121,47 +122,53 @@ This function takes in a vector of dictionaries and outputs a single string wher
|
|||||||
|
|
||||||
# Arguments
|
# Arguments
|
||||||
- `vecd::Vector`
|
- `vecd::Vector`
|
||||||
a vector of dictionaries
|
A vector of dictionaries containing chat messages
|
||||||
- `withkey::Bool`
|
- `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
|
# Returns
|
||||||
a string with the formatted dictionaries
|
A formatted string where each line contains either:
|
||||||
|
- If withkey=true: "name> message\n"
|
||||||
|
- If withkey=false: "message\n"
|
||||||
|
|
||||||
# Example
|
# Example
|
||||||
```jldoctest
|
|
||||||
julia> using Revise
|
julia> using Revise
|
||||||
julia> using GeneralUtils
|
julia> using GeneralUtils
|
||||||
julia> vecd = [Dict(:name => "John", :text => "Hello"), Dict(:name => "Jane", :text => "Goodbye")]
|
julia> vecd = [Dict(:name => "John", :text => "Hello"), Dict(:name => "Jane", :text => "Goodbye")]
|
||||||
julia> GeneralUtils.vectorOfDictToText(vecd, withkey=true)
|
julia> GeneralUtils.vectorOfDictToText(vecd, withkey=true)
|
||||||
"John> Hello\nJane> Goodbye\n"
|
"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
|
# Initialize an empty string to hold the final text
|
||||||
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
|
# Determine whether to include the key in the output text or not
|
||||||
if withkey
|
if withkey
|
||||||
# Loop through each dictionary in the input vector
|
# Loop through each dictionary in the input vector
|
||||||
for d in vecd
|
for d in elements
|
||||||
# Extract the 'name' and 'text' keys from the dictionary
|
# Extract the 'name' and 'text' keys from the dictionary
|
||||||
name = d[:name]
|
name = d[:name]
|
||||||
_text = d[:text]
|
_text = d[:text]
|
||||||
|
|
||||||
# Append the formatted string to the text variable
|
# Append the formatted string to the text variable
|
||||||
text *= "$name> $_text \n"
|
text *= "$name:> $_text \n"
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
# Loop through each dictionary in the input vector
|
# Loop through each dictionary in the input vector
|
||||||
for d in vecd
|
for d in elements
|
||||||
# Iterate over all key-value pairs in the dictionary
|
# Iterate over all key-value pairs in the dictionary
|
||||||
for (k, v) in d
|
for (k, v) in d
|
||||||
# Append the formatted string to the text variable
|
# Append the formatted string to the text variable
|
||||||
text *= "$v \n"
|
text *= "$v \n"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
# Return the final text
|
# Return the final text
|
||||||
@@ -169,11 +176,63 @@ function vectorOfDictToText(vecd::Vector; withkey=true)::String
|
|||||||
end
|
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(;
|
function eventdict(;
|
||||||
event_description::Union{String, Nothing}=nothing,
|
event_description::Union{String, Nothing}=nothing,
|
||||||
timestamp::Union{DateTime, Nothing}=nothing,
|
timestamp::Union{DateTime, Nothing}=nothing,
|
||||||
subject::Union{String, 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,
|
location::Union{String, Nothing}=nothing,
|
||||||
equipment_used::Union{String, Nothing}=nothing,
|
equipment_used::Union{String, Nothing}=nothing,
|
||||||
material_used::Union{String, Nothing}=nothing,
|
material_used::Union{String, Nothing}=nothing,
|
||||||
@@ -184,7 +243,9 @@ function eventdict(;
|
|||||||
:event_description=> event_description,
|
:event_description=> event_description,
|
||||||
:timestamp=> timestamp,
|
:timestamp=> timestamp,
|
||||||
:subject=> subject,
|
:subject=> subject,
|
||||||
:action_or_dialogue=> action_or_dialogue,
|
:thought=> thought,
|
||||||
|
:actionname=> actionname,
|
||||||
|
:actioninput=> actioninput,
|
||||||
:location=> location,
|
:location=> location,
|
||||||
:equipment_used=> equipment_used,
|
:equipment_used=> equipment_used,
|
||||||
:material_used=> material_used,
|
:material_used=> material_used,
|
||||||
@@ -194,6 +255,61 @@ function eventdict(;
|
|||||||
end
|
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.
|
# """ Convert a single chat dictionary into LLM model instruct format.
|
||||||
|
|
||||||
|
|||||||
41
test/Manifest.toml
Normal file
41
test/Manifest.toml
Normal file
@@ -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"
|
||||||
2
test/Project.toml
Normal file
2
test/Project.toml
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
[deps]
|
||||||
|
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
|
||||||
@@ -27,30 +27,50 @@
|
|||||||
"description": "agent role"
|
"description": "agent role"
|
||||||
},
|
},
|
||||||
"organization": {
|
"organization": {
|
||||||
"value": "yiem_hq",
|
"value": "yiem_branch_1",
|
||||||
"description": "organization name"
|
"description": "organization name"
|
||||||
},
|
},
|
||||||
"externalservice": {
|
"externalservice": {
|
||||||
"text2textinstruct": {
|
"loadbalancer": {
|
||||||
"mqtttopic": "/loadbalancer/requestingservice",
|
"mqtttopic": "/loadbalancer/requestingservice",
|
||||||
"description": "text to text service with instruct LLM",
|
"description": "text to text service with instruct LLM"
|
||||||
"llminfo": {
|
},
|
||||||
"name": "llama3instruct"
|
"text2textinstruct": {
|
||||||
}
|
"mqtttopic": "/loadbalancer/requestingservice",
|
||||||
},
|
"description": "text to text service with instruct LLM",
|
||||||
"virtualWineCustomer_1": {
|
"llminfo": {
|
||||||
"mqtttopic": "/virtualenvironment/winecustomer",
|
"name": "llama3instruct"
|
||||||
"description": "text to text service with instruct LLM that act as wine customer",
|
}
|
||||||
"llminfo": {
|
},
|
||||||
"name": "llama3instruct"
|
"virtualWineCustomer_1": {
|
||||||
}
|
"mqtttopic": "/virtualenvironment/winecustomer",
|
||||||
},
|
"description": "text to text service with instruct LLM that act as wine customer",
|
||||||
"text2textchat": {
|
"llminfo": {
|
||||||
"mqtttopic": "/loadbalancer/requestingservice",
|
"name": "llama3instruct"
|
||||||
"description": "text to text service with instruct LLM",
|
}
|
||||||
"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"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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)
|
|
||||||
|
|
||||||
|
|
||||||
0
test/runtests.jl
Normal file
0
test/runtests.jl
Normal file
@@ -1,272 +1,292 @@
|
|||||||
using Revise
|
using Revise
|
||||||
using JSON, JSON3, Dates, UUIDs, PrettyPrinting, LibPQ, Base64, DataFrames
|
using JSON, JSON3, Dates, UUIDs, PrettyPrinting, LibPQ, Base64, DataFrames
|
||||||
using YiemAgent, GeneralUtils
|
using YiemAgent, GeneralUtils
|
||||||
using Base.Threads
|
using Base.Threads
|
||||||
|
|
||||||
# ---------------------------------------------- 100 --------------------------------------------- #
|
# ---------------------------------------------- 100 --------------------------------------------- #
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# load config
|
# 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"))
|
# config = copy(JSON3.read("../mountvolume/config.json"))
|
||||||
|
|
||||||
|
|
||||||
function executeSQL(sql::T) where {T<:AbstractString}
|
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]
|
||||||
result = LibPQ.execute(DBconnection, sql)
|
port = config[:externalservice][:wineDB][:port]
|
||||||
close(DBconnection)
|
dbname = config[:externalservice][:wineDB][:dbname]
|
||||||
return result
|
user = config[:externalservice][:wineDB][:user]
|
||||||
end
|
password = config[:externalservice][:wineDB][:password]
|
||||||
|
DBconnection = LibPQ.Connection("host=$host port=$port dbname=$dbname user=$user password=$password")
|
||||||
function executeSQLVectorDB(sql)
|
result = LibPQ.execute(DBconnection, sql)
|
||||||
DBconnection = LibPQ.Connection("host=192.168.88.12 port=10203 dbname=SQLVectorDB user=yiemtechnologies password=yiemtechnologies@Postgres_0.0")
|
close(DBconnection)
|
||||||
result = LibPQ.execute(DBconnection, sql)
|
return result
|
||||||
close(DBconnection)
|
end
|
||||||
return result
|
|
||||||
end
|
function executeSQLVectorDB(sql)
|
||||||
|
host = config[:externalservice][:SQLVectorDB][:host]
|
||||||
function text2textInstructLLM(prompt::String)
|
port = config[:externalservice][:SQLVectorDB][:port]
|
||||||
msgMeta = GeneralUtils.generate_msgMeta(
|
dbname = config[:externalservice][:SQLVectorDB][:dbname]
|
||||||
config[:externalservice][:text2textinstruct][:mqtttopic];
|
user = config[:externalservice][:SQLVectorDB][:user]
|
||||||
msgPurpose="inference",
|
password = config[:externalservice][:SQLVectorDB][:password]
|
||||||
senderName="yiemagent",
|
DBconnection = LibPQ.Connection("host=$host port=$port dbname=$dbname user=$user password=$password")
|
||||||
senderId=string(uuid4()),
|
result = LibPQ.execute(DBconnection, sql)
|
||||||
receiverName="text2textinstruct",
|
close(DBconnection)
|
||||||
mqttBrokerAddress=config[:mqttServerInfo][:broker],
|
return result
|
||||||
mqttBrokerPort=config[:mqttServerInfo][:port],
|
end
|
||||||
)
|
|
||||||
|
function text2textInstructLLM(prompt::String; maxattempt::Integer=2, modelsize::String="medium")
|
||||||
outgoingMsg = Dict(
|
msgMeta = GeneralUtils.generate_msgMeta(
|
||||||
:msgMeta => msgMeta,
|
config[:externalservice][:loadbalancer][:mqtttopic];
|
||||||
:payload => Dict(
|
msgPurpose="inference",
|
||||||
:text => prompt,
|
senderName="yiemagent",
|
||||||
:kwargs => Dict(
|
senderId=sessionId,
|
||||||
:num_ctx => 16384,
|
receiverName="text2textinstruct_$modelsize",
|
||||||
:temperature => 0.2,
|
mqttBrokerAddress=config[:mqttServerInfo][:broker],
|
||||||
)
|
mqttBrokerPort=config[:mqttServerInfo][:port],
|
||||||
)
|
)
|
||||||
)
|
|
||||||
|
outgoingMsg = Dict(
|
||||||
_response = GeneralUtils.sendReceiveMqttMsg(outgoingMsg; timeout=6000)
|
:msgMeta => msgMeta,
|
||||||
response = _response[:response][:text]
|
:payload => Dict(
|
||||||
|
:text => prompt,
|
||||||
return response
|
:kwargs => Dict(
|
||||||
end
|
:num_ctx => 16384,
|
||||||
|
:temperature => 0.2,
|
||||||
# get text embedding from a LLM service
|
)
|
||||||
function getEmbedding(text::T) where {T<:AbstractString}
|
)
|
||||||
msgMeta = GeneralUtils.generate_msgMeta(
|
)
|
||||||
config[:externalservice][:text2textinstruct][:mqtttopic];
|
|
||||||
msgPurpose="embedding",
|
response = nothing
|
||||||
senderName="yiemagent",
|
for attempts in 1:maxattempt
|
||||||
senderId=string(uuid4()),
|
_response = GeneralUtils.sendReceiveMqttMsg(outgoingMsg; timeout=180, maxattempt=maxattempt)
|
||||||
receiverName="text2textinstruct",
|
payload = _response[:response]
|
||||||
mqttBrokerAddress=config[:mqttServerInfo][:broker],
|
if _response[:success] && payload[:text] !== nothing
|
||||||
mqttBrokerPort=config[:mqttServerInfo][:port],
|
response = _response[:response][:text]
|
||||||
)
|
break
|
||||||
|
else
|
||||||
outgoingMsg = Dict(
|
println("\n<text2textInstructLLM()> attempt $attempts/$maxattempt failed ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
|
||||||
:msgMeta => msgMeta,
|
pprintln(outgoingMsg)
|
||||||
:payload => Dict(
|
println("</text2textInstructLLM()> attempt $attempts/$maxattempt failed ", @__FILE__, ":", @__LINE__, " $(Dates.now())\n")
|
||||||
:text => [text] # must be a vector of string
|
sleep(3)
|
||||||
)
|
end
|
||||||
)
|
end
|
||||||
response = GeneralUtils.sendReceiveMqttMsg(outgoingMsg; timeout=6000)
|
|
||||||
embedding = response[:response][:embeddings]
|
return response
|
||||||
return embedding
|
end
|
||||||
end
|
|
||||||
|
# get text embedding from a LLM service
|
||||||
function findSimilarTextFromVectorDB(text::T1, tablename::T2, embeddingColumnName::T3,
|
function getEmbedding(text::T) where {T<:AbstractString}
|
||||||
vectorDB::Function; limit::Integer=1
|
msgMeta = GeneralUtils.generate_msgMeta(
|
||||||
)::DataFrame where {T1<:AbstractString, T2<:AbstractString, T3<:AbstractString}
|
config[:externalservice][:loadbalancer][:mqtttopic];
|
||||||
|
msgPurpose="embedding",
|
||||||
# get embedding from LLM service
|
senderName="yiemagent",
|
||||||
embedding = getEmbedding(text)[1]
|
senderId=sessionId,
|
||||||
|
receiverName="textembedding",
|
||||||
# check whether there is close enough vector already store in vectorDB. if no, add, else skip
|
mqttBrokerAddress=config[:mqttServerInfo][:broker],
|
||||||
sql = """
|
mqttBrokerPort=config[:mqttServerInfo][:port],
|
||||||
SELECT *, $embeddingColumnName <-> '$embedding' as distance
|
)
|
||||||
FROM $tablename
|
|
||||||
ORDER BY distance LIMIT $limit;
|
outgoingMsg = Dict(
|
||||||
"""
|
:msgMeta => msgMeta,
|
||||||
response = vectorDB(sql)
|
:payload => Dict(
|
||||||
df = DataFrame(response)
|
:text => [text] # must be a vector of string
|
||||||
return df
|
)
|
||||||
end
|
)
|
||||||
|
|
||||||
|
response = GeneralUtils.sendReceiveMqttMsg(outgoingMsg; timeout=120, maxattempt=3)
|
||||||
function similarSQLVectorDB(query; maxdistance::Integer=100)
|
embedding = response[:response][:embeddings]
|
||||||
tablename = "sqlllm_decision_repository"
|
return embedding
|
||||||
# get embedding of the query
|
end
|
||||||
df = findSimilarTextFromVectorDB(query, tablename,
|
|
||||||
"function_input_embedding", executeSQLVectorDB)
|
function findSimilarTextFromVectorDB(text::T1, tablename::T2, embeddingColumnName::T3,
|
||||||
row, col = size(df)
|
vectorDB::Function; limit::Integer=1
|
||||||
distance = row == 0 ? Inf : df[1, :distance]
|
)::DataFrame where {T1<:AbstractString, T2<:AbstractString, T3<:AbstractString}
|
||||||
if row != 0 && distance < maxdistance
|
# get embedding from LLM service
|
||||||
# if there is usable SQL, return it.
|
embedding = getEmbedding(text)[1]
|
||||||
output_b64 = df[1, :function_output_base64] # pick the closest match
|
# check whether there is close enough vector already store in vectorDB. if no, add, else skip
|
||||||
output_str = String(base64decode(output_b64))
|
sql = """
|
||||||
rowid = df[1, :id]
|
SELECT *, $embeddingColumnName <-> '$embedding' as distance
|
||||||
println("\n~~~ found similar sql. row id $rowid, distance $distance ", @__FILE__, " ", @__LINE__)
|
FROM $tablename
|
||||||
return (dict=output_str, distance=distance)
|
ORDER BY distance LIMIT $limit;
|
||||||
else
|
"""
|
||||||
println("\n~~~ similar sql not found, max distance $maxdistance ", @__FILE__, " ", @__LINE__)
|
response = vectorDB(sql)
|
||||||
return (dict=nothing, distance=nothing)
|
df = DataFrame(response)
|
||||||
end
|
return df
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function similarSQLVectorDB(query; maxdistance::Integer=100)
|
||||||
function insertSQLVectorDB(query::T1, SQL::T2; maxdistance::Integer=1) where {T1<:AbstractString, T2<:AbstractString}
|
tablename = "sqlllm_decision_repository"
|
||||||
tablename = "sqlllm_decision_repository"
|
# get embedding of the query
|
||||||
# get embedding of the query
|
df = findSimilarTextFromVectorDB(query, tablename,
|
||||||
# query = state[:thoughtHistory][:question]
|
"function_input_embedding", executeSQLVectorDB)
|
||||||
df = findSimilarTextFromVectorDB(query, tablename,
|
# println(df[1, [:id, :function_output]])
|
||||||
"function_input_embedding", executeSQLVectorDB)
|
row, col = size(df)
|
||||||
row, col = size(df)
|
distance = row == 0 ? Inf : df[1, :distance]
|
||||||
distance = row == 0 ? Inf : df[1, :distance]
|
# distance = 100 # CHANGE this is for testing only
|
||||||
if row == 0 || distance > maxdistance # no close enough SQL stored in the database
|
if row != 0 && distance < maxdistance
|
||||||
query_embedding = getEmbedding(query)[1]
|
# if there is usable SQL, return it.
|
||||||
query = replace(query, "'" => "")
|
output_b64 = df[1, :function_output_base64] # pick the closest match
|
||||||
sql_base64 = base64encode(SQL)
|
output_str = String(base64decode(output_b64))
|
||||||
sql_ = replace(SQL, "'" => "")
|
rowid = df[1, :id]
|
||||||
|
println("\n~~~ found similar sql. row id $rowid, distance $distance ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
|
||||||
sql = """
|
return (dict=output_str, distance=distance)
|
||||||
INSERT INTO $tablename (function_input, function_output, function_output_base64, function_input_embedding) VALUES ('$query', '$sql_', '$sql_base64', '$query_embedding');
|
else
|
||||||
"""
|
println("\n~~~ similar sql not found, max distance $maxdistance ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
|
||||||
println("\n~~~ added new decision to vectorDB ", @__FILE__, " ", @__LINE__)
|
return (dict=nothing, distance=nothing)
|
||||||
println(sql)
|
end
|
||||||
_ = executeSQLVectorDB(sql)
|
end
|
||||||
end
|
|
||||||
end
|
function insertSQLVectorDB(query::T1, SQL::T2; maxdistance::Integer=3) where {T1<:AbstractString, T2<:AbstractString}
|
||||||
|
tablename = "sqlllm_decision_repository"
|
||||||
|
# get embedding of the query
|
||||||
function similarSommelierDecision(recentevents::T1; maxdistance::Integer=5
|
# query = state[:thoughtHistory][:question]
|
||||||
)::Union{AbstractDict, Nothing} where {T1<:AbstractString}
|
df = findSimilarTextFromVectorDB(query, tablename,
|
||||||
tablename = "sommelier_decision_repository"
|
"function_input_embedding", executeSQLVectorDB)
|
||||||
# find similar
|
row, col = size(df)
|
||||||
println("\n~~~ search vectorDB for this: $recentevents ", @__FILE__, " ", @__LINE__)
|
distance = row == 0 ? Inf : df[1, :distance]
|
||||||
df = findSimilarTextFromVectorDB(recentevents, tablename,
|
if row == 0 || distance > maxdistance # no close enough SQL stored in the database
|
||||||
"function_input_embedding", executeSQLVectorDB)
|
query_embedding = getEmbedding(query)[1]
|
||||||
row, col = size(df)
|
query = replace(query, "'" => "")
|
||||||
distance = row == 0 ? Inf : df[1, :distance]
|
sql_base64 = base64encode(SQL)
|
||||||
if row != 0 && distance < maxdistance
|
sql_ = replace(SQL, "'" => "")
|
||||||
# if there is usable decision, return it.
|
|
||||||
rowid = df[1, :id]
|
sql = """
|
||||||
println("\n~~~ found similar decision. row id $rowid, distance $distance ", @__FILE__, " ", @__LINE__)
|
INSERT INTO $tablename (function_input, function_output, function_output_base64, function_input_embedding) VALUES ('$query', '$sql_', '$sql_base64', '$query_embedding');
|
||||||
output_b64 = df[1, :function_output_base64] # pick the closest match
|
"""
|
||||||
_output_str = String(base64decode(output_b64))
|
# println("\n~~~ added new decision to vectorDB ", @__FILE__, ":", @__LINE__, " $(Dates.now())")
|
||||||
output = copy(JSON3.read(_output_str))
|
# println(sql)
|
||||||
return output
|
_ = executeSQLVectorDB(sql)
|
||||||
else
|
end
|
||||||
println("\n~~~ similar decision not found, max distance $maxdistance ", @__FILE__, " ", @__LINE__)
|
end
|
||||||
return nothing
|
|
||||||
end
|
|
||||||
end
|
function similarSommelierDecision(recentevents::T1; maxdistance::Integer=3
|
||||||
|
)::Union{AbstractDict, Nothing} where {T1<:AbstractString}
|
||||||
|
tablename = "sommelier_decision_repository"
|
||||||
function insertSommelierDecision(recentevents::T1, decision::T2; maxdistance::Integer=5
|
# find similar
|
||||||
) where {T1<:AbstractString, T2<:AbstractDict}
|
println("\n~~~ search vectorDB for this: $recentevents ", @__FILE__, " ", @__LINE__)
|
||||||
tablename = "sommelier_decision_repository"
|
df = findSimilarTextFromVectorDB(recentevents, tablename,
|
||||||
# find similar
|
"function_input_embedding", executeSQLVectorDB)
|
||||||
df = findSimilarTextFromVectorDB(recentevents, tablename,
|
row, col = size(df)
|
||||||
"function_input_embedding", executeSQLVectorDB)
|
distance = row == 0 ? Inf : df[1, :distance]
|
||||||
row, col = size(df)
|
if row != 0 && distance < maxdistance
|
||||||
distance = row == 0 ? Inf : df[1, :distance]
|
# if there is usable decision, return it.
|
||||||
if row == 0 || distance > maxdistance # no close enough SQL stored in the database
|
rowid = df[1, :id]
|
||||||
recentevents_embedding = a.func[:getEmbedding](recentevents)[1]
|
println("\n~~~ found similar decision. row id $rowid, distance $distance ", @__FILE__, " ", @__LINE__)
|
||||||
recentevents = replace(recentevents, "'" => "")
|
output_b64 = df[1, :function_output_base64] # pick the closest match
|
||||||
decision_json = JSON3.write(decision)
|
_output_str = String(base64decode(output_b64))
|
||||||
decision_base64 = base64encode(decision_json)
|
output = copy(JSON3.read(_output_str))
|
||||||
decision = replace(decision_json, "'" => "")
|
return output
|
||||||
|
else
|
||||||
sql = """
|
println("\n~~~ similar decision not found, max distance $maxdistance ", @__FILE__, " ", @__LINE__)
|
||||||
INSERT INTO $tablename (function_input, function_output, function_output_base64, function_input_embedding) VALUES ('$recentevents', '$decision', '$decision_base64', '$recentevents_embedding');
|
return nothing
|
||||||
"""
|
end
|
||||||
println("\n~~~ added new decision to vectorDB ", @__FILE__, " ", @__LINE__)
|
end
|
||||||
println(sql)
|
|
||||||
_ = executeSQLVectorDB(sql)
|
|
||||||
else
|
function insertSommelierDecision(recentevents::T1, decision::T2; maxdistance::Integer=5
|
||||||
println("~~~ similar decision previously cached, distance $distance ", @__FILE__, " ", @__LINE__)
|
) where {T1<:AbstractString, T2<:AbstractDict}
|
||||||
end
|
tablename = "sommelier_decision_repository"
|
||||||
end
|
# find similar
|
||||||
|
df = findSimilarTextFromVectorDB(recentevents, tablename,
|
||||||
|
"function_input_embedding", executeSQLVectorDB)
|
||||||
sessionId = "12345"
|
row, col = size(df)
|
||||||
|
distance = row == 0 ? Inf : df[1, :distance]
|
||||||
externalFunction = (
|
if row == 0 || distance > maxdistance # no close enough SQL stored in the database
|
||||||
getEmbedding=getEmbedding,
|
recentevents_embedding = a.func[:getEmbedding](recentevents)[1]
|
||||||
text2textInstructLLM=text2textInstructLLM,
|
recentevents = replace(recentevents, "'" => "")
|
||||||
executeSQL=executeSQL,
|
decision_json = JSON3.write(decision)
|
||||||
similarSQLVectorDB=similarSQLVectorDB,
|
decision_base64 = base64encode(decision_json)
|
||||||
insertSQLVectorDB=insertSQLVectorDB,
|
decision = replace(decision_json, "'" => "")
|
||||||
similarSommelierDecision=similarSommelierDecision,
|
|
||||||
insertSommelierDecision=insertSommelierDecision,
|
sql = """
|
||||||
)
|
INSERT INTO $tablename (function_input, function_output, function_output_base64, function_input_embedding) VALUES ('$recentevents', '$decision', '$decision_base64', '$recentevents_embedding');
|
||||||
|
"""
|
||||||
|
println("\n~~~ added new decision to vectorDB ", @__FILE__, " ", @__LINE__)
|
||||||
|
println(sql)
|
||||||
a = YiemAgent.sommelier(
|
_ = executeSQLVectorDB(sql)
|
||||||
externalFunction;
|
else
|
||||||
name="Ton",
|
println("~~~ similar decision previously cached, distance $distance ", @__FILE__, " ", @__LINE__)
|
||||||
id=sessionId, # agent instance id
|
end
|
||||||
retailername="Yiem",
|
end
|
||||||
)
|
|
||||||
|
|
||||||
while true
|
sessionId = "12345"
|
||||||
println("your respond: ")
|
|
||||||
user_answer = readline()
|
externalFunction = (
|
||||||
response = YiemAgent.conversation(a, Dict(:text=> user_answer))
|
getEmbedding=getEmbedding,
|
||||||
println("\n$response")
|
text2textInstructLLM=text2textInstructLLM,
|
||||||
end
|
executeSQL=executeSQL,
|
||||||
|
similarSQLVectorDB=similarSQLVectorDB,
|
||||||
|
insertSQLVectorDB=insertSQLVectorDB,
|
||||||
# response = YiemAgent.conversation(a, Dict(:text=> "I want to get a French red wine under 100."))
|
similarSommelierDecision=similarSommelierDecision,
|
||||||
|
insertSommelierDecision=insertSommelierDecision,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
a = YiemAgent.sommelier(
|
||||||
|
externalFunction;
|
||||||
|
name="Ton",
|
||||||
|
id=sessionId, # agent instance id
|
||||||
|
retailername="Yiem",
|
||||||
|
)
|
||||||
|
|
||||||
|
while true
|
||||||
|
print("\nyour respond: ")
|
||||||
|
user_answer = readline()
|
||||||
|
response = YiemAgent.conversation(a, Dict(:text=> user_answer))
|
||||||
|
println("\n$response")
|
||||||
|
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.
|
||||||
|
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user