new: allow for additional "clients" for quilc and QVM (#346)

* new: allow for additional "clients" for quilc and QVM

Author: notmgsk

Cargo.lock

@@ -17,7 +17,6 @@ otel-tracing = ["tracing-config", "qcs-api-client-grpc/otel-tracing", "qcs-api-c
 
 [dependencies]
 cached = "0.44.0"
-dirs = "5.0.0"
 enum-as-inner = "0.5.1"
 futures = "0.3.24"
 indexmap = "1.9.1"
@@ -45,6 +44,7 @@ tonic = { version = "0.9.2", features = ["tls", "tls-roots"] }
 zmq = { version = "0.10.0" }
 itertools = "0.11.0"
 derive_builder = "0.12.0"
+async-trait = "0.1.73"
 
 [dev-dependencies]
 erased-serde = "0.3.23"

crates/lib/Cargo.toml

@@ -1,6 +1,6 @@
 //! Submit a program to a QPU but don't immediately wait for the result.
 
-use qcs::{qpu::api::ExecutionOptions, Executable};
+use qcs::{client::Qcs, compiler::rpcq, qpu::api::ExecutionOptions, Executable};
 
 const PROGRAM: &str = r#"
 DECLARE ro BIT
@@ -10,9 +10,15 @@ MEASURE 0 ro[0]
 
 const QUANTUM_PROCESSOR_ID: &str = "Aspen-M-3";
 
+async fn quilc_client() -> rpcq::Client {
+    let qcs = Qcs::load().await;
+    let endpoint = qcs.get_config().quilc_url();
+    rpcq::Client::new(endpoint).unwrap()
+}
+
 #[tokio::main]
 async fn main() {
-    let mut exe = Executable::from_quil(PROGRAM);
+    let mut exe = Executable::from_quil(PROGRAM).with_quilc_client(Some(quilc_client().await));
     let job_handle = exe
         .submit_to_qpu(QUANTUM_PROCESSOR_ID, None, &ExecutionOptions::default())
         .await

crates/lib/examples/delayed_job_retrieval.rs

@@ -1,6 +1,6 @@
 use std::f64::consts::PI;
 
-use qcs::{qpu::api::ExecutionOptions, Executable};
+use qcs::{client::Qcs, compiler::rpcq, qpu::api::ExecutionOptions, Executable};
 
 const PROGRAM: &str = r#"
 DECLARE ro BIT[2]
@@ -11,9 +11,15 @@ MEASURE 0 ro[0]
 MEASURE 1 ro[1]
 "#;
 
+async fn quilc_client() -> rpcq::Client {
+    let qcs = Qcs::load().await;
+    let endpoint = qcs.get_config().quilc_url();
+    rpcq::Client::new(endpoint).unwrap()
+}
+
 #[tokio::main]
 async fn main() {
-    let mut exe = Executable::from_quil(PROGRAM);
+    let mut exe = Executable::from_quil(PROGRAM).with_quilc_client(Some(quilc_client().await));
 
     let result = exe
         .with_parameter("theta", 0, PI)

crates/lib/examples/execute.rs

@@ -1,6 +1,6 @@
 use std::f64::consts::PI;
 
-use qcs::{qpu::api::ExecutionOptions, Executable};
+use qcs::{client::Qcs, compiler::rpcq, qpu::api::ExecutionOptions, Executable};
 
 const PROGRAM: &str = r#"
 DECLARE ro BIT[2]
@@ -12,9 +12,15 @@ MEASURE 0 ro[0]
 MEASURE 1 ro[1]
 "#;
 
+async fn quilc_client() -> rpcq::Client {
+    let qcs = Qcs::load().await;
+    let endpoint = qcs.get_config().quilc_url();
+    rpcq::Client::new(endpoint).unwrap()
+}
+
 #[tokio::main]
 async fn main() {
-    let mut exe = Executable::from_quil(PROGRAM);
+    let mut exe = Executable::from_quil(PROGRAM).with_quilc_client(Some(quilc_client().await));
 
     let result = exe
         .with_parameter("theta", 0, PI)

crates/lib/examples/local.rs

@@ -4,6 +4,8 @@
 use std::f64::consts::PI;
 use std::time::Duration;
 
+use qcs::client::Qcs;
+use qcs::compiler::rpcq;
 use qcs::qpu::api::ExecutionOptions;
 use qcs::Executable;
 
@@ -17,10 +19,15 @@ RX(-pi / 2) 0
 
 MEASURE 0 ro[0]
 "#;
+async fn quilc_client() -> rpcq::Client {
+    let qcs = Qcs::load().await;
+    let endpoint = qcs.get_config().quilc_url();
+    rpcq::Client::new(endpoint).unwrap()
+}
 
 #[tokio::main]
 async fn main() {
-    let mut exe = Executable::from_quil(PROGRAM);
+    let mut exe = Executable::from_quil(PROGRAM).with_quilc_client(Some(quilc_client().await));
     let mut parametric_measurements = Vec::with_capacity(200);
 
     let step = 2.0 * PI / 50.0;

crates/lib/examples/parametric_compilation.rs

@@ -2,7 +2,7 @@
 //!
 //! [pyquil]: https://pyquil-docs.rigetti.com/en/stable/quilt_getting_started.html#Another-example:-a-simple-T1-experiment
 
-use qcs::{qpu::api::ExecutionOptions, Executable};
+use qcs::{client::Qcs, compiler::rpcq, qpu::api::ExecutionOptions, Executable};
 
 /// This program doesn't do much, the main point is that it will fail if quilc is invoked.
 const PROGRAM: &str = r#"
@@ -12,13 +12,17 @@ FENCE 0
 DELAY 0 "rf" 1e-6
 MEASURE 0 ro
 "#;
+async fn quilc_client() -> rpcq::Client {
+    let qcs = Qcs::load().await;
+    let endpoint = qcs.get_config().quilc_url();
+    rpcq::Client::new(endpoint).unwrap()
+}
 
 #[tokio::main]
 async fn main() {
-    let exe = Executable::from_quil(PROGRAM);
+    let mut exe = Executable::from_quil(PROGRAM).with_quilc_client(Some(quilc_client().await));
 
     let result = exe
-        .compile_with_quilc(false)
         .execute_on_qpu("Aspen-M-3", None, &ExecutionOptions::default())
         .await
         .expect("Program should execute successfully")

crates/lib/examples/quil_t.rs

@@ -3,4 +3,4 @@
 
 mod isa;
 pub mod quilc;
-mod rpcq;
+pub mod rpcq;