Merge remote-tracking branch 'origin/concedo_experimental' into remoteManagement

Author: prima

koboldcpp.py

@@ -66,7 +66,7 @@
 dry_seq_break_max = 128
 
 # global vars
-KcppVersion = "1.94"
+KcppVersion = "1.94.1"
 showdebug = True
 kcpp_instance = None #global running instance
 global_memory = {"tunnel_url": "", "restart_target":"", "input_to_exit":False, "load_complete":False, "restart_model": "", "currentConfig": None, "modelOverride": None, "currentModel": None}
@@ -914,6 +914,26 @@ def read_data(datatype):
                 str_val = val_bytes.split(b'\0', 1)[0].decode('utf-8')
                 fptr += str_len
                 return str_val
+            if datatype == "u16":
+                val_bytes = data[fptr:fptr + 2]
+                val = struct.unpack('<H', val_bytes)[0]
+                fptr += 2
+                return val
+            if datatype == "i16":
+                val_bytes = data[fptr:fptr + 2]
+                val = struct.unpack('<h', val_bytes)[0]
+                fptr += 2
+                return val
+            if datatype == "u8":
+                val_bytes = data[fptr:fptr + 1]
+                val = struct.unpack('<B', val_bytes)[0]
+                fptr += 1
+                return val
+            if datatype == "i8":
+                val_bytes = data[fptr:fptr + 1]
+                val = struct.unpack('<b', val_bytes)[0]
+                fptr += 1
+                return val
             if datatype=="arr":
                 val_bytes = data[fptr:fptr + 4]
                 arr_type = struct.unpack('<I', val_bytes)[0]

otherarch/sdcpp/sdtype_adapter.cpp

@@ -589,6 +589,9 @@ sd_generation_outputs sdtype_generate(const sd_generation_inputs inputs)
         //ensure prompt has img keyword, otherwise append it
         if (sd_params->prompt.find("img") == std::string::npos) {
             sd_params->prompt += " img";
+        } else if (sd_params->prompt.rfind("img", 0) == 0) {
+            // "img" found at the start of the string (position 0), which is not allowed. Add some text before it
+            sd_params->prompt = "person " + sd_params->prompt;
         }
     }