Implement engine version management

enso-org · radeusgd · Nov 16, 2020 · Oct 30, 2020 · Nov 2, 2020 · Nov 5, 2020
commit 178c192b2167a59393d04b43053dcbc5047bb800
diff --git a/docs/language-server/protocol-project-manager.md b/docs/language-server/protocol-project-manager.md
@@ -506,7 +506,7 @@ interface TaskStartNotification {
    * May be missing, as it is not always known, for example when downloading a
    * file of unknown size or waiting on a lock.
    */
-  total?: Int;
+  total?: Long;
 }
 ```
 
@@ -529,7 +529,7 @@ interface TaskUpdateNotification {
   message?: String;
 
   /** Indicates amount of progress, for example: count of processed bytes. */
-  done: Int;
+  done: Long;
 }
 ```
 

diff --git a/...ncher/src/main/scala/org/enso/launcher/cli/CLIRuntimeVersionManagementUserInterface.scala b/...ncher/src/main/scala/org/enso/launcher/cli/CLIRuntimeVersionManagementUserInterface.scala
@@ -21,9 +21,11 @@ class CLIRuntimeVersionManagementUserInterface(
 ) extends RuntimeVersionManagementUserInterface {
 
   /** @inheritdoc */
-  override def trackProgress(task: TaskProgress[_]): Unit =
+  override def trackProgress(message: String, task: TaskProgress[_]): Unit = {
+    logInfo(message)
     if (cliOptions.hideProgress) ()
     else ProgressBar.waitWithProgress(task)
+  }
 
   private val logger = Logger[CLIRuntimeVersionManagementUserInterface]
 

diff --git a/engine/launcher/src/main/scala/org/enso/launcher/upgrade/LauncherUpgrader.scala b/engine/launcher/src/main/scala/org/enso/launcher/upgrade/LauncherUpgrader.scala
@@ -437,7 +437,7 @@ object LauncherUpgrader {
       } else {
         logger.warn(
           s"A more recent launcher version (at least " +
-          s"${upgradeRequiredError.expectedLauncherVersion}) is required to " +
+          s"${upgradeRequiredError.expectedVersion}) is required to " +
           s"continue."
         )
         CLIOutput.askConfirmation(

diff --git a/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/MainModule.scala b/lib/scala/project-manager/src/main/scala/org/enso/projectmanager/boot/MainModule.scala
@@ -22,6 +22,7 @@ import org.enso.projectmanager.protocol.{
   ManagerClientControllerFactory
 }
 import org.enso.projectmanager.service.config.GlobalConfigService
+import org.enso.projectmanager.service.versionmanagement.RuntimeVersionManagementService
 import org.enso.projectmanager.service.{
   MonadicProjectValidator,
   ProjectService,
@@ -105,12 +106,16 @@ class MainModule[
 
   lazy val globalConfigService = new GlobalConfigService[F](DefaultManagers)
 
+  lazy val runtimeVersionManagementService =
+    new RuntimeVersionManagementService[F](DefaultManagers)
+
   lazy val clientControllerFactory =
     new ManagerClientControllerFactory[F](
-      system,
-      projectService,
-      globalConfigService,
-      config.timeout
+      system                          = system,
+      projectService                  = projectService,
+      globalConfigService             = globalConfigService,
+      runtimeVersionManagementService = runtimeVersionManagementService,
+      timeoutConfig                   = config.timeout
     )
 
   lazy val server = new JsonRpcServer(JsonRpc.protocol, clientControllerFactory)

diff --git a/...la/project-manager/src/main/scala/org/enso/projectmanager/protocol/ClientController.scala b/...la/project-manager/src/main/scala/org/enso/projectmanager/protocol/ClientController.scala
@@ -15,6 +15,7 @@ import org.enso.projectmanager.protocol.ProjectManagementApi._
 import org.enso.projectmanager.requesthandler._
 import org.enso.projectmanager.service.ProjectServiceApi
 import org.enso.projectmanager.service.config.GlobalConfigServiceApi
+import org.enso.projectmanager.service.versionmanagement.RuntimeVersionManagementServiceApi
 import org.enso.projectmanager.util.UnhandledLogging
 
 import scala.annotation.unused
@@ -31,6 +32,7 @@ class ClientController[F[+_, +_]: Exec: CovariantFlatMap](
   clientId: UUID,
   projectService: ProjectServiceApi[F],
   globalConfigService: GlobalConfigServiceApi[F],
+  runtimeVersionManagementService: RuntimeVersionManagementServiceApi[F],
   timeoutConfig: TimeoutConfig
 ) extends Actor
     with ActorLogging
@@ -55,10 +57,20 @@ class ClientController[F[+_, +_]: Exec: CovariantFlatMap](
         .props[F](clientId, projectService, timeoutConfig.requestTimeout),
       ProjectRename -> ProjectRenameHandler
         .props[F](projectService, timeoutConfig.requestTimeout),
-      EngineListInstalled -> NotImplementedHandler.props,
-      EngineListAvailable -> NotImplementedHandler.props,
-      EngineInstall       -> NotImplementedHandler.props,
-      EngineUninstall     -> NotImplementedHandler.props,
+      EngineListInstalled -> EngineListInstalledHandler.props(
+        runtimeVersionManagementService,
+        timeoutConfig.requestTimeout
+      ),
+      EngineListAvailable -> EngineListAvailableHandler.props(
+        runtimeVersionManagementService,
+        timeoutConfig.requestTimeout
+      ),
+      EngineInstall -> EngineInstallHandler.props(
+        runtimeVersionManagementService
+      ),
+      EngineUninstall -> EngineUninstallHandler.props(
+        runtimeVersionManagementService
+      ),
       ConfigGet -> ConfigGetHandler
         .props(globalConfigService, timeoutConfig.requestTimeout),
       ConfigSet -> ConfigSetHandler
@@ -104,14 +116,16 @@ object ClientController {
     clientId: UUID,
     projectService: ProjectServiceApi[F],
     globalConfigService: GlobalConfigServiceApi[F],
+    runtimeVersionManagementService: RuntimeVersionManagementServiceApi[F],
     config: TimeoutConfig
   ): Props =
     Props(
       new ClientController(
-        clientId            = clientId,
-        projectService      = projectService,
-        globalConfigService = globalConfigService,
-        timeoutConfig       = config: TimeoutConfig
+        clientId                        = clientId,
+        projectService                  = projectService,
+        globalConfigService             = globalConfigService,
+        runtimeVersionManagementService = runtimeVersionManagementService,
+        timeoutConfig                   = config: TimeoutConfig
       )
     )
 

diff --git a/...ager/src/main/scala/org/enso/projectmanager/protocol/ManagerClientControllerFactory.scala b/...ager/src/main/scala/org/enso/projectmanager/protocol/ManagerClientControllerFactory.scala
@@ -9,6 +9,7 @@ import org.enso.projectmanager.control.core.CovariantFlatMap
 import org.enso.projectmanager.control.effect.Exec
 import org.enso.projectmanager.service.ProjectServiceApi
 import org.enso.projectmanager.service.config.GlobalConfigServiceApi
+import org.enso.projectmanager.service.versionmanagement.RuntimeVersionManagementServiceApi
 
 /** Project manager client controller factory.
   *
@@ -18,6 +19,7 @@ class ManagerClientControllerFactory[F[+_, +_]: Exec: CovariantFlatMap](
   system: ActorSystem,
   projectService: ProjectServiceApi[F],
   globalConfigService: GlobalConfigServiceApi[F],
+  runtimeVersionManagementService: RuntimeVersionManagementServiceApi[F],
   timeoutConfig: TimeoutConfig
 ) extends ClientControllerFactory {
 
@@ -29,7 +31,13 @@ class ManagerClientControllerFactory[F[+_, +_]: Exec: CovariantFlatMap](
   override def createClientController(clientId: UUID): ActorRef =
     system.actorOf(
       ClientController
-        .props[F](clientId, projectService, globalConfigService, timeoutConfig),
+        .props[F](
+          clientId,
+          projectService,
+          globalConfigService,
+          runtimeVersionManagementService,
+          timeoutConfig
+        ),
       s"jsonrpc-connection-controller-$clientId"
     )
 

diff --git a/...roject-manager/src/main/scala/org/enso/projectmanager/protocol/ProjectManagementApi.scala b/...roject-manager/src/main/scala/org/enso/projectmanager/protocol/ProjectManagementApi.scala
@@ -121,7 +121,7 @@ object ProjectManagementApi {
       taskId: UUID,
       relatedOperation: String,
       unit: ProgressUnit,
-      total: Option[Int]
+      total: Option[Long]
     )
 
     implicit val hasParams = new HasParams[this.type] {
@@ -134,7 +134,7 @@ object ProjectManagementApi {
     case class Params(
       taskId: UUID,
       message: Option[String],
-      done: Int
+      done: Long
     )
 
     implicit val hasParams = new HasParams[this.type] {

diff --git a/...t-manager/src/main/scala/org/enso/projectmanager/requesthandler/ConfigDeleteHandler.scala b/...t-manager/src/main/scala/org/enso/projectmanager/requesthandler/ConfigDeleteHandler.scala
@@ -16,7 +16,10 @@ import scala.concurrent.duration.FiniteDuration
 class ConfigDeleteHandler[F[+_, +_]: Exec: CovariantFlatMap](
   service: GlobalConfigServiceApi[F],
   requestTimeout: FiniteDuration
-) extends TimedRequestHandler[F, GlobalConfigServiceFailure](requestTimeout) {
+) extends RequestHandler[F, GlobalConfigServiceFailure](
+      ConfigDelete,
+      Some(requestTimeout)
+    ) {
   override def handleRequest
     : PartialFunction[Any, F[GlobalConfigServiceFailure, Any]] = {
     case Request(ConfigDelete, id, params: ConfigDelete.Params) =>

diff --git a/...ject-manager/src/main/scala/org/enso/projectmanager/requesthandler/ConfigGetHandler.scala b/...ject-manager/src/main/scala/org/enso/projectmanager/requesthandler/ConfigGetHandler.scala
@@ -16,7 +16,10 @@ import scala.concurrent.duration.FiniteDuration
 class ConfigGetHandler[F[+_, +_]: Exec: CovariantFlatMap](
   service: GlobalConfigServiceApi[F],
   requestTimeout: FiniteDuration
-) extends TimedRequestHandler[F, GlobalConfigServiceFailure](requestTimeout) {
+) extends RequestHandler[F, GlobalConfigServiceFailure](
+      ConfigGet,
+      Some(requestTimeout)
+    ) {
   override def handleRequest
     : PartialFunction[Any, F[GlobalConfigServiceFailure, Any]] = {
     case Request(ConfigGet, id, params: ConfigGet.Params) =>

diff --git a/...ject-manager/src/main/scala/org/enso/projectmanager/requesthandler/ConfigSetHandler.scala b/...ject-manager/src/main/scala/org/enso/projectmanager/requesthandler/ConfigSetHandler.scala
@@ -16,7 +16,10 @@ import scala.concurrent.duration.FiniteDuration
 class ConfigSetHandler[F[+_, +_]: Exec: CovariantFlatMap](
   service: GlobalConfigServiceApi[F],
   requestTimeout: FiniteDuration
-) extends TimedRequestHandler[F, GlobalConfigServiceFailure](requestTimeout) {
+) extends RequestHandler[F, GlobalConfigServiceFailure](
+      ConfigSet,
+      Some(requestTimeout)
+    ) {
   override def handleRequest
     : PartialFunction[Any, F[GlobalConfigServiceFailure, Any]] = {
     case Request(ConfigSet, id, params: ConfigSet.Params) =>

diff --git a/...-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineInstallHandler.scala b/...-manager/src/main/scala/org/enso/projectmanager/requesthandler/EngineInstallHandler.scala
@@ -0,0 +1,34 @@
+package org.enso.projectmanager.requesthandler
+
+import akka.actor.Props
+import org.enso.jsonrpc.{Request, ResponseResult, Unused}
+import org.enso.projectmanager.control.core.CovariantFlatMap
+import org.enso.projectmanager.control.core.syntax._
+import org.enso.projectmanager.control.effect.Exec
+import org.enso.projectmanager.protocol.ProjectManagementApi.EngineInstall
+import org.enso.projectmanager.requesthandler.ProjectServiceFailureMapper.failureMapper
+import org.enso.projectmanager.service.ProjectServiceFailure
+import org.enso.projectmanager.service.versionmanagement.RuntimeVersionManagementServiceApi
+
+class EngineInstallHandler[F[+_, +_]: Exec: CovariantFlatMap](
+  service: RuntimeVersionManagementServiceApi[F]
+) extends RequestHandler[F, ProjectServiceFailure](EngineInstall, None) {
+  override def handleRequest
+    : PartialFunction[Any, F[ProjectServiceFailure, Any]] = {
+    case Request(EngineInstall, id, params: EngineInstall.Params) =>
+      val progressTracker = sender()
+      for {
+        _ <- service.installEngine(
+          progressTracker,
+          params.version,
+          params.forceInstallBroken.getOrElse(false)
+        )
+      } yield ResponseResult(EngineInstall, id, Unused)
+  }
+}
+
+object EngineInstallHandler {
+  def props[F[+_, +_]: Exec: CovariantFlatMap](
+    service: RuntimeVersionManagementServiceApi[F]
+  ): Props = Props(new EngineInstallHandler[F](service))
+}
diff --git a/...er/src/main/scala/org/enso/projectmanager/requesthandler/EngineListAvailableHandler.scala b/...er/src/main/scala/org/enso/projectmanager/requesthandler/EngineListAvailableHandler.scala
@@ -0,0 +1,40 @@
+package org.enso.projectmanager.requesthandler
+
+import akka.actor.Props
+import org.enso.jsonrpc.{Request, ResponseResult, Unused}
+import org.enso.projectmanager.control.core.CovariantFlatMap
+import org.enso.projectmanager.control.core.syntax._
+import org.enso.projectmanager.control.effect.Exec
+import org.enso.projectmanager.protocol.ProjectManagementApi.EngineListAvailable
+import org.enso.projectmanager.requesthandler.ProjectServiceFailureMapper.failureMapper
+import org.enso.projectmanager.service.ProjectServiceFailure
+import org.enso.projectmanager.service.versionmanagement.RuntimeVersionManagementServiceApi
+
+import scala.concurrent.duration.FiniteDuration
+
+class EngineListAvailableHandler[F[+_, +_]: Exec: CovariantFlatMap](
+  service: RuntimeVersionManagementServiceApi[F],
+  requestTimeout: FiniteDuration
+) extends RequestHandler[F, ProjectServiceFailure](
+      EngineListAvailable,
+      Some(requestTimeout)
+    ) {
+  override def handleRequest
+    : PartialFunction[Any, F[ProjectServiceFailure, Any]] = {
+    case Request(EngineListAvailable, id, Unused) =>
+      for {
+        result <- service.listAvailableEngines()
+      } yield ResponseResult(
+        EngineListAvailable,
+        id,
+        EngineListAvailable.Result(result)
+      )
+  }
+}
+
+object EngineListAvailableHandler {
+  def props[F[+_, +_]: Exec: CovariantFlatMap](
+    service: RuntimeVersionManagementServiceApi[F],
+    requestTimeout: FiniteDuration
+  ): Props = Props(new EngineListAvailableHandler[F](service, requestTimeout))
+}
diff --git a/...er/src/main/scala/org/enso/projectmanager/requesthandler/EngineListInstalledHandler.scala b/...er/src/main/scala/org/enso/projectmanager/requesthandler/EngineListInstalledHandler.scala
@@ -0,0 +1,40 @@
+package org.enso.projectmanager.requesthandler
+
+import akka.actor.Props
+import org.enso.jsonrpc.{Request, ResponseResult, Unused}
+import org.enso.projectmanager.control.core.CovariantFlatMap
+import org.enso.projectmanager.control.core.syntax._
+import org.enso.projectmanager.control.effect.Exec
+import org.enso.projectmanager.protocol.ProjectManagementApi.EngineListInstalled
+import org.enso.projectmanager.requesthandler.ProjectServiceFailureMapper.failureMapper
+import org.enso.projectmanager.service.ProjectServiceFailure
+import org.enso.projectmanager.service.versionmanagement.RuntimeVersionManagementServiceApi
+
+import scala.concurrent.duration.FiniteDuration
+
+class EngineListInstalledHandler[F[+_, +_]: Exec: CovariantFlatMap](
+  service: RuntimeVersionManagementServiceApi[F],
+  requestTimeout: FiniteDuration
+) extends RequestHandler[F, ProjectServiceFailure](
+      EngineListInstalled,
+      Some(requestTimeout)
+    ) {
+  override def handleRequest
+    : PartialFunction[Any, F[ProjectServiceFailure, Any]] = {
+    case Request(EngineListInstalled, id, Unused) =>
+      for {
+        result <- service.listInstalledEngines()
+      } yield ResponseResult(
+        EngineListInstalled,
+        id,
+        EngineListInstalled.Result(result)
+      )
+  }
+}
+
+object EngineListInstalledHandler {
+  def props[F[+_, +_]: Exec: CovariantFlatMap](
+    service: RuntimeVersionManagementServiceApi[F],
+    requestTimeout: FiniteDuration
+  ): Props = Props(new EngineListInstalledHandler[F](service, requestTimeout))
+}
diff --git a/...anager/src/main/scala/org/enso/projectmanager/requesthandler/EngineUninstallHandler.scala b/...anager/src/main/scala/org/enso/projectmanager/requesthandler/EngineUninstallHandler.scala
@@ -0,0 +1,30 @@
+package org.enso.projectmanager.requesthandler
+
+import akka.actor.Props
+import org.enso.jsonrpc.{Request, ResponseResult, Unused}
+import org.enso.projectmanager.control.core.CovariantFlatMap
+import org.enso.projectmanager.control.core.syntax._
+import org.enso.projectmanager.control.effect.Exec
+import org.enso.projectmanager.protocol.ProjectManagementApi.EngineUninstall
+import org.enso.projectmanager.requesthandler.ProjectServiceFailureMapper.failureMapper
+import org.enso.projectmanager.service.ProjectServiceFailure
+import org.enso.projectmanager.service.versionmanagement.RuntimeVersionManagementServiceApi
+
+class EngineUninstallHandler[F[+_, +_]: Exec: CovariantFlatMap](
+  service: RuntimeVersionManagementServiceApi[F]
+) extends RequestHandler[F, ProjectServiceFailure](EngineUninstall, None) {
+  override def handleRequest
+    : PartialFunction[Any, F[ProjectServiceFailure, Any]] = {
+    case Request(EngineUninstall, id, params: EngineUninstall.Params) =>
+      val progressTracker = sender()
+      for {
+        _ <- service.uninstallEngine(progressTracker, params.version)
+      } yield ResponseResult(EngineUninstall, id, Unused)
+  }
+}
+
+object EngineUninstallHandler {
+  def props[F[+_, +_]: Exec: CovariantFlatMap](
+    service: RuntimeVersionManagementServiceApi[F]
+  ): Props = Props(new EngineUninstallHandler[F](service))
+}
diff --git a/...r/src/main/scala/org/enso/projectmanager/requesthandler/ProjectServiceFailureMapper.scala b/...r/src/main/scala/org/enso/projectmanager/requesthandler/ProjectServiceFailureMapper.scala
@@ -26,6 +26,17 @@ object ProjectServiceFailureMapper {
     case CannotRemoveOpenProject    => CannotRemoveOpenProjectError
     case ProjectOperationTimeout    => ServiceError
     case LanguageServerFailure(msg) => LanguageServerError(msg)
+    case ProjectManagerUpgradeRequiredFailure(version) =>
+      ProjectManagerUpgradeRequired(version)
+    case MissingComponentFailure(msg)      => MissingComponentError(msg)
+    case BrokenComponentFailure(msg)       => BrokenComponentError(msg)
+    case ComponentInstallationFailure(msg) => ComponentInstallationError(msg)
+    case ComponentRepositoryAccessFailure(msg) =>
+      ComponentRepositoryUnavailable(msg)
+    case ComponentUninstallationFailure(msg) =>
+      ComponentUninstallationError(msg)
   }
 
+  implicit val failureMapper: FailureMapper[ProjectServiceFailure] =
+    (failure: ProjectServiceFailure) => mapFailure(failure)
 }