Don't read Bundled models with GZIPInputStream.

Author: panhongx

improveai-android/src/androidTest/assets/dummy_v5.xgb.gz

@@ -6,20 +6,24 @@
 import org.junit.runner.RunWith;
 
 import java.io.IOException;
-import java.net.HttpURLConnection;
 import java.net.URL;
 
+import ai.improve.DecisionModel;
+
 @RunWith(AndroidJUnit4.class)
 public class DownloaderTest {
 
     @Test
-    public void testDownloadWithCache() {
-        try {
-            HttpURLConnection urlConnection = (HttpURLConnection) new URL("http://10.254.115.144:8080/dummy_v6.xgb").openConnection();
-            urlConnection.setReadTimeout(15000);
-            urlConnection.getInputStream();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    public void testLoad_asset() throws IOException {
+        URL modelUrl = new URL("file:///android_asset/dummy_v6.xgb");
+        DecisionModel decisionModel = new DecisionModel("dummy");
+        decisionModel.load(modelUrl);
+    }
+
+    @Test
+    public void testLoad_asset_gzip() throws IOException {
+        URL modelUrl = new URL("file:///android_asset/dummy_v5.xgb");
+        DecisionModel decisionModel = new DecisionModel("dummy");
+        decisionModel.load(modelUrl);
     }
 }

improveai-android/src/androidTest/java/ai/improve/android/DownloaderTest.java

@@ -58,6 +58,9 @@ public class DecisionModel {
      * It's an equivalent of DecisionModel(modelName, defaultTrackURL, defaultTrackApiKey)
      * We suggest to have the defaultTrackURL/defaultTrackApiKey set on startup before creating
      * any DecisionModel instances.
+     * @param modelName Length of modelName must be in range [1, 64]; Only alphanumeric
+     *                  characters([a-zA-Z0-9]), '-', '.' and '_' are allowed in the modelName
+     *                  and the first character must be an alphanumeric one.
      * */
     public DecisionModel(String modelName) {
         this(modelName, sDefaultTrackURL, sDefaultTrackApiKey);
@@ -66,7 +69,7 @@ public DecisionModel(String modelName) {
     /**
      * @param modelName Length of modelName must be in range [1, 64]; Only alphanumeric
      *                  characters([a-zA-Z0-9]), '-', '.' and '_' are allowed in the modelName
-     *                  and the first character must be an alphanumeric one;
+     *                  and the first character must be an alphanumeric one.
      * @param trackURL url for tracking decisions. If trackURL is null, no decisions would be
      *                 tracked. If trackURL is not a valid URL, an exception would be thrown.
      * @param trackApiKey will be attached to the header fields of all the post request for tracking
@@ -137,6 +140,12 @@ public void loadAsync(URL modelUrl) {
      * may cause leaks. Before we add a cancel method to allow aborting downloading tasks, you may
      * have to call loadAsync() in something like a Singleton class.
      * @deprecated  The callback method signature will likely have to change for multiple URLs
+     * @param modelUrl A url that can be a local file path, a remote http url that points to a
+     *                 model file, or a bundled asset. Urls that ends with '.gz' are considered gzip
+     *                 compressed, and will be handled appropriately. Bundled model asset urls
+     *                 appears a bit different. Suppose that you have a bundled model file in folder
+     *                 "assets/models/my_model.xgb.gz", then modelUrl should be
+     *                 new URL("file:///android_asset/models/my_model.xgb").
      * */
     @Deprecated
     public void loadAsync(URL modelUrl, LoadListener listener) {

improveai/src/main/java/ai/improve/DecisionModel.java

@@ -58,11 +58,7 @@ public void run() {
                         // When running in pure Java, new URL("file:///android_asset/") is interpreted
                         // as new URL("file:/android_asset").
                         String path = urlString.substring("file:///android_asset/".length());
-                        if(urlString.endsWith(".gz")) {
-                            inputStream = new GZIPInputStream(assetModelLoader.load(path));
-                        } else {
-                            inputStream = assetModelLoader.load(path);
-                        }
+                        inputStream = assetModelLoader.load(path);
                         ImprovePredictor predictor = new ImprovePredictor(inputStream);
                         if(listener != null) {
                             listener.onFinish(predictor, null);
@@ -87,7 +83,11 @@ public void run() {
                     e.printStackTrace();
                     IMPLog.e(Tag, url + ", model download exception: " + e.getMessage());
                     if(listener != null) {
-                        listener.onFinish(null, new IOException(e.getMessage()));
+                        if(e instanceof IOException) {
+                            listener.onFinish(null, (IOException) e);
+                        } else {
+                            listener.onFinish(null, new IOException(e.getMessage()));
+                        }
                     }
                 } finally {
                     if(inputStream != null) {