Remove Gisaia's spark app interface

README.md

@@ -95,15 +95,9 @@ docker run -ti \
         --conf spark.es.index.auto.create="true" \
         --conf spark.cassandra.connection.host="gisaia-scylla-db" \
         --conf spark.driver.allowMultipleContexts="true" \
-        --conf spark.rpc.netty.dispatcher.numThreads="2" \
-        --conf spark.driver.CLOUDSMITH_ML_MODELS_TOKEN="$CLOUDSMITH_PRIVATE_TOKEN" \
-        --conf spark.driver.CLOUDSMITH_ML_MODELS_REPO="gisaia/private"
+        --conf spark.rpc.netty.dispatcher.numThreads="2"
 ```
 
-`spark.driver.CLOUDSMITH_ML_MODELS_REPO` and `spark.driver.CLOUDSMITH_ML_MODELS_TOKEN` are required when using ML models from Cloudsmith. 
-
-CLOUDSMITH_ML_MODELS_REPO is the repo hosting the models (e.g. `gisaia/private`), and CLOUDSMITH_ML_MODELS_TOKEN is the token to use to download from this repository.
-
 Paste (using `:paste`) the following code snippet :
 ```scala
     import io.arlas.data.sql._

build.sbt

@@ -3,7 +3,7 @@ ThisBuild / scalaVersion := "2.11.8"
 ThisBuild / organization := "io.arlas"
 
 resolvers += "osgeo" at "https://repo.osgeo.org/repository/release/"
-resolvers += "gisaia-ml" at "https://dl.cloudsmith.io/public/gisaia/public/maven/"
+resolvers += "gisaia" at "https://dl.cloudsmith.io/public/gisaia/public/maven/"
 resolvers += "jboss" at "https://repository.jboss.org/maven2/"
 
 val sparkVersion = "2.3.3"

src/main/scala/io/arlas/data/model/MLModel.scala

@@ -19,15 +19,11 @@
 
 package io.arlas.data.model
 
-import java.security.InvalidParameterException
-
-import io.arlas.data.app.ArlasProcConfig
-import io.arlas.data.utils.RestTool
 import org.apache.spark.sql.SparkSession
 
 import scala.util.{Failure, Try}
 
-abstract sealed class MLModel {
+abstract class MLModel {
   def getModelString(): Try[String]
 }
 
@@ -37,27 +33,3 @@ case class MLModelLocal(spark: SparkSession, path: String) extends MLModel {
     Try(spark.sparkContext.textFile(path, 1).toLocalIterator.mkString)
   }
 }
-
-case class MLModelHosted(spark: SparkSession, project: String, modelName: String, version: String = "latest") extends MLModel {
-
-  val CLOUDSMITH_TOKEN_KEY = "spark.driver.CLOUDSMITH_ML_MODELS_TOKEN"
-  val CLOUDSMITH_REPO_KEY = "spark.driver.CLOUDSMITH_ML_MODELS_REPO"
-
-  override def getModelString(): Try[String] = {
-
-    val cloudsmithToken = Try(spark.conf.get(CLOUDSMITH_TOKEN_KEY)).toOption
-    val cloudsmithRepo = Try(spark.conf.get(CLOUDSMITH_REPO_KEY)).toOption
-
-    if (!cloudsmithToken.isDefined) {
-      Failure(
-        new InvalidParameterException(s"${CLOUDSMITH_TOKEN_KEY} conf not set, cannot download ML Model ${modelName}:${version}/${project}"))
-    } else if (!cloudsmithRepo.isDefined) {
-      Failure(
-        new InvalidParameterException(s"${CLOUDSMITH_REPO_KEY} conf not set, cannot download ML Model ${modelName}:${version}/${project}"))
-    } else {
-      RestTool.get(ArlasProcConfig.getCloudsmithModelUrl(cloudsmithToken.get, cloudsmithRepo.get, version, project, modelName))
-    }
-
-  }
-
-}