leap-model-parser 0.1.224__py3-none-any.whl → 0.1.225__py3-none-any.whl

leap_model_parser/contract/graph.py

@@ -47,6 +47,7 @@ class Node:
     outputs: Dict[str, ConnectionOutput] = field(default_factory=dict)
     pruning_plan_id: Optional[str] = None
     wrapper: Optional[WrapperData] = None
+    shape: Optional[List[str]] = None
 
     def __key(self):
         return (self.id, self.name)

leap_model_parser/keras_json_model_import.py

@@ -5,7 +5,6 @@ from typing import Set, Dict, Any, List, Type, Optional, Tuple
 
 import tensorflow as tf  # type: ignore
 from keras.engine.keras_tensor import KerasTensor  # type: ignore
-from keras.engine.node import Node  # type: ignore
 from keras.engine.node import Node as keras_node # type: ignore
 from keras.layers import Layer # type: ignore
 from keras.layers.convolutional.base_conv import Conv # type: ignore
@@ -206,7 +205,7 @@ class KerasJsonModelImport:
                            'serialized_call_kwargs': serialized_call_kwargs})
 
     def generate_regular_node(self, layer: Dict[str, Any], layer_metadata: Dict[str, Any], node_key: str,
-                              layer_name_to_inbound_nodes: Dict[str, List[Node]]):
+                              layer_name_to_inbound_nodes: Dict[str, List[keras_node]]):
         data = layer['config']
         if layer['class_name'] in ('TFOpLambda', 'SlicingOpLambda') or layer['class_name'] in self.custom_layers:
             call_args = layer_name_to_inbound_nodes[layer['config']
@@ -221,11 +220,17 @@ class KerasJsonModelImport:
 
         self.layer_data_adjustments(data, layer_metadata)
         node = Node(id=str(self.id), name=layer_metadata.get(
-            "class_name", layer["class_name"]), data=data, position=[0, 0])
+            "class_name", layer["class_name"]), data=data, position=[0, 0],
+                    shape=self._convert_layer_shape_to_string(layer['output_shape']))
         if 'wrapper' in layer:
             node.wrapper = layer['wrapper']
         self.nodes_cache[node_key] = node
 
+    @staticmethod
+    def _convert_layer_shape_to_string(s: List[Optional[int]]) -> List[str]:
+        return [str(dim) if dim is not None else 'dynamic_shape' for dim in s]
+
+
     @classmethod
     def handle_wrapper_layer(cls, layer):
         wrapped_layer = layer['config']['layer']

leap_model_parser/model_parser.py

@@ -7,7 +7,6 @@ import tempfile
 from importlib.util import find_spec
 from pathlib import Path
 
-
 import tensorflow as tf  # type: ignore
 from code_loader.contract.mapping import NodeConnection, NodeMapping  # type: ignore
 from keras import Model  # type: ignore
@@ -34,6 +33,7 @@ if spec is not None:
 
     onnx_imported = True
 
+
 class ModelParser:
     def __init__(self, should_transform_inputs_and_outputs=False,
                  custom_layers=None,
@@ -54,8 +54,14 @@ class ModelParser:
             ImportModelTypeEnum.PB_TF2.value: self.convert_pb_model,
         }
 
+    @staticmethod
+    def _add_output_node_shape_to_model_schema(model_schema: Dict, keras_model: Model):
+        for i, layer in enumerate(keras_model.layers):
+            model_schema['config']['layers'][i]['output_shape'] = list(layer.output_shape)
+
     def get_keras_model_and_model_graph(
-            self, model_path: Path, model_type: ImportModelTypeEnum) -> Tuple[Dict[str, Node], List[InputInfo], Optional[Model], Optional[str]]:
+            self, model_path: Path, model_type: ImportModelTypeEnum) -> Tuple[
+        Dict[str, Node], List[InputInfo], Optional[Model], Optional[str]]:
         model_to_keras_converter: Optional[Callable[[str], Tuple[Dict[str, Node], Model, Optional[str]]]] = \
             self._model_types_converter.get(model_type.value)
         if model_to_keras_converter is None:
@@ -64,6 +70,9 @@ class ModelParser:
 
         file_path = str(model_path)
         model_schema, keras_model_with_weights, error_info = model_to_keras_converter(file_path)
+
+        self._add_output_node_shape_to_model_schema(model_schema, keras_model_with_weights)
+
         model_generator = KerasJsonModelImport(self.custom_layers)
 
         keras_model = keras_model_with_weights
@@ -83,7 +92,6 @@ class ModelParser:
 
         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)
         with tempfile.TemporaryDirectory() as temp_dir:
@@ -98,7 +106,8 @@ class ModelParser:
             k_model = self._load_keras_model_with_custom_layers(pb_folder_path)
         return k_model
 
-    def generate_model_graph(self, model_path: Path, model_type: ImportModelTypeEnum) -> Tuple[Dict[str, Node], List[InputInfo]]:
+    def generate_model_graph(self, model_path: Path, model_type: ImportModelTypeEnum) -> Tuple[
+        Dict[str, Node], List[InputInfo]]:
         model_graph, connected_inputs, _, error_info = self.get_keras_model_and_model_graph(
             model_path, model_type)
         return model_graph, connected_inputs
@@ -123,20 +132,30 @@ class ModelParser:
             node.name for node in onnx_model.graph.initializer]
         input_names = list(set(input_all) - set(input_initializer))
         converted_response: ConvertedResponse = onnx_to_keras(onnx_model, input_names=input_names,
-                                name_policy='attach_weights_name', allow_partial_compilation=False)
+                                                              name_policy='attach_weights_name',
+                                                              allow_partial_compilation=False)
         return self.convert_to_keras_model(converted_response.converted_model, converted_response.error_info)
 
     def _load_keras_model_with_custom_layers(self, file_path: str):
         custom_objects = {}
         if self.custom_layers is not None:
             custom_objects = self.custom_layers
-        return load_model(file_path, custom_objects=custom_objects, compile=False)
+
+        try:
+            return load_model(file_path, custom_objects=custom_objects, compile=False)
+        except OSError as e:
+            if 'signature' in str(e):
+                raise Exception('Unable to open model file. The model might be corrupted or not a valid.')
+            else:
+                raise e
+
 
     def convert_h5_model(self, file_path: str) -> Tuple[Dict[str, Node], Model, Optional[str]]:
         imported_model = self._load_keras_model_with_custom_layers(file_path)
         return self.convert_to_keras_model(imported_model)
 
-    def convert_to_keras_model(self, k_model, error_info: Optional[str] = None) -> Tuple[Dict[str, Node], Model, Optional[str]]:
+    def convert_to_keras_model(self, k_model, error_info: Optional[str] = None) -> Tuple[
+        Dict[str, Node], Model, Optional[str]]:
         converted_k_model = convert_channels_first_to_last(
             k_model, self._should_transform_inputs_and_outputs, self.custom_layers)
 

{leap_model_parser-0.1.224.dist-info → leap_model_parser-0.1.225.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.224
+Version: 0.1.225
 Summary: 
 Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT

{leap_model_parser-0.1.224.dist-info → leap_model_parser-0.1.225.dist-info}/RECORD

@@ -1,13 +1,13 @@
 LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
 leap_model_parser/__init__.py,sha256=OAU7rFHAVVWUM-cDtQ4Ohum567KN8M-YTkHZp5KiYbo,132
 leap_model_parser/contract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-leap_model_parser/contract/graph.py,sha256=c5rSlJJQ3JzLhyeniglzrP5GH0fp8UZDQKZw1fcrNe8,1132
+leap_model_parser/contract/graph.py,sha256=lbs_IUnlkvoVjiARBMJee-aNbqeNXNPsUeOEwQliKgU,1170
 leap_model_parser/contract/importmodelresponse.py,sha256=GlvnKS8xrebU2Sj0dxqtEhAOOo3DlOtT7AMJ2BlzH9E,145
 leap_model_parser/contract/nodedata.py,sha256=1_ML0nzp3QUZ0_9mGSLhfO4_hqjYMwi0DWLwymUnWEs,43326
 leap_model_parser/contract/ui_components.json,sha256=0lsxwOLElW1E-imCcdh3zKPWgzFuQ_bApG6aHvYfTvo,410591
-leap_model_parser/keras_json_model_import.py,sha256=MD9ksO54VywikEAb2lxaNHq8Nbp8oiJab2Yn8UB-DRI,16841
+leap_model_parser/keras_json_model_import.py,sha256=h9-eb41W67goutRV5c3VkStxvntgb6EmPFdPeshhtsY,17058
 leap_model_parser/leap_graph_editor.py,sha256=0SDHNVkMq94PXWaTqZzMlzJMRLWebOj4uyz64c_KCTQ,13559
-leap_model_parser/model_parser.py,sha256=Je37-FjrNgi8w17rBIt_b71xm-BoiopBAvgW30qfb7o,6614
+leap_model_parser/model_parser.py,sha256=1nyVFRzOXkmPVY_401epYdnG2ZUw7D_YIK3gYrnCPxw,7314
 leap_model_parser/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/utils/layerpedia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/utils/layerpedia/layerpedia.py,sha256=1syubfXBTB630TVkgcQ-Ge7Qe9Zbr6EtZRreuqCJnQ8,9292
@@ -18,8 +18,8 @@ leap_model_parser/utils/uicomponents/generatenodedata.py,sha256=LRaPlO5jJ9pUtkvL
 leap_model_parser/utils/uicomponents/tensorflowinscpection.py,sha256=ym613z9iQKPDBpr0RYD35bTABdm1L-Ez86G47BYT7qw,6775
 leap_model_parser/utils/uicomponents/ui_components.json,sha256=0lsxwOLElW1E-imCcdh3zKPWgzFuQ_bApG6aHvYfTvo,410591
 leap_model_parser/utils/uicomponents/ui_components_config.yaml,sha256=cRH8T-c3TAL0nfefRvt9pFsjbTWNEg38NRyHR7RpJsk,19534
-leap_model_parser-0.1.224.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-leap_model_parser-0.1.224.dist-info/METADATA,sha256=XzCmWdsrO-N07khELKcWtfS5G7e-vVj5rF4hIe9qJ-0,1104
-leap_model_parser-0.1.224.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-leap_model_parser-0.1.224.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
-leap_model_parser-0.1.224.dist-info/RECORD,,
+leap_model_parser-0.1.225.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+leap_model_parser-0.1.225.dist-info/METADATA,sha256=VZ6TjVvUV8hBKzuB73D2N-OEJRDZFXk2U244WR42Bvw,1104
+leap_model_parser-0.1.225.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+leap_model_parser-0.1.225.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
+leap_model_parser-0.1.225.dist-info/RECORD,,