leap-model-parser 0.1.243.dev4__py3-none-any.whl → 0.1.243.dev6__py3-none-any.whl

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.dist-info → leap_model_parser-0.1.243.dev6.dist-info}/METADATA

@@ -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.dist-info → leap_model_parser-0.1.243.dev6.dist-info}/RECORD

@@ -7,7 +7,7 @@ leap_model_parser/contract/nodedata.py,sha256=1_ML0nzp3QUZ0_9mGSLhfO4_hqjYMwi0DW
 leap_model_parser/contract/ui_components.json,sha256=0lsxwOLElW1E-imCcdh3zKPWgzFuQ_bApG6aHvYfTvo,410591
 leap_model_parser/keras_json_model_import.py,sha256=h9-eb41W67goutRV5c3VkStxvntgb6EmPFdPeshhtsY,17058
 leap_model_parser/leap_graph_editor.py,sha256=s6iVO06xM6LJ8ZjSxkr1srYxsHhGl2KnQjQoc9g4_iE,14329
-leap_model_parser/model_parser.py,sha256=whPsXLuoptsbSF3djK8KL3Ibz7TXS-SBBX2kxNesGec,9935
+leap_model_parser/model_parser.py,sha256=gzrVLHZRpMK5Q_-vsAFORKTcPraim985vjeW-Fcw_Ng,7717
 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.243.dev4.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-leap_model_parser-0.1.243.dev4.dist-info/METADATA,sha256=h4P3Sk-O1uoXkBXUbBaKGbHA_EdUcvNRk7c4V4NHZMA,1109
-leap_model_parser-0.1.243.dev4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-leap_model_parser-0.1.243.dev4.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
-leap_model_parser-0.1.243.dev4.dist-info/RECORD,,
+leap_model_parser-0.1.243.dev6.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+leap_model_parser-0.1.243.dev6.dist-info/METADATA,sha256=7aRvejx_HvQ2yG3bIEzciCfg0RgMUkrNyriurjejJfs,1109
+leap_model_parser-0.1.243.dev6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+leap_model_parser-0.1.243.dev6.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
+leap_model_parser-0.1.243.dev6.dist-info/RECORD,,