Skip to content

Commit 1372a0e

Browse files
committed
Merge branch 'qv2' into social_login
2 parents 9a52674 + de21929 commit 1372a0e

File tree

711 files changed

+13247
-5132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

711 files changed

+13247
-5132
lines changed

Cargo.lock

Lines changed: 1571 additions & 754 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[workspace]
22
resolver = "3"
3-
members = ["crates/amzn-codewhisperer-client", "crates/amzn-codewhisperer-streaming-client", "crates/amzn-consolas-client", "crates/amzn-qdeveloper-streaming-client", "crates/amzn-toolkit-telemetry-client", "crates/aws-toolkit-telemetry-definitions", "crates/chat-cli", "crates/semantic-search-client"]
3+
members = ["crates/amzn-codewhisperer-client", "crates/amzn-codewhisperer-streaming-client", "crates/amzn-consolas-client", "crates/amzn-qdeveloper-streaming-client", "crates/amzn-toolkit-telemetry-client", "crates/aws-toolkit-telemetry-definitions", "crates/chat-cli", "crates/semantic-search-client", "crates/chat-cli-ui"]
44
default-members = ["crates/chat-cli"]
55

66
[workspace.package]
77
authors = ["Amazon Q CLI Team ([email protected])", "Chay Nabors ([email protected])", "Brandon Kiser ([email protected])", "Felix Ding ([email protected])"]
88
edition = "2024"
99
homepage = "https://aws.amazon.com/q/"
1010
publish = false
11-
version = "1.18.0"
11+
version = "1.19.0"
1212
license = "MIT OR Apache-2.0"
1313

1414
[workspace.dependencies]
@@ -18,7 +18,7 @@ amzn-consolas-client = { path = "crates/amzn-consolas-client" }
1818
amzn-qdeveloper-streaming-client = { path = "crates/amzn-qdeveloper-streaming-client" }
1919
amzn-toolkit-telemetry-client = { path = "crates/amzn-toolkit-telemetry-client" }
2020
anstream = "0.6.13"
21-
arboard = { version = "3.5.0", default-features = false }
21+
arboard = { version = "3.6.1", default-features = false, features = ["image-data"] }
2222
assert_cmd = "2.0"
2323
async-trait = "0.1.87"
2424
aws-config = "1.0.3"
@@ -72,7 +72,9 @@ objc2-foundation = { version = "0.2.2", features = ["NSString", "NSURL"] }
7272
owo-colors = "4.2.0"
7373
parking_lot = "0.12.3"
7474
paste = "1.0.11"
75+
pdf-extract = "0.10.0"
7576
percent-encoding = "2.2.0"
77+
image = "0.25"
7678
predicates = "3.0"
7779
prettyplease = "0.2.32"
7880
quote = "1.0.40"
@@ -130,8 +132,9 @@ winreg = "0.55.0"
130132
schemars = "1.0.4"
131133
jsonschema = "0.30.0"
132134
zip = "2.2.0"
135+
rmcp = { version = "0.8.0", features = ["client", "transport-sse-client-reqwest", "reqwest", "transport-streamable-http-client-reqwest", "transport-child-process", "tower", "auth"] }
136+
chat-cli-ui = { path = "crates/chat-cli-ui" }
133137
serde_yaml = "0.9"
134-
rmcp = { version = "0.7.0", features = ["client", "transport-sse-client-reqwest", "reqwest", "transport-streamable-http-client-reqwest", "transport-child-process", "tower", "auth"] }
135138

136139
[workspace.lints.rust]
137140
future_incompatible = "warn"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- **macOS**:
66
- **DMG**: [Download now](https://desktop-release.q.us-east-1.amazonaws.com/latest/Amazon%20Q.dmg)
7+
- **HomeBrew**: ```brew install --cask amazon-q ```
78
- **Linux**:
89
- [Ubuntu/Debian](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-installing.html#command-line-installing-ubuntu)
910
- [AppImage](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/command-line-installing.html#command-line-installing-appimage)

crates/amzn-codewhisperer-client/Cargo.toml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[package]
1313
edition = "2021"
1414
name = "amzn-codewhisperer-client"
15-
version = "0.1.11582"
15+
version = "0.1.12082"
1616
authors = ["Grant Gurvis <[email protected]>"]
1717
build = false
1818
exclude = [
@@ -34,14 +34,16 @@ all-features = true
3434
targets = ["x86_64-unknown-linux-gnu"]
3535

3636
[package.metadata.smithy]
37-
codegen-version = "unknown"
37+
codegen-version = "bf61672f530d9d291fbcdc7a8e983f2e18842d1d"
3838

3939
[features]
4040
behavior-version-latest = []
4141
default = [
4242
"rustls",
43+
"default-https-client",
4344
"rt-tokio",
4445
]
46+
default-https-client = ["aws-smithy-runtime/default-https-client"]
4547
gated-tests = []
4648
rt-tokio = [
4749
"aws-smithy-async/rt-tokio",
@@ -55,40 +57,40 @@ name = "amzn_codewhisperer_client"
5557
path = "src/lib.rs"
5658

5759
[dependencies.aws-credential-types]
58-
version = "1.2.1"
60+
version = "1.2.6"
5961

6062
[dependencies.aws-runtime]
61-
version = "1.5.5"
63+
version = "1.5.10"
6264

6365
[dependencies.aws-smithy-async]
64-
version = "1.2.4"
66+
version = "1.2.5"
6567

6668
[dependencies.aws-smithy-http]
67-
version = "0.60.12"
69+
version = "0.62.3"
6870

6971
[dependencies.aws-smithy-json]
70-
version = "0.61.2"
72+
version = "0.61.5"
7173

7274
[dependencies.aws-smithy-runtime]
73-
version = "1.7.8"
75+
version = "1.9.2"
7476
features = [
7577
"client",
7678
"http-auth",
7779
]
7880

7981
[dependencies.aws-smithy-runtime-api]
80-
version = "1.7.3"
82+
version = "1.9.0"
8183
features = [
8284
"client",
8385
"http-02x",
8486
"http-auth",
8587
]
8688

8789
[dependencies.aws-smithy-types]
88-
version = "1.2.13"
90+
version = "1.3.2"
8991

9092
[dependencies.aws-types]
91-
version = "1.3.5"
93+
version = "1.3.8"
9294

9395
[dependencies.bytes]
9496
version = "1.4.0"
@@ -103,5 +105,5 @@ version = "0.2.9"
103105
version = "0.1"
104106

105107
[dev-dependencies.aws-credential-types]
106-
version = "1.2.1"
108+
version = "1.2.6"
107109
features = ["test-util"]

crates/amzn-codewhisperer-client/src/auth_plugin.rs

Lines changed: 0 additions & 36 deletions
This file was deleted.

crates/amzn-codewhisperer-client/src/client.rs

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,24 @@ pub(crate) struct Handle {
1010
///
1111
/// Client for invoking operations on Amazon CodeWhisperer. Each operation on Amazon CodeWhisperer
1212
/// is a method on this this struct. `.send()` MUST be invoked on the generated operations to
13-
/// dispatch the request to the service.
13+
/// dispatch the request to the service. # Using the `Client`
14+
///
15+
/// A client has a function for every operation that can be performed by the service.
16+
/// For example, the [`CreateArtifactUploadUrl`](crate::operation::create_artifact_upload_url)
17+
/// operation has a [`Client::create_artifact_upload_url`], function which returns a builder for
18+
/// that operation. The fluent builder ultimately has a `send()` function that returns an async
19+
/// future that returns a result, as illustrated below:
20+
///
21+
/// ```rust,ignore
22+
/// let result = client.create_artifact_upload_url()
23+
/// .content_md5("example")
24+
/// .send()
25+
/// .await;
26+
/// ```
27+
///
28+
/// The underlying HTTP requests that get made by this can be modified with the
29+
/// `customize_operation` function on the fluent builder. See the
30+
/// [`customize`](crate::client::customize) module for more information.
1431
#[derive(::std::clone::Clone, ::std::fmt::Debug)]
1532
pub struct Client {
1633
handle: ::std::sync::Arc<Handle>,
@@ -89,6 +106,30 @@ mod create_user_memory_entry;
89106
mod create_workspace;
90107

91108
/// Operation customization and supporting types.
109+
///
110+
/// The underlying HTTP requests made during an operation can be customized
111+
/// by calling the `customize()` method on the builder returned from a client
112+
/// operation call. For example, this can be used to add an additional HTTP header:
113+
///
114+
/// ```ignore
115+
/// # async fn wrapper() -> ::std::result::Result<(), amzn_codewhisperer_client::Error> {
116+
/// # let client: amzn_codewhisperer_client::Client = unimplemented!();
117+
/// use ::http::header::{HeaderName, HeaderValue};
118+
///
119+
/// let result = client.create_artifact_upload_url()
120+
/// .customize()
121+
/// .mutate_request(|req| {
122+
/// // Add `x-example-header` with value
123+
/// req.headers_mut()
124+
/// .insert(
125+
/// HeaderName::from_static("x-example-header"),
126+
/// HeaderValue::from_static("1"),
127+
/// );
128+
/// })
129+
/// .send()
130+
/// .await;
131+
/// # }
132+
/// ```
92133
pub mod customize;
93134

94135
mod delete_task_assist_conversation;

crates/amzn-codewhisperer-client/src/client/create_subscription_token.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ impl super::Client {
99
/// - [`status_only(bool)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::status_only) / [`set_status_only(Option<bool>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::set_status_only):<br>required: **false**<br>(undocumented)<br>
1010
/// - [`provider(SubscriptionProvider)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::provider) / [`set_provider(Option<SubscriptionProvider>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::set_provider):<br>required: **false**<br>(undocumented)<br>
1111
/// - [`subscription_type(SubscriptionType)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::subscription_type) / [`set_subscription_type(Option<SubscriptionType>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::set_subscription_type):<br>required: **false**<br>(undocumented)<br>
12+
/// - [`success_url(impl Into<String>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::success_url) / [`set_success_url(Option<String>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::set_success_url):<br>required: **false**<br>(undocumented)<br>
13+
/// - [`cancel_url(impl Into<String>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::cancel_url) / [`set_cancel_url(Option<String>)`](crate::operation::create_subscription_token::builders::CreateSubscriptionTokenFluentBuilder::set_cancel_url):<br>required: **false**<br>(undocumented)<br>
1214
/// - On success, responds with
1315
/// [`CreateSubscriptionTokenOutput`](crate::operation::create_subscription_token::CreateSubscriptionTokenOutput)
1416
/// with field(s):

0 commit comments

Comments
 (0)