@@ -102,39 +102,42 @@ ovms_cc_library(
102
102
)
103
103
104
104
ovms_cc_library (
105
- name = "utils " ,
105
+ name = "io_processing_utils " ,
106
106
hdrs = ["io_processing/utils.hpp" ],
107
107
srcs = ["io_processing/utils.cpp" ],
108
108
visibility = ["//visibility:public" ],
109
109
)
110
110
111
111
ovms_cc_library (
112
- name = "base_output_parser " ,
112
+ name = "io_processing_base_output_parser " ,
113
113
hdrs = ["io_processing/base_output_parser.hpp" ],
114
114
srcs = ["io_processing/base_output_parser.cpp" ],
115
115
deps = [
116
116
"@com_github_tencent_rapidjson//:rapidjson" ,
117
- ":utils " ,
117
+ ":io_processing_utils " ,
118
118
] + select ({
119
119
"//conditions:default" : ["//third_party:genai" , ":llm_engine" ],
120
120
"//:not_genai_bin" : [":llm_engine" ],
121
121
}),
122
122
)
123
123
ovms_cc_library (
124
- name = "qwen3coder_tool_parser " ,
124
+ name = "io_processing_qwen3coder_tool_parser " ,
125
125
hdrs = ["io_processing/qwen3coder/qwen3coder_tool_parser.hpp" ],
126
126
srcs = ["io_processing/qwen3coder/qwen3coder_tool_parser.cpp" ],
127
127
deps = [
128
128
"@com_github_tencent_rapidjson//:rapidjson" ,
129
+ "//src:libovmslogging" ,
130
+ "//src:libovmsstatus" ,
131
+ "//src/utils:rapidjson_utils" ,
132
+ ":io_processing_utils" ,
133
+ ":io_processing_base_output_parser" ,
129
134
] + select ({
130
135
"//conditions:default" : ["//third_party:genai" , ":llm_engine" ],
131
136
"//:not_genai_bin" : [":llm_engine" ],
132
137
}),
133
138
visibility = ["//visibility:public" ],
134
139
)
135
-
136
-
137
- ovms_cc_library (
140
+ ovms_cc_library ( # TODO split further so we don't have to recompile everything when changing one parser ...
138
141
name = "output_parsers" ,
139
142
hdrs = [
140
143
"io_processing/hermes3/tool_parser.hpp" ,
@@ -145,7 +148,6 @@ ovms_cc_library(
145
148
"io_processing/gptoss/reasoning_parser.hpp" ,
146
149
"io_processing/gptoss/tool_parser.hpp" ,
147
150
"io_processing/gptoss/harmony.hpp" ,
148
- "io_processing/qwen3coder/qwen3coder_tool_parser.hpp" ,
149
151
"io_processing/output_parser.hpp" ,
150
152
],
151
153
srcs = [
@@ -154,7 +156,6 @@ ovms_cc_library(
154
156
"io_processing/phi4/tool_parser.cpp" ,
155
157
"io_processing/mistral/tool_parser.cpp" ,
156
158
"io_processing/qwen3/reasoning_parser.cpp" ,
157
- "io_processing/qwen3coder/qwen3coder_tool_parser.cpp" ,
158
159
"io_processing/gptoss/reasoning_parser.cpp" ,
159
160
"io_processing/gptoss/tool_parser.cpp" ,
160
161
"io_processing/gptoss/harmony.cpp" ,
@@ -164,11 +165,10 @@ ovms_cc_library(
164
165
"@com_github_tencent_rapidjson//:rapidjson" ,
165
166
"//src:libovmslogging" ,
166
167
"//src:libovmsstring_utils" ,
167
- "//src:libovmsstatus" ,
168
- "//src/utils:rapidjson_utils" ,
169
168
":partial_json_builder" ,
170
- ":base_output_parser" ,
171
- ":utils" ,
169
+ ":io_processing_base_output_parser" ,
170
+ ":io_processing_qwen3coder_tool_parser" ,
171
+ ":io_processing_utils" ,
172
172
] + select ({
173
173
"//conditions:default" : ["//third_party:genai" , ":llm_engine" ],
174
174
"//:not_genai_bin" : [":llm_engine" ],
0 commit comments