aimodelshare 0.1.33__tar.gz → 0.1.35__tar.gz

{aimodelshare-0.1.33/aimodelshare.egg-info → aimodelshare-0.1.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aimodelshare
-Version: 0.1.33
+Version: 0.1.35
 Summary: Deploy locally saved machine learning models to a live rest API and web-dashboard.  Share it with the world via modelshare.org
 Home-page: https://www.modelshare.org
 Author: Michael Parrott

{aimodelshare-0.1.33 → aimodelshare-0.1.35}/aimodelshare/aimsonnx.py

@@ -1,6 +1,6 @@
 # data wrangling
 import pandas as pd
-import numpy as np
+import numpy as np 
 
 # ml frameworks
 try:
@@ -92,11 +92,14 @@ def _extract_onnx_metadata(onnx_model, framework):
     # initialize metadata dict
     metadata_onnx = {}
 
-    # get input shape
-    metadata_onnx["input_shape"] = graph.input[0].type.tensor_type.shape.dim[1].dim_value
-
-    # get output shape
-    metadata_onnx["output_shape"] = graph.output[0].type.tensor_type.shape.dim[1].dim_value 
+    def _get_shape(dims):
+        return [d.dim_value if d.HasField("dim_value") else None for d in dims]
+    
+    input_dims = graph.input[0].type.tensor_type.shape.dim
+    output_dims = graph.output[0].type.tensor_type.shape.dim
+    
+    metadata_onnx["input_shape"] = _get_shape(input_dims)
+    metadata_onnx["output_shape"] = _get_shape(output_dims)
     
     # get layers and activations NEW
     # match layers and nodes and initalizers in sinle object
@@ -647,7 +650,12 @@ def _keras_to_onnx(model, transfer_learning=None,
         metadata['model_weights'] = pickle.dumps(model.get_weights())
 
     # Extract architecture
-
+    if not model.built: # add shape outputs if model not built
+        try:
+            model(tf.random.uniform([1] + list(input_shape[1:])))
+        except Exception:
+            pass  # fallback, don't crash conversion
+            
     keras_layers = keras_unpack(model)
     layers = []
     layers_n_params = []
@@ -657,10 +665,19 @@ def _keras_to_onnx(model, transfer_learning=None,
     for layer in keras_layers:
         layers.append(layer.__class__.__name__)
         layers_n_params.append(layer.count_params())
-        layers_shapes.append(getattr(layer, 'output_shape', None))
+    
+        shape = getattr(layer, 'output_shape', None)
+        if shape is not None:
+            try:
+                shape = tuple(shape)
+            except:
+                shape = str(shape)
+        layers_shapes.append(shape)
+    
         if hasattr(layer, 'activation'):
             act = getattr(layer.activation, '__name__', None)
-            if act: activations.append(act)
+            if act:
+                activations.append(act)
 
     optimizer = getattr(model.optimizer, '__class__', None)
     loss = getattr(model.loss, '__class__', None)

{aimodelshare-0.1.33 → aimodelshare-0.1.35/aimodelshare.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aimodelshare
-Version: 0.1.33
+Version: 0.1.35
 Summary: Deploy locally saved machine learning models to a live rest API and web-dashboard.  Share it with the world via modelshare.org
 Home-page: https://www.modelshare.org
 Author: Michael Parrott

{aimodelshare-0.1.33 → aimodelshare-0.1.35}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name='aimodelshare', #TODO:update
-    version='0.1.33',        #TODO:update
+    version='0.1.35',        #TODO:update
     author="Michael Parrott",
     author_email="mikedparrott@modelshare.org",
     description="Deploy locally saved machine learning models to a live rest API and web-dashboard.  Share it with the world via modelshare.org",