save

Author: dkalinowski

src/image_gen/http_image_gen_calculator.cc

@@ -25,6 +25,8 @@
 #include "../http_payload.hpp"
 #include "../logging.hpp"
 
+#include "pipelines.hpp"
+
 using namespace ovms;
 
 namespace mediapipe {
@@ -40,6 +42,7 @@ class ImageGenCalculator : public CalculatorBase {
         RET_CHECK(!cc->Inputs().GetTags().empty());
         RET_CHECK(!cc->Outputs().GetTags().empty());
         cc->Inputs().Tag(INPUT_TAG_NAME).Set<ovms::HttpPayload>();
+        cc->InputSidePackets().Tag(IMAGE_GEN_SESSION_SIDE_PACKET_TAG).Set<std::unordered_map<std::string, std::shared_ptr<ovms::ImageGenerationPipelines>>>();  // TODO: template?
         cc->Outputs().Tag(OUTPUT_TAG_NAME).Set<std::string>();
         return absl::OkStatus();
     }

src/mediapipe_internal/mediapipegraphdefinition.cpp

@@ -265,7 +265,8 @@ Status MediapipeGraphDefinition::create(std::shared_ptr<MediapipeGraphExecutor>&
 
     pipeline = std::make_shared<MediapipeGraphExecutor>(getName(), std::to_string(getVersion()),
         this->config, this->inputTypes, this->outputTypes, this->inputNames, this->outputNames,
-        this->pythonNodeResourcesMap, this->genAiServableMap, this->pythonBackend, this->reporter.get());
+        this->pythonNodeResourcesMap, this->genAiServableMap, this->imageGenerationPipelinesMap,
+        this->pythonBackend, this->reporter.get());
     return status;
 }
 

src/mediapipe_internal/mediapipegraphexecutor.cpp

@@ -31,6 +31,8 @@
 #include "../python/python_backend.hpp"
 #endif
 
+#include "../image_gen/pipelines.hpp"
+
 namespace ovms {
 
 MediapipeGraphExecutor::MediapipeGraphExecutor(
@@ -43,6 +45,7 @@ MediapipeGraphExecutor::MediapipeGraphExecutor(
     std::vector<std::string> outputNames,
     const PythonNodeResourcesMap& pythonNodeResourcesMap,
     const GenAiServableMap& llmNodeResourcesMap,
+    const ImageGenerationPipelinesMap& imageGenPipelinesMap,
     PythonBackend* pythonBackend,
     MediapipeServableMetricReporter* mediapipeServableMetricReporter) :
     name(name),
@@ -54,6 +57,7 @@ MediapipeGraphExecutor::MediapipeGraphExecutor(
     outputNames(std::move(outputNames)),
     pythonNodeResourcesMap(pythonNodeResourcesMap),
     llmNodeResourcesMap(llmNodeResourcesMap),
+    imageGenPipelinesMap(imageGenPipelinesMap),
     pythonBackend(pythonBackend),
     currentStreamTimestamp(STARTING_TIMESTAMP),
     mediapipeServableMetricReporter(mediapipeServableMetricReporter) {}

src/mediapipe_internal/mediapipegraphexecutor.hpp

@@ -82,6 +82,7 @@ class MediapipeGraphExecutor {
 
     PythonNodeResourcesMap pythonNodeResourcesMap;
     GenAiServableMap llmNodeResourcesMap;
+    ImageGenerationPipelinesMap imageGenPipelinesMap;
     PythonBackend* pythonBackend;
 
     ::mediapipe::Timestamp currentStreamTimestamp;
@@ -100,6 +101,7 @@ class MediapipeGraphExecutor {
         std::vector<std::string> inputNames, std::vector<std::string> outputNames,
         const PythonNodeResourcesMap& pythonNodeResourcesMap,
         const GenAiServableMap& llmNodeResourcesMap,
+        const ImageGenerationPipelinesMap& imageGenPipelinesMap,
         PythonBackend* pythonBackend,
         MediapipeServableMetricReporter* mediapipeServableMetricReporter);
 
@@ -137,6 +139,9 @@ class MediapipeGraphExecutor {
         inputSidePackets[PYTHON_SESSION_SIDE_PACKET_TAG] = mediapipe::MakePacket<PythonNodeResourcesMap>(this->pythonNodeResourcesMap).At(STARTING_TIMESTAMP);
         inputSidePackets[LLM_SESSION_SIDE_PACKET_TAG] = mediapipe::MakePacket<GenAiServableMap>(this->llmNodeResourcesMap).At(STARTING_TIMESTAMP);
 #endif
+        inputSidePackets[IMAGE_GEN_SESSION_SIDE_PACKET_TAG] = mediapipe::MakePacket<ImageGenerationPipelinesMap>(this->imageGenPipelinesMap).At(STARTING_TIMESTAMP);
+        // TODO: Add for streaming?
+
         MP_RETURN_ON_FAIL(graph.StartRun(inputSidePackets), std::string("start MediaPipe graph: ") + this->name, StatusCode::MEDIAPIPE_GRAPH_START_ERROR);
 
         ::mediapipe::Packet packet;