New Script commands

src/main/java/com/redislabs/redisai/Command.java

@@ -13,9 +13,11 @@ public enum Command implements ProtocolCommand {
   MODEL_RUN("AI.MODELRUN"),
   MODEL_EXECUTE("AI.MODELEXECUTE"),
   SCRIPT_SET("AI.SCRIPTSET"),
+  SCRIPT_STORE("AI.SCRIPTSTORE"),
   SCRIPT_GET("AI.SCRIPTGET"),
   SCRIPT_DEL("AI.SCRIPTDEL"),
   SCRIPT_RUN("AI.SCRIPTRUN"),
+  SCRIPT_EXECUTE("AI.SCRIPTEXECUTE"),
   DAGRUN("AI.DAGRUN"),
   DAGRUN_RO("AI.DAGRUN_RO"),
   DAGEXECUTE("AI.DAGEXECUTE"),

src/main/java/com/redislabs/redisai/Dag.java

@@ -68,6 +68,21 @@ public Dag runScript(String key, String function, String[] inputs, String[] outp
     return this;
   }
 
+  @Override
+  public Dag executeScript(
+      String key,
+      String function,
+      List<String> keys,
+      List<String> inputs,
+      List<String> args,
+      List<String> outputs) {
+    List<byte[]> binary =
+        Script.scriptExecuteFlatArgs(key, function, keys, inputs, keys, outputs, -1L, true);
+    this.commands.add(binary);
+    this.tensorgetflag.add(false);
+    return this;
+  }
+
   List<byte[]> dagRunFlatArgs(String[] loadKeys, String[] persistKeys) {
     List<byte[]> args = new ArrayList<>();
     if (loadKeys != null && loadKeys.length > 0) {

src/main/java/com/redislabs/redisai/DagRunCommands.java

@@ -1,5 +1,7 @@
 package com.redislabs.redisai;
 
+import java.util.List;
+
 interface DagRunCommands<T> {
   T setTensor(String key, Tensor tensor);
 
@@ -10,4 +12,12 @@ interface DagRunCommands<T> {
   T executeModel(String key, String[] inputs, String[] outputs);
 
   T runScript(String key, String function, String[] inputs, String[] outputs);
+
+  T executeScript(
+      String key,
+      String function,
+      List<String> keys,
+      List<String> inputs,
+      List<String> args,
+      List<String> outputs);
 }

src/main/java/com/redislabs/redisai/Device.java

@@ -10,9 +10,10 @@ public enum Device implements ProtocolCommand {
   private final byte[] raw;
 
   Device() {
-    raw = SafeEncoder.encode(this.name());
+    raw = SafeEncoder.encode(name());
   }
 
+  @Override
   public byte[] getRaw() {
     return raw;
   }

src/main/java/com/redislabs/redisai/Keyword.java

@@ -12,6 +12,7 @@ public enum Keyword implements ProtocolCommand {
   SOURCE,
   RESETSTAT,
   TAG,
+  ENTRY_POINTS,
   BATCHSIZE,
   MINBATCHSIZE,
   MINBATCHTIMEOUT,
@@ -21,6 +22,7 @@ public enum Keyword implements ProtocolCommand {
   LOAD,
   PERSIST,
   KEYS,
+  ARGS,
   PIPE("|>");
 
   private final byte[] raw;

src/main/java/com/redislabs/redisai/RedisAI.java

@@ -9,6 +9,7 @@
 import java.util.Map;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import redis.clients.jedis.BinaryClient;
+import redis.clients.jedis.Client;
 import redis.clients.jedis.HostAndPort;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisClientConfig;
@@ -103,6 +104,22 @@ private static JedisPoolConfig initPoolConfig(int poolSize) {
     return conf;
   }
 
+  private Jedis getConnection() {
+    return pool.getResource();
+  }
+
+  private BinaryClient sendCommand(Jedis conn, Command command, byte[]... args) {
+    BinaryClient client = conn.getClient();
+    client.sendCommand(command, args);
+    return client;
+  }
+
+  private Client sendCommand(Jedis conn, Command command, String... args) {
+    Client client = conn.getClient();
+    client.sendCommand(command, args);
+    return client;
+  }
+
   /**
    * Direct mapping to AI.TENSORSET
    *
@@ -320,6 +337,27 @@ public boolean setScript(String key, Script script) {
     }
   }
 
+  /**
+   * Direct mapping to AI.MODELSTORE command.
+   *
+   * <p>{@code AI.SCRIPTSTORE <key> <device> [TAG tag] ENTRY_POINTS <entry_point_count>
+   * <entry_point> [<entry_point>...] SOURCE "<script>"}
+   *
+   * @param key name of key to store the Script in RedisAI server
+   * @param script the Script Object
+   * @return true if Script was properly stored in RedisAI server
+   */
+  public boolean storeScript(String key, Script script) {
+    try (Jedis conn = getConnection()) {
+      List<String> args = script.getScriptStoreCommandBytes(key);
+      return sendCommand(conn, Command.SCRIPT_STORE, args.toArray(new String[args.size()]))
+          .getStatusCodeReply()
+          .equals("OK");
+    } catch (JedisDataException ex) {
+      throw new RedisAIException(ex.getMessage(), ex);
+    }
+  }
+
   /**
    * Direct mapping to AI.SCRIPTGET
    *
@@ -427,6 +465,50 @@ public boolean runScript(String key, String function, String[] inputs, String[]
     }
   }
 
+  public boolean executeScript(
+      String key,
+      String function,
+      List<String> keys,
+      List<String> inputs,
+      List<String> args,
+      List<String> outputs) {
+    return executeScript(key, function, keys, inputs, args, outputs, -1);
+  }
+
+  /**
+   * Direct mapping to AI.SCRIPTEXECUTE command.
+   *
+   * <p>{@code AI.SCRIPTEXECUTE <key> <function> [KEYS n <key> [keys...]] [INPUTS m <input> [input
+   * ...]] [ARGS k <arg> [arg...]] [OUTPUTS k <output> [output ...] [TIMEOUT t]]+}
+   *
+   * @param key
+   * @param function
+   * @param keys
+   * @param inputs
+   * @param args
+   * @param outputs
+   * @param timeout timeout in ms
+   * @return
+   */
+  public boolean executeScript(
+      String key,
+      String function,
+      List<String> keys,
+      List<String> inputs,
+      List<String> args,
+      List<String> outputs,
+      long timeout) {
+    try (Jedis conn = getConnection()) {
+      List<byte[]> binary =
+          Script.scriptExecuteFlatArgs(key, function, keys, inputs, args, outputs, timeout, false);
+      return sendCommand(conn, Command.SCRIPT_EXECUTE, binary.toArray(new byte[binary.size()][]))
+          .getStatusCodeReply()
+          .equals("OK");
+    } catch (JedisDataException ex) {
+      throw new RedisAIException(ex.getMessage(), ex);
+    }
+  }
+
   /**
    * Direct mapping to AI.DAGRUN specifies a direct acyclic graph of operations to run within
    * RedisAI
@@ -555,16 +637,6 @@ public boolean resetStat(String key) {
     }
   }
 
-  private Jedis getConnection() {
-    return pool.getResource();
-  }
-
-  private BinaryClient sendCommand(Jedis conn, Command command, byte[]... args) {
-    BinaryClient client = conn.getClient();
-    client.sendCommand(command, args);
-    return client;
-  }
-
   /**
    * AI.CONFIG <BACKENDSPATH <path>>
    *