Output parsers build split

Author: atobiszei

src/llm/BUILD

@@ -91,9 +91,52 @@ ovms_cc_library(
     additional_copts = COPTS_PYTHON
 )
 
+ovms_cc_library(
+    name = "partial_json_builder",
+    hdrs = ["io_processing/partial_json_builder.hpp"],
+    srcs = ["io_processing/partial_json_builder.cpp"],
+    deps = [
+        "@com_github_tencent_rapidjson//:rapidjson",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+ovms_cc_library(
+    name = "utils",
+    hdrs = ["io_processing/utils.hpp"],
+    srcs = ["io_processing/utils.cpp"],
+    visibility = ["//visibility:public"],
+)
+
+ovms_cc_library(
+    name = "base_output_parser",
+    hdrs = ["io_processing/base_output_parser.hpp"],
+    srcs = ["io_processing/base_output_parser.cpp"],
+    deps = [
+        "@com_github_tencent_rapidjson//:rapidjson",
+        ":utils",
+    ] + select({
+        "//conditions:default": ["//third_party:genai", ":llm_engine"],
+        "//:not_genai_bin" : [":llm_engine"],
+    }),
+)
+ovms_cc_library(
+    name = "qwen3coder_tool_parser",
+    hdrs = ["io_processing/qwen3coder/qwen3coder_tool_parser.hpp"],
+    srcs = ["io_processing/qwen3coder/qwen3coder_tool_parser.cpp"],
+    deps = [
+        "@com_github_tencent_rapidjson//:rapidjson",
+    ] + select({
+        "//conditions:default": ["//third_party:genai", ":llm_engine"],
+        "//:not_genai_bin" : [":llm_engine"],
+    }),
+    visibility = ["//visibility:public"],
+)
+
+
 ovms_cc_library(
     name = "output_parsers",
-    hdrs = ["io_processing/base_output_parser.hpp",
+    hdrs = [
             "io_processing/hermes3/tool_parser.hpp",
             "io_processing/llama3/tool_parser.hpp",
             "io_processing/phi4/tool_parser.hpp",
@@ -104,9 +147,8 @@ ovms_cc_library(
             "io_processing/gptoss/harmony.hpp",
             "io_processing/qwen3coder/qwen3coder_tool_parser.hpp",
             "io_processing/output_parser.hpp",
-            "io_processing/partial_json_builder.hpp",
-            "io_processing/utils.hpp"],
-    srcs = ["io_processing/base_output_parser.cpp",
+    ],
+    srcs = [
             "io_processing/hermes3/tool_parser.cpp",
             "io_processing/llama3/tool_parser.cpp",
             "io_processing/phi4/tool_parser.cpp",
@@ -117,14 +159,16 @@ ovms_cc_library(
             "io_processing/gptoss/tool_parser.cpp",
             "io_processing/gptoss/harmony.cpp",
             "io_processing/output_parser.cpp",
-            "io_processing/partial_json_builder.cpp",
-            "io_processing/utils.cpp"],
+    ],
     deps = [
         "@com_github_tencent_rapidjson//:rapidjson",
         "//src:libovmslogging",
         "//src:libovmsstring_utils",
         "//src:libovmsstatus",
         "//src/utils:rapidjson_utils",
+        ":partial_json_builder",
+        ":base_output_parser",
+        ":utils",
     ] + select({
         "//conditions:default": ["//third_party:genai", ":llm_engine"],
         "//:not_genai_bin" : [":llm_engine"],

src/llm/io_processing/base_output_parser.hpp

@@ -32,8 +32,6 @@
 #include <rapidjson/writer.h>
 #pragma warning(pop)
 
-#include "partial_json_builder.hpp"
-
 namespace ovms {
 struct ToolCall {
     std::string id;

src/llm/io_processing/hermes3/tool_parser.hpp

@@ -28,7 +28,8 @@
 #include <rapidjson/writer.h>
 #pragma warning(pop)
 
-#include "../base_output_parser.hpp"
+#include "src/llm/io_processing/base_output_parser.hpp"
+#include "src/llm/io_processing/partial_json_builder.hpp"
 
 namespace ovms {
 class Hermes3ToolParser : public BaseOutputParser {

src/llm/io_processing/llama3/tool_parser.hpp

@@ -28,7 +28,8 @@
 #include <rapidjson/writer.h>
 #pragma warning(pop)
 
-#include "../base_output_parser.hpp"
+#include "src/llm/io_processing/base_output_parser.hpp"
+#include "src/llm/io_processing/partial_json_builder.hpp"
 
 namespace ovms {
 class Llama3ToolParser : public BaseOutputParser {

src/llm/io_processing/mistral/tool_parser.hpp

@@ -28,7 +28,7 @@
 #include <rapidjson/writer.h>
 #pragma warning(pop)
 
-#include "../base_output_parser.hpp"
+#include "src/llm/io_processing/base_output_parser.hpp"
 
 namespace ovms {
 class MistralToolParser : public BaseOutputParser {

src/llm/io_processing/phi4/tool_parser.hpp

@@ -28,7 +28,7 @@
 #include <rapidjson/writer.h>
 #pragma warning(pop)
 
-#include "../base_output_parser.hpp"
+#include "src/llm/io_processing/base_output_parser.hpp"
 
 namespace ovms {
 class Phi4ToolParser : public BaseOutputParser {

src/test/llm/output_parsers/qwen3coder_output_parser_test.cpp

@@ -571,8 +571,7 @@ TEST_F(Qwen3CoderOutputParserTest, StreamingSimpleToolCall) {
         {"ANOTHER_STRING_VALUE\n", ov::genai::GenerationFinishReason::NONE, std::nullopt},
         {"</parameter>\n", ov::genai::GenerationFinishReason::NONE, std::nullopt},
         {"</function>", ov::genai::GenerationFinishReason::NONE, std::nullopt},
-        {"</tool_call>", ov::genai::GenerationFinishReason::NONE, R"({"delta":{"tool_calls":[{"index":1,"function":{"arguments":"{\"arg1\": \"\nANOTHER_STRING_VALUE\"}"}}]}})"}
-    };
+        {"</tool_call>", ov::genai::GenerationFinishReason::NONE, R"({"delta":{"tool_calls":[{"index":1,"function":{"arguments":"{\"arg1\": \"\nANOTHER_STRING_VALUE\"}"}}]}})"}};
     for (const auto& [chunk, finishReason, expectedDelta] : chunkToDeltaVec) {
         i++;
         std::optional<rapidjson::Document> doc = outputParser->parseChunk(chunk, true, ov::genai::GenerationFinishReason::NONE);