Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions demos/common/export_models/export_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,14 @@ def add_common_arguments(parser):
name: "S2tExecutor"
input_side_packet: "STT_NODE_RESOURCES:s2t_servable"
calculator: "S2tCalculator"
input_stream: "LOOPBACK:loopback"
input_stream: "HTTP_REQUEST_PAYLOAD:input"
output_stream: "LOOPBACK:loopback"
output_stream: "HTTP_RESPONSE_PAYLOAD:output"
input_stream_info: {
tag_index: 'LOOPBACK:0',
back_edge: true
}
node_options: {
[type.googleapis.com / mediapipe.S2tCalculatorOptions]: {
models_path: "{{model_path}}",
Expand All @@ -144,6 +150,16 @@ def add_common_arguments(parser):
enable_word_timestamps: {% if not enable_word_timestamps %}false{% else %}true{% endif%},
}
}
input_stream_handler {
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@michalkulakowski will old graphs without a loop work? for users that exported model in the past but will use ovms 2026.2 (with a loop input)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it will work with unary request, for streaming error will be returned
"{'error': 'Mediapipe execution failed. MP status - INVALID_ARGUMENT: CalculatorGraph::Run() failed: \nCalculator::Process() for node "S2tExecutor" failed: streaming is not supported for this graph configuration (LOOPBACK not configured)'}"

input_stream_handler: "SyncSetInputStreamHandler",
options {
[mediapipe.SyncSetInputStreamHandlerOptions.ext] {
sync_set {
tag_index: "LOOPBACK:0"
}
}
}
}
}
"""

Expand Down
17 changes: 17 additions & 0 deletions src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ cc_library(
copts = COMMON_STATIC_LIBS_COPTS,
)

ovms_cc_library(
name = "executor_base",
hdrs = ["executor_base.hpp"],
deps = [
"//src:libovmslogging",
],
visibility = ["//visibility:public"],
alwayslink = 1,
)

cc_shared_library(
name = "ovms_shared",
dynamic_deps = [],
Expand Down Expand Up @@ -1231,6 +1241,12 @@ ovms_cc_library(
)


ovms_cc_library(
name = "sse_utils",
hdrs = ["sse_utils.hpp"],
visibility = ["//visibility:public"],
)

ovms_cc_library(
name = "libovmsstatus",
hdrs = ["status.hpp",],
Expand Down Expand Up @@ -2243,6 +2259,7 @@ cc_test(
"test/llm/visual_language_model/initialization_test.cpp",
"test/audio/text2speech_test.cpp",
"test/audio/speech2text_test.cpp",
"test/audio/s2t_streaming_test.cpp",
],
"//:disable_mediapipe" : [
"test/disabled_mediapipe_test.cpp",
Expand Down
47 changes: 45 additions & 2 deletions src/audio/speech_to_text/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,50 @@ load("//:common_settings.bzl", "ovms_cc_library")

ovms_cc_library(
name = "s2t_servable",
hdrs = ["s2t_servable.hpp"],
srcs = ["s2t_servable.cpp"],
hdrs = [
"s2t_executor.hpp",
"s2t_servable.hpp",
],
deps = [
"//src:executor_base",
"//src:httppayload",
"//src:libovmslogging",
"//src:libmodelconfigjsonparser",
"//src:libovmsstring_utils",
"s2t_calculator_cc_proto",
"@com_google_absl//absl/status",
"//third_party:genai",
],
visibility = ["//visibility:public"],
alwayslink = 1,
)

ovms_cc_library(
name = "s2t_streaming_handler",
srcs = [
"s2t_streaming_handler.cpp",
"streaming_text_queue.cpp",
],
hdrs = [
"s2t_streaming_handler.hpp",
"streaming_text_queue.hpp",
],
deps = [
"@mediapipe//mediapipe/framework:calculator_framework",
"//src:httppayload",
"//src:libovmsclient_connection",
"//src:libovmslogging",
"//src:libovmsstring_utils",
"//src:libovmsstatus",
"//src:libmodelconfigjsonparser",
"//src:sse_utils",
"//src/port:rapidjson_stringbuffer",
"//src/port:rapidjson_writer",
":s2t_servable",
"s2t_calculator_cc_proto",
"//third_party:genai",
],
visibility = ["//visibility:public"],
alwayslink = 1,
)
Expand All @@ -37,11 +80,11 @@ ovms_cc_library(
"//src/port:rapidjson_stringbuffer",
"//src/port:rapidjson_writer",
":s2t_servable",
":s2t_streaming_handler",
"//third_party:genai",
"//src/audio:audio_utils",
"//src:libmodelconfigjsonparser",
"//src/mediapipe_internal:node_initializer",
"//src:libovmsstring_utils",
],
visibility = ["//visibility:public"],
alwayslink = 1,
Expand Down
Loading