Update README.md

Author: LogicismDev

README.md

@@ -6,6 +6,11 @@ A Java based implementation for StableHorde's Generations UI. Aimed to be more f
 - Text Generation Scribe Worker
   - KoboldAI Client Verifier
   - Generation Popper
+- Interrogation Alchemist Worker
+  - Image Captioning
+  - NSFW Checking
+  - Image Interrogation
+  - Strip Background Post Processing
 
 ## How to install and use
 
@@ -20,7 +25,10 @@ Please note that this requires the usage of Java 11 or higher to use the bridge.
 | API Key | -a, --kai_apikey | Set the Horde Worker API Key | -a Qjr8u2I0j2D8ZjXrA0aZ4r |
 | Config File | -c, --config | The configuration file to grab the Horde Worker information from | -c config.yml |
 | Interval | -i, --interval | The interval to check if there are new generations | -i 1 |
+| Worker Type | -t, --worker_type | The Worker type to specify (text/interrogation) | -t text |
 | KoboldAI URL | -k, --kai_url | The KoboldAI URL to grab generations from | -k http://127.0.0.1:5000 |
 | Horde Worker Name | -n, --kai_name | Set the Horde Worker name | -n "A Java-Horde-Bridge Worker" |
 | Priority Usernames | -p, --priority_usernames | The usernames to prioritize generations | -p Logicism#14426,db0#1,Henk#1326 |
-| Cluster URL | -u, --cluster_url | Set the cluster url to grab prompts and to send generations to | -u https://stablehorde.net |
+| Cluster URL | -u, --cluster_url | Set the cluster url to grab prompts and to send generations to | -u https://aihorde.net |
+| Backup Cluster URL | -b, --backup_cluster_url | Set the backup cluster url if the main cluster is down | -b https://stablehorde.net |
+| Forms | -f, --forms | The interrogation forms to enable for the worker | -f caption,nsfw,interrogation,strip_background |

src/main/java/me/Logicism/JavaHordeBridge/HordeBridge.java

@@ -36,6 +36,7 @@ public class HordeBridge {
     private static String clusterURL = "https://aihorde.net";
     private static String backupClusterURL = "https://stablehorde.net";
     private static String[] priorityUsernames = new String[0];
+    private static String[] forms = new String[0];
 
     private static ExecutorService service = Executors.newSingleThreadExecutor();
 
@@ -52,7 +53,8 @@ public static void main(String[] args) {
         Option kai_apikey = Option.builder("a").longOpt("kai_apikey").argName("kai_apikey").hasArg().desc("Set the Horde Worker API Key").numberOfArgs(1).build();
         Option cluster_url = Option.builder("u").longOpt("cluster_url").argName("cluster_url").hasArg().desc("Set the cluster url to grab prompts and to send generations to").numberOfArgs(1).build();
         Option backup_cluster_url = Option.builder("b").longOpt("backup_cluster_url").argName("backup_cluster_url").hasArg().desc("Set the backup cluster url if the main cluster is down").numberOfArgs(1).build();
-        Option priority_usernames = Option.builder("p").longOpt("priority_usernames").argName("priority_usernames").hasArg().valueSeparator(',').desc("The usernames to prioritize generations").build();
+        Option priority_usernames = Option.builder("p").longOpt("priority_usernames").argName("priority_usernames").hasArg().valueSeparator(',').desc("The usernames to prioritize generations").numberOfArgs(1).build();
+        Option oForms = Option.builder("f").longOpt("forms").argName("forms").hasArg().valueSeparator(',').desc("The interrogation forms to enable for the worker").numberOfArgs(1).build();
 
         options.addOption(interval);
         options.addOption(config);
@@ -63,6 +65,7 @@ public static void main(String[] args) {
         options.addOption(cluster_url);
         options.addOption(backup_cluster_url);
         options.addOption(priority_usernames);
+        options.addOption(oForms);
 
         HelpFormatter helper = new HelpFormatter();
         try {
@@ -76,7 +79,7 @@ public static void main(String[] args) {
             if (workerType.equals("text")) {
                 service.execute(new TextHordeRunnable(INSTANCE, kaiURL, kaiName, kaiAPIKey, clusterURL, backupClusterURL, priorityUsernames));
             } else if (workerType.equals("interrogate")) {
-                service.execute(new InterrogationHordeRunnable(INSTANCE, kaiURL, kaiName, kaiAPIKey, clusterURL, backupClusterURL, priorityUsernames));
+                service.execute(new InterrogationHordeRunnable(INSTANCE, kaiURL, kaiName, kaiAPIKey, clusterURL, backupClusterURL, priorityUsernames, forms));
             }
         } catch (ParseException e) {
             System.out.println(e.getMessage());
@@ -125,6 +128,9 @@ public HordeBridge(CommandLine cmd) {
             if (cmd.hasOption("priority_usernames")) {
                 priorityUsernames = cmd.getOptionValues("priority_usernames");
             }
+            if (cmd.hasOption("forms")) {
+                forms = cmd.getOptionValues("forms");
+            }
         } else {
             ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
 
@@ -162,8 +168,4 @@ public KAIGenerator getGenerator() {
     public InterrogationGenerator getInterroGenerator() {
         return interroGenerator;
     }
-
-    public HordeConfig getConfig() {
-        return config;
-    }
 }

src/main/java/me/Logicism/JavaHordeBridge/runnables/InterrogationHordeRunnable.java

@@ -24,6 +24,7 @@ public class InterrogationHordeRunnable implements Runnable {
     private String clusterURL;
     private String backupClusterURL;
     private String[] priorityUsernames;
+    private String[] forms;
 
     private boolean isRunning = true;
     private int failedRequestsCount = 0;
@@ -32,14 +33,15 @@ public class InterrogationHordeRunnable implements Runnable {
     private Long lastValidated = null;
     private boolean online = false;
 
-    public InterrogationHordeRunnable(HordeBridge bridge, String kaiURL, String kaiName, String apiKey, String clusterURL, String backupClusterURL, String[] priorityUsernames) {
+    public InterrogationHordeRunnable(HordeBridge bridge, String kaiURL, String kaiName, String apiKey, String clusterURL, String backupClusterURL, String[] priorityUsernames, String[] forms) {
         this.bridge = bridge;
         this.kaiURL = kaiURL;
         this.kaiName = kaiName;
         this.apiKey = apiKey;
         this.backupClusterURL = backupClusterURL;
         this.clusterURL = clusterURL;
         this.priorityUsernames = priorityUsernames;
+        this.forms = forms;
     }
 
     @Override
@@ -87,7 +89,7 @@ public void run() {
 
             if (online) {
                 JSONObject interrogatePayload = new JSONObject();
-                interrogatePayload.put("name", kaiName).put("forms", bridge.getConfig().getInterrogationForms()).put("amount", 1).put("threads", 1).put("max_tiles", 64).put("bridge_version", HordeBridge.BRIDGE_VERSION).put("bridge_agent", HordeBridge.BRIDGE_AGENT);;
+                interrogatePayload.put("name", kaiName).put("amount", 1).put("threads", 1).put("max_tiles", 64).put("bridge_version", HordeBridge.BRIDGE_VERSION).put("bridge_agent", HordeBridge.BRIDGE_AGENT);;
                 if (priorityUsernames.length != 0) {
                     JSONArray priorityUsernameArrays = new JSONArray();
 
@@ -97,6 +99,11 @@ public void run() {
 
                     interrogatePayload.put("priority_usernames", priorityUsernameArrays);
                 }
+                JSONArray formsArray = new JSONArray();
+                for (String form : forms) {
+                    formsArray.put(form);
+                }
+                interrogatePayload.put("forms", formsArray);
 
                 Map<String, String> headers = new HashMap<>();
                 headers.put("apikey", apiKey);