leap-model-parser 0.1.256.dev3__tar.gz → 0.1.257__tar.gz

{leap_model_parser-0.1.256.dev3 → leap_model_parser-0.1.257}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.256.dev3
+Version: 0.1.257
 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.198.dev3)
+Requires-Dist: onnx2kerastl (==0.0.198)
 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.256.dev3 → leap_model_parser-0.1.257}/leap_model_parser/leap_graph_editor.py

@@ -1,3 +1,4 @@
+import logging
 from enum import Enum
 from typing import Optional, Dict, Any, List
 
@@ -55,8 +56,16 @@ class LeapGraphEditor:
             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_loss_node_id, input_name, input_node_id)
+        elif node_connection.node.type.value == 'CustomLatentSpace':
+            new_latent_space_node_id = self._add_latent_space_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_latent_space_node_id, input_name, input_node_id)
         else:
-            raise Exception(f"Can't add node of type {node_connection.node.type.name}")
+            # Deliberately warn instead of raising, so connection types added by newer code-loaders don't fail the import
+            logging.warning(f"Skipping connection of unsupported node type {node_connection.node.type.name}")
 
     def model_graph_dict(self) -> Dict[str, Any]:
         json_model_graph = {}
@@ -81,6 +90,7 @@ class LeapGraphEditor:
         return None
 
     def _replace_prediction_node_name_with_correct_name(self, connections: List[NodeConnection]) -> List[NodeConnection]:
+        index_by_resolved_name: Dict[str, int] = {}
         for connection in connections:
             if connection.node_inputs is None:
                 continue
@@ -88,6 +98,15 @@ class LeapGraphEditor:
                 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
+                    known_index = index_by_resolved_name.setdefault(origin_name, prediction_index)
+                    # The same tensor returned twice binds correctly; two tensors of one layer
+                    # (a shared layer, a multi-output op) cannot be told apart by layer name.
+                    if (self.keras_model.outputs[known_index] is not
+                            self.keras_model.outputs[prediction_index]):
+                        raise Exception(
+                            f"Prediction{known_index} and Prediction{prediction_index} both resolve to "
+                            f"layer '{origin_name}', so their bindings are ambiguous; give the model "
+                            f"outputs distinct layers")
                     input_node.name = origin_name
 
         return connections
@@ -176,6 +195,23 @@ class LeapGraphEditor:
         self.model_graph[new_node_id] = metric_node
         return new_node_id
 
+    def _add_latent_space_node(self, latent_space_name: str,
+                             user_unique_name: str, arg_names: List[str]) -> str:
+        new_node_id = self._generate_new_node_id()
+
+        latent_space_node = Node(
+            new_node_id,
+            'CustomLatentSpace',
+            position=[0, 0],
+            data={'latent_space_name': latent_space_name, 'type': 'CustomLatentSpace',
+                  'name': latent_space_name,
+                  'arg_names': arg_names, "user_unique_name": user_unique_name},
+            inputs={},
+            outputs={})
+
+        self.model_graph[new_node_id] = latent_space_node
+        return new_node_id
+
     def _add_loss_node(self, loss_name: str, user_unique_name:str, is_custom_loss: bool, arg_names: Optional[List[str]]=None) -> str:
         new_node_id = self._generate_new_node_id()
 

{leap_model_parser-0.1.256.dev3 → leap_model_parser-0.1.257}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leap-model-parser"
-version = "0.1.256.dev3"
+version = "0.1.257"
 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.198.dev3"
+onnx2kerastl = "0.0.198"
 keras-data-format-converter = "0.1.24"
 leap-model-rebuilder = "0.1.7"
 tensorflow-io-gcs-filesystem = "0.34.0"