Added xdata to dbmem_provider_t

Author: marcobambini

src/sqlite-memory.c

@@ -571,7 +571,7 @@ static void dbmem_context_free (void *ptr) {
     if (ctx->cache_buffer) dbmem_free(ctx->cache_buffer);
 
     // custom provider
-    if (ctx->custom_engine && ctx->custom_provider.free) ctx->custom_provider.free(ctx->custom_engine);
+    if (ctx->custom_engine && ctx->custom_provider.free) ctx->custom_provider.free(ctx->custom_engine, ctx->custom_provider.xdata);
     if (ctx->custom_provider_name) dbmem_free(ctx->custom_provider_name);
 
     #ifndef DBMEM_OMIT_LOCAL_ENGINE
@@ -608,7 +608,7 @@ bool dbmem_context_is_custom (dbmem_context *ctx) {
 
 int dbmem_context_custom_compute (dbmem_context *ctx, const char *text, int text_len, embedding_result_t *result) {
     dbmem_embedding_result_t cr = {0};
-    int rc = ctx->custom_provider.compute(ctx->custom_engine, text, text_len, &cr);
+    int rc = ctx->custom_provider.compute(ctx->custom_engine, text, text_len, ctx->custom_provider.xdata, &cr);
     if (rc != 0) return rc;
     result->n_tokens = cr.n_tokens;
     result->n_tokens_truncated = cr.n_tokens_truncated;
@@ -950,10 +950,10 @@ static void dbmem_set_model (sqlite3_context *context, int argc, sqlite3_value *
     // custom provider path
     if (is_custom_provider) {
         // free previous custom engine if any
-        if (ctx->custom_engine && ctx->custom_provider.free) ctx->custom_provider.free(ctx->custom_engine);
+        if (ctx->custom_engine && ctx->custom_provider.free) ctx->custom_provider.free(ctx->custom_engine, ctx->custom_provider.xdata);
         ctx->custom_engine = NULL;
 
-        ctx->custom_engine = ctx->custom_provider.init(model, ctx->api_key, ctx->error_msg);
+        ctx->custom_engine = ctx->custom_provider.init(model, ctx->api_key, ctx->custom_provider.xdata, ctx->error_msg);
         if (ctx->custom_engine == NULL) {
             sqlite3_result_error(context, ctx->error_msg, -1);
             return;
@@ -1562,7 +1562,7 @@ SQLITE_DBMEMORY_API int sqlite3_memory_register_provider (sqlite3 *db, const cha
     if (!ctx) return SQLITE_ERROR;
 
     // free previous custom provider if any
-    if (ctx->custom_engine && ctx->custom_provider.free) ctx->custom_provider.free(ctx->custom_engine);
+    if (ctx->custom_engine && ctx->custom_provider.free) ctx->custom_provider.free(ctx->custom_engine, ctx->custom_provider.xdata);
     ctx->custom_engine = NULL;
     if (ctx->custom_provider_name) dbmem_free(ctx->custom_provider_name);
 

src/sqlite-memory.h

@@ -26,7 +26,7 @@
 extern "C" {
 #endif
 
-#define SQLITE_DBMEMORY_VERSION "0.8.0"
+#define SQLITE_DBMEMORY_VERSION "0.8.1"
 
 // public API
 SQLITE_DBMEMORY_API int sqlite3_memory_init (sqlite3 *db, char **pzErrMsg, const sqlite3_api_routines *pApi);
@@ -47,14 +47,18 @@ typedef struct {
 typedef struct {
     // Called when memory_set_model(provider, model) matches this provider.
     // api_key is the value set via memory_set_apikey() (may be NULL).
+    // xdata is the user-supplied generic pointer from the struct.
     // Return opaque engine pointer, or NULL on error (fill err_msg).
-    void *(*init)(const char *model, const char *api_key, char err_msg[1024]);
+    void *(*init)(const char *model, const char *api_key, void *xdata, char err_msg[1024]);
 
     // Compute embedding for text. Return 0 on success, non-zero on error.
-    int   (*compute)(void *engine, const char *text, int text_len, dbmem_embedding_result_t *result);
+    int   (*compute)(void *engine, const char *text, int text_len, void *xdata, dbmem_embedding_result_t *result);
 
     // Free the engine. Called on context teardown or model change. May be NULL.
-    void  (*free)(void *engine);
+    void  (*free)(void *engine, void *xdata);
+
+    // User-supplied generic data pointer, passed to all callbacks.
+    void  *xdata;
 } dbmem_provider_t;
 
 // Register a custom embedding provider.

test/unittest.c

@@ -2231,8 +2231,9 @@ typedef struct {
     char api_key[256];
 } dummy_engine_t;
 
-static void *dummy_init(const char *model, const char *api_key, char err_msg[1024]) {
+static void *dummy_init(const char *model, const char *api_key, void *xdata, char err_msg[1024]) {
     UNUSED_PARAM(model);
+    UNUSED_PARAM(xdata);
     dummy_engine_t *e = (dummy_engine_t *)calloc(1, sizeof(dummy_engine_t));
     if (!e) { snprintf(err_msg, 1024, "alloc failed"); return NULL; }
     e->dimension = 4;
@@ -2244,9 +2245,10 @@ static void *dummy_init(const char *model, const char *api_key, char err_msg[102
     return e;
 }
 
-static int dummy_compute(void *engine, const char *text, int text_len, dbmem_embedding_result_t *result) {
+static int dummy_compute(void *engine, const char *text, int text_len, void *xdata, dbmem_embedding_result_t *result) {
     UNUSED_PARAM(text);
     UNUSED_PARAM(text_len);
+    UNUSED_PARAM(xdata);
     dummy_engine_t *e = (dummy_engine_t *)engine;
     e->compute_count++;
     result->n_tokens = text_len / 4;
@@ -2256,13 +2258,15 @@ static int dummy_compute(void *engine, const char *text, int text_len, dbmem_emb
     return 0;
 }
 
-static void dummy_free(void *engine) {
+static void dummy_free(void *engine, void *xdata) {
+    UNUSED_PARAM(xdata);
     free(engine);
 }
 
-static void *dummy_init_fail(const char *model, const char *api_key, char err_msg[1024]) {
+static void *dummy_init_fail(const char *model, const char *api_key, void *xdata, char err_msg[1024]) {
     UNUSED_PARAM(model);
     UNUSED_PARAM(api_key);
+    UNUSED_PARAM(xdata);
     snprintf(err_msg, 1024, "intentional init failure");
     return NULL;
 }