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

aimodelshare/aimsonnx.py

@@ -647,7 +647,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 +662,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)
@@ -1104,6 +1118,7 @@ def _get_leaderboard_data(onnx_model, eval_metrics=None):
 
 def _model_summary(meta_dict, from_onnx=False):
     '''Creates model summary table from model metadata dict.'''
+    import io
     
     assert(isinstance(meta_dict, dict)), \
     "Please pass valid metadata dict."
@@ -1112,9 +1127,9 @@ def _model_summary(meta_dict, from_onnx=False):
     "Please make sure model architecture data is included."
 
     if from_onnx == True:
-        model_summary = pd.read_json(meta_dict['metadata_onnx']["model_summary"])
+        model_summary = pd.read_json(io.StringIO(meta_dict['metadata_onnx']["model_summary"]))
     else:
-        model_summary = pd.read_json(meta_dict["model_summary"])
+        model_summary = pd.read_json(io.StringIO(meta_dict["model_summary"]))
        
     return model_summary
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aimodelshare
-Version: 0.1.32
+Version: 0.1.34
 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
@@ -11,33 +11,16 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: boto3==1.34.69
-Requires-Dist: botocore==1.34.69
-Requires-Dist: scikit-learn==1.6.0
-Requires-Dist: onnx==1.14.1
-Requires-Dist: onnxconverter-common==1.14.0
-Requires-Dist: regex
-Requires-Dist: keras2onnx==1.7.0
-Requires-Dist: tensorflow==2.18.0
-Requires-Dist: tf2onnx==1.16.1
-Requires-Dist: skl2onnx==1.18.0
-Requires-Dist: onnxruntime==1.17.1
-Requires-Dist: torch==2.6.0
-Requires-Dist: pydot==1.4.2
-Requires-Dist: importlib-resources==6.1.1
-Requires-Dist: onnxmltools==1.11.0
-Requires-Dist: Pympler==1.0.1
-Requires-Dist: docker==6.1.3
-Requires-Dist: wget==3.2
-Requires-Dist: PyJWT==2.8.0
-Requires-Dist: seaborn==0.13.2
-Requires-Dist: astunparse==1.6.3
-Requires-Dist: shortuuid==1.0.11
-Requires-Dist: psutil==5.9.5
-Requires-Dist: pathlib
-Requires-Dist: protobuf==3.20.3
-Requires-Dist: dill==0.3.7
-Requires-Dist: scikeras==0.11.0
+Requires-Dist: boto3
+Requires-Dist: onnx
+Requires-Dist: onnxmltools
+Requires-Dist: onnxruntime
+Requires-Dist: skl2onnx
+Requires-Dist: tf2onnx
+Requires-Dist: wget
+Requires-Dist: shortuuid
+Requires-Dist: Pympler
+Requires-Dist: scikeras
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{aimodelshare-0.1.32.dist-info → aimodelshare-0.1.34.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=rGhnNBonyrwpNgkuPTJ0hJFx_RGHQnNsCeAERZsPdcU,67129
+aimodelshare/aimsonnx.py,sha256=3FC5O4NqvOtkFCUKXL8TNKl1dNJYtoa_wi_hNJlCm4Y,67589
 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.32.dist-info/licenses/LICENSE,sha256=JXBYLriXYgTloZs-9CJPZY76dqkuDT5df_HghMnljx8,1134
+aimodelshare-0.1.34.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.32.dist-info/METADATA,sha256=4tr51rAZknBEIiALek1441tjpMArQd3xn-5zAZ5jElQ,3523
-aimodelshare-0.1.32.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-aimodelshare-0.1.32.dist-info/top_level.txt,sha256=2KJgeHQ0BmZuilB75J203i7W4vri6CON2kdbwk9BNpU,19
-aimodelshare-0.1.32.dist-info/RECORD,,
+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,,