leap-model-parser 0.1.225.dev2__tar.gz → 0.1.227__tar.gz

{leap_model_parser-0.1.225.dev2 → leap_model_parser-0.1.227}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.225.dev2
+Version: 0.1.227
 Summary: 
 Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT
@@ -17,7 +17,7 @@ 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)
 Requires-Dist: onnx (==1.13.0)
-Requires-Dist: onnx2kerastl (==0.0.175)
+Requires-Dist: onnx2kerastl (==0.0.176)
 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.225.dev2 → leap_model_parser-0.1.227}/leap_model_parser/contract/graph.py

@@ -47,7 +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[Optional[str]]] = None
+    shape: Optional[List[str]] = None
 
     def __key(self):
         return (self.id, self.name)

{leap_model_parser-0.1.225.dev2 → leap_model_parser-0.1.227}/leap_model_parser/keras_json_model_import.py

@@ -205,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']

{leap_model_parser-0.1.225.dev2 → leap_model_parser-0.1.227}/leap_model_parser/leap_graph_editor.py

@@ -127,6 +127,22 @@ class LeapGraphEditor:
         self.model_graph[new_node_id] = ground_truth_node
         return new_node_id
 
+    def _add_input_encoder_not_connected_to_the_model_node(self, input_name: str) -> str:
+        new_node_id = self._generate_new_node_id()
+        ground_truth_node = Node(
+            new_node_id,
+            'Input',
+            position=[0, 0],
+            data={'name': input_name, 'output_name': input_name,
+                  'type': 'Input', "selected": input_name},
+            inputs={},
+            outputs={
+                f'{new_node_id}-{input_name}': ConnectionOutput([])
+            }
+        )
+        self.model_graph[new_node_id] = ground_truth_node
+        return new_node_id
+
     def _add_visualizer_node(self, visualizer_name: str, visualizer_type: str,
                              user_unique_name: str, arg_names: List[str]) -> str:
         new_node_id = self._generate_new_node_id()
@@ -240,6 +256,8 @@ class LeapGraphEditor:
             if input_node_id is None:
                 if input_node.type == NodeMappingType.GroundTruth:
                     input_node_id = self._add_ground_truth_node(input_node.name)
+                elif input_node.type == NodeMappingType.Input:
+                    input_node_id = self._add_input_encoder_not_connected_to_the_model_node(input_node.name)
                 else:
                     raise Exception(f'Couldnt find input node name {input_node.name}')
         elif 'Input' in input_node.type.value:

{leap_model_parser-0.1.225.dev2 → leap_model_parser-0.1.227}/leap_model_parser/model_parser.py

@@ -1,13 +1,13 @@
+# mypy: ignore-errors
+
 import glob
 import json
 import ntpath
-import pickle
 import tarfile
 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 +34,7 @@ if spec is not None:
 
     onnx_imported = True
 
+
 class ModelParser:
     def __init__(self, should_transform_inputs_and_outputs=False,
                  custom_layers=None,
@@ -54,12 +55,14 @@ class ModelParser:
             ImportModelTypeEnum.PB_TF2.value: self.convert_pb_model,
         }
 
-    def _add_output_node_shape_to_model_schema(self, model_schema: Dict, keras_model: 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:
@@ -90,7 +93,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:
@@ -105,7 +107,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
@@ -130,23 +133,56 @@ 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)
 
+        from keras.saving.legacy.saved_model import json_utils  # type: ignore
+        import numpy as np
+
+        _orig_get_json_type = json_utils.get_json_type
+
+
+        def _patched_get_json_type(obj):  # type: ignore
+            # Handle numpy dtype explicitly
+            if isinstance(obj, np.dtype):
+                return obj.name  # e.g. "int64"
+            # Make sure common numpy scalars/containers are handled robustly
+            if isinstance(obj, np.integer):
+                return int(obj)
+            if isinstance(obj, np.floating):
+                return float(obj)
+            if isinstance(obj, np.bool_):
+                return bool(obj)
+            if isinstance(obj, np.ndarray):
+                return obj.tolist()
+            return _orig_get_json_type(obj)
+
+        json_utils.get_json_type = _patched_get_json_type
+
         model_schema = json.loads(converted_k_model.to_json())
 
         return model_schema, converted_k_model, error_info

{leap_model_parser-0.1.225.dev2 → leap_model_parser-0.1.227}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leap-model-parser"
-version = "0.1.225.dev2"
+version = "0.1.227"
 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.175"
+onnx2kerastl = "0.0.176"
 keras-data-format-converter = "0.1.22"
 leap-model-rebuilder = "0.1.7"
 tensorflow-io-gcs-filesystem = "0.34.0"