leap-model-parser 0.1.257.dev2__tar.gz → 0.1.258__tar.gz

{leap_model_parser-0.1.257.dev2 → leap_model_parser-0.1.258}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.257.dev2
+Version: 0.1.258
 Summary: 
 Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT

{leap_model_parser-0.1.257.dev2 → leap_model_parser-0.1.258}/leap_model_parser/leap_graph_editor.py

@@ -64,6 +64,7 @@ class LeapGraphEditor:
                 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:
+            # 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]:
@@ -88,6 +89,16 @@ class LeapGraphEditor:
                 return node
         return None
 
+    @staticmethod
+    def _expected_output_count(connections: List[NodeConnection]) -> int:
+        # The integration test refers to model outputs as Prediction0, Prediction1, ...; it expects
+        # at least as many outputs as its highest index + 1.
+        indices = [int(input_node.type.value.replace('Prediction', ''))
+                   for connection in connections if connection.node_inputs is not None
+                   for input_node in connection.node_inputs.values()
+                   if 'Prediction' in input_node.type.value]
+        return max(indices) + 1 if indices else 0
+
     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:
@@ -96,6 +107,12 @@ class LeapGraphEditor:
             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', ''))
+                    n_outputs = len(self.keras_model.outputs)
+                    if prediction_index >= n_outputs:
+                        expected = self._expected_output_count(connections)
+                        raise Exception(
+                            f"The model has {n_outputs} output{'' if n_outputs == 1 else 's'}, "
+                            f"the integration expects {expected}.")
                     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

{leap_model_parser-0.1.257.dev2 → leap_model_parser-0.1.258}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "leap-model-parser"
-version = "0.1.257.dev2"
+version = "0.1.258"
 description = ""
 authors = ["idan <idan.yogev@tensorleap.ai>"]
 license = "MIT"