diff --git a/Cargo.lock b/Cargo.lock index c700c584b..485bd9a3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4707,7 +4707,7 @@ dependencies = [ [[package]] name = "shinkai_node" -version = "0.4.5" +version = "0.5.0" dependencies = [ "aes-gcm", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 5a376e5d4..b41b062f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shinkai_node" -version = "0.4.5" +version = "0.5.0" edition = "2018" authors = ["Nico Arqueros "] diff --git a/scripts/run_node_localhost.sh b/scripts/run_node_localhost.sh index 2afbee279..233a2a141 100755 --- a/scripts/run_node_localhost.sh +++ b/scripts/run_node_localhost.sh @@ -17,9 +17,9 @@ export NO_SECRET_FILE="true" export EMBEDDINGS_SERVER_URL="https://internal.shinkai.com/x-embed-api/" export UNSTRUCTURED_SERVER_URL="https://internal.shinkai.com/x-unstructured-api/" -export INITIAL_AGENT_NAMES="o_mixtral,o_llava" -export INITIAL_AGENT_URLS="http://localhost:11434,http://localhost:11435" -export INITIAL_AGENT_MODELS="ollama:mixtral:8x7b-instruct-v0.1-q4_1,ollama:llava" +export INITIAL_AGENT_NAMES="o_llava,o_mixtral" +export INITIAL_AGENT_URLS="http://localhost:11435,http://localhost:11434" +export INITIAL_AGENT_MODELS="ollama:llava,ollama:mixtral:8x7b-instruct-v0.1-q4_1" export INITIAL_AGENT_API_KEYS="," # Add these lines to enable all log options diff --git a/shinkai-libs/shinkai-message-pyo3/Cargo.lock b/shinkai-libs/shinkai-message-pyo3/Cargo.lock index ef85eba82..87255e2b3 100644 --- a/shinkai-libs/shinkai-message-pyo3/Cargo.lock +++ b/shinkai-libs/shinkai-message-pyo3/Cargo.lock @@ -2892,7 +2892,7 @@ dependencies = [ [[package]] name = "shinkai_message_pyo3" -version = "0.4.5" +version = "0.5.0" dependencies = [ "ed25519-dalek", "hex", diff --git a/shinkai-libs/shinkai-message-pyo3/Cargo.toml b/shinkai-libs/shinkai-message-pyo3/Cargo.toml index 663ae4dea..69fb4387f 100644 --- a/shinkai-libs/shinkai-message-pyo3/Cargo.toml +++ b/shinkai-libs/shinkai-message-pyo3/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shinkai_message_pyo3" -version = "0.4.5" +version = "0.5.0" edition = "2018" authors = ["Nico Arqueros "] diff --git a/shinkai-libs/shinkai-message-wasm/Cargo.lock b/shinkai-libs/shinkai-message-wasm/Cargo.lock index b4299bc35..25f50b17d 100644 --- a/shinkai-libs/shinkai-message-wasm/Cargo.lock +++ b/shinkai-libs/shinkai-message-wasm/Cargo.lock @@ -1863,7 +1863,7 @@ dependencies = [ [[package]] name = "shinkai_message_wasm" -version = "0.4.5" +version = "0.5.0" dependencies = [ "anyhow", "blake3", diff --git a/shinkai-libs/shinkai-message-wasm/Cargo.toml b/shinkai-libs/shinkai-message-wasm/Cargo.toml index 8016377c1..faf2a6ad6 100644 --- a/shinkai-libs/shinkai-message-wasm/Cargo.toml +++ b/shinkai-libs/shinkai-message-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shinkai_message_wasm" -version = "0.4.5" +version = "0.5.0" edition = "2018" authors = ["Nico Arqueros "] diff --git a/shinkai-libs/shinkai-message-wasm/pkg/package.json b/shinkai-libs/shinkai-message-wasm/pkg/package.json index f0efe0a6d..a695eeed7 100644 --- a/shinkai-libs/shinkai-message-wasm/pkg/package.json +++ b/shinkai-libs/shinkai-message-wasm/pkg/package.json @@ -3,7 +3,7 @@ "collaborators": [ "Nico Arqueros " ], - "version": "0.4.5", + "version": "0.5.0", "files": [ "shinkai_message_wasm_bg.wasm", "shinkai_message_wasm.js", diff --git a/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm.d.ts b/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm.d.ts index 485fc04b1..08ff1a564 100644 --- a/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm.d.ts +++ b/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm.d.ts @@ -1,15 +1,15 @@ /* tslint:disable */ /* eslint-disable */ /** -* @param {string} encryption_sk +* @param {string} input * @returns {string} */ -export function convert_encryption_sk_string_to_encryption_pk_string(encryption_sk: string): string; +export function calculate_blake3_hash(input: string): string; /** -* @param {string} input +* @param {string} encryption_sk * @returns {string} */ -export function calculate_blake3_hash(input: string): string; +export function convert_encryption_sk_string_to_encryption_pk_string(encryption_sk: string): string; /** */ export class InboxNameWrapper { diff --git a/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.js b/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.js index ebf0b5afc..693dd8b7a 100644 --- a/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.js +++ b/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.js @@ -205,36 +205,6 @@ function debugString(val) { // TODO we could test for more things here, like `Set`s and `Map`s. return className; } -/** -* @param {string} encryption_sk -* @returns {string} -*/ -export function convert_encryption_sk_string_to_encryption_pk_string(encryption_sk) { - let deferred3_0; - let deferred3_1; - try { - const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); - const ptr0 = passStringToWasm0(encryption_sk, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - const len0 = WASM_VECTOR_LEN; - wasm.convert_encryption_sk_string_to_encryption_pk_string(retptr, ptr0, len0); - var r0 = getInt32Memory0()[retptr / 4 + 0]; - var r1 = getInt32Memory0()[retptr / 4 + 1]; - var r2 = getInt32Memory0()[retptr / 4 + 2]; - var r3 = getInt32Memory0()[retptr / 4 + 3]; - var ptr2 = r0; - var len2 = r1; - if (r3) { - ptr2 = 0; len2 = 0; - throw takeObject(r2); - } - deferred3_0 = ptr2; - deferred3_1 = len2; - return getStringFromWasm0(ptr2, len2); - } finally { - wasm.__wbindgen_add_to_stack_pointer(16); - wasm.__wbindgen_free(deferred3_0, deferred3_1, 1); - } -} let stack_pointer = 128; @@ -266,6 +236,37 @@ export function calculate_blake3_hash(input) { } } +/** +* @param {string} encryption_sk +* @returns {string} +*/ +export function convert_encryption_sk_string_to_encryption_pk_string(encryption_sk) { + let deferred3_0; + let deferred3_1; + try { + const retptr = wasm.__wbindgen_add_to_stack_pointer(-16); + const ptr0 = passStringToWasm0(encryption_sk, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; + wasm.convert_encryption_sk_string_to_encryption_pk_string(retptr, ptr0, len0); + var r0 = getInt32Memory0()[retptr / 4 + 0]; + var r1 = getInt32Memory0()[retptr / 4 + 1]; + var r2 = getInt32Memory0()[retptr / 4 + 2]; + var r3 = getInt32Memory0()[retptr / 4 + 3]; + var ptr2 = r0; + var len2 = r1; + if (r3) { + ptr2 = 0; len2 = 0; + throw takeObject(r2); + } + deferred3_0 = ptr2; + deferred3_1 = len2; + return getStringFromWasm0(ptr2, len2); + } finally { + wasm.__wbindgen_add_to_stack_pointer(16); + wasm.__wbindgen_free(deferred3_0, deferred3_1, 1); + } +} + function handleError(f, args) { try { return f.apply(this, args); diff --git a/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.wasm b/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.wasm index de23176db..1627e10f3 100644 Binary files a/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.wasm and b/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.wasm differ diff --git a/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.wasm.d.ts b/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.wasm.d.ts index ee31393d1..e43656040 100644 --- a/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.wasm.d.ts +++ b/shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.wasm.d.ts @@ -45,16 +45,48 @@ export function shinkaimessagebuilderwrapper_vecfs_retrieve_resource(a: number, export function shinkaimessagebuilderwrapper_vecfs_retrieve_path_simplified(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number): void; export function shinkaimessagebuilderwrapper_vecfs_retrieve_vector_search_simplified(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number, r: number, s: number, t: number, u: number, v: number, w: number): void; export function shinkaimessagebuilderwrapper_get_last_unread_messages_from_inbox(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number, k: number, l: number, m: number, n: number, o: number, p: number, q: number, r: number, s: number, t: number): void; +export function __wbg_shinkaimessagewrapper_free(a: number): void; +export function shinkaimessagewrapper_message_body(a: number, b: number): void; +export function shinkaimessagewrapper_set_message_body(a: number, b: number, c: number): void; +export function shinkaimessagewrapper_external_metadata(a: number, b: number): void; +export function shinkaimessagewrapper_set_external_metadata(a: number, b: number, c: number): void; +export function shinkaimessagewrapper_encryption(a: number, b: number): void; +export function shinkaimessagewrapper_set_encryption(a: number, b: number, c: number): void; +export function shinkaimessagewrapper_to_jsvalue(a: number, b: number): void; +export function shinkaimessagewrapper_fromJsValue(a: number, b: number): void; +export function shinkaimessagewrapper_to_json_str(a: number, b: number): void; +export function shinkaimessagewrapper_from_json_str(a: number, b: number, c: number): void; +export function shinkaimessagewrapper_calculate_blake3_hash(a: number, b: number): void; +export function shinkaimessagewrapper_new_with_empty_outer_signature(a: number): number; +export function shinkaimessagewrapper_new_with_empty_inner_signature(a: number, b: number): void; +export function shinkaimessagewrapper_inner_content_for_hashing(a: number, b: number): void; +export function shinkaimessagewrapper_calculate_blake3_hash_with_empty_outer_signature(a: number, b: number): void; +export function shinkaimessagewrapper_calculate_blake3_hash_with_empty_inner_signature(a: number, b: number): void; +export function shinkaimessagewrapper_generate_time_now(a: number): void; +export function __wbg_inboxnamewrapper_free(a: number): void; +export function inboxnamewrapper_new(a: number, b: number): void; +export function inboxnamewrapper_to_string(a: number, b: number): void; +export function inboxnamewrapper_get_value(a: number): number; +export function inboxnamewrapper_get_is_e2e(a: number): number; +export function inboxnamewrapper_get_identities(a: number, b: number): void; +export function inboxnamewrapper_get_unique_id(a: number): number; +export function inboxnamewrapper_to_jsvalue(a: number, b: number): void; +export function inboxnamewrapper_to_json_str(a: number, b: number): void; +export function inboxnamewrapper_get_regular_inbox_name_from_params(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number): void; +export function inboxnamewrapper_get_job_inbox_name_from_params(a: number, b: number, c: number): void; +export function inboxnamewrapper_get_inner(a: number): number; export function shinkaistringtime_generateTimeNow(a: number): void; export function shinkaistringtime_generateTimeInFutureWithSecs(a: number, b: number): void; export function shinkaistringtime_generateSpecificTime(a: number, b: number, c: number, d: number, e: number, f: number, g: number): void; +export function calculate_blake3_hash(a: number, b: number, c: number): void; +export function __wbg_shinkaistringtime_free(a: number): void; +export function shinkaimessagewrapper_new(a: number, b: number): void; export function __wbg_wasmencryptionmethod_free(a: number): void; export function wasmencryptionmethod_new(a: number, b: number): number; export function wasmencryptionmethod_as_str(a: number, b: number): void; export function wasmencryptionmethod_DiffieHellmanChaChaPoly1305(a: number): void; export function wasmencryptionmethod_None(a: number): void; export function convert_encryption_sk_string_to_encryption_pk_string(a: number, b: number, c: number): void; -export function __wbg_shinkaistringtime_free(a: number): void; export function __wbg_shinkainamewrapper_free(a: number): void; export function shinkainamewrapper_new(a: number, b: number): void; export function shinkainamewrapper_get_full_name(a: number): number; @@ -93,38 +125,6 @@ export function jobmessagewrapper_from_jsvalue(a: number, b: number): void; export function jobmessagewrapper_fromStrings(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number): number; export function serializedagentwrapper_new(a: number, b: number): void; export function serializedagentwrapper_to_jsvalue(a: number, b: number): void; -export function __wbg_shinkaimessagewrapper_free(a: number): void; -export function shinkaimessagewrapper_message_body(a: number, b: number): void; -export function shinkaimessagewrapper_set_message_body(a: number, b: number, c: number): void; -export function shinkaimessagewrapper_external_metadata(a: number, b: number): void; -export function shinkaimessagewrapper_set_external_metadata(a: number, b: number, c: number): void; -export function shinkaimessagewrapper_encryption(a: number, b: number): void; -export function shinkaimessagewrapper_set_encryption(a: number, b: number, c: number): void; -export function shinkaimessagewrapper_to_jsvalue(a: number, b: number): void; -export function shinkaimessagewrapper_fromJsValue(a: number, b: number): void; -export function shinkaimessagewrapper_to_json_str(a: number, b: number): void; -export function shinkaimessagewrapper_from_json_str(a: number, b: number, c: number): void; -export function shinkaimessagewrapper_calculate_blake3_hash(a: number, b: number): void; -export function shinkaimessagewrapper_new_with_empty_outer_signature(a: number): number; -export function shinkaimessagewrapper_new_with_empty_inner_signature(a: number, b: number): void; -export function shinkaimessagewrapper_inner_content_for_hashing(a: number, b: number): void; -export function shinkaimessagewrapper_calculate_blake3_hash_with_empty_outer_signature(a: number, b: number): void; -export function shinkaimessagewrapper_calculate_blake3_hash_with_empty_inner_signature(a: number, b: number): void; -export function shinkaimessagewrapper_generate_time_now(a: number): void; -export function __wbg_inboxnamewrapper_free(a: number): void; -export function inboxnamewrapper_new(a: number, b: number): void; -export function inboxnamewrapper_to_string(a: number, b: number): void; -export function inboxnamewrapper_get_value(a: number): number; -export function inboxnamewrapper_get_is_e2e(a: number): number; -export function inboxnamewrapper_get_identities(a: number, b: number): void; -export function inboxnamewrapper_get_unique_id(a: number): number; -export function inboxnamewrapper_to_jsvalue(a: number, b: number): void; -export function inboxnamewrapper_to_json_str(a: number, b: number): void; -export function inboxnamewrapper_get_regular_inbox_name_from_params(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number): void; -export function inboxnamewrapper_get_job_inbox_name_from_params(a: number, b: number, c: number): void; -export function inboxnamewrapper_get_inner(a: number): number; -export function calculate_blake3_hash(a: number, b: number, c: number): void; -export function shinkaimessagewrapper_new(a: number, b: number): void; export function __wbindgen_malloc(a: number, b: number): number; export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number; export function __wbindgen_add_to_stack_pointer(a: number): number;