diff --git a/Makefile b/Makefile index 15a7c3c..98473bd 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: build build_rd build_free build_rpylib run_rd +all: build build_rd build_free build_rpylib run_free # Variables for compiler and flags CC = gcc diff --git a/r.h b/r.h index 0c2d7cc..c5a34b4 100644 --- a/r.h +++ b/r.h @@ -21,8 +21,9 @@ char *fast_model = "gpt-3.5-turbo"; char *models_api_url = "https://api.openai.com/v1/models"; char *completions_api_url = "https://api.deepinfra.com/v1/openai/chat/completions"; +char *advanced_model = "meta-llama/Llama-3.3-70B-Instruct-Turbo"; //char *advanced_model = "meta-llama/Meta-Llama-3.1-8B-Instruct"; -char *advanced_model = "google/gemini-1.5-flash"; +//char *advanced_model = "google/gemini-1.5-flash"; char *fast_model = "Qwen/Qwen2.5-Coder-32B-Instruct"; #endif @@ -30,6 +31,7 @@ char *fast_model = "Qwen/Qwen2.5-Coder-32B-Instruct"; char *models_api_url = "https://ollama.molodetz.nl/v1/models"; char *completions_api_url = "https://ollama.molodetz.nl/v1/chat/completions"; char *advanced_model = "qwen2.5:3b"; +//char *advanced_model = "qwen2.5-coder:0.5b"; char *fast_model = "qwen2.5:0.5b"; #endif diff --git a/rpylib.so b/rpylib.so index 3478a9d..24cc4bd 100755 Binary files a/rpylib.so and b/rpylib.so differ diff --git a/tools.h b/tools.h index 73f2e5b..bd6cf9f 100644 --- a/tools.h +++ b/tools.h @@ -216,7 +216,7 @@ struct json_object *tool_description_db_get() { json_object_array_add(required, json_object_new_string("key")); json_object_object_add(parameters, "required", required); - json_object_object_add(parameters, "additionalProperties", + json_object_object_add(parameters, "additionalProperties", json_object_new_boolean(0)); json_object_object_add(function, "parameters", parameters); @@ -266,7 +266,7 @@ struct json_object *tool_description_db_query() { json_object_array_add(required, json_object_new_string("query")); json_object_object_add(parameters, "required", required); - json_object_object_add(parameters, "additionalProperties", + json_object_object_add(parameters, "additionalProperties", json_object_new_boolean(0)); json_object_object_add(function, "parameters", parameters); @@ -323,7 +323,7 @@ struct json_object *tool_description_db_set() { json_object_array_add(required, json_object_new_string("value")); json_object_object_add(parameters, "required", required); - json_object_object_add(parameters, "additionalProperties", + json_object_object_add(parameters, "additionalProperties", json_object_new_boolean(0)); json_object_object_add(function, "parameters", parameters); @@ -494,8 +494,7 @@ struct json_object *tool_description_index_source_directory() { struct json_object *required = json_object_new_array(); json_object_array_add(required, json_object_new_string("path")); json_object_object_add(parameters, "required", required); - - json_object_object_add(parameters, "additionalProperties", + json_object_object_add(parameters, "additionalProperties", json_object_new_boolean(0)); json_object_object_add(function, "parameters", parameters); @@ -621,7 +620,7 @@ struct json_object *tool_description_read_file() { json_object_object_add(parameters, "required", required); json_object_object_add(parameters, "additionalProperties", - json_object_new_boolean(0)); + json_object_new_boolean(0)); json_object_object_add(function, "parameters", parameters); json_object_object_add(function, "strict", json_object_new_boolean(1)); @@ -951,8 +950,8 @@ struct json_object *tool_description_http_get() { json_object_array_add(required, json_object_new_string("url")); json_object_object_add(parameters, "required", required); - json_object_object_add(parameters, "additionalProperties", - json_object_new_boolean(0)); + //json_object_object_add(parameters, "additionalProperties", + // json_object_new_boolean(0)); json_object_object_add(function, "parameters", parameters); json_object_object_add(function, "strict", json_object_new_boolean(1)); @@ -993,8 +992,8 @@ struct json_object *tool_description_directory_glob() { json_object_array_add(required, json_object_new_string("path")); json_object_object_add(parameters, "required", required); - json_object_object_add(parameters, "additionalProperties", - json_object_new_boolean(0)); + // json_object_object_add(parameters, "additionalProperties", + // json_object_new_boolean(0)); json_object_object_add(function, "parameters", parameters); json_object_object_add(function, "strict", json_object_new_boolean(1)); @@ -1032,8 +1031,8 @@ struct json_object *tool_description_linux_terminal() { json_object_array_add(required, json_object_new_string("command")); json_object_object_add(parameters, "required", required); - json_object_object_add(parameters, "additionalProperties", - json_object_new_boolean(0)); + //json_object_object_add(parameters, "additionalProperties", + // json_object_new_boolean(0)); json_object_object_add(function, "parameters", parameters); json_object_object_add(function, "strict", json_object_new_boolean(1)); @@ -1326,3 +1325,4 @@ struct json_object *tools_execute(struct json_object *tools_array) { } #endif +