diff options
| author | Onur Gündüz <ogunduz@gmail.com> | 2026-06-25 14:00:54 +0200 |
|---|---|---|
| committer | Onur Gündüz <ogunduz@gmail.com> | 2026-06-25 14:01:11 +0200 |
| commit | 13dd2132310fb4dc5aa3dd217ed62f2e8301b981 (patch) | |
| tree | 0e6f5dfdc686365af06fb59d32957e47a3ca5a79 /tools/server/models.c | |
| parent | b673eb9a72138b89f1efecf52578020cb43857ff (diff) | |
| download | ffwd-13dd2132310fb4dc5aa3dd217ed62f2e8301b981.tar.gz ffwd-13dd2132310fb4dc5aa3dd217ed62f2e8301b981.zip | |
all: migrate to yyjson
Diffstat (limited to 'tools/server/models.c')
| -rw-r--r-- | tools/server/models.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/tools/server/models.c b/tools/server/models.c index 8fdc590..479ff97 100644 --- a/tools/server/models.c +++ b/tools/server/models.c @@ -89,25 +89,27 @@ static int read_query_instruct_from_files(const char *model_dir, char **out) { int rc = read_optional_text_file(model_dir, "config_sentence_transformers.json", &buf); if (rc <= 0) return rc; - cJSON *root = cJSON_Parse(buf); + yyjson_doc *doc = yyjson_read(buf, strlen(buf), 0); free(buf); - if (!root) { + if (!doc) { server_log("ffwd-server: invalid config_sentence_transformers.json: %s", model_dir); return -1; } - cJSON *prompts = cJSON_GetObjectItemCaseSensitive(root, "prompts"); - cJSON *query = prompts ? cJSON_GetObjectItemCaseSensitive(prompts, "query") : NULL; - if (query && !cJSON_IsString(query)) { - cJSON_Delete(root); + yyjson_val *root = yyjson_doc_get_root(doc); + yyjson_val *prompts = yyjson_obj_get(root, "prompts"); + yyjson_val *query = prompts ? yyjson_obj_get(prompts, "query") : NULL; + if (query && !yyjson_is_str(query)) { + yyjson_doc_free(doc); server_log("ffwd-server: prompts.query must be a string: %s", model_dir); return -1; } - if (query && query->valuestring && query->valuestring[0]) { - *out = xstrdup(query->valuestring); - cJSON_Delete(root); + const char *qs = yyjson_get_str(query); + if (qs && qs[0]) { + *out = xstrdup(qs); + yyjson_doc_free(doc); return *out ? 1 : -1; } - cJSON_Delete(root); + yyjson_doc_free(doc); return 0; } @@ -156,7 +158,7 @@ void embedding_request_free(embedding_request *r) { free(r->tokens); free(r->inputs); if (r->root) - cJSON_Delete(r->root); + yyjson_doc_free(r->root); memset(r, 0, sizeof(*r)); } @@ -169,7 +171,7 @@ void contextual_request_free(contextual_request *r) { } free(r->docs); if (r->root) - cJSON_Delete(r->root); + yyjson_doc_free(r->root); memset(r, 0, sizeof(*r)); } @@ -189,7 +191,7 @@ void rerank_request_free(rerank_request *r) { late_tokens_free(&r->documents[i]); free(r->documents); if (r->root) - cJSON_Delete(r->root); + yyjson_doc_free(r->root); memset(r, 0, sizeof(*r)); } |
