aimodelshare 0.1.34__py3-none-any.whl → 0.1.36__py3-none-any.whl

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
@@ -654,23 +657,41 @@ def _keras_to_onnx(model, transfer_learning=None,
             pass  # fallback, don't crash conversion
             
     keras_layers = keras_unpack(model)
+    
+    
+    from tensorflow.python.framework import tensor_shape  # <- place this at the top of your file
+    
     layers = []
     layers_n_params = []
     layers_shapes = []
     activations = []
-
+    
     for layer in keras_layers:
+        # layer name
         layers.append(layer.__class__.__name__)
-        layers_n_params.append(layer.count_params())
     
+        # parameter count
+        try:
+            layers_n_params.append(layer.count_params())
+        except:
+            layers_n_params.append(0)
+    
+        # output shape (sanitized for JSON)
         shape = getattr(layer, 'output_shape', None)
-        if shape is not None:
+    
+        if isinstance(shape, tensor_shape.TensorShape):
+            shape = shape.as_list()
+        elif shape is not None:
             try:
-                shape = tuple(shape)
+                shape = list(shape)
             except:
                 shape = str(shape)
+        else:
+            shape = None
+    
         layers_shapes.append(shape)
     
+        # activation
         if hasattr(layer, 'activation'):
             act = getattr(layer.activation, '__name__', None)
             if act:

{aimodelshare-0.1.34.dist-info → aimodelshare-0.1.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aimodelshare
-Version: 0.1.34
+Version: 0.1.36
 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.34.dist-info → aimodelshare-0.1.36.dist-info}/RECORD

@@ -1,6 +1,6 @@
 aimodelshare/README.md,sha256=_OMdUIeIYZnpFlKdafM1KNWaANO2nWdx0QpLE_ZC-Qs,2014
 aimodelshare/__init__.py,sha256=CS0iFxgAic21gBcQE6NSZ-D_ElHw80_A3OWrEYo9Dks,539
-aimodelshare/aimsonnx.py,sha256=3FC5O4NqvOtkFCUKXL8TNKl1dNJYtoa_wi_hNJlCm4Y,67589
+aimodelshare/aimsonnx.py,sha256=oFPRaZ6HGqj8m9l1Zq1cBPMk9cH3QGy8Ru1c8xsQ9rY,68162
 aimodelshare/api.py,sha256=jeCIMbpBllTYi-bPvCdNvI6yHaT3JYakq9fgaz10s_E,34920
 aimodelshare/aws.py,sha256=jn99R9-N77Qac-_eYm-LaCQUPd-RnE7oVULm9rh-3RY,15232
 aimodelshare/aws_client.py,sha256=Ce19iwf69BwpuyyJlVN8z1da3c5jf93svsTgx1OWhaA,6784
@@ -140,11 +140,11 @@ aimodelshare/sam/codepipeline_policies.txt,sha256=267HMXMnbP7qRASkmFZYSx-2HmKf5o
 aimodelshare/sam/codepipeline_trust_relationship.txt,sha256=yfPYvZlN3fnaIHs7I3ENMMveigIE89mufV9pvR8EQH8,245
 aimodelshare/sam/spark-class.txt,sha256=chyJBxDzCzlUKXzVQYTzuJ2PXCTwg8_gd1yfnI-xbRw,217
 aimodelshare/sam/template.txt,sha256=JKSvEOZNaaLalHSx7r9psJg_6LLCb0XLAYi1-jYPu3M,1195
-aimodelshare-0.1.34.dist-info/licenses/LICENSE,sha256=JXBYLriXYgTloZs-9CJPZY76dqkuDT5df_HghMnljx8,1134
+aimodelshare-0.1.36.dist-info/licenses/LICENSE,sha256=JXBYLriXYgTloZs-9CJPZY76dqkuDT5df_HghMnljx8,1134
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_aimsonnx.py,sha256=-GOF1_qXGQaMxHyqK0GPg7dD1meE-S7CZea4pLmBDTk,3906
 tests/test_playground.py,sha256=vdFWPRrZNQ2poiBOoN3l7HsXB5yc3p3rrrclNYJHnaw,24574
-aimodelshare-0.1.34.dist-info/METADATA,sha256=C8WYQRoE8zPDC4am5ekyiRlQA1GEOcW4_aZyDGSr9m8,2916
-aimodelshare-0.1.34.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-aimodelshare-0.1.34.dist-info/top_level.txt,sha256=2KJgeHQ0BmZuilB75J203i7W4vri6CON2kdbwk9BNpU,19
-aimodelshare-0.1.34.dist-info/RECORD,,
+aimodelshare-0.1.36.dist-info/METADATA,sha256=KJcDX9G3XAOH3kWaxGRoV4oArRv3R25ipKl9Aht7CP4,2916
+aimodelshare-0.1.36.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+aimodelshare-0.1.36.dist-info/top_level.txt,sha256=2KJgeHQ0BmZuilB75J203i7W4vri6CON2kdbwk9BNpU,19
+aimodelshare-0.1.36.dist-info/RECORD,,