Python API: allow regular Dict[str, ?] to describe expected attributes

Signed-off-by: Evgeniia Nugmanova <evgeniia.nugmanova@intel.com>

Author: jane-intel

src/bindings/python/src/pyopenvino/graph/passes/pattern_ops.cpp

@@ -18,6 +18,7 @@
 #include "openvino/pass/pattern/op/pattern.hpp"
 #include "openvino/pass/pattern/op/wrap_type.hpp"
 #include "pyopenvino/core/common.hpp"
+#include "pyopenvino/utils/utils.hpp"
 
 static ov::NodeTypeInfo get_type(const std::string& type_name) {
     // Supported types: opsetX.OpName or opsetX::OpName
@@ -1014,7 +1015,9 @@ inline void reg_predicates(py::module m) {
     m.def("type_matches", &ov::pass::pattern::type_matches);
     m.def("type_matches_any", &ov::pass::pattern::type_matches_any);
     m.def("shape_matches", &ov::pass::pattern::shape_matches);
-    m.def("attrs_match", &ov::pass::pattern::attrs_match);
+    m.def("attrs_match", [](py::object& attrs) {
+        return ov::pass::pattern::attrs_match(Common::utils::py_object_to_unordered_any_map(attrs));
+    });
 }
 
 void reg_passes_pattern_ops(py::module m) {

src/bindings/python/src/pyopenvino/utils/utils.cpp

@@ -404,6 +404,21 @@ ov::AnyMap py_object_to_any_map(const py::object& py_obj) {
     return return_value;
 }
 
+std::unordered_map<std::string, ov::Any> py_object_to_unordered_any_map(const py::object& py_obj) {
+    OPENVINO_ASSERT(py_object_is_any_map(py_obj), "Unsupported attribute type.");
+    std::unordered_map<std::string, ov::Any> return_value = {};
+    for (auto& item : py::cast<py::dict>(py_obj)) {
+        std::string key = py::cast<std::string>(item.first);
+        py::object value = py::cast<py::object>(item.second);
+        if (py_object_is_any_map(value)) {
+            return_value[key] = Common::utils::py_object_to_any_map(value);
+        } else {
+            return_value[key] = Common::utils::py_object_to_any(value);
+        }
+    }
+    return return_value;
+}
+
 ov::Any py_object_to_any(const py::object& py_obj) {
     // Python types
     py::object float_32_type = py::module_::import("numpy").attr("float32");

src/bindings/python/src/pyopenvino/utils/utils.hpp

@@ -91,6 +91,8 @@ class MemoryBuffer : public std::streambuf {
 
     ov::AnyMap py_object_to_any_map(const py::object& py_obj);
 
+    std::unordered_map<std::string, ov::Any> py_object_to_unordered_any_map(const py::object& py_obj);
+
     ov::Any py_object_to_any(const py::object& py_obj);
 
     ov::pass::Serialize::Version convert_to_version(const std::string& version);

src/bindings/python/tests/test_transformations/test_pattern_ops.py

@@ -4,7 +4,7 @@
 import numpy as np
 import pytest
 
-from openvino import PartialShape, Symbol, Dimension, OVAny
+from openvino import PartialShape, Symbol, Dimension
 from openvino import opset13 as ops
 from openvino.passes import Matcher, WrapType, Or, AnyInput, Optional
 from openvino.passes import (
@@ -284,7 +284,7 @@ def test_attrs_match():
 
     def test_shape_of_attribute(et: str):
         node = ops.shape_of(param, output_type=et)
-        attr = {"output_type": OVAny(et)}
+        attr = {"output_type": et}
         matcher = Matcher(AnyInput(attrs_match(attr)), "Find shape_of with attribute")
         assert matcher.match(node), f"Match failed for {node} with attribute"