aimodelshare 0.1.32__tar.gz → 0.1.34__tar.gz

{aimodelshare-0.1.32/aimodelshare.egg-info → aimodelshare-0.1.34}/PKG-INFO

@@ -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 → aimodelshare-0.1.34}/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 → aimodelshare-0.1.34/aimodelshare.egg-info}/PKG-INFO

@@ -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.34/aimodelshare.egg-info/requires.txt

@@ -0,0 +1,10 @@
+boto3
+onnx
+onnxmltools
+onnxruntime
+skl2onnx
+tf2onnx
+wget
+shortuuid
+Pympler
+scikeras

aimodelshare-0.1.34/setup.py

@@ -0,0 +1,39 @@
+
+import setuptools
+
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
+    name='aimodelshare', #TODO:update
+    version='0.1.34',        #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",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://www.modelshare.org",
+    packages=setuptools.find_packages(),
+    install_requires=[
+        "boto3",
+        "onnx",
+        "onnxmltools",
+        "onnxruntime",
+        "skl2onnx",
+        "tf2onnx",
+        "wget",
+        "shortuuid",
+        "Pympler",
+        "scikeras"
+    ]
+
+
+      ,
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: Other/Proprietary License",
+        "Operating System :: OS Independent",
+    ],
+    python_requires='>=3.7',
+    include_package_data=True)
+  

aimodelshare-0.1.32/aimodelshare.egg-info/requires.txt

@@ -1,27 +0,0 @@
-boto3==1.34.69
-botocore==1.34.69
-scikit-learn==1.6.0
-onnx==1.14.1
-onnxconverter-common==1.14.0
-regex
-keras2onnx==1.7.0
-tensorflow==2.18.0
-tf2onnx==1.16.1
-skl2onnx==1.18.0
-onnxruntime==1.17.1
-torch==2.6.0
-pydot==1.4.2
-importlib-resources==6.1.1
-onnxmltools==1.11.0
-Pympler==1.0.1
-docker==6.1.3
-wget==3.2
-PyJWT==2.8.0
-seaborn==0.13.2
-astunparse==1.6.3
-shortuuid==1.0.11
-psutil==5.9.5
-pathlib
-protobuf==3.20.3
-dill==0.3.7
-scikeras==0.11.0

aimodelshare-0.1.32/setup.py

@@ -1,55 +0,0 @@
-
-import setuptools
-
-with open("README.md", "r") as fh:
-    long_description = fh.read()
-
-setuptools.setup(
-    name='aimodelshare', #TODO:update
-    version='0.1.32',        #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",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://www.modelshare.org",
-    packages=setuptools.find_packages(),
-    install_requires=[
-        "boto3==1.34.69",
-        "botocore==1.34.69",
-        "scikit-learn==1.6.0",
-        "onnx==1.14.1",
-        "onnxconverter-common==1.14.0",
-        "regex",
-        "keras2onnx==1.7.0",
-        "tensorflow==2.18.0",
-        "tf2onnx==1.16.1",
-        "skl2onnx==1.18.0",
-        "onnxruntime==1.17.1",
-        "torch==2.6.0",
-        "pydot==1.4.2",
-        "importlib-resources==6.1.1",
-        "onnxmltools==1.11.0",
-        "Pympler==1.0.1",
-        "docker==6.1.3",
-        "wget==3.2",
-        "PyJWT==2.8.0",
-        "seaborn==0.13.2",
-        "astunparse==1.6.3",
-        "shortuuid==1.0.11",
-        "psutil==5.9.5",
-        "pathlib",  # standard in Python 3.11
-        "protobuf==3.20.3",
-        "dill==0.3.7",
-        "scikeras==0.11.0"]
-
-
-      ,
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: Other/Proprietary License",
-        "Operating System :: OS Independent",
-    ],
-    python_requires='>=3.7',
-    include_package_data=True)
-