include rclone in adserver

components/alibi-detect-server/Dockerfile

@@ -1,4 +1,4 @@
-# TODO: Add to release script 
+# TODO: Add to release script
 FROM docker.io/seldonio/seldon-core-s2i-python37-ubi8:1.8.0-dev
 LABEL name="Seldon Alibi Detect Server" \
       vendor="Seldon Technologies" \
@@ -7,6 +7,13 @@ LABEL name="Seldon Alibi Detect Server" \
       summary="Alibi Detect Server for Seldon Core" \
       description="The Alibi Detect Server provides outlier, drift and adversarial detection services for Seldon Core"
 
+# Install Rclone Binary to be present in the image
+RUN yum install -y unzip
+RUN wget https://downloads.rclone.org/v1.55.1/rclone-v1.55.1-linux-amd64.zip && \
+    unzip rclone-v1.55.1-linux-amd64.zip && \
+    mv rclone-v1.55.1-linux-amd64/rclone /usr/bin/rclone && \
+    rm -rf rclone-v1.55.1-linux-amd64.zip rclone-v1.55.1-linux-amd64
+
 ADD requirements_server.txt .
 
 RUN pip install pip -U

components/alibi-detect-server/adserver/ad_model.py

@@ -1,12 +1,12 @@
 import json
 from typing import List, Dict, Optional
 import logging
-import kfserving
 import numpy as np
 from adserver.constants import HEADER_RETURN_INSTANCE_SCORE
 from .numpy_encoder import NumpyEncoder
 from alibi_detect.utils.saving import load_detector, Data
 from adserver.base import CEModel
+from adserver.base.storage import download_model
 
 
 class AlibiDetectAdversarialDetectionModel(
@@ -34,7 +34,7 @@ def load(self):
         Load the model from storage
 
         """
-        model_folder = kfserving.Storage.download(self.storage_uri)
+        model_folder = download_model(self.storage_uri)
         self.model: Data = load_detector(model_folder)
         self.ready = True
 

components/alibi-detect-server/adserver/base/alibi_model.py

@@ -1,6 +1,6 @@
-import kfserving
 from typing import Optional
 from adserver.base.model import CEModel
+from adserver.base.storage import download_model
 from alibi_detect.utils.saving import load_detector, Data
 
 
@@ -27,6 +27,6 @@ def load(self):
         Load the model from storage
 
         """
-        model_folder = kfserving.Storage.download(self.storage_uri)
+        model_folder = download_model(self.storage_uri)
         self.model: Data = load_detector(model_folder)
         self.ready = True

components/alibi-detect-server/adserver/base/storage.py

@@ -0,0 +1,63 @@
+import os
+import sys
+import kfserving
+import logging
+import tempfile
+from distutils.util import strtobool
+
+
+logger = logging.getLogger(__name__)
+
+try:
+    from sh import rclone
+except ImportError:
+    logger.warning(
+        "rclone-based storage funcionality not available without rclone binary"
+    )
+    rclone = None
+
+
+def _rclone_enabled():
+    # IF RCLONE_ENABLED variable set explicitly we read from it
+    enabled = os.environ.get("RCLONE_ENABLED", None)
+    if enabled is not None:
+        return strtobool(enabled)
+
+    # Otherwise we determine if Rclone config is provided
+    for key in os.environ.keys():
+        if "RCLONE_CONFIG" in key:
+            return True
+    else:
+        return False
+
+
+RCLONE_ENABLED = _rclone_enabled()
+
+
+class Rclone:
+    def __init__(self, cfg_file: str = None):
+        self.cfg_file = cfg_file
+
+    def copy(self, src: str, dest: str = None):
+        if rclone is None:
+            raise RuntimeError(
+                "rclone binary not found - rclone-based storage funcionality disabled"
+            )
+
+        if dest is None:
+            dest = tempfile.mkdtemp()
+
+        args = ["-v"]
+        kwargs = {}
+        if self.cfg_file is not None:
+            kwargs["config"] = os.path.abspath(os.path.expanduser(self.cfg_file))
+
+        rclone.copy(src, dest, *args, **kwargs, _out=sys.stdout, _err_to_out=True)
+        return dest
+
+
+def download_model(storage_uri) -> str:
+    if RCLONE_ENABLED:
+        return Rclone().copy(storage_uri)
+    else:
+        return kfserving.Storage.download(storage_uri)

components/alibi-detect-server/adserver/cd_model.py

@@ -6,7 +6,6 @@
 from alibi_detect.utils.saving import load_detector, Data
 from adserver.base import AlibiDetectModel
 from seldon_core.user_model import SeldonResponse
-import kfserving
 import tensorflow as tf
 from transformers import AutoTokenizer
 

components/alibi-detect-server/adserver/cm_model.py

@@ -3,7 +3,6 @@
 import logging
 import numpy as np
 from enum import Enum
-import kfserving
 import importlib
 import pickle
 import os
@@ -14,6 +13,7 @@
 )
 from .numpy_encoder import NumpyEncoder
 from adserver.base import CEModel
+from adserver.base.storage import download_model
 from seldon_core.user_model import SeldonResponse
 from seldon_core.flask_utils import SeldonMicroserviceException
 from seldon_core.metrics import DEFAULT_LABELS, NONIMPLEMENTED_MSG
@@ -73,7 +73,7 @@ def load(self):
 
         """
         if "/" in self.storage_uri:
-            model_folder = kfserving.Storage.download(self.storage_uri)
+            model_folder = download_model(self.storage_uri)
             self.model = pickle.load(
                 open(os.path.join(model_folder, "meta.pickle"), "rb")
             )

components/alibi-detect-server/adserver/od_model.py

@@ -2,12 +2,13 @@
 from typing import List, Dict, Optional, Union
 import os
 import logging
-import kfserving
 import numpy as np
 from .numpy_encoder import NumpyEncoder
 from adserver.base import CEModel
+from adserver.base.storage import download_model
 from alibi_detect.utils.saving import load_detector, Data
 from seldon_core.user_model import SeldonResponse
+from adserver.base.storage import download_model
 from adserver.constants import (
     HEADER_RETURN_INSTANCE_SCORE,
     HEADER_RETURN_FEATURE_SCORE,
@@ -62,7 +63,7 @@ def load(self):
         Load the model from storage
 
         """
-        model_folder = kfserving.Storage.download(self.storage_uri)
+        model_folder = download_model(self.storage_uri)
         self.model: Data = load_detector(model_folder)
         self.ready = True
 

components/alibi-detect-server/setup.py

@@ -17,6 +17,7 @@
         "numpy >= 1.8.2",
         "cloudevents == 1.2.0",
         "elasticsearch==7.9.1",
+        "sh<2.0.0",
         # Fixes #2533
         "google-cloud-core==1.4.1",
         "google-cloud-storage==1.31.2",