qcs-sdk-python 0.19.3__tar.gz → 0.20.1__tar.gz

{qcs_sdk_python-0.19.3 → qcs_sdk_python-0.20.1}/Cargo.lock

@@ -1592,18 +1592,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "lexical"
-version = "6.1.1"
+version = "7.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6"
+checksum = "8ecd3381ac77c22d4e2607284ac71e44b21c21bd3785ee807d21976d54ee16f9"
 dependencies = [
  "lexical-core",
 ]
 
 [[package]]
 name = "lexical-core"
-version = "0.8.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+checksum = "0885f6cdfe75c96e45bbf1c4e49511f128201391ce3b56e60e29f5a1fadbc1c1"
 dependencies = [
  "lexical-parse-float",
  "lexical-parse-integer",
@@ -1614,9 +1614,9 @@ dependencies = [
 
 [[package]]
 name = "lexical-parse-float"
-version = "0.8.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+checksum = "924f7ec090cd4f60bd873f160b0fb69a0c80bb3a98f2e778a1893ae0e5c4b0b9"
 dependencies = [
  "lexical-parse-integer",
  "lexical-util",
@@ -1625,9 +1625,9 @@ dependencies = [
 
 [[package]]
 name = "lexical-parse-integer"
-version = "0.8.6"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+checksum = "8feab1da84a2ab0ddbbad2fb1830b755f71a9a8d996c7a1f2a553faf72aa3686"
 dependencies = [
  "lexical-util",
  "static_assertions",
@@ -1635,18 +1635,18 @@ dependencies = [
 
 [[package]]
 name = "lexical-util"
-version = "0.8.5"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+checksum = "591ce1a12ecd3b26d4121ab360a6a4483a67f05a5372add6acbfd0b65c9285d9"
 dependencies = [
  "static_assertions",
 ]
 
 [[package]]
 name = "lexical-write-float"
-version = "0.8.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+checksum = "05b0f3f9ddada5942b54e97654d535df37c9340ad66c24b50360a90619779f41"
 dependencies = [
  "lexical-util",
  "lexical-write-integer",
@@ -1655,9 +1655,9 @@ dependencies = [
 
 [[package]]
 name = "lexical-write-integer"
-version = "0.8.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+checksum = "48c6d47254ddb292771dce7697ae2be9619f8e369d01a9ccda15ef2ff50443fc"
 dependencies = [
  "lexical-util",
  "static_assertions",
@@ -2551,7 +2551,7 @@ dependencies = [
  "num-complex",
  "parking_lot",
  "portable-atomic",
- "pyo3-build-config",
+ "pyo3-build-config 0.20.3",
  "pyo3-ffi",
  "pyo3-macros",
  "unindent",
@@ -2580,6 +2580,16 @@ dependencies = [
  "target-lexicon",
 ]
 
+[[package]]
+name = "pyo3-build-config"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7879eb018ac754bba32cb0eec7526391c02c14a093121857ed09fbf1d1057d41"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
 [[package]]
 name = "pyo3-ffi"
 version = "0.20.3"
@@ -2587,7 +2597,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
 dependencies = [
  "libc",
- "pyo3-build-config",
+ "pyo3-build-config 0.20.3",
 ]
 
 [[package]]
@@ -2621,7 +2631,7 @@ checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
- "pyo3-build-config",
+ "pyo3-build-config 0.20.3",
  "quote",
  "syn 2.0.66",
 ]
@@ -2674,7 +2684,7 @@ dependencies = [
 
 [[package]]
 name = "qcs"
-version = "0.23.2"
+version = "0.24.1"
 dependencies = [
  "assert2",
  "async-trait",
@@ -2736,19 +2746,25 @@ dependencies = [
 
 [[package]]
 name = "qcs-api-client-common"
-version = "0.8.4"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "040552f233992abe94376304cf17dab2d79ff62d4a9ee986d75efe3d19337f57"
+checksum = "1cf1692d12ab36478f43f1ef493a8b2445f7f5d17164f739d8b0fd57ad59e6e6"
 dependencies = [
  "async-trait",
  "backoff",
+ "base64 0.22.1",
  "derive_builder 0.20.0",
  "figment",
  "futures",
  "home",
  "http",
  "jsonwebtoken",
+ "paste",
+ "pyo3",
+ "pyo3-asyncio",
+ "pyo3-build-config 0.22.1",
  "reqwest",
+ "rigetti-pyo3 0.3.6",
  "serde",
  "shellexpand",
  "thiserror",
@@ -2762,9 +2778,9 @@ dependencies = [
 
 [[package]]
 name = "qcs-api-client-grpc"
-version = "0.8.4"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb755cd59b1b3ce99abe52ff6898ad74ca26463e94300c103cafaac4f345c4f3"
+checksum = "b6224aeaaafb92d44439a398a03b042889edacbe23a115cfb1ff1e17c80c8bf2"
 dependencies = [
  "backoff",
  "http",
@@ -2795,9 +2811,9 @@ dependencies = [
 
 [[package]]
 name = "qcs-api-client-openapi"
-version = "0.9.4"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "008d06c4051dd4b3e7d5b6c1f31457c68384f8f36b05b304de6059bbd81c6128"
+checksum = "c5107bbd313d31d1eede8dec2bc9c69e0aa50ffc6207457bb4d8c3ab3cb32434"
 dependencies = [
  "anyhow",
  "qcs-api-client-common",
@@ -2815,7 +2831,7 @@ dependencies = [
 
 [[package]]
 name = "qcs-sdk-python"
-version = "0.19.3"
+version = "0.20.1"
 dependencies = [
  "async-trait",
  "numpy",
@@ -2823,9 +2839,10 @@ dependencies = [
  "opentelemetry 0.23.0",
  "opentelemetry_sdk 0.23.0",
  "paste",
+ "prost",
  "pyo3",
  "pyo3-asyncio",
- "pyo3-build-config",
+ "pyo3-build-config 0.20.3",
  "pyo3-log",
  "pyo3-opentelemetry",
  "pyo3-tracing-subscriber",
@@ -2835,7 +2852,7 @@ dependencies = [
  "qcs-api-client-grpc",
  "qcs-api-client-openapi",
  "quil-rs",
- "rigetti-pyo3",
+ "rigetti-pyo3 0.4.1",
  "serde_json",
  "thiserror",
  "tokio",
@@ -2850,8 +2867,8 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quil-rs"
-version = "0.27.1"
-source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.11.1#ab5b976573b38f3ba2605f57482ccadb1f13bf30"
+version = "0.28.1"
+source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.12.1#a0f2776893d3ce33eb9f29449f3b4b0e9ed24174"
 dependencies = [
  "approx",
  "indexmap 2.2.6",
@@ -3099,6 +3116,19 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "rigetti-pyo3"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f924032d36104a859f936762576a9e6fc0811b37a1f4a8144c0b9b25ee89607b"
+dependencies = [
+ "num-complex",
+ "num-traits",
+ "paste",
+ "pyo3",
+ "time",
+]
+
 [[package]]
 name = "ring"
 version = "0.16.20"

{qcs_sdk_python-0.19.3 → qcs_sdk_python-0.20.1}/Cargo.toml

@@ -4,19 +4,19 @@ resolver = "2"
 
 [workspace.dependencies]
 qcs-api = "0.2.1"
-qcs-api-client-common = "0.8.4"
-qcs-api-client-grpc = "0.8.4"
-qcs-api-client-openapi = "0.9.4"
+qcs-api-client-common = "0.10.1"
+qcs-api-client-grpc = "0.10.1"
+qcs-api-client-openapi = "0.11.1"
 serde_json = "1.0.86"
 thiserror = "1.0.57"
 tokio = "1.36.0"
 # We specify quil-rs as a git and versioned dependency so that we can keep the version of
 # quil-rs used in both the Rust and Python packages in sync. The tag used should always
-# be a `quil-py` tag and should be comaptible with the version specified in 
+# be a `quil-py` tag and should be compatible with the version specified in
 # `crates/python/pyproject.toml`.
 # The version must also be specified in order to publish to crates.io. Cargo enforces
 # that the specified version is the same as the version in the git repository.
-quil-rs = { version = "0.27.1", git = "https://github.com/rigetti/quil-rs", tag = "quil-py/v0.11.1" }
+quil-rs = { version = "0.28.1", git = "https://github.com/rigetti/quil-rs", tag = "quil-py/v0.12.1" }
 
 # ndarray is used by the `qcs` crate, but it is also used in the `python` crate via a
 # re-export through the numpy crate. They should be updated as a pair to keep both
@@ -32,7 +32,7 @@ pyo3-opentelemetry = { version = "=0.3.2-dev.1" }
 pyo3-tracing-subscriber = { version = "=0.1.2-dev.1", default-features = true }
 
 pyo3-build-config = "0.20.0"
-rigetti-pyo3 = { version = "0.3.1", default-features = false, features = ["time", "complex"] }
+rigetti-pyo3 = { version = "0.4.1", default-features = false, features = ["complex", "time"] }
 
 # The primary intent of these options is to reduce the binary size for Python wheels
 # since PyPi has limits on how much storage a project can use.

{qcs_sdk_python-0.19.3 → qcs_sdk_python-0.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: qcs-sdk-python
-Version: 0.19.3
+Version: 0.20.1
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3.8
@@ -9,6 +9,23 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Operating System :: OS Independent
 Requires-Dist: quil >=0.11.2
+Requires-Dist: qcs-api-client-common >=0.10.0
+Requires-Dist: pyquil ==4.14.2 ; extra == 'pyquil'
+Requires-Dist: black >=24.8.0 ; extra == 'dev'
+Requires-Dist: opentelemetry-sdk ==1.25.0 ; extra == 'dev'
+Requires-Dist: pytest >=8.1.1 ; extra == 'dev'
+Requires-Dist: pytest-asyncio >=0.23.6 ; extra == 'dev'
+Requires-Dist: pytest-mock >=3.14.0 ; extra == 'dev'
+Requires-Dist: pytest-sugar >=1.0.0 ; extra == 'dev'
+Requires-Dist: pytest-clarity >=1.0.1 ; extra == 'dev'
+Requires-Dist: syrupy >=4.0.0 ; extra == 'dev'
+Requires-Dist: maturin ==1.5.1 ; extra == 'dev'
+Requires-Dist: numpy >=1.24.1 ; extra == 'dev'
+Requires-Dist: pdoc >=14.6.1 ; extra == 'dev'
+Requires-Dist: ruff >=0.3.5 ; extra == 'dev'
+Requires-Dist: mypy >=1.4.1 ; extra == 'dev'
+Provides-Extra: pyquil
+Provides-Extra: dev
 Summary: Python interface for the QCS Rust SDK
 Keywords: pyquil,SDK,Rigetti,Quil,Quantum
 Author-email: Rigetti Computing <softapps@rigetti.com>, Mark Skilbeck <mark.skilbeck@rigetti.com>, Marquess Valdez <mvaldez@rigetti.com>, Randall Fulton <rfulton@rigetti.com>

{qcs_sdk_python-0.19.3 → qcs_sdk_python-0.20.1}/crates/lib/CHANGELOG.md

@@ -1,3 +1,41 @@
+## 0.24.1
+
+### Fixes
+
+- Bump qcs-api-client-rust versions (#500)
+
+## 0.24.1-rc.0
+
+### Fixes
+
+- Bump qcs-api-client-rust versions (#500)
+
+## 0.24.0
+
+### Breaking Changes
+
+- Make Python bindings public (#463)
+
+### Fixes
+
+- ExecutionOptions::default() now respects defaults used in ExecutionOptionsBuilder::default() (#499)
+
+## 0.24.0-rc.0
+
+### Breaking Changes
+
+- Make Python bindings public (#463)
+
+### Fixes
+
+- ExecutionOptions::default() now respects defaults used in ExecutionOptionsBuilder::default() (#499)
+
+## 0.23.3-rc.0
+
+### Fixes
+
+- ExecutionOptions::default() now respects defaults used in ExecutionOptionsBuilder::default() (#499)
+
 ## 0.23.2
 
 ### Fixes

{qcs_sdk_python-0.19.3 → qcs_sdk_python-0.20.1}/crates/lib/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "qcs"
 description = "High level interface for running Quil on a QPU"
-version = "0.23.2"
+version = "0.24.1"
 edition = "2018"
 license = "Apache-2.0"
 repository = "https://github.com/rigetti/qcs-sdk-rust"
 keywords = ["pyquil", "SDK", "Rigetti", "Quil", "Quantum"]
 categories = ["api-bindings", "compilers", "science", "emulators"]
-readme = "./README.md"
+readme = "README.md"
 
 [features]
 manual-tests = []

{qcs_sdk_python-0.19.3 → qcs_sdk_python-0.20.1}/crates/lib/src/compiler/quilc.rs

@@ -357,7 +357,7 @@ mod tests {
         serde_json::from_reader(File::open("tests/qvm_isa.json").unwrap()).unwrap()
     }
 
-    async fn rpcq_client() -> rpcq::Client {
+    fn rpcq_client() -> rpcq::Client {
         let qcs = Qcs::load();
         let endpoint = qcs.get_config().quilc_url();
         rpcq::Client::new(endpoint).unwrap()
@@ -366,7 +366,6 @@ mod tests {
     #[tokio::test]
     async fn compare_native_quil_to_expected_output() {
         let output = rpcq_client()
-            .await
             .compile_program(
                 "MEASURE 0",
                 TargetDevice::try_from(qvm_isa()).expect("Couldn't build target device from ISA"),
@@ -390,7 +389,6 @@ MEASURE 1 ro[1]
         let client = Qcs::load();
         let client = qvm::http::HttpClient::from(&client);
         let output = rpcq_client()
-            .await
             .compile_program(
                 BELL_STATE,
                 TargetDevice::try_from(aspen_9_isa())
@@ -426,7 +424,6 @@ MEASURE 1 ro[1]
     #[tokio::test]
     async fn test_compile_declare_only() {
         let output = rpcq_client()
-            .await
             .compile_program(
                 "DECLARE ro BIT[1]\n",
                 TargetDevice::try_from(aspen_9_isa())
@@ -440,7 +437,7 @@ MEASURE 1 ro[1]
 
     #[tokio::test]
     async fn get_version_info_from_quilc() {
-        let rpcq_client = rpcq_client().await;
+        let rpcq_client = rpcq_client();
         let version = rpcq_client
             .get_version_info()
             .expect("Should get version info from quilc");
@@ -450,7 +447,7 @@ MEASURE 1 ro[1]
 
     #[tokio::test]
     async fn test_conjugate_pauli_by_clifford() {
-        let rpcq_client = rpcq_client().await;
+        let rpcq_client = rpcq_client();
         let request = ConjugateByCliffordRequest {
             pauli: PauliTerm {
                 indices: vec![0],
@@ -473,7 +470,7 @@ MEASURE 1 ro[1]
 
     #[tokio::test]
     async fn test_generate_randomized_benchmark_sequence() {
-        let rpcq_client = rpcq_client().await;
+        let rpcq_client = rpcq_client();
         let request = RandomizedBenchmarkingRequest {
             depth: 2,
             qubits: 1,

{qcs_sdk_python-0.19.3 → qcs_sdk_python-0.20.1}/crates/lib/src/executable.rs

@@ -803,7 +803,7 @@ mod describe_get_config {
     use crate::client::Qcs;
     use crate::{compiler::rpcq, Executable};
 
-    async fn quilc_client() -> rpcq::Client {
+    fn quilc_client() -> rpcq::Client {
         let qcs = Qcs::load();
         let endpoint = qcs.get_config().quilc_url();
         rpcq::Client::new(endpoint).unwrap()
@@ -811,7 +811,7 @@ mod describe_get_config {
 
     #[tokio::test]
     async fn it_resizes_params_dynamically() {
-        let mut exe = Executable::from_quil("").with_quilc_client(Some(quilc_client().await));
+        let mut exe = Executable::from_quil("").with_quilc_client(Some(quilc_client()));
 
         exe.with_parameter("foo", 0, 0.0);
         let params = exe.params.get("foo").unwrap().len();
@@ -834,7 +834,7 @@ mod describe_qpu_for_id {
     use crate::qpu;
     use crate::{client::Qcs, Executable};
 
-    async fn quilc_client() -> rpcq::Client {
+    fn quilc_client() -> rpcq::Client {
         let qcs = Qcs::load();
         let endpoint = qcs.get_config().quilc_url();
         rpcq::Client::new(endpoint).unwrap()
@@ -845,7 +845,7 @@ mod describe_qpu_for_id {
         // Default config has no auth, so it should try to refresh
         let mut exe = Executable::from_quil("")
             .with_qcs_client(Qcs::load())
-            .with_quilc_client(Some(quilc_client().await));
+            .with_quilc_client(Some(quilc_client()));
         let result = exe.qpu_for_id("blah").await;
         let Err(err) = result else {
             panic!("Expected an error!");
@@ -856,7 +856,7 @@ mod describe_qpu_for_id {
 
     #[tokio::test]
     async fn it_loads_cached_version() {
-        let mut exe = Executable::from_quil("").with_quilc_client(Some(quilc_client().await));
+        let mut exe = Executable::from_quil("").with_quilc_client(Some(quilc_client()));
         let shots = NonZeroU16::new(17).expect("value is non-zero");
         exe.shots = shots;
         exe.qpu = Some(
@@ -881,7 +881,7 @@ mod describe_qpu_for_id {
     async fn it_creates_new_after_shot_change() {
         let original_shots = NonZeroU16::new(23).expect("value is non-zero");
         let mut exe = Executable::from_quil("")
-            .with_quilc_client(Some(quilc_client().await))
+            .with_quilc_client(Some(quilc_client()))
             .with_shots(original_shots);
         let qpu = exe.qpu_for_id("Aspen-9").await.unwrap();
 
@@ -898,7 +898,7 @@ mod describe_qpu_for_id {
 
     #[tokio::test]
     async fn it_creates_new_for_new_qpu_id() {
-        let mut exe = Executable::from_quil("").with_quilc_client(Some(quilc_client().await));
+        let mut exe = Executable::from_quil("").with_quilc_client(Some(quilc_client()));
         let qpu = exe.qpu_for_id("Aspen-9").await.unwrap();
 
         assert_eq!(qpu.quantum_processor_id, "Aspen-9");

{qcs_sdk_python-0.19.3 → qcs_sdk_python-0.20.1}/crates/lib/src/qpu/api.rs

@@ -3,6 +3,7 @@
 
 use std::{convert::TryFrom, fmt, time::Duration};
 
+use async_trait::async_trait;
 use cached::proc_macro::cached;
 use derive_builder::Builder;
 use qcs_api_client_common::configuration::TokenError;
@@ -39,6 +40,7 @@ use crate::executable::Parameters;
 
 use crate::client::{GrpcClientError, GrpcConnection, Qcs};
 
+/// The maximum size of a gRPC response, in bytes.
 const MAX_DECODING_MESSAGE_SIZE_BYTES: usize = 250 * 1024 * 1024;
 
 pub(crate) fn params_into_job_execution_configuration(
@@ -327,11 +329,11 @@ pub type QpuConnectionOptions = ExecutionOptions;
 /// Builder for setting up [`QpuConnectionOptions`].
 pub type QpuConnectionOptionsBuilder = ExecutionOptionsBuilder;
 
-/// Options avaialable when executing a job on a QPU.
+/// Options available when executing a job on a QPU.
 ///
 /// Use [`Default`] to get a reasonable set of defaults, or start with [`ExecutionOptionsBuilder`]
 /// to build a custom set of options.
-#[derive(Builder, Clone, Debug, Default, PartialEq)]
+#[derive(Builder, Clone, Debug, PartialEq)]
 pub struct ExecutionOptions {
     #[doc = "The [`ConnectionStrategy`] to use to establish a connection to the QPU."]
     #[builder(default)]
@@ -339,14 +341,22 @@ pub struct ExecutionOptions {
     #[doc = "The timeout to use for the request, defaults to 30 seconds. If set to `None`, then there is no timeout."]
     #[builder(default = "Some(Duration::from_secs(30))")]
     timeout: Option<Duration>,
-    #[doc = "Options avaialable when executing a job on a QPU, particular to the execution service's API."]
+    #[doc = "Options available when executing a job on a QPU, particular to the execution service's API."]
     #[builder(default = "None")]
     api_options: Option<InnerApiExecutionOptions>,
 }
 
+impl Default for ExecutionOptions {
+    fn default() -> Self {
+        ExecutionOptionsBuilder::default().build().expect(
+            "Should be able to derive a default set of the ExecutionOptions from the builder.",
+        )
+    }
+}
+
 impl Eq for ExecutionOptions {}
 
-/// Options avaialable when executing a job on a QPU, particular to the execution service's API.
+/// Options available when executing a job on a QPU, particular to the execution service's API.
 /// This is a conventent alias for [`InnerApiExecutionOptions`] which provides a builder.
 ///
 /// Use [`Default`] to get a reasonable set of defaults, or start with [`ApiExecutionOptionsBuilder`]
@@ -435,11 +445,21 @@ pub enum ConnectionStrategy {
     EndpointId(String),
 }
 
-/// Methods that help select and configure a controller service client given a set of
-/// [`ExecutionOptions`] and QPU ID.
-impl ExecutionOptions {
+/// An ExecutionTarget provides methods to establish the appropriate connection to the execution
+/// service.
+///
+/// Implementors provide a [`ConnectionStrategy`] and timeout, the trait provides default
+/// implementation for getting connections and execution targets.
+#[async_trait]
+pub trait ExecutionTarget<'a> {
+    /// The [`ConnectionStrategy`] to use to determine the connection target.
+    fn connection_strategy(&'a self) -> &'a ConnectionStrategy;
+    /// The timeout to use for requests to the target.
+    fn timeout(&self) -> Option<Duration>;
+
+    /// Get the [`execute_controller_job_request::Target`] for the given quantum processor ID.
     fn get_job_target(
-        &self,
+        &'a self,
         quantum_processor_id: Option<&str>,
     ) -> Option<execute_controller_job_request::Target> {
         match self.connection_strategy() {
@@ -452,8 +472,9 @@ impl ExecutionOptions {
         }
     }
 
+    /// Get the [`get_controller_job_results_request::Target`] for the given quantum processor ID.
     fn get_results_target(
-        &self,
+        &'a self,
         quantum_processor_id: Option<&str>,
     ) -> Option<get_controller_job_results_request::Target> {
         match self.connection_strategy() {
@@ -466,8 +487,9 @@ impl ExecutionOptions {
         }
     }
 
+    /// Get the [`cancel_controller_jobs_request::Target`] for the given quantum processor ID.
     fn get_cancel_target(
-        &self,
+        &'a self,
         quantum_processor_id: Option<&str>,
     ) -> Option<cancel_controller_jobs_request::Target> {
         match self.connection_strategy() {
@@ -480,9 +502,9 @@ impl ExecutionOptions {
         }
     }
 
-    /// Get a controller client for the given QPU ID.
-    pub async fn get_controller_client(
-        &self,
+    /// Get a controller client for the given quantum processor ID.
+    async fn get_controller_client(
+        &'a self,
         client: &Qcs,
         quantum_processor_id: Option<&str>,
     ) -> Result<ControllerClient<GrpcConnection>, QpuApiError> {
@@ -494,8 +516,8 @@ impl ExecutionOptions {
     }
 
     /// Get a GRPC connection to a QPU, without specifying the API to use.
-    pub async fn get_qpu_grpc_connection(
-        &self,
+    async fn get_qpu_grpc_connection(
+        &'a self,
         client: &Qcs,
         quantum_processor_id: Option<&str>,
     ) -> Result<GrpcConnection, QpuApiError> {
@@ -525,6 +547,7 @@ impl ExecutionOptions {
         self.grpc_address_to_channel(&address, client)
     }
 
+    /// Get a channel from the given gRPC address.
     fn grpc_address_to_channel(
         &self,
         address: &str,
@@ -540,6 +563,7 @@ impl ExecutionOptions {
         Ok(channel)
     }
 
+    /// Get the gateway address for the given quantum processor ID.
     async fn get_gateway_address(
         &self,
         quantum_processor_id: &str,
@@ -548,6 +572,7 @@ impl ExecutionOptions {
         get_accessor_with_cache(quantum_processor_id, client).await
     }
 
+    /// Get the default endpoint address for the given quantum processor ID.
     async fn get_default_endpoint_address(
         &self,
         quantum_processor_id: &str,
@@ -557,6 +582,19 @@ impl ExecutionOptions {
     }
 }
 
+/// Methods that help select and configure a controller service client given a set of
+/// [`ExecutionOptions`] and QPU ID.
+#[async_trait]
+impl<'a> ExecutionTarget<'a> for ExecutionOptions {
+    fn connection_strategy(&'a self) -> &'a ConnectionStrategy {
+        self.connection_strategy()
+    }
+
+    fn timeout(&self) -> Option<Duration> {
+        self.timeout()
+    }
+}
+
 #[cached(
     result = true,
     time = 60,
@@ -690,7 +728,10 @@ pub enum QpuApiError {
         /// The message associated with the failed job.
         message: String,
     },
-
+    /// Error that can occur when the gRPC status code cannot be decoded.
+    #[error("The status code could not be decoded: {0}")]
+    StatusCodeDecode(String),
+    // just for the error type?
     /// Error that can occur if a numeric status identifier cannot be converted
     /// into a known status type.
     #[error("The request returned an invalid status: {status}. {message}")]
@@ -702,3 +743,18 @@ pub enum QpuApiError {
         message: String,
     },
 }
+
+#[cfg(test)]
+mod test {
+    use crate::qpu::api::ExecutionOptions;
+
+    use super::ExecutionOptionsBuilder;
+
+    #[test]
+    fn test_default_execution_options() {
+        assert_eq!(
+            ExecutionOptions::default(),
+            ExecutionOptionsBuilder::default().build().unwrap(),
+        );
+    }
+}