Return single-line error in response. Free err details with RM_Free. (#76)

Author: lantiga

src/err.c

@@ -5,6 +5,17 @@
 
 #include "redismodule.h"
 
+char *RAI_Chomp(const char *src) {
+  char* str = RedisModule_Strdup(src);
+  size_t len = strlen(src);
+  for (size_t i=0; i<len; i++) {
+    if (str[i] == '\n' || str[i] == '\r') {
+      str[i] = ' ';
+    }
+  }
+  return str;
+}
+
 void RAI_SetError(RAI_Error *err, RAI_ErrorCode code, const char *detail) {
   if (err->code != RAI_OK) {
     return;
@@ -15,19 +26,23 @@ void RAI_SetError(RAI_Error *err, RAI_ErrorCode code, const char *detail) {
   if (detail) {
     err->detail = RedisModule_Strdup(detail);
   } else {
-    err->detail = strdup("Generic error");
+    err->detail = RedisModule_Strdup("Generic error");
   }
+
+  err->detail_oneline = RAI_Chomp(err->detail);
 }
 
 RAI_Error RAI_InitError() {
-  RAI_Error err = {.code = RAI_OK, .detail = NULL};
+  RAI_Error err = {.code = RAI_OK, .detail = NULL, .detail_oneline = NULL};
   return err;
 }
 
 void RAI_ClearError(RAI_Error *err) {
   if (err->detail) {
-    free(err->detail);
+    RedisModule_Free(err->detail);
+    RedisModule_Free(err->detail_oneline);
     err->detail = NULL;
+    err->detail_oneline = NULL;
   }
   err->code = RAI_OK;
 }

src/err.h

@@ -19,6 +19,7 @@ typedef enum {
 typedef struct RAI_Error {
   RAI_ErrorCode code;
   char* detail;
+  char* detail_oneline;
 } RAI_Error;
 
 RAI_Error RAI_InitError();

src/redisai.c

@@ -474,7 +474,7 @@ int RedisAI_ModelSet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv,
     #ifdef RAI_PRINT_BACKEND_ERRORS
     printf("ERR: %s\n", err.detail);
     #endif
-    int ret = RedisModule_ReplyWithError(ctx, err.detail);
+    int ret = RedisModule_ReplyWithError(ctx, err.detail_oneline);
     RAI_ClearError(&err);
     return ret;
   }
@@ -531,7 +531,7 @@ void *RedisAI_RunSession(void *arg) {
     #ifdef RAI_PRINT_BACKEND_ERRORS
     printf("ERR: %s\n", err.detail);
     #endif
-    int ret = RedisModule_ReplyWithError(ctx, err.detail);
+    int ret = RedisModule_ReplyWithError(ctx, err.detail_oneline);
     RAI_ClearError(&err);
     return NULL;
   }
@@ -844,7 +844,7 @@ int RedisAI_ScriptRun_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv
     #ifdef RAI_PRINT_BACKEND_ERRORS
     printf("ERR: %s\n", err.detail);
     #endif
-    int ret = RedisModule_ReplyWithError(ctx, err.detail);
+    int ret = RedisModule_ReplyWithError(ctx, err.detail_oneline);
     RAI_ClearError(&err);
     return ret;
   }
@@ -918,12 +918,11 @@ int RedisAI_ScriptSet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv
   RAI_Error err = RAI_InitError();
   script = RAI_ScriptCreate(device, scriptdef, &err);
 
-  // if (script == NULL){
   if (err.code != RAI_OK){
     #ifdef RAI_PRINT_BACKEND_ERRORS
     printf("ERR: %s\n", err.detail);
     #endif
-    int ret = RedisModule_ReplyWithError(ctx, err.detail);
+    int ret = RedisModule_ReplyWithError(ctx, err.detail_oneline);
     RAI_ClearError(&err);
     return ret;
   }

test/basic_tests.py

@@ -149,3 +149,18 @@ def test_run_mobilenet_multiproc(env):
     env.assertEqual(
         label, 'giant_panda'
     )
+
+def test_set_incorrect_script(env):
+    try:
+        env.execute_command('AI.SCRIPTSET', 'ket', 'CPU', 'return 1')
+    except Exception as e:
+        exception = e
+    env.assertEqual(type(exception), redis.exceptions.ResponseError)
+
+def test_set_correct_script(env):
+    script = '''
+       def foo(a, b):
+           return a + b
+    '''
+    env.execute_command('AI.SCRIPTSET', 'ket', 'CPU', script)
+