leap-model-parser 0.1.244.dev5__tar.gz → 0.1.245.dev0__tar.gz

{leap_model_parser-0.1.244.dev5 → leap_model_parser-0.1.245.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.244.dev5
+Version: 0.1.245.dev0
 Summary: 
 Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT
@@ -17,7 +17,7 @@ Requires-Dist: keras-data-format-converter (==0.1.24)
 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.188.dev5)
+Requires-Dist: onnx2kerastl (==0.0.188.dev)
 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.244.dev5 → leap_model_parser-0.1.245.dev0}/leap_model_parser/keras_json_model_import.py

@@ -93,11 +93,12 @@ class KerasJsonModelImport:
 
             self.visited_connections.add(connection_name)
             self.attach(input_layer, input_node_name,
-                        current_node_name, input_index)
+                        current_node_name, input_index, len(inbound_layers))
             self.generate_graph_recursive(current_layer=input_layer, instance_index=input_node_instance_index,
                                           layer_name_to_inbound_nodes=layer_name_to_inbound_nodes)
 
-    def attach(self, input_layer: Dict, node_input_layer_name: str, node_output_layer_name: str, input_index: int):
+    def attach(self, input_layer: Dict, node_input_layer_name: str, node_output_layer_name: str, input_index: int,
+               num_inbound: int = None):
         node_output_layer = self.nodes_cache[node_output_layer_name]
         if input_layer['class_name'] == 'InputLayer':
             if node_output_layer.name == 'Lambda':
@@ -108,7 +109,7 @@ class KerasJsonModelImport:
         node_output_key = self.get_connection_key(
             input_layer, node_input_layer, 'outputs', input_index)
         node_input_key = self.get_connection_key(
-            input_layer, node_output_layer, 'inputs', input_index)
+            input_layer, node_output_layer, 'inputs', input_index, num_inbound)
         if node_output_key is None or node_input_key is None:
             return
 
@@ -285,7 +286,8 @@ class KerasJsonModelImport:
             "output_name": "Action"
         })
 
-    def get_connection_key(self, node_input_layer, node: Node, direction: str, index: int) -> Optional[str]:
+    def get_connection_key(self, node_input_layer, node: Node, direction: str, index: int,
+                           num_connections: int = None) -> Optional[str]:
         layer_metadata = self.ui_components.get(node.name)
         if _is_represntaion_block_node(node) or layer_metadata is None:
             if direction == 'inputs':
@@ -295,17 +297,24 @@ class KerasJsonModelImport:
         elif _is_input_node(node):
             connection_format = f"{node.id}-{node_input_layer['name']}"
         else:
-            try:
-                connection_format = layer_metadata[f"{direction}_data"][direction][index]['name']
-            except IndexError:
-                connection_format = layer_metadata[f"{direction}_data"][direction][0]['name']
-            if connection_format.count('${id}') > 0:
+            metadata_slots = layer_metadata[f"{direction}_data"][direction]
+            if num_connections is not None and num_connections > len(metadata_slots) and '${id}' not in metadata_slots[0].get('name', ''):
                 connection_format = f"{node.id}-{index}"
                 if 'custom_input_keys' not in node.data:
                     node.data['custom_input_keys'] = []
                 node.data['custom_input_keys'].append(connection_format)
             else:
-                connection_format = f"{node.id}-{connection_format}"
+                try:
+                    connection_format = metadata_slots[index]['name']
+                except IndexError:
+                    connection_format = metadata_slots[0]['name']
+                if connection_format.count('${id}') > 0:
+                    connection_format = f"{node.id}-{index}"
+                    if 'custom_input_keys' not in node.data:
+                        node.data['custom_input_keys'] = []
+                    node.data['custom_input_keys'].append(connection_format)
+                else:
+                    connection_format = f"{node.id}-{connection_format}"
         return connection_format
 
     def handle_cudnn(self, layer: Dict[str, Any]) -> Dict[str, Any]:

{leap_model_parser-0.1.244.dev5 → leap_model_parser-0.1.245.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leap-model-parser"
-version = "0.1.244.dev5"
+version = "0.1.245.dev"
 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.188.dev5"
+onnx2kerastl = "0.0.188.dev"
 keras-data-format-converter = "0.1.24"
 leap-model-rebuilder = "0.1.7"
 tensorflow-io-gcs-filesystem = "0.34.0"