leap-model-parser 0.1.189.dev19__py3-none-any.whl → 0.1.189.dev21__py3-none-any.whl

leap_model_parser/leap_graph_editor.py

@@ -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
@@ -76,6 +77,12 @@ class ModelParser:
         graph, connected_inputs = model_generator.generate_graph(
             model_schema, layer_name_to_inbound_nodes)
 
+        with open("/Users/idan/tensorleap_home/leap-model-parser/leap_model_parser/bla.pkl", "rb") as f:
+
+            loade = pickle.load(f)
+
+        self.mapping_connections = loade
+
         if self.mapping_connections is not None:
             leap_graph_editor = LeapGraphEditor(graph, keras_model_with_weights)
             leap_graph_editor.add_connections_to_graph(self.mapping_connections)

{leap_model_parser-0.1.189.dev19.dist-info → leap_model_parser-0.1.189.dev21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: leap-model-parser
-Version: 0.1.189.dev19
+Version: 0.1.189.dev21
 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.99.dev8)
+Requires-Dist: code-loader (==1.0.99.dev10)
 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.189.dev19.dist-info → leap_model_parser-0.1.189.dev21.dist-info}/RECORD

@@ -1,13 +1,14 @@
 LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
 leap_model_parser/__init__.py,sha256=OAU7rFHAVVWUM-cDtQ4Ohum567KN8M-YTkHZp5KiYbo,132
+leap_model_parser/bla.pkl,sha256=M_IxQT2hRHcRPnZeYkBB2VDxU3bQejDk99iJv5T-kNA,926
 leap_model_parser/contract/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 leap_model_parser/contract/graph.py,sha256=c5rSlJJQ3JzLhyeniglzrP5GH0fp8UZDQKZw1fcrNe8,1132
 leap_model_parser/contract/importmodelresponse.py,sha256=GlvnKS8xrebU2Sj0dxqtEhAOOo3DlOtT7AMJ2BlzH9E,145
 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=qAloTHZGspx0j9YUGXUViIELJ7xgdqcklNE1ocN0hLo,12985
-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=eiOmRAHMJ_mY_7_LqtDMgX-WyhPt7GGyIZbB_efP5GQ,6798
 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
@@ -18,8 +19,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.189.dev19.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
-leap_model_parser-0.1.189.dev19.dist-info/METADATA,sha256=7XQ72hXadNGnhhQe35kEL7Gwc0P_P2NzxZABTfrXtg4,1114
-leap_model_parser-0.1.189.dev19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-leap_model_parser-0.1.189.dev19.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
-leap_model_parser-0.1.189.dev19.dist-info/RECORD,,
+leap_model_parser-0.1.189.dev21.dist-info/LICENSE,sha256=qIwWjdspQeSMTtnFZBC8MuT-95L02FPvzRUdWFxrwJY,1067
+leap_model_parser-0.1.189.dev21.dist-info/METADATA,sha256=BBoMS-QWrros5QpbzbU9c7-z7pr6hf19IDfzy5JIsys,1115
+leap_model_parser-0.1.189.dev21.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+leap_model_parser-0.1.189.dev21.dist-info/entry_points.txt,sha256=ZvV6EuQt1uAqwapNg5Lo2qjJM9ZG5g2wfzZoLh_Ztyk,77
+leap_model_parser-0.1.189.dev21.dist-info/RECORD,,