Skip to content

Commit

Permalink
Merge pull request #259 from dcSpark/nico/version-bump
Browse files Browse the repository at this point in the history
version bump
  • Loading branch information
nicarq authored Mar 5, 2024
2 parents 40cf42a + 9697889 commit 0f6b2a4
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 77 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shinkai_node"
version = "0.4.5"
version = "0.5.0"
edition = "2018"
authors = ["Nico Arqueros <[email protected]>"]

Expand Down
6 changes: 3 additions & 3 deletions scripts/run_node_localhost.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion shinkai-libs/shinkai-message-pyo3/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion shinkai-libs/shinkai-message-pyo3/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shinkai_message_pyo3"
version = "0.4.5"
version = "0.5.0"
edition = "2018"
authors = ["Nico Arqueros <[email protected]>"]

Expand Down
2 changes: 1 addition & 1 deletion shinkai-libs/shinkai-message-wasm/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion shinkai-libs/shinkai-message-wasm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "shinkai_message_wasm"
version = "0.4.5"
version = "0.5.0"
edition = "2018"
authors = ["Nico Arqueros <[email protected]>"]

Expand Down
2 changes: 1 addition & 1 deletion shinkai-libs/shinkai-message-wasm/pkg/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"collaborators": [
"Nico Arqueros <[email protected]>"
],
"version": "0.4.5",
"version": "0.5.0",
"files": [
"shinkai_message_wasm_bg.wasm",
"shinkai_message_wasm.js",
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
61 changes: 31 additions & 30 deletions shinkai-libs/shinkai-message-wasm/pkg/shinkai_message_wasm_bg.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 0f6b2a4

Please sign in to comment.