qcs-sdk-python 0.17.0rc0__tar.gz → 0.17.0rc1__tar.gz

{qcs_sdk_python-0.17.0rc0 → qcs_sdk_python-0.17.0rc1}/Cargo.lock

@@ -186,6 +186,20 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "backoff"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
+dependencies = [
+ "futures-core",
+ "getrandom",
+ "instant",
+ "pin-project-lite",
+ "rand",
+ "tokio",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.69"
@@ -584,6 +598,9 @@ name = "deranged"
 version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
+dependencies = [
+ "powerfmt",
+]
 
 [[package]]
 name = "derive_builder"
@@ -1613,6 +1630,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -1910,6 +1933,12 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -2078,7 +2107,7 @@ dependencies = [
 
 [[package]]
 name = "qcs"
-version = "0.21.0-rc.0"
+version = "0.21.0-rc.1"
 dependencies = [
  "assert2",
  "async-trait",
@@ -2138,11 +2167,12 @@ dependencies = [
 
 [[package]]
 name = "qcs-api-client-common"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc3356caa74bb697c4271c950a3040e8dbb9448a9bd0124411b9b43155b8e192"
+checksum = "36b591a8d1498c533f714c6b6f420ffbab9577e6fc92b0d07d05b9e6e3689e90"
 dependencies = [
  "async-trait",
+ "backoff",
  "futures",
  "home",
  "http",
@@ -2150,6 +2180,7 @@ dependencies = [
  "reqwest",
  "serde",
  "thiserror",
+ "time",
  "tokio",
  "toml 0.7.8",
  "tracing",
@@ -2159,10 +2190,11 @@ dependencies = [
 
 [[package]]
 name = "qcs-api-client-grpc"
-version = "0.7.10"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5639253e10f82014f416fdcc91c0aec0f4e276d81ebd8fdaca1b7277ba2269ad"
+checksum = "52716630ac986eabf83be964118fa5cc109f50e3404e37b5a6a7a8e801ea96a8"
 dependencies = [
+ "backoff",
  "http",
  "http-body",
  "hyper",
@@ -2179,6 +2211,7 @@ dependencies = [
  "qcs-api-client-common",
  "serde",
  "thiserror",
+ "tokio",
  "tonic",
  "tonic-build",
  "tower",
@@ -2189,9 +2222,9 @@ dependencies = [
 
 [[package]]
 name = "qcs-api-client-openapi"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e51ee4c7359a1226ea601d3f080d4664d141a9b28dd7d2a3abb548ff100e44"
+checksum = "ff1892f58e793ff0d68110736583c88a442a9690ceb3e59dc65cd2daf3fbec29"
 dependencies = [
  "anyhow",
  "qcs-api-client-common",
@@ -2201,6 +2234,7 @@ dependencies = [
  "serde",
  "serde_json",
  "task-local-extensions",
+ "tokio",
  "tracing",
  "url",
  "urlpattern",
@@ -2208,7 +2242,7 @@ dependencies = [
 
 [[package]]
 name = "qcs-sdk-python"
-version = "0.17.0-rc.0"
+version = "0.17.0-rc.1"
 dependencies = [
  "async-trait",
  "numpy",
@@ -2446,7 +2480,6 @@ dependencies = [
  "num-traits",
  "paste",
  "pyo3",
- "time",
 ]
 
 [[package]]
@@ -3088,12 +3121,14 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.28"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
 dependencies = [
  "deranged",
  "itoa",
+ "num-conv",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -3101,16 +3136,17 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.14"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 

{qcs_sdk_python-0.17.0rc0 → qcs_sdk_python-0.17.0rc1}/Cargo.toml

@@ -4,9 +4,9 @@ resolver = "2"
 
 [workspace.dependencies]
 qcs-api = "0.2.1"
-qcs-api-client-common = "0.7.9"
-qcs-api-client-grpc = "0.7.10"
-qcs-api-client-openapi = "0.8.10"
+qcs-api-client-common = "0.7.10"
+qcs-api-client-grpc = "0.7.12"
+qcs-api-client-openapi = "0.8.11"
 serde_json = "1.0.86"
 thiserror = "1.0.37"
 tokio = "1.34.0"
@@ -27,7 +27,7 @@ numpy = "0.20.0"
 pyo3 = "0.20.0"
 pyo3-asyncio = { version = "0.20", features = ["tokio-runtime"] }
 pyo3-build-config = "0.20.0"
-rigetti-pyo3 = { version = "0.3.1", features = ["complex"] }
+rigetti-pyo3 = { version = "0.3.1", default-features = false, features = ["complex"] }
 
 # 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.17.0rc0 → qcs_sdk_python-0.17.0rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcs-sdk-python
-Version: 0.17.0rc0
+Version: 0.17.0rc1
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3.8

{qcs_sdk_python-0.17.0rc0 → qcs_sdk_python-0.17.0rc1}/crates/lib/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.21.0-rc.0
+## 0.21.0-rc.1
 
 ### Breaking Changes
 
@@ -12,6 +12,24 @@ slightly modified.
 
 * put calibration in mock calibration program
 
+### Features
+
+- Automatically retry requests that fail due to transient network errors, fgequests to cancel job no longer error due to missing target. (#443)
+
+## 0.21.0-rc.0
+
+### Breaking Changes
+
+- The calibration program is now from
+`get_quilt_calibrations` as a string. The error variants have also been
+slightly modified.
+
+* simplify error map
+
+* cleanup test
+
+* put calibration in mock calibration program
+
 ## 0.20.6
 
 ### Features

{qcs_sdk_python-0.17.0rc0 → qcs_sdk_python-0.17.0rc1}/crates/lib/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "qcs"
 description = "High level interface for running Quil on a QPU"
-version = "0.21.0-rc.0"
+version = "0.21.0-rc.1"
 edition = "2018"
 license = "Apache-2.0"
 repository = "https://github.com/rigetti/qcs-sdk-rust"

qcs_sdk_python-0.17.0rc1/crates/lib/examples/execute.rs

@@ -0,0 +1,57 @@
+use std::f64::consts::PI;
+
+use qcs::{client::Qcs, compiler::rpcq, qpu::api::ExecutionOptions, Executable};
+
+const PROGRAM: &str = r#"
+DECLARE ro BIT[2]
+DECLARE theta REAL
+RX(theta) 0
+CNOT 0 1
+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).with_quilc_client(Some(quilc_client().await));
+    let execution_options = ExecutionOptions::default();
+
+    // You can submit a job to a QPU and retrieve results in a single step.
+    let result = exe
+        .with_parameter("theta", 0, PI)
+        .execute_on_qpu("Ankaa-2", None, &execution_options)
+        .await
+        .expect("Program should execute successfully");
+
+    dbg!(&result);
+
+    // Or you can submit a job, then retrieve results later.
+    let handle = exe
+        .with_parameter("theta", 0, PI / 2.0)
+        .submit_to_qpu("Ankaa-2", None, &execution_options)
+        .await
+        .expect("Program should be sumbitted successfully.");
+
+    // You can use the job handle to attempt job cancellation. This will only succeed if the job
+    // has not begun executing.
+    let cancelled_result = exe.cancel_qpu_job(handle.clone()).await;
+    dbg!(&cancelled_result);
+    let cancelled = cancelled_result.is_ok();
+
+    // Retrieving results will return an error if the job was successfully cancelled.
+    let result = exe.retrieve_results(handle.clone()).await;
+    if !cancelled {
+        println!("Job was not cancelled");
+        assert!(result.is_ok());
+    } else {
+        println!("Job was cancelled");
+        assert!(result.is_err());
+    }
+    dbg!(&result);
+}

{qcs_sdk_python-0.17.0rc0 → qcs_sdk_python-0.17.0rc1}/crates/lib/src/client.rs

@@ -6,7 +6,10 @@ use std::time::Duration;
 
 use qcs_api_client_common::configuration::{ClientConfiguration, RefreshError};
 use qcs_api_client_grpc::{
-    channel::{get_channel, parse_uri, wrap_channel_with, RefreshService},
+    channel::{
+        get_channel, parse_uri, wrap_channel_with, wrap_channel_with_retry, RefreshService,
+        RetryService,
+    },
     services::translation::translation_client::TranslationClient,
 };
 use qcs_api_client_openapi::apis::configuration::Configuration as OpenApiConfiguration;
@@ -21,7 +24,7 @@ pub use qcs_api_client_openapi::apis::Error as OpenApiError;
 /// It is public so that users can create gRPC clients with different APIs using a "raw" connection
 /// initialized by this library. This ensures that the exact Tonic version used for such clients
 /// matches what this library uses.
-pub type GrpcConnection = RefreshService<Channel, ClientConfiguration>;
+pub type GrpcConnection = RetryService<RefreshService<Channel, ClientConfiguration>>;
 
 /// TODO: make configurable at the client level.
 /// <https://github.com/rigetti/qcs-sdk-rust/issues/239>
@@ -88,7 +91,8 @@ impl Qcs {
     ) -> Result<TranslationClient<GrpcConnection>, GrpcError<RefreshError>> {
         let uri = parse_uri(translation_grpc_endpoint)?;
         let channel = get_channel(uri)?;
-        let service = wrap_channel_with(channel, self.get_config().clone());
+        let service =
+            wrap_channel_with_retry(wrap_channel_with(channel, self.get_config().clone()));
         Ok(TranslationClient::new(service))
     }
 }

{qcs_sdk_python-0.17.0rc0 → qcs_sdk_python-0.17.0rc1}/crates/lib/src/qpu/api.rs

@@ -8,17 +8,17 @@ use derive_builder::Builder;
 use qcs_api_client_common::configuration::RefreshError;
 pub use qcs_api_client_grpc::channel::Error as GrpcError;
 use qcs_api_client_grpc::{
-    channel::{parse_uri, wrap_channel_with},
+    channel::{parse_uri, wrap_channel_with, wrap_channel_with_retry},
     get_channel_with_timeout,
     models::controller::{
         controller_job_execution_result, data_value::Value, ControllerJobExecutionResult,
         DataValue, EncryptedControllerJob, JobExecutionConfiguration, RealDataValue,
     },
     services::controller::{
-        controller_client::ControllerClient, execute_controller_job_request,
-        get_controller_job_results_request, CancelControllerJobsRequest,
-        ExecuteControllerJobRequest, ExecutionOptions as InnerApiExecutionOptions,
-        GetControllerJobResultsRequest,
+        cancel_controller_jobs_request, controller_client::ControllerClient,
+        execute_controller_job_request, get_controller_job_results_request,
+        CancelControllerJobsRequest, ExecuteControllerJobRequest,
+        ExecutionOptions as InnerApiExecutionOptions, GetControllerJobResultsRequest,
     },
 };
 pub use qcs_api_client_openapi::apis::Error as OpenApiError;
@@ -131,9 +131,8 @@ pub async fn submit(
 /// This action is *not* atomic, and will attempt to cancel every job even when some jobs cannot be
 /// cancelled. A job can be cancelled only if it has not yet started executing.
 ///
-/// Success response indicates only that the request was received. Cancellation is not guaranteed,
-/// as it is based on job state at the time of cancellation, and is completed on a best effort
-/// basis.
+/// Cancellation is not guaranteed, as it is based on job state at the time of cancellation, and is
+/// completed on a best effort basis.
 ///
 /// # Arguments
 /// * `quantum_processor_id` - The quantum processor to execute the job on. This parameter
@@ -144,20 +143,25 @@ pub async fn submit(
 /// * `execution_options` - The [`ExecutionOptions`] to use. If the connection strategy used
 ///       is [`ConnectionStrategy::EndpointId`] then direct access to that endpoint
 ///       overrides the `quantum_processor_id` parameter.
+///
+/// # Errors
+/// * Returns [`QpuApiError::GrpcClientError`] with [`GrpcClientError::RequestFailed`] if any of
+///     the jobs could not be cancelled.
 pub async fn cancel_jobs(
     job_ids: Vec<JobId>,
     quantum_processor_id: Option<&str>,
     client: &Qcs,
     execution_options: &ExecutionOptions,
 ) -> Result<(), QpuApiError> {
-    let request = CancelControllerJobsRequest {
-        job_ids: job_ids.into_iter().map(|id| id.0).collect(),
-    };
-
     let mut controller_client = execution_options
         .get_controller_client(client, quantum_processor_id)
         .await?;
 
+    let request = CancelControllerJobsRequest {
+        job_ids: job_ids.into_iter().map(|id| id.0).collect(),
+        target: execution_options.get_cancel_target(quantum_processor_id),
+    };
+
     controller_client
         .cancel_controller_jobs(request)
         .await
@@ -171,9 +175,8 @@ pub async fn cancel_jobs(
 /// This action is *not* atomic, and will attempt to cancel a job even if it cannot be cancelled. A
 /// job can be cancelled only if it has not yet started executing.
 ///
-/// Success response indicates only that the request was received. Cancellation is not guaranteed,
-/// as it is based on job state at the time of cancellation, and is completed on a best effort
-/// basis.
+/// Cancellation is not guaranteed, as it is based on job state at the time of cancellation, and is
+/// completed on a best effort basis.
 ///
 /// # Arguments
 /// * `quantum_processor_id` - The quantum processor to execute the job on. This parameter is
@@ -184,6 +187,10 @@ pub async fn cancel_jobs(
 /// * `execution_options` - The [`ExecutionOptions`] to use. If the connection strategy used is
 ///      [`ConnectionStrategy::EndpointId`] then direct access to that endpoint overrides the
 ///      `quantum_processor_id` parameter.
+///
+/// # Errors
+/// * Returns [`QpuApiError::GrpcClientError`] with [`GrpcClientError::RequestFailed`] if the
+///     job could not be cancelled.
 pub async fn cancel_job(
     job_id: JobId,
     quantum_processor_id: Option<&str>,
@@ -404,6 +411,20 @@ impl ExecutionOptions {
         }
     }
 
+    fn get_cancel_target(
+        &self,
+        quantum_processor_id: Option<&str>,
+    ) -> Option<cancel_controller_jobs_request::Target> {
+        match self.connection_strategy() {
+            ConnectionStrategy::EndpointId(endpoint_id) => Some(
+                cancel_controller_jobs_request::Target::EndpointId(endpoint_id.to_string()),
+            ),
+            ConnectionStrategy::Gateway | ConnectionStrategy::DirectAccess => quantum_processor_id
+                .map(String::from)
+                .map(cancel_controller_jobs_request::Target::QuantumProcessorId),
+        }
+    }
+
     /// Get a controller client for the given QPU ID.
     pub async fn get_controller_client(
         &self,
@@ -457,7 +478,10 @@ impl ExecutionOptions {
         let uri = parse_uri(address).map_err(QpuApiError::GrpcError)?;
         let channel = get_channel_with_timeout(uri, self.timeout())
             .map_err(|err| QpuApiError::GrpcError(err.into()))?;
-        Ok(wrap_channel_with(channel, client.get_config().clone()))
+        Ok(wrap_channel_with_retry(wrap_channel_with(
+            channel,
+            client.get_config().clone(),
+        )))
     }
 
     async fn get_gateway_address(

{qcs_sdk_python-0.17.0rc0 → qcs_sdk_python-0.17.0rc1}/crates/python/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.17.0-rc.0
+## 0.17.0-rc.1
 
 ### Breaking Changes
 
@@ -12,6 +12,24 @@ slightly modified.
 
 * put calibration in mock calibration program
 
+### Features
+
+- Automatically retry requests that fail due to transient network errors, fgequests to cancel job no longer error due to missing target. (#443)
+
+## 0.17.0-rc.0
+
+### Breaking Changes
+
+- The calibration program is now from
+`get_quilt_calibrations` as a string. The error variants have also been
+slightly modified.
+
+* simplify error map
+
+* cleanup test
+
+* put calibration in mock calibration program
+
 ## 0.16.5
 
 ### Features

{qcs_sdk_python-0.17.0rc0 → qcs_sdk_python-0.17.0rc1}/crates/python/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "qcs-sdk-python"
 description = "Python bindings to qcs-sdk-rust"
-version = "0.17.0-rc.0"
+version = "0.17.0-rc.1"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/rigetti/qcs-sdk-rust"

{qcs_sdk_python-0.17.0rc0 → qcs_sdk_python-0.17.0rc1}/pyproject.toml

@@ -1,7 +1,7 @@
 # This is the metadata Maturin uploads to PyPI on publish
 [project]
 name = "qcs-sdk-python"
-version = "0.17.0-rc.0"
+version = "0.17.0-rc.1"
 description = "Python interface for the QCS Rust SDK"
 readme = "README.md"
 license = { text = "Apache-2.0" }
@@ -26,7 +26,7 @@ dependencies = ["quil==0.6.6"]
 # We can remove this table once this issue is resolved: https://github.com/python-poetry/poetry/issues/3332
 [tool.poetry]
 name = "qcs-sdk-python"
-version = "0.17.0-rc.0"
+version = "0.17.0-rc.1"
 description = "Python interface for the QCS Rust SDK"
 readme = "README.md"
 authors = [

qcs_sdk_python-0.17.0rc0/crates/lib/examples/execute.rs

@@ -1,31 +0,0 @@
-use std::f64::consts::PI;
-
-use qcs::{client::Qcs, compiler::rpcq, qpu::api::ExecutionOptions, Executable};
-
-const PROGRAM: &str = r#"
-DECLARE ro BIT[2]
-DECLARE theta REAL
-RX(theta) 0
-CNOT 0 1
-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).with_quilc_client(Some(quilc_client().await));
-
-    let result = exe
-        .with_parameter("theta", 0, PI)
-        .execute_on_qpu("Aspen-M-3", None, &ExecutionOptions::default())
-        .await
-        .expect("Program should execute successfully");
-
-    dbg!(&result);
-}