leap-model-parser 0.1.185.dev6__tar.gz → 0.1.185.dev8__tar.gz

{leap_model_parser-0.1.185.dev6 → leap_model_parser-0.1.185.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.185.dev6
+Version: 0.1.185.dev8
 Summary: 
 Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Dist: code-loader (==1.0.87.dev5)
+Requires-Dist: code-loader (==1.0.87.dev7)
 Requires-Dist: keras-data-format-converter (==0.1.22)
 Requires-Dist: leap-model-rebuilder (==0.1.7)
 Requires-Dist: numpy (>=1.22.3,<2.0.0)

{leap_model_parser-0.1.185.dev6 → leap_model_parser-0.1.185.dev8}/leap_model_parser/keras_json_model_import.py

@@ -349,6 +349,8 @@ def _add_origin_name_to_nodes(nodes: Dict[str, Node]):
         if "name" in node.data:
             node.data["origin_name"] = node.data["name"]
             node.data.pop("name")
+        elif "output_name" in node.data:
+            node.data["origin_name"] = node.data["output_name"]
 
 
 def _is_input_node(node: Node) -> bool:

{leap_model_parser-0.1.185.dev6 → leap_model_parser-0.1.185.dev8}/leap_model_parser/leap_graph_editor.py

@@ -310,7 +310,17 @@ class LeapGraphEditor:
         if input_node.type in (NodeMappingType.Input, NodeMappingType.GroundTruth):
             input_node_id = self._find_encoder_node_id(input_node.name)
             if input_node_id is None:
-                input_node_id = self._add_ground_truth_node(input_node.name)
+                if input_node.type == NodeMappingType.GroundTruth:
+                    input_node_id = self._add_ground_truth_node(input_node.name)
+                else:
+                    raise Exception(f'Couldnt find input node name {input_node.name}')
+        elif 'Input' in input_node.type.value:
+            input_index = int(input_node.type.value.replace('Input', ''))
+            origin_name = self.keras_model.inputs[input_index].node.layer.name
+            input_node_id = self._find_input_node_by_origin_name(origin_name)
+            self.model_graph[input_node_id].data['output_name'] = input_node.name
+            if input_node_id is None:
+                raise Exception(f"Couldn't find input node by origin name {origin_name}")
         elif input_node.type.value.startswith('Prediction'):
             input_node_id = self._find_node_by_origin_name(input_node.name).id
         else:

{leap_model_parser-0.1.185.dev6 → leap_model_parser-0.1.185.dev8}/leap_model_parser/model_parser.py

@@ -60,48 +60,26 @@ class ModelParser:
                 f"Unable to import external version, {str(model_path)} file format isn't supported")
 
         file_path = str(model_path)
-        try:
-            model_schema, keras_model_with_weights, error_info = model_to_keras_converter(file_path)
-            model_generator = KerasJsonModelImport(self.custom_layers)
-
-            keras_model = keras_model_with_weights
-            if keras_model is None:
-                keras_model = tf.keras.models.model_from_json(json.dumps(model_schema))
-            layer_name_to_inbound_nodes = {
-                layer.name: layer.inbound_nodes
-                for layer in keras_model.layers
-            }
-
-            graph, connected_inputs = model_generator.generate_graph(
-                model_schema, layer_name_to_inbound_nodes)
-
-            if self.mapping_connections is not None:
-                leap_graph_editor = LeapGraphEditor(graph, keras_model_with_weights)
-                leap_graph_editor.add_connections_to_graph(self.mapping_connections)
-
-            return graph, connected_inputs, keras_model_with_weights, error_info
-        except Exception as e:
-            if model_type.value in [ImportModelTypeEnum.H5_TF2.value, ImportModelTypeEnum.PB_TF2.value]:
-                if model_type.value == ImportModelTypeEnum.H5_TF2.value:
-                    keras_model = self._load_keras_model_with_custom_layers(
-                        file_path)
-                else:
-                    keras_model = self._get_k_model_from_pb_path(file_path)
-
-                rebuilt_model = rebuild_model(keras_model)
-                model_schema, keras_model, error_info = self.convert_to_keras_model(
-                    rebuilt_model)
-
-                layer_name_to_inbound_nodes = {
-                    layer.name: layer.inbound_nodes
-                    for layer in keras_model.layers
-                }
-                model_generator = KerasJsonModelImport(self.custom_layers)
-                graph, connected_inputs = model_generator.generate_graph(
-                    model_schema, layer_name_to_inbound_nodes)
-                return graph, connected_inputs, keras_model, error_info
-            else:
-                raise e
+        model_schema, keras_model_with_weights, error_info = model_to_keras_converter(file_path)
+        model_generator = KerasJsonModelImport(self.custom_layers)
+
+        keras_model = keras_model_with_weights
+        if keras_model is None:
+            keras_model = tf.keras.models.model_from_json(json.dumps(model_schema))
+        layer_name_to_inbound_nodes = {
+            layer.name: layer.inbound_nodes
+            for layer in keras_model.layers
+        }
+
+        graph, connected_inputs = model_generator.generate_graph(
+            model_schema, layer_name_to_inbound_nodes)
+
+        if self.mapping_connections is not None:
+            leap_graph_editor = LeapGraphEditor(graph, keras_model_with_weights)
+            leap_graph_editor.add_connections_to_graph(self.mapping_connections)
+
+        return graph, connected_inputs, keras_model_with_weights, error_info
+
 
     def _get_k_model_from_pb_path(self, file_path: str):
         tar_file = tarfile.open(file_path)

{leap_model_parser-0.1.185.dev6 → leap_model_parser-0.1.185.dev8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leap-model-parser"
-version = "0.1.185.dev6"
+version = "0.1.185.dev8"
 description = ""
 authors = ["idan <idan.yogev@tensorleap.ai>"]
 license = "MIT"
@@ -22,7 +22,7 @@ onnx2kerastl = "0.0.174"
 keras-data-format-converter = "0.1.22"
 leap-model-rebuilder = "0.1.7"
 tensorflow-io-gcs-filesystem = "0.34.0"
-code-loader = "1.0.87.dev5"
+code-loader = "1.0.87.dev7"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1.1"