chore: merge develop into main for 0.47.0

jonaro00 · Jul 23, 2024 · bae5fed · bae5fed
2 parents 7910fc1 + 7ffa384
commit bae5fed
Show file tree

Hide file tree

Showing 53 changed files with 193 additions and 111 deletions.
diff --git a/actix-web/clerk/backend/Cargo.toml b/actix-web/clerk/backend/Cargo.toml
@@ -10,5 +10,5 @@ clerk-rs = "0.2.3"
 openssl-sys = { version = "0.9.9", features = ["vendored"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-shuttle-actix-web = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-actix-web = "0.47.0"
+shuttle-runtime = "0.47.0"
diff --git a/actix-web/cookie-authentication/Cargo.toml b/actix-web/cookie-authentication/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2021"
 actix-identity = "0.7.1"
 actix-session = { version = "0.9.0", features = ["cookie-session"] }
 actix-web = "4.3.1"
-shuttle-actix-web = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-actix-web = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.26.0"
diff --git a/actix-web/hello-world/Cargo.toml b/actix-web/hello-world/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 actix-web = "4.3.1"
-shuttle-actix-web = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-actix-web = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.26.0"
diff --git a/actix-web/postgres/Cargo.toml b/actix-web/postgres/Cargo.toml
@@ -5,9 +5,9 @@ edition = "2021"
 
 [dependencies]
 actix-web = "4.3.1"
-shuttle-actix-web = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-actix-web = "0.47.0"
+shuttle-runtime = "0.47.0"
 serde = "1.0.148"
-shuttle-shared-db = { version = "0.46.0", features = ["postgres", "sqlx"] }
+shuttle-shared-db = { version = "0.47.0", features = ["postgres", "sqlx"] }
 sqlx = "0.7.1"
 tokio = "1.26.0"
diff --git a/actix-web/static-files/Cargo.toml b/actix-web/static-files/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 [dependencies]
 actix-files = "0.6.2"
 actix-web = "4.3.1"
-shuttle-actix-web = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-actix-web = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.26.0"
diff --git a/actix-web/websocket-actorless/Cargo.toml b/actix-web/websocket-actorless/Cargo.toml
@@ -13,7 +13,7 @@ futures = "0.3"
 reqwest = "0.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-shuttle-actix-web = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-actix-web = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = { version = "1", features = ["rt-multi-thread", "sync"] }
 tracing = "0.1"
diff --git a/axum/hello-world/Cargo.toml b/axum/hello-world/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 axum = "0.7.4"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.28.2"
diff --git a/axum/htmx-crud/Cargo.toml b/axum/htmx-crud/Cargo.toml
@@ -9,9 +9,9 @@ askama_axum = "0.4.0"
 axum = "0.7.4"
 serde = { version = "1.0.189", features = ["derive"] }
 serde_json = "1.0.107"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
-shuttle-shared-db = { version = "0.46.0", features = ["postgres", "sqlx"] }
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
+shuttle-shared-db = { version = "0.47.0", features = ["postgres", "sqlx"] }
 sqlx = "0.7.2"
 tokio = "1.28.2"
 tokio-stream = { version = "0.1.14", features = ["sync"] }
diff --git a/axum/jwt-authentication/Cargo.toml b/axum/jwt-authentication/Cargo.toml
@@ -10,7 +10,7 @@ jsonwebtoken = "8.3.0"
 once_cell = "1.18.0"
 serde = { version = "1.0.188", features = ["derive"] }
 serde_json = "1.0.107"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.28.2"
 tracing-subscriber = "0.3.17"
diff --git a/axum/metadata/Cargo.toml b/axum/metadata/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 axum = "0.7.3"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.28.2"
diff --git a/axum/oauth2/Cargo.toml b/axum/oauth2/Cargo.toml
@@ -11,9 +11,9 @@ chrono = { version = "0.4.35", features = ["clock"] }
 oauth2 = "4.4.1"
 reqwest = { version = "0.11.18", features = ["json"] }
 serde = { version = "1.0.183", features = ["derive"] }
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
-shuttle-shared-db = { version = "0.46.0", features = ["postgres", "sqlx"] }
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
+shuttle-shared-db = { version = "0.47.0", features = ["postgres", "sqlx"] }
 sqlx = { version = "0.7.2", features = ["runtime-tokio-rustls", "macros", "chrono"] }
 thiserror = "1.0.57"
 time = "0.3.25"

diff --git a/axum/openai/Cargo.toml b/axum/openai/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "shuttle-axum-openai"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+async-openai = "0.23.0"
+axum = "0.7.3"
+serde_json = "1"
+shuttle-axum = "0.47.0"
+shuttle-openai = "0.47.0"
+shuttle-runtime = "0.47.0"
+tokio = "1.26.0"
diff --git a/axum/openai/README.md b/axum/openai/README.md
@@ -0,0 +1,7 @@
+A simple endpoint that sends a chat message to ChatGPT and returns the response.
+
+Set your OpenAI API key in `Secrets.toml`, then try it on a local run with:
+
+```sh
+curl http://localhost:8000 -H 'content-type: application/json' --data '{"message":"What is shuttle.rs?"}'
+```
diff --git a/axum/openai/Secrets.toml b/axum/openai/Secrets.toml
@@ -0,0 +1 @@
+OPENAI_API_KEY = 'your_api_key'
diff --git a/axum/openai/src/main.rs b/axum/openai/src/main.rs
@@ -0,0 +1,53 @@
+use std::sync::Arc;
+
+use async_openai::{
+    config::OpenAIConfig,
+    types::{
+        ChatCompletionRequestMessage, ChatCompletionRequestUserMessageArgs,
+        CreateChatCompletionRequestArgs,
+    },
+    Client,
+};
+use axum::{extract::State, routing::post, Json, Router};
+use serde_json::{json, Value};
+
+struct AppState {
+    openai: Client<OpenAIConfig>,
+}
+
+async fn chat(State(state): State<Arc<AppState>>, Json(v): Json<Value>) -> Result<Json<Value>, ()> {
+    let user_msg: ChatCompletionRequestMessage = ChatCompletionRequestUserMessageArgs::default()
+        .content(v["message"].as_str().unwrap())
+        .build()
+        .unwrap()
+        .into();
+    let req = CreateChatCompletionRequestArgs::default()
+        .model("gpt-4o-mini")
+        .messages(vec![user_msg])
+        .n(1)
+        .build()
+        .unwrap();
+    let res = state.openai.chat().create(req).await.unwrap();
+    let reply = res
+        .choices
+        .first()
+        .unwrap()
+        .message
+        .content
+        .as_ref()
+        .unwrap()
+        .to_owned();
+
+    Ok(Json(json!({ "response": reply })))
+}
+
+#[shuttle_runtime::main]
+async fn main(
+    #[shuttle_openai::OpenAI(api_key = "{secrets.OPENAI_API_KEY}")] openai: Client<OpenAIConfig>,
+) -> shuttle_axum::ShuttleAxum {
+    let state = Arc::new(AppState { openai });
+
+    let router = Router::new().route("/", post(chat)).with_state(state);
+
+    Ok(router.into())
+}
diff --git a/axum/postgres/Cargo.toml b/axum/postgres/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 [dependencies]
 axum = "0.7.3"
 serde = { version = "1.0.188", features = ["derive"] }
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
-shuttle-shared-db = { version = "0.46.0", features = ["postgres", "sqlx"] }
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
+shuttle-shared-db = { version = "0.47.0", features = ["postgres", "sqlx"] }
 sqlx = "0.7.1"
 tokio = "1.28.2"
diff --git a/axum/qdrant/Cargo.toml b/axum/qdrant/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 
 [dependencies]
 axum = "0.7.3"
-qdrant-client = "1.7.0"
-shuttle-axum = "0.46.0"
-shuttle-qdrant = "0.46.0"
-shuttle-runtime = "0.46.0"
+qdrant-client = "1.10.1"
+shuttle-axum = "0.47.0"
+shuttle-qdrant = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.26.0"
diff --git a/axum/qdrant/src/main.rs b/axum/qdrant/src/main.rs
@@ -1,9 +1,9 @@
 use axum::{extract::State, routing::get, Router};
-use qdrant_client::prelude::*;
+use qdrant_client::Qdrant;
 use std::sync::Arc;
 
 struct AppState {
-    qdrant: QdrantClient,
+    qdrant: Qdrant,
 }
 
 async fn list_collections(State(state): State<Arc<AppState>>) -> String {
@@ -13,7 +13,7 @@ async fn list_collections(State(state): State<Arc<AppState>>) -> String {
 #[shuttle_runtime::main]
 async fn main(
     #[shuttle_qdrant::Qdrant(cloud_url = "{secrets.CLOUD_URL}", api_key = "{secrets.API_KEY}")]
-    qdrant: QdrantClient,
+    qdrant: Qdrant,
 ) -> shuttle_axum::ShuttleAxum {
     let state = Arc::new(AppState { qdrant });
 

diff --git a/axum/static-files/Cargo.toml b/axum/static-files/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 axum = "0.7.3"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.28.2"
 tower-http = { version = "0.5.0", features = ["fs"] }
diff --git a/axum/turso/Cargo.toml b/axum/turso/Cargo.toml
@@ -5,9 +5,9 @@ edition = "2021"
 
 [dependencies]
 axum = "0.7.3"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
-shuttle-turso = "0.46.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
+shuttle-turso = "0.47.0"
 libsql = "0.3.1"
 tokio = "1.26.0"
 serde = { version = "1.0.164", features = ["derive"] }

diff --git a/axum/websocket/Cargo.toml b/axum/websocket/Cargo.toml
@@ -10,7 +10,7 @@ futures = "0.3.28"
 reqwest = "0.11.23"
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.28.2"
 tower-http = { version = "0.5.0", features = ["fs"] }
diff --git a/bevy/hello-world/server/Cargo.toml b/bevy/hello-world/server/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 axum = "0.7.4"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.28.2"
 tower-http = { version = "0.5.0", features = ["fs"] }
diff --git a/custom-resource/pdo/Cargo.toml b/custom-resource/pdo/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 async-trait = "0.1.56"
 axum = "0.7.3"
 serde = { version = "1", features = ["derive"] }
-shuttle-service = "0.46.0"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-service = "0.47.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.28.2"
diff --git a/custom-service/none/Cargo.toml b/custom-service/none/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-shuttle-runtime = "0.46.0"
+shuttle-runtime = "0.47.0"
 tokio = "1"
diff --git a/custom-service/request-scheduler/Cargo.toml b/custom-service/request-scheduler/Cargo.toml
@@ -10,7 +10,7 @@ chrono = "0.4.24"
 cron = "0.12.0"
 reqwest = "0.11.17"
 serde = "1.0.163"
-shuttle-persist = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-persist = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.28.0"
 tracing = "0.1.37"
diff --git a/fullstack-templates/saas/backend/Cargo.toml b/fullstack-templates/saas/backend/Cargo.toml
@@ -16,9 +16,9 @@ lettre = "0.11.4"
 rand = "0.8.5"
 reqwest = "0.11.16"
 serde = { version = "1.0.160", features = ["derive"] }
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
-shuttle-shared-db = { version = "0.46.0", features = ["postgres", "sqlx"] }
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
+shuttle-shared-db = { version = "0.47.0", features = ["postgres", "sqlx"] }
 sqlx = { version = "0.7.1", features = ["time"] }
 time = { version = "0.3.20", features = ["serde"] }
 tokio = "1.27.0"

diff --git a/loco/hello-world/Cargo.toml b/loco/hello-world/Cargo.toml
@@ -13,8 +13,8 @@ async-trait = "0.1.74"
 axum = "0.7.1"
 eyre = "*"
 loco-rs = { version = "0.3.1", default-features = false, features = ["cli"] }
-shuttle-axum = "0.46.0"
-shuttle-runtime = { version = "0.46.0", default-features = false }
+shuttle-axum = "0.47.0"
+shuttle-runtime = { version = "0.47.0", default-features = false }
 serde = "*"
 serde_json = "*"
 tokio = "1.33.0"

diff --git a/other/feature-flags/Cargo.toml b/other/feature-flags/Cargo.toml
@@ -6,8 +6,8 @@ publish = false
 
 [dependencies]
 axum = "0.7.3"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
 
 [features]
 # Shuttle will disable default features and enable the feature "shuttle" if it exists.

diff --git a/other/standalone-binary/Cargo.toml b/other/standalone-binary/Cargo.toml
@@ -15,6 +15,6 @@ path = "src/bin/standalone.rs"
 [dependencies]
 axum = "0.7.3"
 dotenvy = "0.15.7"
-shuttle-axum = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-axum = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.28.2"
diff --git a/poem/hello-world/Cargo.toml b/poem/hello-world/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 poem = "3.0.0"
-shuttle-poem = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-poem = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.26.0"
diff --git a/poem/mongodb/Cargo.toml b/poem/mongodb/Cargo.toml
@@ -6,9 +6,9 @@ edition = "2021"
 [dependencies]
 mongodb = "2.4.0"
 poem = "3.0.0"
-shuttle-poem = "0.46.0"
-shuttle-shared-db = { version = "0.46.0", features = ["mongodb"] }
-shuttle-runtime = "0.46.0"
+shuttle-poem = "0.47.0"
+shuttle-shared-db = { version = "0.47.0", features = ["mongodb"] }
+shuttle-runtime = "0.47.0"
 serde = { version = "1.0.148", features = ["derive"] }
 serde_json = "1.0.89"
 tokio = "1.26.0"
diff --git a/poise/hello-world/Cargo.toml b/poise/hello-world/Cargo.toml
@@ -7,8 +7,8 @@ publish = false
 [dependencies]
 anyhow = "1.0.68"
 poise = "0.6.1"
-shuttle-runtime = "0.46.0"
+shuttle-runtime = "0.47.0"
 # Since poise is a serenity command framework, it can run on Shuttle with shuttle-serenity
-shuttle-serenity = "0.46.0"
+shuttle-serenity = "0.47.0"
 tracing = "0.1.37"
 tokio = "1.26.0"
diff --git a/rocket/dyn-templates/Cargo.toml b/rocket/dyn-templates/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 [dependencies]
 rocket = "0.5.0"
 rocket_dyn_templates = { version = "0.1.0", features = ["handlebars"] }
-shuttle-rocket = "0.46.0"
-shuttle-runtime = "0.46.0"
+shuttle-rocket = "0.47.0"
+shuttle-runtime = "0.47.0"
 tokio = "1.26.0"