leap-model-parser 0.1.253__tar.gz → 0.1.255.dev0__tar.gz

{leap_model_parser-0.1.253 → leap_model_parser-0.1.255.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.253
+Version: 0.1.255.dev0
 Summary: 
 Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT
@@ -17,7 +17,7 @@ Requires-Dist: keras-data-format-converter (==0.1.24)
 Requires-Dist: leap-model-rebuilder (==0.1.7)
 Requires-Dist: numpy (>=1.22.3,<2.0.0)
 Requires-Dist: onnx (==1.13.0)
-Requires-Dist: onnx2kerastl (==0.0.195)
+Requires-Dist: onnx2kerastl (==0.0.197.dev0)
 Requires-Dist: tensorflow (==2.12.0) ; platform_machine == "x86_64"
 Requires-Dist: tensorflow-io-gcs-filesystem (==0.34.0)
 Requires-Dist: tensorflow-macos (==2.12.0) ; platform_machine == "arm64"

{leap_model_parser-0.1.253 → leap_model_parser-0.1.255.dev0}/leap_model_parser/keras_json_model_import.py

@@ -125,13 +125,20 @@ class KerasJsonModelImport:
         ))
 
     def _get_layer_metadata(self, layer_json: Dict) -> Optional[Dict]:
-        layer_metadata = self.ui_components.get(layer_json['class_name'])
+        class_name = layer_json['class_name']
+        layer_metadata = self.ui_components.get(class_name)
         if layer_metadata is None:
-            if layer_json['class_name'] in self.custom_layers:
+            # Custom layers registered via keras' register_keras_serializable(package=...)
+            # serialize their class_name as "<package>><ClassName>" (e.g.
+            # "onnx2kerastl>OnnxConstant"). Strip the package prefix so the plain
+            # class name matches the ui_components / custom_layers keys.
+            plain_class_name = class_name.split('>')[-1]
+            layer_metadata = self.ui_components.get(plain_class_name)
+            if layer_metadata is None and plain_class_name in self.custom_layers:
                 layer_metadata = {
                     'type': 'CustomLayer',
                     'class_name': 'CustomLayer',
-                    'selected': layer_json['class_name']
+                    'selected': plain_class_name
                 }
         return layer_metadata
 

{leap_model_parser-0.1.253 → leap_model_parser-0.1.255.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leap-model-parser"
-version = "0.1.253"
+version = "0.1.255.dev0"
 description = ""
 authors = ["idan <idan.yogev@tensorleap.ai>"]
 license = "MIT"
@@ -18,7 +18,7 @@ tensorflow = {version = "2.12.0", markers = "platform_machine  == 'x86_64'"}
 tensorflow-macos = {version = "2.12.0", markers = "platform_machine  == 'arm64'"}
 numpy = "^1.22.3"
 onnx = "1.13.0"
-onnx2kerastl = "0.0.195"
+onnx2kerastl = "0.0.197.dev0"
 keras-data-format-converter = "0.1.24"
 leap-model-rebuilder = "0.1.7"
 tensorflow-io-gcs-filesystem = "0.34.0"