leap-model-parser 0.1.183__tar.gz → 0.1.185.dev1__tar.gz

{leap_model_parser-0.1.183 → leap_model_parser-0.1.185.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.183
+Version: 0.1.185.dev1
 Summary: 
 Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT
@@ -12,11 +12,12 @@ 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.dev1)
 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.173)
+Requires-Dist: onnx2kerastl (==0.0.174)
 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.185.dev1/leap_model_parser/leap_graph_editor.py

@@ -0,0 +1,365 @@
+from enum import Enum
+from typing import Optional, Dict, Any, List
+
+from code_loader.contract.mapping import NodeConnection, NodeMappingType, NodeMapping
+from keras import Model
+
+from leap_model_parser.contract.graph import Node as Node, OutputData, ConnectionOutput, ConnectionInput, InputData
+
+
+# class NodeMappingType(Enum):
+#     Visualizer = 'Visualizer'
+#     Metric = 'Metric'
+#     GroundTruth = 'GroundTruth'
+#     Input = 'Input'
+#     Layer = 'Layer'
+#     Loss = 'Loss'
+#     CustomLoss = 'CustomLoss'
+#     Optimizer = 'Optimizer'
+#     Prediction0 = 'Prediction0'
+#     Prediction1 = 'Prediction1'
+#     Prediction2 = 'Prediction2'
+#     Prediction3 = 'Prediction3'
+#     Input0 = 'Input0'
+#     Input1 = 'Input1'
+#     Input2 = 'Input2'
+#     Input3 = 'Input3'
+#     Input4 = 'Input4'
+#     Input5 = 'Input5'
+#
+#
+#
+#
+#
+# @dataclass
+# class NodeMapping:
+#     name: str
+#     type: NodeMappingType
+#     user_unique_name: Optional[str] = None
+#     sub_type: Optional[str] = None
+#     arg_names: Optional[List[str]] = None
+#
+#
+# @dataclass
+# class NodeConnection:
+#     node: NodeMapping
+#     node_inputs: Optional[Dict[str, NodeMapping]]
+#     prediction_type_name: Optional[str] = None
+
+
+class LeapGraphEditor:
+    def __init__(self, model_graph: Dict[str, Node], keras_model: Model):
+        self.model_graph = model_graph
+        self.keras_model = keras_model
+
+        node_ids_as_int = [int(node_id) for node_id in model_graph.keys()]
+        self._next_node_id_index = max(node_ids_as_int) + 1
+
+    # def add_dataset(self, dataset_name: str, raw_dataset_version: Dict[str, Any],
+    #                 dataset_parse_result: DatasetIntegParseResult):
+    #
+    #     LeapGraphEditor._add_setup_to_metadata(raw_dataset_version['metadata'], dataset_parse_result)
+    #     raw_dataset_version['name'] = dataset_name
+    #
+    #     dataset_node = self._get_dataset_node()
+    #     dataset_node.data['datasetVersion'] = raw_dataset_version
+    #     dataset_node.data['selected_dataset'] = dataset_name
+    #     self._add_arg_names_to_visualizers(dataset_parse_result)
+
+    def add_connections_to_graph(self, connections: List[NodeConnection]):
+        connections = self._validate_and_reorder_connections_list(connections)
+        for connection in connections:
+            self._add_node_connection_to_graph(connection)
+
+    def _add_node_connection_to_graph(self, node_connection: NodeConnection):
+        # if node_connection.node.type.value.startswith('Input'):
+        #     input_index = int(node_connection.node.type.value.replace('Input', ''))
+        #
+        #     origin_name = self.keras_model.inputs[input_index].node.layer.name
+        #
+        #     _find_node_by_origin_name
+        # # elif node_connection.node.type == NodeMappingType.Input:
+        # #     self._find_or_add_input_node()
+
+
+        if node_connection.node.type == NodeMappingType.Visualizer:
+            new_visualizer_node_id = self._add_visualizer_node(
+                node_connection.node.name, node_connection.node.sub_type,
+                node_connection.node.user_unique_name, node_connection.node.arg_names)
+            for input_name, node in node_connection.node_inputs.items():
+                input_node_id = self._find_or_add_input_node(node)
+                self._add_connection_to_node(new_visualizer_node_id, input_name, input_node_id)
+        elif node_connection.node.type == NodeMappingType.Metric:
+            new_metric_node_id = self._add_metric_node(
+                node_connection.node.name,
+                node_connection.node.user_unique_name, node_connection.node.arg_names)
+            for input_name, node in node_connection.node_inputs.items():
+                input_node_id = self._find_or_add_input_node(node)
+                self._add_connection_to_node(new_metric_node_id, input_name, input_node_id)
+        elif node_connection.node.type in (NodeMappingType.Loss, NodeMappingType.CustomLoss):
+            prediction_type_name = node_connection.prediction_type_name
+            # if prediction_type_name is None:
+            #     raise Exception("prediction_type_name is required for loss connection")
+
+            new_loss_node_id = self._add_loss_node(node_connection.node.name,
+                                                   node_connection.node.type == NodeMappingType.CustomLoss)
+            for input_name, node in node_connection.node_inputs.items():
+                input_node_id = self._find_or_add_input_node(node)
+                # if node.type == NodeMappingType.Layer:
+                #     self.model_graph[input_node_id].data['prediction_type'] = prediction_type_name
+                self._add_connection_to_node(new_loss_node_id, input_name, input_node_id)
+        # elif node_connection.node.type == NodeMappingType.Optimizer:
+        #     new_optimizer_node_id = self._add_optimizer_node(node_connection.node.name)
+        #     loss_node_ids = self._get_all_loss_node_ids()
+        #     assert len(loss_node_ids) > 0
+        #     for i, loss_node_id in enumerate(loss_node_ids):
+        #         self._add_connection_to_node(new_optimizer_node_id, str(i), loss_node_id)
+        #     self.model_graph[new_optimizer_node_id].data['custom_input_keys'] = list(
+        #         self.model_graph[new_optimizer_node_id].inputs.keys())
+        else:
+            raise Exception(f"Can't add node of type {node_connection.node.type.name}")
+
+    def model_graph_dict(self) -> Dict[str, Any]:
+        json_model_graph = {}
+        for node_id, node in self.model_graph.items():
+            json_model_graph[node_id] = node.__dict__
+
+        return json_model_graph
+
+
+    def _find_node_by_origin_name(self, origin_name: str) -> Optional[Node]:
+        for node in self.model_graph.values():
+            if node.data.get('origin_name') == origin_name:
+                return node
+        return None
+
+    def _find_input_node_by_origin_name(self, origin_name: str) -> Optional[Node]:
+        for node in self.model_graph.values():
+            if node.data.get('output_name') == origin_name:
+                return node
+        return None
+
+    def _validate_and_reorder_connections_list(self, connections: List[NodeConnection]) -> List[NodeConnection]:
+        # optimizers = [connection for connection in connections if connection.node.type == NodeType.Optimizer]
+        for connection in connections:
+            if connection.node_inputs is None:
+                continue
+            for input_name, input_node in connection.node_inputs.items():
+                if 'Prediction' in input_node.type.value:
+                    prediction_index= int(input_node.type.value.replace('Prediction', ''))
+                    origin_name = self.keras_model.outputs[prediction_index].node.layer.name
+                    input_node.name = origin_name
+
+        return connections
+        losses = [connection for connection in connections
+                  if connection.node.type in (NodeMappingType.Loss, NodeMappingType.CustomLoss)]
+        visualizers = [connection for connection in connections if connection.node.type == NodeMappingType.Visualizer]
+
+        # if len(optimizers) == 0:
+        #     raise Exception('At least one optimizer needed')
+        # if len(losses) == 0:
+        #     raise Exception('At least one loss needed')
+        # if len(optimizers) + len(losses) + len(visualizers) < len(connections):
+        #     raise Exception('Unsupported node type')
+
+        return visualizers + losses
+
+    def _find_encoder_node_id(self, encoder_name: str) -> Optional[str]:
+        for node_id, node_response in self.model_graph.items():
+            if 'type' in node_response.data and (node_response.data['type'] in ('Input', 'GroundTruth')):
+                if f'{node_id}-{encoder_name}' in node_response.outputs:
+                    return node_id
+        return None
+
+    def _find_layer_node_id(self, layer_name: str) -> str:
+        for node_id, node_response in self.model_graph.items():
+            if 'type' in node_response.data and node_response.data['type'] == 'Layer':
+                if node_response.data['origin_name'] == layer_name:
+                    return node_id
+        raise Exception(f"Couldn't find node for layer {layer_name}")
+
+    def _generate_new_node_id(self) -> str:
+        self._next_node_id_index += 1
+        return str(self._next_node_id_index - 1)
+
+    def _add_ground_truth_node(self, ground_truth_name: str) -> str:
+        new_node_id = self._generate_new_node_id()
+        ground_truth_node = Node(
+            new_node_id,
+            'GroundTruth',
+            position=[0, 0],
+            data={'name': ground_truth_name, 'output_name': ground_truth_name,
+                  'type': 'GroundTruth', "selected": ground_truth_name},
+            inputs={},
+            outputs={
+                f'{new_node_id}-{ground_truth_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()
+
+        visualizer_node = Node(
+            new_node_id,
+            'Visualizer',
+            position=[0, 0],
+            data={'visualizer_name': visualizer_name, 'type': 'Visualizer',
+                  'selected': visualizer_name, 'name': visualizer_name, 'visualizer_type': visualizer_type,
+                  'arg_names': arg_names, "user_unique_name": user_unique_name},
+            inputs={},
+            outputs={})
+
+        self.model_graph[new_node_id] = visualizer_node
+        return new_node_id
+
+    def _add_metric_node(self, metric_name: str,
+                             user_unique_name: str, arg_names: List[str]) -> str:
+        new_node_id = self._generate_new_node_id()
+
+        metric_node = Node(
+            new_node_id,
+            'Metric',
+            position=[0, 0],
+            data={'metric_name': metric_name, 'type': 'Metric', 'name': metric_name,
+                  'arg_names': arg_names, "user_unique_name": user_unique_name},
+            inputs={},
+            outputs={})
+
+        self.model_graph[new_node_id] = metric_node
+        return new_node_id
+
+    def _add_loss_node(self, loss_name: str, is_custom_loss: bool) -> str:
+        new_node_id = self._generate_new_node_id()
+
+        loss_type = 'CustomLoss' if is_custom_loss else 'Loss'
+        loss_node_name = 'CustomLoss' if is_custom_loss else loss_name
+
+        loss_node = Node(
+            new_node_id,
+            loss_node_name,
+            position=[0, 0],
+            data={'type': loss_type, 'selected': loss_name, 'name': loss_name},
+            inputs={},
+            outputs={
+                f'{new_node_id}-loss': ConnectionOutput([])
+            }
+            # outputs={
+            #     f'{new_node_id}-loss': {'connections': []}
+            # }
+        )
+
+        self.model_graph[new_node_id] = loss_node
+        return new_node_id
+
+    # def _add_optimizer_node(self, optimizer_name: str) -> str:
+    #     new_node_id = self._generate_new_node_id()
+    #
+    #     optimizer_node = NodeResponse(
+    #         new_node_id,
+    #         optimizer_name,
+    #         data={'type': 'Optimizer', 'selected': optimizer_name},
+    #         inputs={},
+    #         outputs={})
+    #
+    #     self.model_graph[new_node_id] = optimizer_node
+    #     return new_node_id
+
+    def _get_output_name_from_node_id(self, input_node_id: str, input_name: Optional[str] = None) -> str:
+        input_node_outputs_len = len(self.model_graph[input_node_id].outputs)
+        if input_node_outputs_len == 0:
+            output_name_to_add = f'{input_node_id}-feature_map'
+            self.model_graph[input_node_id].outputs[output_name_to_add] = ConnectionOutput([])
+
+            # self.model_graph[input_node_id].outputs[output_name_to_add] = {
+            #     'connections': []
+            # }
+            return output_name_to_add
+        if input_node_outputs_len == 1:
+            return list(self.model_graph[input_node_id].outputs.keys())[0]
+        if input_name is not None:
+            guessed_output_name = f'{input_node_id}-{input_name}'
+            if guessed_output_name in self.model_graph[input_node_id].outputs:
+                return guessed_output_name
+
+        # todo: layers with multiple outputs
+        raise Exception("Can't decide on output name")
+
+    def _add_connection_to_node(self, node_id: str, input_name: str, input_node_id: str):
+        # todo: layers with multiple outputs
+        output_name = self._get_output_name_from_node_id(input_node_id, input_name)
+        input_name = f'{node_id}-{input_name}'
+        self.model_graph[node_id].inputs[input_name] = ConnectionInput([InputData(input_node_id, output_name)])
+        # self.model_graph[node_id].inputs[input_name] = {
+        #     'connections': [{'data': {}, 'node': input_node_id, 'output': output_name}]
+        # }
+
+        # if 'connections' not in self.model_graph[input_node_id].outputs[output_name]:
+        #     self.model_graph[input_node_id].outputs[output_name]['connections'] = []
+        output_connection = OutputData(node_id, input_name)
+        # output_connection = {'input': input_name, 'node': node_id, 'data': {}}
+        self.model_graph[input_node_id].outputs[output_name].connections.append(output_connection)
+
+    def _find_or_add_input_node(self, input_node: NodeMapping) -> str:
+        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)
+        elif input_node.type.value.startswith('Prediction'):
+            input_node_id = self._find_node_by_origin_name(input_node.name).id
+        else:
+            input_node_id = self._find_layer_node_id(input_node.name)
+
+        return input_node_id
+
+    def _find_prediction_node(self, prediction_index):
+        pass
+
+    def _get_all_loss_node_ids(self):
+        loss_node_ids = []
+        for node_id, node_response in self.model_graph.items():
+            if 'type' in node_response.data and node_response.data['type'] in ('CustomLoss', 'Loss'):
+                loss_node_ids.append(node_id)
+        return loss_node_ids
+
+    # def _get_dataset_node(self) -> NodeResponse:
+    #     for node_response in self.model_graph.values():
+    #         if 'type' in node_response.data and node_response.data['type'] == 'dataset':
+    #             return node_response
+    #
+    #     raise Exception("Didn't find dataset node")
+
+    @staticmethod
+    def _convert_dataclass_to_json_dict(_dataclass):
+        if isinstance(_dataclass, Enum):
+            return _dataclass.name
+        if hasattr(_dataclass, '__dict__'):
+            return {
+                key: LeapGraphEditor._convert_dataclass_to_json_dict(_dataclass.__dict__[key])
+                for key in _dataclass.__dict__
+            }
+        if isinstance(_dataclass, list):
+            return [
+                LeapGraphEditor._convert_dataclass_to_json_dict(element)
+                for element in _dataclass
+            ]
+        return _dataclass
+
+    # @staticmethod
+    # def _add_setup_to_metadata(dataset_version_metadata: Dict[str, Any],
+    #                            dataset_parse_result: DatasetIntegParseResult):
+    #     setup_json = LeapGraphEditor._convert_dataclass_to_json_dict(dataset_parse_result.setup)
+    #
+    #     dataset_version_metadata['setup'] = setup_json
+
+    # def _add_arg_names_to_visualizers(self, dataset_parse_result: DatasetIntegParseResult):
+    #     visualizer_instance_by_name: Dict[str, VisualizerInstance] = {
+    #         visualizer_instance.name: visualizer_instance
+    #         for visualizer_instance in dataset_parse_result.setup.visualizers
+    #     }
+    #
+    #     for _, node_response in self.model_graph.items():
+    #         if node_response.data['type'] == 'Visualizer':
+    #             node_response.data['arg_names'] = visualizer_instance_by_name[node_response.data['selected']].arg_names

{leap_model_parser-0.1.183 → leap_model_parser-0.1.185.dev1}/leap_model_parser/model_parser.py

@@ -8,6 +8,7 @@ from pathlib import Path
 from typing import Callable, Optional, List, Dict, Tuple, Type
 
 import tensorflow as tf  # type: ignore
+from code_loader.contract.mapping import NodeConnection
 from keras import Model  # type: ignore
 from keras_data_format_converter import convert_channels_first_to_last  # type: ignore
 from leap_model_rebuilder import rebuild_model  # type: ignore
@@ -20,6 +21,7 @@ from tensorflow.keras.models import load_model  # type: ignore
 from leap_model_parser.contract.graph import Node, InputInfo
 from leap_model_parser.contract.importmodelresponse import ImportModelTypeEnum
 from leap_model_parser.keras_json_model_import import KerasJsonModelImport
+from leap_model_parser.leap_graph_editor import LeapGraphEditor
 
 onnx_imported = False
 package_name = 'onnx'
@@ -32,13 +34,16 @@ if spec is not None:
 
 class ModelParser:
     def __init__(self, should_transform_inputs_and_outputs=False,
-                 custom_layers: Optional[Dict[str, Type[tf.keras.layers.Layer]]] = None):
+                 custom_layers: Optional[Dict[str, Type[tf.keras.layers.Layer]]] = None,
+                 mapping_connections: Optional[List[NodeConnection]] = None):
         self._should_transform_inputs_and_outputs = should_transform_inputs_and_outputs
         self.custom_layers = custom_layers
         if custom_layers is None:
             self.custom_layers = {}
 
-        self.custom_layers = {**self.custom_layers, **onnx_custom_layers}  # type: ignore
+        self.custom_layers = {**self.custom_layers, **onnx_custom_layers}
+
+        self.mapping_connections = mapping_connections
 
         self._model_types_converter = {
             ImportModelTypeEnum.JSON_TF2.value: self.convert_json_model,
@@ -70,6 +75,11 @@ class ModelParser:
 
             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]:

{leap_model_parser-0.1.183 → leap_model_parser-0.1.185.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leap-model-parser"
-version = "0.1.183"
+version = "0.1.185.dev1"
 description = ""
 authors = ["idan <idan.yogev@tensorleap.ai>"]
 license = "MIT"
@@ -18,10 +18,11 @@ 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.173"
+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.dev1"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1.1"