leap-model-parser 0.1.199.dev3__py3-none-any.whl → 0.1.201.dev1__py3-none-any.whl

leap_model_parser/leap_graph_editor.py

@@ -31,7 +31,7 @@ class LeapGraphEditor:
                 f"Prediction node with name {prediction_node.name} not found in model graph"
             prediction_node_id = prediction_mapping_node.id
             self.model_graph[prediction_node_id].data['prediction_type'] = prediction_labels_name
-        if node_connection.node.type == NodeMappingType.Visualizer:
+        elif 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)
@@ -71,6 +71,8 @@ class LeapGraphEditor:
 
     def _find_input_node_by_origin_name(self, origin_name: str) -> Optional[Node]:
         for node in self.model_graph.values():
+            if node.data.get('original_output_name') == origin_name:
+                return node
             if node.data.get('output_name') == origin_name:
                 return node
         return None
@@ -210,7 +212,10 @@ class LeapGraphEditor:
         input_node_by_origin = self._find_input_node_by_origin_name(origin_name)
         assert input_node_by_origin is not None, f"Input node with origin name {origin_name} not found in model graph"
         input_node_id = input_node_by_origin.id
+        if 'original_output_name' not in self.model_graph[input_node_id].data:
+            self.model_graph[input_node_id].data['original_output_name'] = self.model_graph[input_node_id].data['output_name']
         self.model_graph[input_node_id].data['output_name'] = input_node.name
+
         output_keys = list(self.model_graph[input_node_id].outputs.keys())
         for output_key in output_keys:
             new_output_key = f'{input_node_id}-{input_node.name}'

leap_model_parser/model_parser.py

@@ -1,6 +1,7 @@
 import glob
 import json
 import ntpath
+import pickle
 import tarfile
 import tempfile
 from importlib.util import find_spec
@@ -8,7 +9,7 @@ from pathlib import Path
 
 
 import tensorflow as tf  # type: ignore
-from code_loader.contract.mapping import NodeConnection  # type: ignore
+from code_loader.contract.mapping import NodeConnection, NodeMapping  # type: ignore
 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

leap_model_parser-0.1.201.dev1.dist-info/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 TensorLeap
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{leap_model_parser-0.1.199.dev3.dist-info → leap_model_parser-0.1.201.dev1.dist-info}/METADATA

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.199.dev3
+Version: 0.1.201.dev1
 Summary: 
+Home-page: https://github.com/tensorleap/leap-model-parser
 License: MIT
 Author: idan
 Author-email: idan.yogev@tensorleap.ai
@@ -11,16 +12,15 @@ 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.92.dev4)
+Requires-Dist: code-loader (==1.0.102.dev3)
 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.174)
+Requires-Dist: onnx2kerastl (==0.0.175)
 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"
-Project-URL: Homepage, https://github.com/tensorleap/leap-model-parser
 Project-URL: Repository, https://github.com/tensorleap/leap-model-parser
 Description-Content-Type: text/markdown
 

{leap_model_parser-0.1.199.dev3.dist-info → leap_model_parser-0.1.201.dev1.dist-info}/RECORD

@@ -1,3 +1,4 @@
+LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
 leap_model_parser/__init__.py,sha256=OAU7rFHAVVWUM-cDtQ4Ohum567KN8M-YTkHZp5KiYbo,132
 leap_model_parser/contract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/contract/graph.py,sha256=c5rSlJJQ3JzLhyeniglzrP5GH0fp8UZDQKZw1fcrNe8,1132
@@ -5,8 +6,8 @@ leap_model_parser/contract/importmodelresponse.py,sha256=GlvnKS8xrebU2Sj0dxqtEhA
 leap_model_parser/contract/nodedata.py,sha256=1_ML0nzp3QUZ0_9mGSLhfO4_hqjYMwi0DWLwymUnWEs,43326
 leap_model_parser/contract/ui_components.json,sha256=0lsxwOLElW1E-imCcdh3zKPWgzFuQ_bApG6aHvYfTvo,410591
 leap_model_parser/keras_json_model_import.py,sha256=x7HOH6iaASfzJgwMRHgF5SQS-iFOF5j9yCG0mDC9HEA,16794
-leap_model_parser/leap_graph_editor.py,sha256=ToPnBUh31hXrA83BMTo631DLQm36PgFE_uTYB-boFAM,12983
-leap_model_parser/model_parser.py,sha256=kodF6aCPXP5FzZR9To2txqu6YdwklmhdJbyQKO_hghM,6587
+leap_model_parser/leap_graph_editor.py,sha256=fGbGo_28nG_KU7vFB3-d_zkXVvYWwtqOk_1ZkBeg6So,13289
+leap_model_parser/model_parser.py,sha256=Je37-FjrNgi8w17rBIt_b71xm-BoiopBAvgW30qfb7o,6614
 leap_model_parser/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/utils/layerpedia/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/utils/layerpedia/layerpedia.py,sha256=1syubfXBTB630TVkgcQ-Ge7Qe9Zbr6EtZRreuqCJnQ8,9292
@@ -17,8 +18,8 @@ leap_model_parser/utils/uicomponents/generatenodedata.py,sha256=LRaPlO5jJ9pUtkvL
 leap_model_parser/utils/uicomponents/tensorflowinscpection.py,sha256=ym613z9iQKPDBpr0RYD35bTABdm1L-Ez86G47BYT7qw,6775
 leap_model_parser/utils/uicomponents/ui_components.json,sha256=0lsxwOLElW1E-imCcdh3zKPWgzFuQ_bApG6aHvYfTvo,410591
 leap_model_parser/utils/uicomponents/ui_components_config.yaml,sha256=cRH8T-c3TAL0nfefRvt9pFsjbTWNEg38NRyHR7RpJsk,19534
-leap_model_parser-0.1.199.dev3.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-leap_model_parser-0.1.199.dev3.dist-info/METADATA,sha256=opTnz-zXYcuvb1aePLInzNVxApH8peiSAUBfDkkIF2E,1125
-leap_model_parser-0.1.199.dev3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-leap_model_parser-0.1.199.dev3.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
-leap_model_parser-0.1.199.dev3.dist-info/RECORD,,
+leap_model_parser-0.1.201.dev1.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+leap_model_parser-0.1.201.dev1.dist-info/METADATA,sha256=4BgmCL8EBcdv1YuJLUL2Y1mCGhkb-BYVcJMi4hVFf48,1114
+leap_model_parser-0.1.201.dev1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+leap_model_parser-0.1.201.dev1.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
+leap_model_parser-0.1.201.dev1.dist-info/RECORD,,

{leap_model_parser-0.1.199.dev3.dist-info → leap_model_parser-0.1.201.dev1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any