ton/YiemAgent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 6 Wiki Activity

Merge pull request 'update' (#13) from v0.6.0-output_text_image into v0.6.0

Browse Source 
Reviewed-on: #13
This commit was merged in pull request #13.
This commit is contained in:
ton
2026-07-15 04:57:11 +00:00
parent 24b85be58b a503d4d759
commit a6a9395ecc
5 changed files with 139 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Manifest.toml
+10 -6
View File
@@ -2,7 +2,7 @@
julia_version = "1.12.6" julia_version = "1.12.6"
manifest_format = "2.0" manifest_format = "2.0"
project_hash = "db8baf2dd943e4138b5952183a64465f457da356" project_hash = "76bd6c852fad3452022f32202b19c4689be8e912"
[[deps.Accessors]] [[deps.Accessors]]
deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "MacroTools"] deps = ["CompositionsBase", "ConstructionBase", "Dates", "InverseFunctions", "MacroTools"]
@@ -290,9 +290,11 @@ version = "1.1.0"
[[deps.GeneralUtils]] [[deps.GeneralUtils]]
deps = ["CSV", "DataFrames", "DataStructures", "Dates", "Distributions", "Graphs", "HTTP", "JSON", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "SHA", "StringDistances", "UUIDs"] deps = ["CSV", "DataFrames", "DataStructures", "Dates", "Distributions", "Graphs", "HTTP", "JSON", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "SHA", "StringDistances", "UUIDs"]
path = "../GeneralUtils" git-tree-sha1 = "aa695d21f155567524e7329fb7b96d8a9d0eba86"
repo-rev = "main"
repo-url = "https://git.yiem.cc/ton/GeneralUtils"
uuid = "c6c72f09-b708-4ac8-ac7c-2084d70108fe" uuid = "c6c72f09-b708-4ac8-ac7c-2084d70108fe"
version = "0.4.10" version = "0.5.0"
[[deps.Graphs]] [[deps.Graphs]]
deps = ["ArnoldiMethod", "DataStructures", "Inflate", "LinearAlgebra", "Random", "SimpleTraits", "SparseArrays", "Statistics"] deps = ["ArnoldiMethod", "DataStructures", "Inflate", "LinearAlgebra", "Random", "SimpleTraits", "SparseArrays", "Statistics"]
@@ -791,9 +793,11 @@ version = "0.7.0"
[[deps.SQLLLM]] [[deps.SQLLLM]]
deps = ["CSV", "DataFrames", "DataStructures", "Dates", "FileIO", "GeneralUtils", "HTTP", "JSON", "LLMMCTS", "LibPQ", "PrettyPrinting", "Random", "Revise", "StatsBase", "Tables", "URIs", "UUIDs"] deps = ["CSV", "DataFrames", "DataStructures", "Dates", "FileIO", "GeneralUtils", "HTTP", "JSON", "LLMMCTS", "LibPQ", "PrettyPrinting", "Random", "Revise", "StatsBase", "Tables", "URIs", "UUIDs"]
path = "../SQLLLM" git-tree-sha1 = "bae2fd2e2b087753fbb3415896be41df1ae0eb90"
repo-rev = "main"
repo-url = "https://git.yiem.cc/ton/SQLLLM"
uuid = "2ebc79c7-cc10-4a3a-9665-d2e1d61e63d3" uuid = "2ebc79c7-cc10-4a3a-9665-d2e1d61e63d3"
version = "0.2.7" version = "0.2.8"
[[deps.SQLStrings]] [[deps.SQLStrings]]
git-tree-sha1 = "55de0530689832b1d3d43491ee6b67bd54d3323c" git-tree-sha1 = "55de0530689832b1d3d43491ee6b67bd54d3323c"
@@ -1043,7 +1047,7 @@ uuid = "76eceee3-57b5-4d4a-8e66-0e911cebbf60"
version = "1.6.1" version = "1.6.1"
[[deps.YiemAgent]] [[deps.YiemAgent]]
deps = ["CSV", "DataFrames", "DataStructures", "Dates", "GeneralUtils", "HTTP", "JSON", "LLMMCTS", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "SQLLLM", "Serialization", "URIs", "UUIDs"] deps = ["CSV", "DataFrames", "DataStructures", "Dates", "GeneralUtils", "HTTP", "JSON", "LLMMCTS", "LibPQ", "NATS", "PrettyPrinting", "Random", "Revise", "Serialization", "URIs", "UUIDs"]
path = "." path = "."
uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2" uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2"
version = "0.5.0" version = "0.5.0"
Project.toml
+3 -1
View File
@@ -1,6 +1,6 @@
name = "YiemAgent" name = "YiemAgent"
uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2" uuid = "e012c34b-7f78-48e0-971c-7abb83b6f0a2"
version = "0.5.0" version = "0.6.0"
authors = ["narawat lamaiin <narawat@outlook.com>"] authors = ["narawat lamaiin <narawat@outlook.com>"]
[deps] [deps]
@@ -25,7 +25,9 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
[compat] [compat]
CSV = "0.10.15" CSV = "0.10.15"
DataFrames = "1.7.0" DataFrames = "1.7.0"
GeneralUtils = "0.5.0"
HTTP = "2.4.0" HTTP = "2.4.0"
JSON = "1.6.1" JSON = "1.6.1"
LLMMCTS = "0.1.5" LLMMCTS = "0.1.5"
NATS = "0.1.0" NATS = "0.1.0"
SQLLLM = "0.2.8"
src/interface.jl
+2 -1
View File
@@ -400,6 +400,7 @@ function conversation(a::sommelier; userinput::Union{Dict{String, Any}, JSON.Obj
"content" => [Dict("type" => "text", "text" => thoughtdict["action_input"]),] "content" => [Dict("type" => "text", "text" => thoughtdict["action_input"]),]
) )
addNewMessage(a, "assistant", assistant_response; maximumMsg=maximumMsg) addNewMessage(a, "assistant", assistant_response; maximumMsg=maximumMsg)
@info "YiemAgent conversation() 2-5 think count $loopcount " @__LINE__
return thoughtdict["action_input"] return thoughtdict["action_input"]
# elseif thoughtdict["action_name"] ∈ ["CHAT_BOX"] # elseif thoughtdict["action_name"] ∈ ["CHAT_BOX"]
# @info "YiemAgent conversation() 2-4 think count $loopcount " @__LINE__ # @info "YiemAgent conversation() 2-4 think count $loopcount " @__LINE__
@@ -419,7 +420,7 @@ function conversation(a::sommelier; userinput::Union{Dict{String, Any}, JSON.Obj
# ) # )
# addNewMessage(a, "assistant", assistant_response; maximumMsg=maximumMsg) # addNewMessage(a, "assistant", assistant_response; maximumMsg=maximumMsg)
return thoughtdict["action_input"] #XXX change output from string to dict # return thoughtdict["action_input"] #XXX change output from string to dict
else else
action_name = thoughtdict["action_name"] action_name = thoughtdict["action_name"]
action_input = thoughtdict["action_input"] action_input = thoughtdict["action_input"]
src/llmfunction.jl
+122 -117
View File
@@ -396,123 +396,123 @@ function generatesql(a::T, searchterm::String,
Do not wrap the SQL as it will be executed against the database directly and SQL must be ended with ';'. Do not wrap the SQL as it will be executed against the database directly and SQL must be ended with ';'.
""" """
table_schema = # table_schema =
""" # """
create table customer ( # create table customer (
customer_id uuid primary key default gen_random_uuid (), # customer_id uuid primary key default gen_random_uuid (),
customer_firstname varchar(128), # customer_firstname varchar(128),
customer_lastname varchar(128), # customer_lastname varchar(128),
customer_displayname varchar(128) not null, # customer_displayname varchar(128) not null,
customer_username varchar(128), # customer_username varchar(128),
customer_password varchar(128), # customer_password varchar(128),
customer_gender varchar(128), # customer_gender varchar(128),
country varchar(128), # country varchar(128),
telephone varchar(128), # telephone varchar(128),
email varchar(128) not null, # email varchar(128) not null,
customer_birthdate varchar(128), # customer_birthdate varchar(128),
note text, # note text,
other_attributes jsonb, # other_attributes jsonb,
created_time timestamptz default current_timestamp, # created_time timestamptz default current_timestamp,
updated_time timestamptz default current_timestamp, # updated_time timestamptz default current_timestamp,
description text # description text
); # );
create table retailer ( # create table retailer (
retailer_id uuid primary key default gen_random_uuid (), # retailer_id uuid primary key default gen_random_uuid (),
retailer_name varchar(128) not null, # retailer_name varchar(128) not null,
retailer_username varchar(128) not null, # retailer_username varchar(128) not null,
retailer_password varchar(128) not null, # retailer_password varchar(128) not null,
retailer_address text not null, # retailer_address text not null,
country varchar(128) not null, # country varchar(128) not null,
contact_person varchar(128) not null, # contact_person varchar(128) not null,
telephone varchar(128) not null, # telephone varchar(128) not null,
email varchar(128) not null, # email varchar(128) not null,
note text, # note text,
other_attributes jsonb, # other_attributes jsonb,
created_time timestamptz default current_timestamp, # created_time timestamptz default current_timestamp,
updated_time timestamptz default current_timestamp, # updated_time timestamptz default current_timestamp,
description text # description text
); # );
create table food ( # create table food (
food_id uuid primary key default gen_random_uuid (), # food_id uuid primary key default gen_random_uuid (),
food_name varchar(128) not null, # food_name varchar(128) not null,
country varchar(128), # country varchar(128),
spiciness integer, # spiciness integer,
sweetness integer, # sweetness integer,
sourness integer, # sourness integer,
savoriness integer, # savoriness integer,
bitterness integer, # bitterness integer,
serving_temperature integer, # serving_temperature integer,
image_url jsonb, # image_url jsonb,
note text, # note text,
other_attributes jsonb, # other_attributes jsonb,
created_time timestamptz default current_timestamp, # created_time timestamptz default current_timestamp,
updated_time timestamptz default current_timestamp, # updated_time timestamptz default current_timestamp,
description text # description text
); # );
create table wine ( # create table wine (
wine_id uuid primary key default gen_random_uuid (), # wine_id uuid primary key default gen_random_uuid (),
seo_name varchar(128) not null, # seo_name varchar(128) not null,
wine_name varchar(128) not null, # wine_name varchar(128) not null,
winery varchar(128) not null, # winery varchar(128) not null,
vintage integer not null, # vintage integer not null,
region varchar(128) not null, # region varchar(128) not null,
country varchar(128) not null, # country varchar(128) not null,
wine_type varchar(128) not null, # wine_type varchar(128) not null,
grape varchar(128) not null, # grape varchar(128) not null,
serving_temperature varchar(128) not null, # serving_temperature varchar(128) not null,
intensity integer, # intensity integer,
sweetness integer, # sweetness integer,
tannin integer, # tannin integer,
acidity integer, # acidity integer,
fizziness integer, # fizziness integer,
tasting_notes text, # tasting_notes text,
image_url jsonb, # image_url jsonb,
manufacturer_sku text, # manufacturer_sku text,
note text, # note text,
other_attributes jsonb, # other_attributes jsonb,
created_time timestamptz default current_timestamp, # created_time timestamptz default current_timestamp,
updated_time timestamptz default current_timestamp, # updated_time timestamptz default current_timestamp,
description text # description text
); # );
create table wine_food ( # create table wine_food (
wine_id uuid references wine(wine_id), # wine_id uuid references wine(wine_id),
food_id uuid references food(food_id), # food_id uuid references food(food_id),
constraint wine_food_id primary key (wine_id, food_id), # constraint wine_food_id primary key (wine_id, food_id),
created_time timestamptz default current_timestamp, # created_time timestamptz default current_timestamp,
updated_time timestamptz default current_timestamp # updated_time timestamptz default current_timestamp
); # );
CREATE TABLE retailer_wine ( # CREATE TABLE retailer_wine (
retailer_id uuid references retailer(retailer_id), # retailer_id uuid references retailer(retailer_id),
wine_id uuid references wine(wine_id), # wine_id uuid references wine(wine_id),
constraint retailer_wine_id primary key (retailer_id, wine_id), # constraint retailer_wine_id primary key (retailer_id, wine_id),
price NUMERIC(10, 2), # price NUMERIC(10, 2),
currency varchar(3) not null, # currency varchar(3) not null,
created_time timestamptz default current_timestamp, # created_time timestamptz default current_timestamp,
updated_time timestamptz default current_timestamp # updated_time timestamptz default current_timestamp
); # );
CREATE TABLE retailer_food ( # CREATE TABLE retailer_food (
retailer_id uuid references retailer(retailer_id), # retailer_id uuid references retailer(retailer_id),
food_id uuid references food(food_id), # food_id uuid references food(food_id),
constraint retailer_food_id primary key (retailer_id, food_id), # constraint retailer_food_id primary key (retailer_id, food_id),
price NUMERIC(10, 2), # price NUMERIC(10, 2),
currency varchar(3) not null, # currency varchar(3) not null,
created_time timestamptz default current_timestamp, # created_time timestamptz default current_timestamp,
updated_time timestamptz default current_timestamp # updated_time timestamptz default current_timestamp
); # );
""" # """
requiredKeys = ["plan", "action_name", "action_input"] requiredKeys = ["plan", "action_name", "action_input"]
errornote = "" errornote = ""
@@ -525,6 +525,16 @@ function generatesql(a::T, searchterm::String,
return similarSQL_ return similarSQL_
end end
#CHANGE use find_related_tables_for_user_question and inject only related table schema instead
# of hard code table schema. CPU embedding is too slow. use embedding service on GPU.
related_tables = a.context.find_related_tables_for_user_question(searchterm)
table_schema = ""
for table in related_tables
table_schema_df = GeneralUtils.get_db_table_schema(a.context.pg_conn_str, table)
table_schema_str = sprint(show, table_schema_df) * "\n"
table_schema = table_schema * table_schema_str
end
context = context =
""" """
<internal_context_for_assistant> <internal_context_for_assistant>
@@ -823,11 +833,11 @@ function extractWineAttributes_1(a::T1, input::T2; maxattempt=10
responsedict[k] = _v responsedict[k] = _v
end end
println("\n--- extractWineAttributes_1-1()") # println("\n--- extractWineAttributes_1-1()")
@show responsedict # @show responsedict
@info "---\n" @__LINE__ # @info "---\n" @__LINE__
#WORKING check each attributes against database with BM25 # check each attributes against each column in a database table with BM25
for (k, v) in responsedict for (k, v) in responsedict
words_catalog = GeneralUtils.harvest_entity_catalog(a.context.pg_conn_str, "wine", k) words_catalog = GeneralUtils.harvest_entity_catalog(a.context.pg_conn_str, "wine", k)
resolved_word = GeneralUtils.resolve_entity(v, words_catalog;threshold=0.9) resolved_word = GeneralUtils.resolve_entity(v, words_catalog;threshold=0.9)
@@ -843,15 +853,10 @@ function extractWineAttributes_1(a::T1, input::T2; maxattempt=10
end end
result = result[1:end-2] # remove the ending ", " result = result[1:end-2] # remove the ending ", "
println("\n--- extractWineAttributes_1-2()") # println("\n--- extractWineAttributes_1-2()")
@show responsedict # @show responsedict
@show result # @show result
@info "---\n" @__LINE__ # @info "---\n" @__LINE__
return result return result
end end
error("extractWineAttributes_1() failed to get a response") error("extractWineAttributes_1() failed to get a response")
src/type.jl
+2
View File
@@ -16,7 +16,9 @@ mutable struct agentcontext
insertSQLVectorDB::Function insertSQLVectorDB::Function
similarSommelierDecision::Function similarSommelierDecision::Function
insertSommelierDecision::Function insertSommelierDecision::Function
find_related_tables_for_user_question::Function
pg_conn_str::String pg_conn_str::String
agentconfig::AbstractDict
end end
abstract type agent end abstract type agent end