leap-model-parser 0.1.185.dev5__tar.gz → 0.1.185.dev7__tar.gz

{leap_model_parser-0.1.185.dev5 → leap_model_parser-0.1.185.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.185.dev5
+Version: 0.1.185.dev7
 Summary: 
 Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT
@@ -12,7 +12,7 @@ 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.dev5)
+Requires-Dist: code-loader (==1.0.87.dev7)
 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)

{leap_model_parser-0.1.185.dev5 → leap_model_parser-0.1.185.dev7}/leap_model_parser/keras_json_model_import.py

@@ -349,6 +349,8 @@ def _add_origin_name_to_nodes(nodes: Dict[str, Node]):
         if "name" in node.data:
             node.data["origin_name"] = node.data["name"]
             node.data.pop("name")
+        elif "output_name" in node.data:
+            node.data["origin_name"] = node.data["output_name"]
 
 
 def _is_input_node(node: Node) -> bool:

{leap_model_parser-0.1.185.dev5 → leap_model_parser-0.1.185.dev7}/leap_model_parser/leap_graph_editor.py

@@ -102,7 +102,8 @@ class LeapGraphEditor:
             #     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)
+                                                   node_connection.node.type == NodeMappingType.CustomLoss,
+                                                   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)
                 # if node.type == NodeMappingType.Layer:
@@ -231,7 +232,7 @@ class LeapGraphEditor:
         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:
+    def _add_loss_node(self, loss_name: str, is_custom_loss: bool, arg_names: Optional[List[str]]=None) -> str:
         new_node_id = self._generate_new_node_id()
 
         loss_type = 'CustomLoss' if is_custom_loss else 'Loss'
@@ -250,6 +251,9 @@ class LeapGraphEditor:
             #     f'{new_node_id}-loss': {'connections': []}
             # }
         )
+        if arg_names is not None:
+            loss_node.data['arg_names'] = arg_names
+
 
         self.model_graph[new_node_id] = loss_node
         return new_node_id
@@ -306,7 +310,17 @@ class LeapGraphEditor:
         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)
+                if input_node.type == NodeMappingType.GroundTruth:
+                    input_node_id = self._add_ground_truth_node(input_node.name)
+                else:
+                    raise Exception(f'Couldnt find input node name {input_node.name}')
+        elif 'Input' in input_node.type.value:
+            input_index = int(input_node.type.value.replace('Input', ''))
+            origin_name = self.keras_model.inputs[input_index].node.layer.name
+            input_node_id = self._find_input_node_by_origin_name(origin_name)
+            self.model_graph[input_node_id].data['output_name'] = input_node.name
+            if input_node_id is None:
+                raise Exception(f"Couldn't find input node by origin name {origin_name}")
         elif input_node.type.value.startswith('Prediction'):
             input_node_id = self._find_node_by_origin_name(input_node.name).id
         else:

{leap_model_parser-0.1.185.dev5 → leap_model_parser-0.1.185.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leap-model-parser"
-version = "0.1.185.dev5"
+version = "0.1.185.dev7"
 description = ""
 authors = ["idan <idan.yogev@tensorleap.ai>"]
 license = "MIT"
@@ -22,7 +22,7 @@ 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.dev5"
+code-loader = "1.0.87.dev7"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.1.1"