leap-model-parser 0.1.243.dev4__tar.gz → 0.1.243.dev6__tar.gz

{leap_model_parser-0.1.243.dev4 → leap_model_parser-0.1.243.dev6}/PKG-INFO

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

{leap_model_parser-0.1.243.dev4 → leap_model_parser-0.1.243.dev6}/leap_model_parser/model_parser.py

@@ -99,54 +99,7 @@ class ModelParser:
     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]]:
-        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:
-            raise Exception(
-                f"Unable to import external version, {str(model_path)} file format isn't supported")
-
-        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
-        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)
-        # make sure input order is kept with original model
-        input_list = []
-        for inp in keras_model.inputs:
-            name = inp.name
-            name = name.replace(".", "_")
-            for inp_graph in connected_inputs:
-                if inp_graph.name == name:
-                    input_list.append(inp_graph)
-        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, input_list, 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:
-            tar_file.extractall(temp_dir)
-            pb_files = glob.glob(temp_dir + "/**/*.pb", recursive=True)
-            if len(pb_files) == 0:
-                raise Exception('no pb files were found')
+ pb files were found')
 
             pb_file_path = next(iter(pb_files))
             pb_folder_path = next(iter(ntpath.split(pb_file_path)))

{leap_model_parser-0.1.243.dev4 → leap_model_parser-0.1.243.dev6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leap-model-parser"
-version = "0.1.243.dev4"
+version = "0.1.243.dev6"
 description = ""
 authors = ["idan <idan.yogev@tensorleap.ai>"]
 license = "MIT"