DRY: Removed mixed arrays for prompt

Author: wwoodsTM

examples/server/server.cpp

@@ -164,7 +164,7 @@ struct server_slot {
     int32_t n_prompt_tokens           = 0;
     int32_t n_prompt_tokens_processed = 0;
 
-    json prompt; // can be either a string, array of strings, array of token ids, or mixed array of strings and token ids
+    json prompt; // can be either a string, array of strings or array of token ids
 
     json input_prefix;
     json input_suffix;
@@ -906,20 +906,10 @@ struct server_context {
             // Ref: https://github.com/oobabooga/text-generation-webui/blob/d1af7a41ade7bd3c3a463bfa640725edb818ebaf/extensions/openai/typing.py#L39
 
             auto dry_sequence_breakers = data.find("dry_sequence_breakers");
-            if (dry_sequence_breakers != data.end()) {
-                try {
-                    if (dry_sequence_breakers->is_array()) {
-                        slot.sparams.dry_sequence_breakers = dry_sequence_breakers->get<std::vector<std::string>>();
-                        if (slot.sparams.dry_sequence_breakers.empty()) {
-                            send_error(task, "Error: dry_sequence_breakers must be a non-empty array of strings", ERROR_TYPE_INVALID_REQUEST);
-                            return false;
-                        }
-                    } else {
-                        send_error(task, "Error: dry_sequence_breakers must be a non-empty array of strings", ERROR_TYPE_INVALID_REQUEST);
-                        return false;
-                    }
-                } catch (const std::exception & e) {
-                    send_error(task, std::string("\"dry_sequence_breakers\": ") + e.what(), ERROR_TYPE_INVALID_REQUEST);
+            if (data.contains("dry_sequence_breakers")) {
+                slot.sparams.dry_sequence_breakers = json_value(data, "dry_sequence_breakers", std::vector<std::string>());
+                if (slot.sparams.dry_sequence_breakers.empty()) {
+                    send_error(task, "Error: dry_sequence_breakers must be a non-empty array of strings", ERROR_TYPE_INVALID_REQUEST);
                     return false;
                 }
             }
@@ -979,21 +969,22 @@ struct server_context {
             }
 
             if ((prompt->is_string()) ||
-                (prompt->is_array() && !prompt->empty() && (prompt->at(0).is_string() || prompt->at(0).is_number_integer()))) {
+                (prompt->is_array() &&  prompt->size() == 1 && prompt->at(0).is_string()) ||
+                (prompt->is_array() && !prompt->empty()     && prompt->at(0).is_number_integer())) {
                 slot.prompt = *prompt;
             } else if (prompt->is_array() && prompt->size() == 1 && prompt->at(0).is_array()) {
                 slot.prompt = prompt->at(0);
             } else if (prompt->is_array() && prompt->size() > 1) {
                 // array of strings
                 for (const auto & el : *prompt) {
                     if (!el.is_string()) {
-                        send_error(task, "\"prompt\" must be a string, an array of strings, an array of integers, or a mixed array of strings and integers", ERROR_TYPE_INVALID_REQUEST);
+                        send_error(task, "\"prompt\" must be a string, an array of strings or an array of integers", ERROR_TYPE_INVALID_REQUEST);
                         return false;
                     }
                 }
                 slot.prompt = *prompt;
             } else {
-                send_error(task, "\"prompt\" must be a string, an array of strings, an array of integers, or a mixed array of strings and integers", ERROR_TYPE_INVALID_REQUEST);
+                send_error(task, "\"prompt\" must be a string, an array of strings or an array of integers", ERROR_TYPE_INVALID_REQUEST);
                 return false;
             }
         }
@@ -1511,27 +1502,15 @@ struct server_context {
             tasks.push_back(std::move(task));
         };
 
-        static constexpr const char * error_msg = "\"prompt\" must be a string, an array of token ids, a mixed array of strings and token ids, or an array of prompts";
+        static constexpr const char * error_msg = "\"prompt\" must be a string, an array of token ids or an array of prompts";
         if (!data.contains("prompt")) {
             throw std::runtime_error(error_msg);
         }
 
         json prompt = data.at("prompt");
 
-        auto is_valid_singleton_array = [](const json& arr) {
-            bool has_number = false;
-            for (const auto& elem : arr) {
-                if (elem.is_number()) {
-                    has_number = true;
-                } else if (!elem.is_string()) {
-                    return false;
-                }
-            }
-            return has_number;
-        };
-
-        // if the prompt is a singleton (i.e. a string, a list of tokens, or a mixed array of strings and tokens), we only need to create a single task
-        if (prompt.is_string() || (prompt.is_array() && is_valid_singleton_array(prompt))) {
+        // if the prompt is a singleton (i.e. a string or a list of tokens), we only need to create single task
+        if (prompt.is_string() || json_is_array_of_numbers(prompt)) {
             data["index"] = 0;
             create_task(data, false, nullptr);
         } else if (prompt.is_array()) {