Merge pull request #19 from asfadmin/sg/ml

Sg/ml

README.md

@@ -49,11 +49,11 @@ inputs:
     name_of_input_1:
         type: << Any, Bool, Binary, Set, Sequence, Str, Map, None, Number, !CustomClass your.type.here >>
         default: << Value this variable should default to >>
-        user_input: << True, False >>
+        user_input: << None, Text, Dropdown, FileUpload >>
     name_of_input_N:
         type: << Any, Bool, Binary, Set, Sequence, Str, Map, None, Number, !CustomClass your.type.here >>
         default: << Value this variable should default to >>
-        user_input: << True, False >>
+        user_input: << None, Text, Dropdown, FileUpload >>
 outputs:
     name_of_output:
         type: << Any, Bool, Binary, Set, Sequence, Str, Map, None, Number, !CustomClass your.type.here >>
@@ -105,7 +105,7 @@ You can determine what system the code is currently running on using the platfor
 import platform
 system = platform.system()
 
-if system() == "Emscripten":
+if system == "Emscripten":
     # import web packages
     # Run web only code
 else:

flowblock_source_files/asf_utils/download_product.py

@@ -5,15 +5,15 @@
 inputs:
     grd_product:
         type: !CustomClass asf_search.ASFProduct.ASFProduct
-        user_input: True
+        user_input: Text
 
     edl_token:
         type: Str
-        user_input: True
+        user_input: Text
 
     download_path:
         type: Str
-        user_input: True
+        user_input: Text
         default: "/tmp/data_download"
         
 outputs:

flowblock_source_files/asf_utils/find_product.py

@@ -5,7 +5,7 @@
 inputs:
     scene_name:
         type: Str
-        user_input: True
+        user_input: Text
 outputs:
     grd_product:
         type: !CustomClass asf_search.ASFProduct.ASFProduct

flowblock_source_files/base/concatenate.py

@@ -5,12 +5,12 @@
     string1:
         type: Str
         default: "Python"
-        user_input: True
+        user_input: Text
 
     string2:
         type: Str
         default: " exists"
-        user_input: True
+        user_input: Text
 outputs:
     concatenated_string:
         type: Str

flowblock_source_files/base/download_file.py

@@ -6,11 +6,11 @@
     URL:
         type: Str
         default: "/"
-        user_input: True
+        user_input: Text
 
     directory:
         type: Str
-        user_input: True
+        user_input: Text
 outputs:
     path:
         type: Str

flowblock_source_files/base/output_image.py

@@ -3,7 +3,7 @@
 inputs:
     image:
         type: !CustomClass PIL.Image.Image
-        user_input: True
+        user_input: Text
 description: "Writes the input PIL image to the \"Image Output\" field."
 """
 

flowblock_source_files/base/output_text.py

@@ -3,7 +3,7 @@
 inputs:
     input_string:
         type: Str
-        user_input: True
+        user_input: Text
 description: "Displays the input_string based on platform"
 """
 

flowblock_source_files/base/print_file.py

@@ -4,7 +4,7 @@
 inputs:
     path:
         type: Str
-        user_input: True
+        user_input: Text
 outputs:
     success:
         type: Bool

flowblock_source_files/base/read_string.py

@@ -3,7 +3,7 @@
 inputs:
     input_string:
         type: Str
-        user_input: True
+        user_input: Text
 outputs:
     output_string:
         type: Str

flowblock_source_files/base/write_read.py

@@ -4,14 +4,14 @@
 inputs:
     path:
         type: Str
-        user_input: True
+        user_input: Text
     write_mode:
         type: Bool
-        user_input: True
+        user_input: Text
         default: False
     write_contents:
         type: Str
-        user_input: True
+        user_input: Text
         default: ""
 outputs:
     string:

flowblock_source_files/example/open_image_and_scale.py

@@ -10,7 +10,7 @@
         type: Str
     scale:
         type: Number
-        user_input: True
+        user_input: Text
 outputs:
     image:
         type: !CustomClass PIL.Image.Image

flowblock_source_files/example/save_geotiff.py

@@ -8,7 +8,7 @@
         type: Map
     out_path:
         type: Str
-        user_input: True
+        user_input: Text
 outputs:
 description: "Saves geotiff to a path"
 """

flowblock_source_files/library_list.txt

@@ -4,4 +4,5 @@ convert
 example
 image
 math
+ml
 string

flowblock_source_files/math/add.py

@@ -4,11 +4,11 @@
     a:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
     b:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
 outputs:
     sum:
         type: Number

flowblock_source_files/math/divide.py

@@ -4,11 +4,11 @@
     a:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
     b:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
 outputs:
     sum:
         type: Number

flowblock_source_files/math/mod.py

@@ -4,11 +4,11 @@
     a:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
     b:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
 outputs:
     sum:
         type: Number

flowblock_source_files/math/multiply.py

@@ -4,11 +4,11 @@
     a:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
     b:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
 outputs:
     sum:
         type: Number

flowblock_source_files/math/power.py

@@ -6,11 +6,11 @@
     a:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
     b:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
 outputs:
     sum:
         type: Number

flowblock_source_files/math/roundup.py

@@ -6,7 +6,7 @@
     a:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
 outputs:
     sum:
         type: Number

flowblock_source_files/math/subtract.py

@@ -4,11 +4,11 @@
     a:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
     b:
         type: Number
         default: 0
-        user_input: True
+        user_input: Text
 outputs:
     sum:
         type: Number

flowblock_source_files/ml/cross-val-score.py

@@ -0,0 +1,27 @@
+"""
+name: "Cross Validation Score"
+requirements:
+    - numpy
+    - scikit-learn
+inputs:
+    X:
+        type: !CustomClass numpy.ndarray
+    y:
+        type: !CustomClass numpy.ndarray
+    model: 
+        type: !CustomClass sklearn.neural_network._multilayer_perceptron.MLPClassifier
+outputs:
+    mean:
+        type: Number
+    standard_deviation:
+        type: Number
+description: "Returns a trained sklearn MLP"
+"""
+
+import numpy as np
+from sklearn.neural_network import MLPClassifier
+from sklearn.model_selection import cross_val_score
+
+def main(X:np.ndarray, y:np.ndarray, model:MLPClassifier):
+    scores = cross_val_score(model, X, y)
+    return scores.mean(), scores.std()

flowblock_source_files/ml/import-sklearn-dataset.py

@@ -0,0 +1,78 @@
+"""
+name: "Import SKlearn Dataset"
+requirements:
+    - numpy
+    - scikit-learn
+inputs:
+    dataset_name:
+        type: Str
+        user_input: Dropdown
+        options:
+            - "breast_cancer"
+            - "diabetes"
+            - "digits"
+            - "iris"
+            - "linnerud"
+            - "wine"
+    n_class:
+        type: Number
+        default: None
+        user_input: Text
+    scaled:
+        type: Bool
+        default: None
+        user_input: Text
+outputs:
+    X:
+        type: !CustomClass numpy.ndarray
+    y:
+        type: !CustomClass numpy.ndarray
+description: "Returns a dataset loaded from sklearn"
+"""
+
+from sklearn import datasets
+import logging
+logging.basicConfig(format='%(asctime)s - %(message)s', level=logging.INFO)
+
+def main(dataset_name:str, n_class:int=None, scaled:bool=None):
+    logging.info(f"Starting to import {dataset_name}")
+
+    ## Temporary set "None" to None
+    ## Remove after scipyflow issue #116 is completed
+    if n_class == "None":
+        n_class = None
+    if scaled == "None":
+        scaled = None
+    ## End temporary code
+
+    dataset_name = dataset_name.lower()
+    kwargs = {
+        'return_X_y':True,
+        'as_frame':False,
+    }
+
+    if dataset_name == "breast_cancer":
+        return datasets.load_breast_cancer(**kwargs)
+
+    elif dataset_name == "diabetes":
+        if scaled:
+            kwargs[scaled] = scaled
+        return datasets.load_diabetes(**kwargs)
+
+    elif dataset_name == "digits":
+        if n_class:
+            kwargs[n_class] = n_class
+        return datasets.load_digits(**kwargs)
+
+    elif dataset_name == "iris":
+        return datasets.load_iris(**kwargs)
+
+    elif dataset_name == "linnerud":
+        return datasets.load_linnerud(**kwargs)
+
+    elif dataset_name == "wine":
+        return datasets.load_wine(**kwargs)
+
+    else:
+        logging.info(f"Cannot find dataset '{dataset_name}'")
+        return None, None

flowblock_source_files/ml/load-model.py

@@ -0,0 +1,23 @@
+"""
+name: "Load Model"
+requirements:
+    - numpy
+    - scikit-learn
+inputs:
+    X:
+        type: !CustomClass numpy.ndarray
+    y:
+        type: !CustomClass numpy.ndarray
+    model: 
+        type: !CustomClass sklearn.neural_network._multilayer_perceptron.MLPClassifier
+outputs:
+    score:
+        type: Number
+description: "Returns a trained sklearn MLP"
+"""
+
+import numpy as np
+from sklearn.neural_network import MLPClassifier
+
+def main(X:np.ndarray, y: np.ndarray, model:MLPClassifier):
+    pass