Merge branch 'master' into release

Author: ukclivecox

docker/examples/anomaly_detection/inne/Dockerfile.in

@@ -4,13 +4,13 @@ ENV SELDON_HOME=/home/seldon
 ENV PYTHONPATH=/home/seldon
 
 COPY AnomalyDetection.py $SELDON_HOME/AnomalyDetection.py
-COPY anomaly_wrapper.py $SELDON_HOME/anomaly_wrapper.py
+#COPY anomaly_wrapper.py $SELDON_HOME/anomaly_wrapper.py
 
 COPY inne_pipeline.py $SELDON_HOME/inne_pipeline.py
 COPY create-json.py $SELDON_HOME/create-json.py
 COPY DataGenerator.py $SELDON_HOME/DataGenerator.py
 
-RUN  mkdir -p $SELDON_HOME/data && cd $SELDON_HOME/ && python DataGenerator.py --std 1 --nb-samples 2000 --dim 4 --nb-clusters 3 --fout data/simulation.csv
+RUN  mkdir -p $SELDON_HOME/data && cd $SELDON_HOME/ && python DataGenerator.py --std 0.1 --nb-samples 1000 --dim 4 --nb-clusters 3 --fout data/simulation.csv
 
 RUN mkdir -p $SELDON_HOME/data/simulation/events/1 && cat $SELDON_HOME/data/simulation.csv | python $SELDON_HOME/create-json.py | shuf > $SELDON_HOME/data/simulation/events/1/simulation.json
 

docker/examples/anomaly_detection/inne/Makefile

@@ -1,7 +1,7 @@
 SHELL:=/bin/bash
 
-SELDON_PYTHON_PACKAGE_VERSION=2.2
-SELDON_SIMULATION_INNE_IMAGE_VERSION=2.0.7
+SELDON_PYTHON_PACKAGE_VERSION=2.2.1
+SELDON_SIMULATION_INNE_IMAGE_VERSION=1.0
 IMAGE_NAME=simulation_inne
 
 Dockerfile: Dockerfile.in

docker/examples/anomaly_detection/inne/inne_pipeline.py

@@ -1,12 +1,12 @@
 import sys, getopt, argparse
+import seldon.anomaly_wrapper as aw
 import seldon.pipeline.basic_transforms as bt
 import seldon.pipeline.util as sutl
 import seldon.pipeline.auto_transforms as pauto
 from sklearn.pipeline import Pipeline
 #import anomaly_wrapper as aw
-#import AnomalyDetection as anod
-import seldon.anomaly_wrapper as aw
-import seldon.anomaly.AnomalyDetection as anod
+import AnomalyDetection as anod
+#import seldon.anomaly.AnomalyDetection as anod
 import sys
 import logging
 
@@ -22,7 +22,6 @@ def run_pipeline(events,models):
 
     pw = sutl.Pipeline_wrapper()
     df = pw.create_dataframe_from_files(events)
-    logger.debug(df)
     df2 = p.fit_transform(df)
     pw.save_pipeline(p,models)
 

python/seldon/anomaly/AnomalyDetection.py

@@ -8,7 +8,7 @@
 logger = logging.getLogger(__name__)
 logger.setLevel(logging.DEBUG)
 ch = logging.StreamHandler()
-ch.setLevel(logging.DEBUG)
+ch.setLevel(logging.INFO)
 formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
 ch.setFormatter(formatter)
 logger.addHandler(ch)