Project import generated by Copybara.

GitOrigin-RevId: f9a66589eaf652bb93f8e37ed9e4da26e59ef214

mediapipe/python/pybind/BUILD

@@ -43,6 +43,7 @@ pybind_library(
     deps = [
         ":image_frame_util",
         ":util",
+        "//mediapipe/framework:type_map",
     ],
 )
 

mediapipe/python/pybind/calculator_graph.cc

@@ -98,12 +98,14 @@ void CalculatorGraphSubmodule(pybind11::module* module) {
         if ((init_with_binary_graph ? 1 : 0) + (init_with_graph_proto ? 1 : 0) +
                 (init_with_validated_graph_config ? 1 : 0) !=
             1) {
-          throw RaisePyError(
-              PyExc_ValueError,
-              "Please provide \'binary_graph\' to initialize the graph with"
-              " binary graph or provide \'graph_config\' to initialize the "
-              " with graph config proto or provide \'validated_graph_config\' "
-              " to initialize the with ValidatedGraphConfig object.");
+          throw RaisePyError(PyExc_ValueError,
+                             "Please provide one of the following: "
+                             "\'binary_graph_path\' to initialize the graph "
+                             "with a binary graph file, or "
+                             "\'graph_config\' to initialize the graph with a "
+                             "graph config proto, or "
+                             "\'validated_graph_config\' to initialize the "
+                             "graph with a ValidatedGraphConfig object.");
         }
         auto calculator_graph = absl::make_unique<CalculatorGraph>();
         RaisePyErrorIfNotOk(calculator_graph->Initialize(graph_config_proto));

mediapipe/python/pybind/image_frame.cc

@@ -365,3 +365,7 @@ void ImageFrameSubmodule(pybind11::module* module) {
 
 }  // namespace python
 }  // namespace mediapipe
+
+#include "mediapipe/framework/type_map.h"
+MEDIAPIPE_REGISTER_TYPE(::mediapipe::ImageFrame, "::mediapipe::ImageFrame",
+                        nullptr, nullptr);

mediapipe/python/pybind/validated_graph_config.cc

@@ -65,6 +65,14 @@ void ValidatedGraphConfigSubmodule(pybind11::module* module) {
                         .c_str());
               }
             }
+            if (!(init_with_binary_graph ^ init_with_graph_proto)) {
+              throw RaisePyError(
+                  PyExc_ValueError,
+                  "Please either provide \'binary_graph_path\' to initialize "
+                  "a ValidatedGraphConfig object with a binary graph file or "
+                  "\'graph_config\' to initialize a ValidatedGraphConfig "
+                  "object with a graph config proto.");
+            }
             RaisePyErrorIfNotOk(self->Initialize(graph_config_proto));
           },
           R"doc(Initialize ValidatedGraphConfig with a CalculatorGraphConfig.