aimodelshare 0.1.3__tar.gz → 0.1.5__tar.gz

{aimodelshare-0.1.3/aimodelshare.egg-info → aimodelshare-0.1.5}/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: aimodelshare
-Version: 0.1.3
+Version: 0.1.5
 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
 Author-email: mikedparrott@modelshare.org
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent

{aimodelshare-0.1.3 → aimodelshare-0.1.5}/aimodelshare/aimsonnx.py

@@ -3,25 +3,36 @@ import pandas as pd
 import numpy as np
 
 # ml frameworks
-
 try:
     import sklearn
     from sklearn.model_selection import GridSearchCV, RandomizedSearchCV
 except:
-    pass
+    print("Warning: Please install sklearn to enable sklearn features")
+
 try:
     import torch
 except:
-    pass
+    print("Warning: Please install pytorch to enable pytorch features")
+
 try:
     import xgboost
 except:
-    pass
+    print("Warning: Please install xgboost to enable xgboost features")
+
 try:
     import tensorflow as tf
     import keras
 except:
-    pass
+    print("Warning: Please install tensorflow/keras to enable tensorflow/keras features")
+
+try:
+    import pyspark
+    from pyspark.sql import SparkSession
+    from pyspark.ml import PipelineModel, Model
+    from pyspark.ml.tuning import CrossValidatorModel, TrainValidationSplitModel
+    from onnxmltools import convert_sparkml
+except:
+    print("Warning: Please install pyspark to enable pyspark features")
 
 
 # onnx modules
@@ -1184,7 +1195,6 @@ def onnx_to_image(model):
     return pydot_graph
 
 
-
 def inspect_model(apiurl, version=None, naming_convention = None, submission_type="competition"):
     if all(["username" in os.environ, 
            "password" in os.environ]):
@@ -1582,9 +1592,9 @@ def model_from_string(model_type):
 def _get_pyspark_modules():
     try:
         if pyspark is None:
-            raise("Error: Please install pyspark to enable pyspark features")
+            raise Exception("Error: Please install pyspark to enable pyspark features")
     except:
-        raise("Error: Please install pyspark to enable pyspark features")
+        raise Exception("Error: Please install pyspark to enable pyspark features")
 
     pyspark_modules = ['ml', 'ml.feature', 'ml.classification', 'ml.clustering', 'ml.regression']
 
@@ -1603,9 +1613,9 @@ def _get_pyspark_modules():
 def pyspark_model_from_string(model_type):
     try:
         if pyspark is None:
-            raise("Error: Please install pyspark to enable pyspark features")
+            raise Exception("Error: Please install pyspark to enable pyspark features")
     except:
-        raise("Error: Please install pyspark to enable pyspark features")
+        raise Exception("Error: Please install pyspark to enable pyspark features")
 
     models_modules_dict = _get_pyspark_modules()
     module = models_modules_dict[model_type]

{aimodelshare-0.1.3 → aimodelshare-0.1.5}/aimodelshare/api.py

@@ -211,7 +211,8 @@ class create_prediction_api_class():
         ###
         api_key = str(shortuuid.uuid())
 
-        t = Template(pkg_resources.read_text(main, 'eval_lambda.txt').replace("$apikey",api_key))
+        t = Template(pkg_resources.read_text(main, 'eval_lambda.txt').replace("$apikey",api_key).replace("$task_type",self.task_type))
+        
         data = t.substitute(bucket_name = self.bucket_name, unique_model_id = self.unique_model_id, task_type = self.task_type)
         with open(os.path.join(self.temp_dir, 'main.py'), 'w') as file:
             file.write(data)

{aimodelshare-0.1.3 → aimodelshare-0.1.5}/aimodelshare/main/eval_lambda.txt

@@ -33,6 +33,20 @@ def handler(event, context):
         if value == "None":
             body[key]=None
 
+
+    if body.get("return_task_type","ALL")  == "True" or body.get("return_task_type", "ALL") == "TRUE":
+        task_type="$task_type"
+        task_type_dict = {"statusCode": 200,
+        "headers": {
+        "Access-Control-Allow-Origin" : "*",
+        "Access-Control-Allow-Credentials": True,
+        "Allow" : "GET, OPTIONS, POST",
+        "Access-Control-Allow-Methods" : "GET, OPTIONS, POST",
+        "Access-Control-Allow-Headers" : "*"},
+        "body": json.dumps({"task_type":task_type})
+        }
+        return task_type_dict
+
     if body.get("exampledata", "ALL") == "True" or body.get("exampledata", "ALL") == "TRUE":
 
         exampledata=get_exampledata(example_data_filename = "exampledata.json")

{aimodelshare-0.1.3 → aimodelshare-0.1.5}/aimodelshare/playground.py

@@ -50,6 +50,13 @@ class ModelPlayground:
 
         self.model_type = input_type
 
+        if task_type == None:
+            post_dict = {"return_task_type": "TRUE"}
+            headers = { 'Content-Type':'application/json', 'authorizationToken': os.environ.get("AWS_TOKEN"),} 
+            playground_url_eval=playground_url[:-1]+"eval"
+            response = requests.post(playground_url_eval,headers=headers,data=json.dumps(post_dict))
+            task_type = json.loads(response.text)['task_type']
+        
         if task_type == "classification":
             self.categorical = True
         elif task_type == "regression":
@@ -786,7 +793,7 @@ class ModelPlayground:
                               eval_metric_filepath=eval_metric_filepath,
                               email_list=email_list,
                               public=public,
-                              public_private_split=public_private_split,
+                              public_private_split=0, #set to 0 because its an experiment
                               input_dict=exp_input_dict,
                               print_output=False)
 

{aimodelshare-0.1.3 → aimodelshare-0.1.5/aimodelshare.egg-info}/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: aimodelshare
-Version: 0.1.3
+Version: 0.1.5
 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
 Author-email: mikedparrott@modelshare.org
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: OS Independent

{aimodelshare-0.1.3 → aimodelshare-0.1.5}/aimodelshare.egg-info/requires.txt

@@ -1,7 +1,7 @@
 boto3==1.26.69
 botocore==1.29.82
 scikit-learn==1.2.2
-onnx>=1.13.1
+onnx==1.13.1
 onnxconverter-common>=1.7.0
 regex
 keras2onnx>=1.7.0

{aimodelshare-0.1.3 → aimodelshare-0.1.5}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name='aimodelshare', #TODO:update
-    version='0.1.3',        #TODO:update
+    version='0.1.5',        #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",
@@ -14,7 +14,7 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     url="https://www.modelshare.org",
     packages=setuptools.find_packages(),
-    install_requires=["boto3==1.26.69", "botocore==1.29.82","scikit-learn==1.2.2","onnx>=1.13.1","onnxconverter-common>=1.7.0", "regex",
+    install_requires=["boto3==1.26.69", "botocore==1.29.82","scikit-learn==1.2.2","onnx==1.13.1","onnxconverter-common>=1.7.0", "regex",
     "keras2onnx>=1.7.0","tensorflow>=2.12","tf2onnx","skl2onnx>=1.14.0","onnxruntime>=1.7.0","torch>=1.8.1","pydot==1.3.0","importlib-resources==5.10.0",
       "onnxmltools>=1.6.1","Pympler==0.9","docker==5.0.0","wget==3.2","PyJWT>=2.4.0","seaborn>=0.11.2","astunparse==1.6.3","shortuuid>=1.0.8","psutil>=5.9.1","pathlib>=1.0.1",
       "protobuf>=3.20.1", "dill"],

aimodelshare-0.1.5/tests/test_aimsonnx.py

@@ -0,0 +1,135 @@
+from aimodelshare.aimsonnx import _get_layer_names
+from aimodelshare.aimsonnx import _get_layer_names_pytorch
+from aimodelshare.aimsonnx import _get_sklearn_modules
+from aimodelshare.aimsonnx import model_from_string
+from aimodelshare.aimsonnx import _get_pyspark_modules
+from aimodelshare.aimsonnx import pyspark_model_from_string
+from aimodelshare.aimsonnx import layer_mapping
+from aimodelshare.aimsonnx import _sklearn_to_onnx
+from aimodelshare.aimsonnx import _pyspark_to_onnx
+from aimodelshare.aimsonnx import _keras_to_onnx
+from aimodelshare.aimsonnx import _pytorch_to_onnx
+from aimodelshare.aimsonnx import _misc_to_onnx
+from sklearn.linear_model import LogisticRegression
+from sklearn.neural_network import MLPClassifier
+import onnx
+from xgboost import XGBClassifier
+from pyspark.ml.classification import RandomForestClassifier, MultilayerPerceptronClassifier
+from keras.models import Sequential
+from torch import nn
+import torch
+from tensorflow.keras.layers import Dense
+
+def test_sklearn_to_onnx():
+
+    from sklearn.datasets import load_iris
+    data = load_iris()
+    X = data.data
+    y = data.target
+
+    model = LogisticRegression(C=10, penalty='l1', solver='liblinear')
+    model.fit(X, y)
+    onnx_model = _sklearn_to_onnx(model)
+    assert isinstance(onnx_model, onnx.ModelProto)
+
+    # model = MLPClassifier()
+    # model.fit(X, y)
+    # onnx_model = _sklearn_to_onnx(model)
+    # assert isinstance(onnx_model, onnx.ModelProto)
+
+
+# def test_misc_to_onnx():
+#
+#     model = XGBClassifier()
+#     onnx_model = _misc_to_onnx(model)
+#     assert isinstance(onnx_model, onnx.ModelProto)
+
+
+# def test_pyspark_to_onnx():
+#
+#     model =RandomForestClassifier(labelCol="indexedLabel", featuresCol="indexedFeatures", numTrees=10)
+#     onnx_model = _pyspark_to_onnx(model)
+#     assert isinstance(onnx_model, onnx.ModelProto)
+#
+#     model = MultilayerPerceptronClassifier()
+#     onnx_model = _pyspark_to_onnx(model)
+#     assert isinstance(onnx_model, onnx.ModelProto)
+
+def test_keras_to_onnx():
+
+    model = Sequential()
+    model.add(Dense(12, input_shape=(8,), activation='relu'))
+    model.add(Dense(8, activation='relu'))
+    model.add(Dense(1, activation='sigmoid'))
+    model.compile(loss='binary_crossentropy', optimizer='adam', metrics=['accuracy'])
+
+    onnx_model = _keras_to_onnx(model)
+    assert isinstance(onnx_model, onnx.ModelProto)
+
+
+def test_pytorch_to_onnx():
+
+    model = nn.Sequential(nn.Linear(3, 3),
+                          nn.ReLU(),
+                          nn.Linear(3, 1),
+                          nn.Sigmoid())
+
+    onnx_model = _pytorch_to_onnx(model, torch.randn(1, 3))
+    assert isinstance(onnx_model, onnx.ModelProto)
+
+
+def test_get_layer_names():
+
+    layers = _get_layer_names()
+
+    assert isinstance(layers, tuple)
+
+
+def test_get_layer_names_pytorch():
+
+        layers = _get_layer_names_pytorch()
+
+        assert isinstance(layers, tuple)
+
+
+def test_get_sklearn_modules():
+
+        modules = _get_sklearn_modules()
+
+        assert isinstance(modules, dict)
+
+def test_model_from_string():
+
+    model_class = model_from_string("RandomForestClassifier")
+
+    assert model_class.__name__ == "RandomForestClassifier"
+
+
+def test_get_pyspark_modules():
+
+    modules = _get_pyspark_modules()
+
+    assert isinstance(modules, dict)
+
+
+def test_pyspark_model_from_string():
+
+    model_class = pyspark_model_from_string("RandomForestClassifier")
+
+    assert model_class.__name__ == "RandomForestClassifier"
+
+
+def test_layer_mapping():
+
+    layer_map = layer_mapping(direction="torch_to_keras")
+    assert isinstance(layer_map, dict)
+
+    layer_map = layer_mapping(direction="keras_to_torch")
+    assert isinstance(layer_map, dict)
+
+    layer_map = layer_mapping(direction="torch_to_keras", activation=True)
+    assert isinstance(layer_map, dict)
+
+    layer_map = layer_mapping(direction="keras_to_torch", activation=True)
+    assert isinstance(layer_map, dict)
+