cli: use async client

Author: mcobzarenco

Cargo.lock

@@ -32,9 +32,11 @@ reqwest = { version = "0.11.11", default-features = false }
 serde = { version = "1.0.138", features = ["derive"] }
 serde_json = "1.0.82"
 structopt = { version = "0.3.26", default-features = false }
+tokio = { version = "1.19.2", features = ["rt"] }
 url = { version = "2.2.2", features = ["serde"] }
 
 reinfer-client = { version = "0.12.0", path = "../api" }
+futures = "0.3.24"
 
 [dev-dependencies]
 pretty_assertions = "1.2.1"

cli/Cargo.toml

@@ -117,7 +117,7 @@ pub fn run(
             table.printstd();
         }
         ConfigArgs::ListContexts { .. } => {
-            info!("No available contexts.");
+            info!("No available contexts");
         }
         ConfigArgs::AddContext {
             name,
@@ -139,17 +139,17 @@ pub fn run(
         ConfigArgs::UseContext { name } => {
             if !config.set_current_context(name) {
                 return Err(anyhow!(
-                    "No such context `{}` exists in `{}`.",
+                    "No such context `{}` exists in `{}`",
                     name,
                     config_path.as_ref().display(),
                 ));
             } else {
                 config::write_reinfer_config(config_path, &config)?;
-                info!("Switched to context `{}`.", name);
+                info!("Switched to context `{}`", name);
             }
         }
         ConfigArgs::CurrentContext => config.get_current_context().map_or_else(
-            || info!("There is no default context in use."),
+            || info!("There is no default context in use"),
             |current_context| println!("{}", current_context.name),
         ),
         ConfigArgs::GetToken { name } => match name.as_ref() {
@@ -158,21 +158,21 @@ pub fn run(
                     "{}",
                     config
                         .get_current_context()
-                        .ok_or_else(|| anyhow!("There is no default context in use."))?
+                        .ok_or_else(|| anyhow!("There is no default context in use"))?
                         .token
                         .as_ref()
-                        .ok_or_else(|| anyhow!("The default context has no stored token."))?
+                        .ok_or_else(|| anyhow!("The default context has no stored token"))?
                 );
             }
             Some(name) => {
                 println!(
                     "{}",
                     config
                         .get_context(name)
-                        .ok_or_else(|| anyhow!("No such context `{}`.", name))?
+                        .ok_or_else(|| anyhow!("No such context `{}`", name))?
                         .token
                         .as_ref()
-                        .ok_or_else(|| anyhow!("The context `{}` has no stored token.", name))?
+                        .ok_or_else(|| anyhow!("The context `{}` has no stored token", name))?
                 );
             }
         },
@@ -181,13 +181,13 @@ pub fn run(
                 if config.delete_context(name) {
                     config::write_reinfer_config(&config_path, &config)?;
                     info!(
-                        "Deleted context `{}` from `{}`.",
+                        "Deleted context `{}` from `{}`",
                         name,
                         config_path.as_ref().display()
                     );
                 } else {
                     return Err(anyhow!(
-                        "No such context `{}` exists in `{}`.",
+                        "No such context `{}` exists in `{}`",
                         name,
                         config_path.as_ref().display()
                     ));
@@ -216,15 +216,15 @@ fn add_or_edit_context(
         if !name.is_empty() {
             break name;
         } else {
-            error!("Context name cannot be empty.");
+            error!("Context name cannot be empty");
         }
     };
 
     let existing_context = config.get_context(&name);
     if existing_context.is_some() {
-        info!("Context `{}` already exists, it will be modified.", name);
+        info!("Context `{}` already exists, it will be modified", name);
     } else {
-        info!("A new context `{}` will be created.", name);
+        info!("A new context `{}` will be created", name);
     }
 
     // Get API token (either argument or from stdin)
@@ -239,7 +239,7 @@ fn add_or_edit_context(
         ));
     } else {
         warn!(
-            "Be careful, API tokens are stored in cleartext in {}.",
+            "Be careful, API tokens are stored in cleartext in {}",
             config_path.as_ref().display()
         );
     }
@@ -281,16 +281,16 @@ fn add_or_edit_context(
     let update_existing = existing_context.is_some();
     let is_new_context = !config.set_context(context);
     if is_new_context && config.num_contexts() == 1 {
-        info!("Default context set to `{}`.", name);
+        info!("Default context set to `{}`", name);
         config.set_current_context(&name);
     }
 
     config::write_reinfer_config(config_path, &config)?;
 
     if update_existing {
-        info!("Context `{}` was updated.", name);
+        info!("Context `{}` was updated", name);
     } else {
-        info!("New context `{}` was created.", name);
+        info!("New context `{}` was created", name);
     }
 
     Ok(())

cli/src/commands/config.rs

@@ -38,14 +38,16 @@ pub struct CreateAnnotationsArgs {
     no_progress: bool,
 }
 
-pub fn create(client: &Client, args: &CreateAnnotationsArgs) -> Result<()> {
+pub async fn create(client: &Client, args: &CreateAnnotationsArgs) -> Result<()> {
     let source = client
         .get_source(args.source.clone())
+        .await
         .with_context(|| format!("Unable to get source {}", args.source))?;
     let source_name = source.full_name();
 
     let dataset = client
         .get_dataset(args.dataset.clone())
+        .await
         .with_context(|| format!("Unable to get dataset {}", args.dataset))?;
     let dataset_name = dataset.full_name();
 
@@ -75,7 +77,8 @@ pub fn create(client: &Client, args: &CreateAnnotationsArgs) -> Result<()> {
             } else {
                 Some(progress_bar(file_metadata.len(), &statistics))
             };
-            upload_annotations_from_reader(client, &source, file, &statistics, &dataset_name)?;
+            upload_annotations_from_reader(client, &source, file, &statistics, &dataset_name)
+                .await?;
             if let Some(mut progress) = progress {
                 progress.done();
             }
@@ -94,7 +97,8 @@ pub fn create(client: &Client, args: &CreateAnnotationsArgs) -> Result<()> {
                 BufReader::new(io::stdin()),
                 &statistics,
                 &dataset_name,
-            )?;
+            )
+            .await?;
             statistics
         }
     };
@@ -107,7 +111,7 @@ pub fn create(client: &Client, args: &CreateAnnotationsArgs) -> Result<()> {
 }
 
 #[allow(clippy::too_many_arguments)]
-fn upload_annotations_from_reader(
+async fn upload_annotations_from_reader(
     client: &Client,
     source: &Source,
     annotations: impl BufRead,
@@ -128,6 +132,7 @@ fn upload_annotations_from_reader(
                         .as_deref(),
                     new_comment.entities.as_ref(),
                 )
+                .await
                 .with_context(|| {
                     format!(
                         "Could not update labelling for comment `{}`",

cli/src/commands/create/annotations.rs

@@ -24,7 +24,7 @@ pub struct CreateBucketArgs {
     transform_tag: TransformTag,
 }
 
-pub fn create(client: &Client, args: &CreateBucketArgs, printer: &Printer) -> Result<()> {
+pub async fn create(client: &Client, args: &CreateBucketArgs, printer: &Printer) -> Result<()> {
     let CreateBucketArgs {
         name,
         title,
@@ -41,6 +41,7 @@ pub fn create(client: &Client, args: &CreateBucketArgs, printer: &Printer) -> Re
                 transform_tag,
             },
         )
+        .await
         .context("Operation to create a bucket has failed")?;
     info!(
         "New bucket `{}` [id: {}] created successfully",