Rib REPL integration (#196)

* WIP: Rib Repl integration

* update and finish Rib REPL integration

* make fix

* Update OSS and Cloud deps to v1.2.2-dev.8

Author: noise64

Cargo.lock

@@ -14,16 +14,17 @@ exclude = [
 [workspace.dependencies]
 
 # Golem dep
-golem-client = "=1.2.2-dev.6"
-golem-common = "=1.2.2-dev.6"
-golem-rib = "=1.2.2-dev.6"
-golem-service-base = "=1.2.2-dev.6"
-golem-wasm-ast = { version = "=1.2.2-dev.6", default-features = false, features = ["analysis", "wave"] }
-golem-wasm-rpc = { version = "=1.2.2-dev.6", default-features = false, features = ["host"] }
+golem-client = "=1.2.2-dev.8"
+golem-common = "=1.2.2-dev.8"
+golem-rib = "=1.2.2-dev.8"
+golem-rib-repl = "=1.2.2-dev.8"
+golem-service-base = "=1.2.2-dev.8"
+golem-wasm-ast = { version = "=1.2.2-dev.8", default-features = false, features = ["analysis", "wave"] }
+golem-wasm-rpc = { version = "=1.2.2-dev.8", default-features = false, features = ["host"] }
 golem-wit = "=1.2.0"
 
 # Golem cloud deps
-golem-cloud-client = "=1.2.2-dev.6"
+golem-cloud-client = "=1.2.2-dev.8"
 
 # External deps
 anyhow = "1.0.97"
@@ -116,12 +117,13 @@ wit-encoder = "=0.227.1"
 wit-parser = "=0.227.1"
 
 [patch.crates-io]
-golem-client = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.6" }
-golem-common = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.6" }
-golem-rib = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.6" }
-golem-service-base = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.6" }
-golem-wasm-ast = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.6" }
-golem-wasm-rpc = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.6" }
+golem-client = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.8" }
+golem-common = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.8" }
+golem-rib = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.8" }
+golem-rib-repl = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.8" }
+golem-service-base = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.8" }
+golem-wasm-ast = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.8" }
+golem-wasm-rpc = { git = "https://github.com/golemcloud/golem.git", tag = "v1.2.2-dev.8" }
 
 redis-protocol = { git = "https://github.com/golemcloud/redis-protocol.rs.git", branch = "unpin-cookie-factory" }
 wasmtime = { git = "https://github.com/golemcloud/wasmtime.git", branch = "golem-wasmtime-v27.0.0" }

Cargo.toml

@@ -36,6 +36,7 @@ golem-client = { workspace = true }
 golem-cloud-client = { workspace = true }
 golem-common = { workspace = true }
 golem-rib = { workspace = true }
+golem-rib-repl = { workspace = true }
 golem-wasm-ast = { workspace = true }
 golem-wasm-rpc = { workspace = true }
 golem-wit = { workspace = true }

golem-cli/Cargo.toml

@@ -38,6 +38,7 @@ use uuid::Uuid;
 
 #[cfg(feature = "server-commands")]
 use crate::command::server::ServerSubcommand;
+use crate::command::shared_args::ComponentOptionalComponentName;
 
 /// Golem Command Line Interface
 #[derive(Debug, Parser)]
@@ -524,6 +525,13 @@ pub enum GolemCliSubcommand {
         #[clap(subcommand)]
         subcommand: CloudSubcommand,
     },
+    /// Start Rib REPL for a selected component
+    Repl {
+        #[command(flatten)]
+        component_name: ComponentOptionalComponentName,
+        /// Optional component version to use, defaults to latest component version
+        version: Option<u64>,
+    },
     /// Generate shell completion
     Completion {
         /// Selects shell
@@ -569,6 +577,7 @@ pub mod shared_args {
 
     #[derive(Debug, Args)]
     pub struct ComponentOptionalComponentNames {
+        // DO NOT ADD EMPTY LINES TO THE DOC COMMENT
         /// Optional component names, if not specified components are selected based on the current directory
         /// Accepted formats:
         ///   - <COMPONENT>
@@ -580,7 +589,12 @@ pub mod shared_args {
 
     #[derive(Debug, Args)]
     pub struct AppOptionalComponentNames {
+        // DO NOT ADD EMPTY LINES TO THE DOC COMMENT
         /// Optional component names, if not specified all components are selected.
+        /// Accepted formats:
+        ///   - <COMPONENT>
+        ///   - <PROJECT>/<COMPONENT>
+        ///   - <ACCOUNT>/<PROJECT>/<COMPONENT>
         pub component_name: Vec<ComponentName>,
     }
 

golem-cli/src/command.rs

@@ -383,7 +383,7 @@ impl AppCommandHandler {
             match self
                 .ctx
                 .component_handler()
-                .component_by_name(project.as_ref(), component_name, None)
+                .component(project.as_ref(), component_name.into(), None)
                 .await?
             {
                 Some(component) => {
@@ -400,7 +400,7 @@ impl AppCommandHandler {
         Ok(components)
     }
 
-    async fn must_select_components(
+    pub async fn must_select_components(
         &mut self,
         component_names: Vec<ComponentName>,
         default: &ApplicationComponentSelectMode,

golem-cli/src/command_handler/app.rs

@@ -30,15 +30,15 @@ use crate::model::app::{
     AppComponentName, ApplicationComponentSelectMode, BuildProfileName, DynamicHelpSections,
 };
 use crate::model::app::{DependencyType, InitialComponentFile};
-use crate::model::component::{Component, ComponentView};
+use crate::model::component::{Component, ComponentSelection, ComponentView};
 use crate::model::deploy::TryUpdateAllWorkersResult;
 use crate::model::text::component::{ComponentCreateView, ComponentGetView, ComponentUpdateView};
 use crate::model::text::fmt::{log_error, log_text_view, log_warn};
 use crate::model::text::help::ComponentNameHelp;
 use crate::model::to_cloud::ToCloud;
 use crate::model::{
-    ComponentName, ComponentNameMatchKind, ProjectNameAndId, SelectedComponents, WorkerName,
-    WorkerUpdateMode,
+    ComponentName, ComponentNameMatchKind, ComponentVersionSelection, ProjectNameAndId,
+    SelectedComponents, WorkerUpdateMode,
 };
 use anyhow::{anyhow, bail, Context as AnyhowContext};
 use golem_client::api::ComponentClient as ComponentClientOss;
@@ -801,9 +801,9 @@ impl ComponentCommandHandler {
         let mut components = Vec::with_capacity(selected_component_names.component_names.len());
         for component_name in &selected_component_names.component_names {
             match self
-                .component_by_name(
+                .component(
                     selected_component_names.project.as_ref(),
-                    component_name,
+                    component_name.into(),
                     None,
                 )
                 .await?
@@ -1037,10 +1037,10 @@ impl ComponentCommandHandler {
         project: Option<&ProjectNameAndId>,
         component_match_kind: ComponentNameMatchKind,
         component_name: &ComponentName,
-        worker_name: Option<&WorkerName>,
+        component_version_selection: Option<ComponentVersionSelection<'_>>,
     ) -> anyhow::Result<Component> {
         match self
-            .component_by_name(project, component_name, worker_name)
+            .component(project, component_name.into(), component_version_selection)
             .await?
         {
             Some(component) => Ok(component),
@@ -1100,7 +1100,7 @@ impl ComponentCommandHandler {
                         .await?;
                     self.ctx
                         .component_handler()
-                        .component_by_name(project, component_name, None)
+                        .component(project, component_name.into(), None)
                         .await?
                         .ok_or_else(|| {
                             anyhow!("Component ({}) not found after deployment", component_name)
@@ -1115,63 +1115,84 @@ impl ComponentCommandHandler {
     // TODO: server: we might want to have a filter for batch name lookups on the server side
     // TODO: server: also the search returns all versions
     // TODO: maybe add transient or persistent cache for all the meta
-    pub async fn component_by_name(
+    // TODO: merge these 3 args into "component lookup" or "selection" struct
+    pub async fn component(
         &self,
         project: Option<&ProjectNameAndId>,
-        component_name: &ComponentName,
-        worker_name: Option<&WorkerName>,
+        component_name_or_id: ComponentSelection<'_>,
+        component_version_selection: Option<ComponentVersionSelection<'_>>,
     ) -> anyhow::Result<Option<Component>> {
-        let component = match self.ctx.golem_clients().await? {
-            GolemClients::Oss(clients) => {
-                let mut components = clients
+        let component = match component_name_or_id {
+            ComponentSelection::Name(component_name) => match self.ctx.golem_clients().await? {
+                GolemClients::Oss(clients) => {
+                    let mut components = clients
+                        .component
+                        .get_components(Some(&component_name.0))
+                        .await
+                        .map_service_error()?;
+                    if !components.is_empty() {
+                        Some(Component::from(components.pop().unwrap()))
+                    } else {
+                        None
+                    }
+                }
+                GolemClients::Cloud(clients) => {
+                    let mut components = clients
+                        .component
+                        .get_components(
+                            project.as_ref().map(|p| &p.project_id.0),
+                            Some(&component_name.0),
+                        )
+                        .await
+                        .map_service_error()?;
+                    if !components.is_empty() {
+                        Some(Component::from(components.pop().unwrap()))
+                    } else {
+                        None
+                    }
+                }
+            },
+            ComponentSelection::Id(component_id) => match self.ctx.golem_clients().await? {
+                GolemClients::Oss(clients) => clients
                     .component
-                    .get_components(Some(&component_name.0))
+                    .get_latest_component_metadata(&component_id)
                     .await
-                    .map_service_error()?;
-                if !components.is_empty() {
-                    Some(Component::from(components.pop().unwrap()))
-                } else {
-                    None
-                }
-            }
-            GolemClients::Cloud(clients) => {
-                let mut components = clients
+                    .map(Component::from)
+                    .map_service_error_not_found_as_opt()?,
+                GolemClients::Cloud(clients) => clients
                     .component
-                    .get_components(
-                        project.as_ref().map(|p| &p.project_id.0),
-                        Some(&component_name.0),
-                    )
+                    .get_latest_component_metadata(&component_id)
                     .await
-                    .map_service_error()?;
-                if !components.is_empty() {
-                    Some(Component::from(components.pop().unwrap()))
-                } else {
-                    None
-                }
-            }
+                    .map(Component::from)
+                    .map_service_error_not_found_as_opt()?,
+            },
         };
 
-        match (component, worker_name) {
-            (Some(component), Some(worker_name)) => {
-                let worker_metadata = self
-                    .ctx
-                    .worker_handler()
-                    .worker_metadata(
-                        component.versioned_component_id.component_id,
-                        &component.component_name,
-                        worker_name,
-                    )
-                    .await
-                    .ok();
+        match (component, component_version_selection) {
+            (Some(component), Some(component_version_selection)) => {
+                let version = match component_version_selection {
+                    ComponentVersionSelection::ByWorkerName(worker_name) => self
+                        .ctx
+                        .worker_handler()
+                        .worker_metadata(
+                            component.versioned_component_id.component_id,
+                            &component.component_name,
+                            worker_name,
+                        )
+                        .await
+                        .ok()
+                        .map(|worker_metadata| worker_metadata.component_version),
+                    ComponentVersionSelection::ByExplicitVersion(version) => Some(version),
+                };
 
-                match worker_metadata {
-                    Some(worker_metadata) => {
+                match version {
+                    Some(version) => {
                         let component = match self.ctx.golem_clients().await? {
                             GolemClients::Oss(clients) => clients
                                 .component
                                 .get_component_metadata(
                                     &component.versioned_component_id.component_id,
-                                    &worker_metadata.component_version.to_string(),
+                                    &version.to_string(),
                                 )
                                 .await
                                 .map_service_error()
@@ -1180,7 +1201,7 @@ impl ComponentCommandHandler {
                                 .component
                                 .get_component_metadata(
                                     &component.versioned_component_id.component_id,
-                                    &worker_metadata.component_version.to_string(),
+                                    &version.to_string(),
                                 )
                                 .await
                                 .map_service_error()
@@ -1203,7 +1224,7 @@ impl ComponentCommandHandler {
         component_name: &ComponentName,
     ) -> anyhow::Result<Option<ComponentId>> {
         Ok(self
-            .component_by_name(project, component_name, None)
+            .component(project, component_name.into(), None)
             .await?
             .map(|c| ComponentId(c.versioned_component_id.component_id)))
     }

golem-cli/src/command_handler/component/mod.rs

@@ -113,7 +113,11 @@ impl ComponentPluginCommandHandler {
             let component = self
                 .ctx
                 .component_handler()
-                .component_by_name(selected_components.project.as_ref(), component_name, None)
+                .component(
+                    selected_components.project.as_ref(),
+                    component_name.into(),
+                    None,
+                )
                 .await?;
 
             let result = match component {
@@ -186,7 +190,11 @@ impl ComponentPluginCommandHandler {
             let component = self
                 .ctx
                 .component_handler()
-                .component_by_name(selected_components.project.as_ref(), component_name, None)
+                .component(
+                    selected_components.project.as_ref(),
+                    component_name.into(),
+                    None,
+                )
                 .await?;
 
             let result = match component {
@@ -252,7 +260,11 @@ impl ComponentPluginCommandHandler {
             let component = self
                 .ctx
                 .component_handler()
-                .component_by_name(selected_components.project.as_ref(), component_name, None)
+                .component(
+                    selected_components.project.as_ref(),
+                    component_name.into(),
+                    None,
+                )
                 .await?;
 
             match component {
@@ -326,7 +338,11 @@ impl ComponentPluginCommandHandler {
             let component = self
                 .ctx
                 .component_handler()
-                .component_by_name(selected_components.project.as_ref(), component_name, None)
+                .component(
+                    selected_components.project.as_ref(),
+                    component_name.into(),
+                    None,
+                )
                 .await?;
 
             let result = match component {

golem-cli/src/command_handler/component/plugin.rs

@@ -154,6 +154,17 @@ impl InteractiveHandler {
         Ok((profile_name.into(), profile, set_as_active))
     }
 
+    pub fn select_component(
+        &self,
+        component_names: Vec<ComponentName>,
+    ) -> anyhow::Result<ComponentName> {
+        Ok(Select::new(
+            "Select a component to be used in Rib REPL:",
+            component_names,
+        )
+        .prompt()?)
+    }
+
     fn confirm<M: AsRef<str>>(&self, default: bool, message: M) -> anyhow::Result<bool> {
         const YES_FLAG_HINT: &str = "To automatically confirm such questions use the '--yes' flag.";