slumber-python 5.4.0__tar.gz → 5.4.4__tar.gz

{slumber_python-5.4.0 → slumber_python-5.4.4}/Cargo.lock

@@ -160,13 +160,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.89"
+version = "0.1.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.114",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -192,9 +192,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "aws-lc-rs"
-version = "1.15.3"
+version = "1.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e84ce723ab67259cfeb9877c6a639ee9eb7a27b28123abd71db7f0d5d0cc9d86"
+checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13"
 dependencies = [
  "aws-lc-sys",
  "zeroize",
@@ -202,21 +202,22 @@ dependencies = [
 
 [[package]]
 name = "aws-lc-sys"
-version = "0.36.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a442ece363113bd4bd4c8b18977a7798dd4d3c3383f34fb61936960e8f4ad8"
+checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc"
 dependencies = [
  "cc",
  "cmake",
  "dunce",
  "fs_extra",
+ "pkg-config",
 ]
 
 [[package]]
 name = "axum"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
+checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90"
 dependencies = [
  "axum-core",
  "bytes",
@@ -224,6 +225,8 @@ dependencies = [
  "http",
  "http-body",
  "http-body-util",
+ "hyper",
+ "hyper-util",
  "itoa",
  "matchit",
  "memchr",
@@ -232,6 +235,7 @@ dependencies = [
  "pin-project-lite",
  "serde_core",
  "sync_wrapper",
+ "tokio",
  "tower",
  "tower-layer",
  "tower-service",
@@ -282,6 +286,12 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
+[[package]]
+name = "base64"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -877,7 +887,7 @@ dependencies = [
 
 [[package]]
 name = "doc_utils"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "anyhow",
  "clap",
@@ -2404,36 +2414,33 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.27.2"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab53c047fcd1a1d2a8820fe84f05d6be69e9526be40cb03b73f86b6b03e6d87d"
+checksum = "229ca13b8a15bb0d1487b81ab975bfcd97513416499a8312011b6036e42e0de4"
 dependencies = [
  "indexmap",
- "indoc",
  "libc",
- "memoffset",
  "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
- "unindent",
 ]
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.27.2"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b455933107de8642b4487ed26d912c2d899dec6114884214a0b3bb3be9261ea6"
+checksum = "70130e2b6dd1ee589a8788026a429561ca5c40fa7a2fa7914c2282eddae24700"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.27.2"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c85c9cbfaddf651b1221594209aed57e9e5cff63c4d11d1feead529b872a089"
+checksum = "5e7ff73c555c286d212d4ce7e5fbda845a973c4f61bd5f160f5f2c3c2a04d1c4"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -2441,27 +2448,26 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.27.2"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a5b10c9bf9888125d917fb4d2ca2d25c8df94c7ab5a52e13313a07e050a3b02"
+checksum = "c46d2e5862c7bb8207e3b639f713dda3c499933444784154c11d013c5a691b60"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 2.0.114",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.27.2"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b51720d314836e53327f5871d4c0cfb4fb37cc2c4a11cc71907a86342c40f9"
+checksum = "38b89f066f2ae72a2aef52d1537ca2fcd104440ebfadee06e97aa90738a25b9b"
 dependencies = [
  "heck",
  "proc-macro2",
- "pyo3-build-config",
  "quote",
- "syn 2.0.114",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -2752,11 +2758,11 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "reqwest"
-version = "0.13.1"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e9018c9d814e5f30cc16a0f03271aeab3571e609612d9fe78c1aa8d11c2f62"
+checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029"
 dependencies = [
- "base64 0.22.1",
+ "base64 0.23.1",
  "bytes",
  "futures-core",
  "futures-util",
@@ -2783,7 +2789,7 @@ dependencies = [
  "tokio-rustls",
  "tokio-util",
  "tower",
- "tower-http",
+ "tower-http 0.6.8",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -2981,9 +2987,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.9"
+version = "0.103.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
+checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281"
 dependencies = [
  "aws-lc-rs",
  "ring",
@@ -3348,7 +3354,7 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "slumber"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "anyhow",
  "slumber_cli",
@@ -3360,7 +3366,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_cli"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -3388,14 +3394,13 @@ dependencies = [
  "slumber_util",
  "tokio",
  "tracing",
- "url",
  "uuid",
  "wiremock",
 ]
 
 [[package]]
 name = "slumber_config"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "derive_more",
  "dirs",
@@ -3420,7 +3425,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_console"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3434,7 +3439,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_core"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3482,7 +3487,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_import"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3514,16 +3519,33 @@ dependencies = [
 
 [[package]]
 name = "slumber_macros"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "slumber_mock"
+version = "0.1.2"
+dependencies = [
+ "anyhow",
+ "axum",
+ "clap",
+ "itertools",
+ "reqwest",
+ "slumber_core",
+ "tokio",
+ "tower-http 0.7.1",
+ "tracing",
+ "tracing-subscriber",
+ "url",
+]
+
 [[package]]
 name = "slumber_python"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "async-trait",
  "indexmap",
@@ -3537,7 +3559,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_template"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "bytes",
  "derive_more",
@@ -3564,7 +3586,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_tui"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3606,7 +3628,7 @@ dependencies = [
 
 [[package]]
 name = "slumber_util"
-version = "5.4.0"
+version = "5.4.4"
 dependencies = [
  "console-subscriber",
  "derive_more",
@@ -3728,6 +3750,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "3.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@@ -4133,6 +4166,23 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "tower-http"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08a05a66a4fdd61cbbe0a1d755ffe0ca6aba159dd4820936a0ff8a8278245b9c"
+dependencies = [
+ "bitflags 2.10.0",
+ "bytes",
+ "http",
+ "http-body",
+ "percent-encoding",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -4302,12 +4352,6 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
-
 [[package]]
 name = "unsafe-libyaml"
 version = "0.2.11"
@@ -4495,9 +4539,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb"
 dependencies = [
  "futures-util",
  "js-sys",

{slumber_python-5.4.0 → slumber_python-5.4.4}/Cargo.toml

@@ -9,9 +9,9 @@ homepage = "https://slumber.lucaspickering.me"
 keywords = ["rest", "http", "terminal", "tui"]
 license = "MIT"
 repository = "https://github.com/LucasPickering/slumber"
-version = "5.4.0"
+version = "5.4.4"
 # Keep in sync w/ rust-toolchain.toml
-rust-version = "1.90.0"
+rust-version = "1.99.0"
 
 # Dependencies used in multiple crates get de-duplicated here
 [workspace.dependencies]
@@ -43,15 +43,16 @@ serde_json = {version = "1.0.120", default-features = false, features = ["preser
 serde_json_path = "0.7.1"
 serde_test = "1.0.176"
 serde_yaml = {version = "0.9.0", default-features = false}
-slumber_cli = {path = "./crates/cli", version = "5.4.0" }
-slumber_config = {path = "./crates/config", version = "5.4.0", default-features = false}
-slumber_console = {path = "./crates/console", version = "5.4.0" }
-slumber_core = {path = "./crates/core", version = "5.4.0" }
-slumber_import = {path = "./crates/import", version = "5.4.0" }
-slumber_macros = {path = "./crates/macros", version = "5.4.0" }
-slumber_template = {path = "./crates/template", version = "5.4.0" }
-slumber_tui = {path = "./crates/tui", version = "5.4.0" }
-slumber_util = {path = "./crates/util", version = "5.4.0" }
+slumber_cli = {path = "./crates/cli", version = "5.4.4" }
+slumber_config = {path = "./crates/config", version = "5.4.4", default-features = false}
+slumber_console = {path = "./crates/console", version = "5.4.4" }
+slumber_core = {path = "./crates/core", version = "5.4.4" }
+slumber_import = {path = "./crates/import", version = "5.4.4" }
+slumber_macros = {path = "./crates/macros", version = "5.4.4" }
+slumber_mock = {path = "./crates/mock", version = "0.1.2" }
+slumber_template = {path = "./crates/template", version = "5.4.4" }
+slumber_tui = {path = "./crates/tui", version = "5.4.4" }
+slumber_util = {path = "./crates/util", version = "5.4.4" }
 strum = {version = "0.27.0", default-features = false}
 syn = "2.0.101"
 terminput = "0.5.3"
@@ -59,6 +60,7 @@ thiserror = "2.0.12"
 tokio = {version = "1.39.2", default-features = false}
 tokio-util = "0.7.13"
 tracing = "0.1.40"
+tracing-subscriber = {version = "0.3.17", default-features = false}
 url = "2.0.0"
 uuid = {version = "1.10.0", default-features = false}
 winnow = "0.7.0"
@@ -92,6 +94,7 @@ needless_pass_by_value = "allow"
 similar_names = "allow"
 single_match = "allow"
 too_many_lines = "allow"
+unused_async_trait_impl = "allow"
 unused_self = "allow"
 used_underscore_binding = "allow"
 

{slumber_python-5.4.0 → slumber_python-5.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: slumber-python
-Version: 5.4.0
+Version: 5.4.4
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/core/src/database/convert.rs

@@ -353,7 +353,7 @@ impl FromSql for SqlWrap<Bytes> {
 impl FromSql for SqlWrap<StatusCode> {
     fn column_result(value: ValueRef<'_>) -> FromSqlResult<Self> {
         let code: u16 = value.as_i64()?.try_into().map_err(error_other)?;
-        let code = StatusCode::from_u16(code as u16).map_err(error_other)?;
+        let code = StatusCode::from_u16(code).map_err(error_other)?;
         Ok(Self(code))
     }
 }

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/core/src/database/tests.rs

@@ -112,7 +112,7 @@ fn test_collection_delete(collection_file: CollectionFile) {
     collection.insert_command("jq .").unwrap();
 
     // Sanity checks
-    assert_eq!(collection.get_all_requests().unwrap().len(), 1);
+    assert_eq!(collection.get_all_exchange_summaries().unwrap().len(), 1);
     assert_eq!(
         collection.get_ui(key_type, ui_key).unwrap(),
         Some("value1".into())
@@ -126,7 +126,7 @@ fn test_collection_delete(collection_file: CollectionFile) {
 
     // All gone!
     assert_eq!(database.get_collections().unwrap(), []);
-    assert_eq!(database.get_all_requests().unwrap(), []);
+    assert_eq!(database.get_all_exchange_summaries().unwrap(), []);
     assert_eq!(collection.get_ui(key_type, ui_key).unwrap(), None);
     assert_eq!(collection.get_commands("jq").unwrap(), [""; 0]);
 }
@@ -240,7 +240,14 @@ fn test_collection_merge(
 /// Test fetching all requests for the whole DB
 #[rstest]
 fn test_database_get_all_requests(request_db: RequestDb) {
-    assert_eq!(request_db.database.get_all_requests().unwrap().len(), 12);
+    assert_eq!(
+        request_db
+            .database
+            .get_all_exchange_summaries()
+            .unwrap()
+            .len(),
+        12
+    );
 }
 
 /// Test getting most recent request by recipe/profile
@@ -293,7 +300,7 @@ fn test_request_body(#[case] body: RequestBody) {
     });
 
     database.insert_exchange(&exchange).unwrap();
-    let actual = database.get_request(exchange.id).unwrap().unwrap();
+    let actual = database.get_exchange(exchange.id).unwrap().unwrap();
 
     // What goes in is what comes out
     assert_eq!(actual.request.body, body);
@@ -303,8 +310,8 @@ fn test_request_body(#[case] body: RequestBody) {
 #[rstest]
 fn test_collection_get_all_requests(request_db: RequestDb) {
     let [collection1, collection2] = request_db.collections;
-    assert_eq!(collection1.get_all_requests().unwrap().len(), 6);
-    assert_eq!(collection2.get_all_requests().unwrap().len(), 6);
+    assert_eq!(collection1.get_all_exchange_summaries().unwrap().len(), 6);
+    assert_eq!(collection2.get_all_exchange_summaries().unwrap().len(), 6);
 }
 
 /// Test fetching all requests for a single recipe
@@ -349,7 +356,10 @@ fn test_get_recipe_requests() {
             // Leave the Option here so a non-match will trigger a handy
             // assertion error
             let ids = database
-                .get_recipe_requests(profile_id.as_ref().into(), &recipe_id)
+                .get_recipe_exchange_summaries(
+                    profile_id.as_ref().into(),
+                    &recipe_id,
+                )
                 .unwrap()
                 .into_iter()
                 .map(|exchange| exchange.id)
@@ -370,7 +380,7 @@ fn test_get_recipe_requests() {
     // Load all requests for a recipe (across all profiles)
     let recipe_id = "recipe1".into();
     let ids = database
-        .get_recipe_requests(ProfileFilter::All, &recipe_id)
+        .get_recipe_exchange_summaries(ProfileFilter::All, &recipe_id)
         .unwrap()
         .into_iter()
         .map(|exchange| exchange.id)

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/core/src/database.rs

@@ -9,7 +9,7 @@ mod tests;
 use crate::{
     collection::{Collection, CollectionFile, ProfileId, RecipeId},
     database::convert::{CollectionPath, SqlWrap},
-    http::{Exchange, ExchangeSummary, RequestId},
+    http::{Exchange, ExchangeSummary, HttpMethod, RequestId},
 };
 use chrono::Utc;
 use rusqlite::{Connection, OptionalExtension, named_params};
@@ -25,6 +25,7 @@ use std::{
 use strum::IntoDiscriminant;
 use thiserror::Error;
 use tracing::{debug, info};
+use url::Url;
 use uuid::Uuid;
 
 /// Maximum number of commands to store in history **per collection**. When we
@@ -268,8 +269,8 @@ impl Database {
         Ok(())
     }
 
-    /// Get all requests for all collections
-    pub fn get_all_requests(
+    /// Get all exchanges for all collections
+    pub fn get_all_exchange_summaries(
         &self,
     ) -> Result<Vec<ExchangeSummary>, DatabaseError> {
         // Wish we had try blocks ¯\_(ツ)_/¯
@@ -392,8 +393,8 @@ impl CollectionDatabase {
             .traced();
     }
 
-    /// Get a request by ID, or `None` if it does not exist in history.
-    pub fn get_request(
+    /// Get an exchange by ID, or `None` if not in the database
+    pub fn get_exchange(
         &self,
         request_id: RequestId,
     ) -> Result<Option<Exchange>, DatabaseError> {
@@ -455,8 +456,8 @@ impl CollectionDatabase {
             .traced()
     }
 
-    /// Get a list of all requests for a profile+recipe combo
-    pub fn get_recipe_requests(
+    /// Get a list of all exchanges for a profile+recipe combo
+    pub fn get_recipe_exchange_summaries(
         &self,
         profile_filter: ProfileFilter,
         recipe_id: &RecipeId,
@@ -493,8 +494,8 @@ impl CollectionDatabase {
             .map_err(DatabaseError::add_context("Extracting request history"))
     }
 
-    /// Get all requests for this collection
-    pub fn get_all_requests(
+    /// Get all exchanges for this collection
+    pub fn get_all_exchange_summaries(
         &self,
     ) -> Result<Vec<ExchangeSummary>, DatabaseError> {
         self.database
@@ -518,6 +519,36 @@ impl CollectionDatabase {
             .traced()
     }
 
+    /// Get request data for all requests for this collection
+    pub fn get_all_requests(
+        &self,
+    ) -> Result<Vec<(RequestId, HttpMethod, Url)>, DatabaseError> {
+        self.database
+            .connection()
+            .prepare(
+                "SELECT id, method, url FROM requests_v2
+                WHERE collection_id = :collection_id ORDER BY start_time DESC",
+            )
+            .and_then(|mut stmt| {
+                stmt.query_map(
+                    named_params! {":collection_id": self.collection_id},
+                    |row| {
+                        Ok((
+                            row.get("id")?,
+                            row.get("method")?,
+                            row.get::<_, SqlWrap<_>>("url")?.0,
+                        ))
+                    },
+                )?
+                .collect::<rusqlite::Result<Vec<_>>>()
+            })
+            .map_err(DatabaseError::add_context(format!(
+                "Error loading requests for collection `{}`",
+                self.collection_id
+            )))
+            .traced()
+    }
+
     /// Add a new exchange to history. The HTTP engine is responsible for
     /// inserting its own exchanges. Only requests that received a valid HTTP
     /// response should be stored. In-flight requests, invalid requests, and

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/core/src/http/models.rs

@@ -242,6 +242,22 @@ impl TryFrom<String> for HttpMethod {
     }
 }
 
+impl PartialEq<reqwest::Method> for HttpMethod {
+    fn eq(&self, other: &reqwest::Method) -> bool {
+        match self {
+            Self::Connect => other == reqwest::Method::CONNECT,
+            Self::Delete => other == reqwest::Method::DELETE,
+            Self::Get => other == reqwest::Method::GET,
+            Self::Head => other == reqwest::Method::HEAD,
+            Self::Options => other == reqwest::Method::OPTIONS,
+            Self::Patch => other == reqwest::Method::PATCH,
+            Self::Post => other == reqwest::Method::POST,
+            Self::Put => other == reqwest::Method::PUT,
+            Self::Trace => other == reqwest::Method::TRACE,
+        }
+    }
+}
+
 #[derive(Debug, Error)]
 #[error(
     "Invalid HTTP method `{input}`. Must be one of: {}",

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/core/src/http/tests.rs

@@ -1082,7 +1082,7 @@ async fn test_send_request(http_engine: HttpEngine) {
     );
 
     // Ensure it was persisted
-    assert_eq!(database.get_request(exchange.id).unwrap(), Some(exchange));
+    assert_eq!(database.get_exchange(exchange.id).unwrap(), Some(exchange));
 }
 
 /// Leading/trailing newlines should be stripped from rendered header

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/core/src/render/tests.rs

@@ -923,7 +923,7 @@ async fn test_response_header(
             ..ResponseRecord::factory(id)
         }
         .into(),
-        end_time: Utc::now() - Duration::from_secs(60 * 60),
+        end_time: Utc::now() - Duration::from_hours(1),
         ..Exchange::factory((id, None, recipe.id.clone()))
     };
     database.insert_exchange(&exchange).unwrap();

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/core/src/render.rs

@@ -212,6 +212,7 @@ impl TemplateContext {
     }
 }
 
+/// Template context when producing eager values (where streams aren't allowed)
 impl Context<Value> for TemplateContext {
     async fn get_field(
         &self,
@@ -241,11 +242,14 @@ impl Context<Value> for TemplateContext {
     }
 }
 
+/// Template context when producing lazy values (where streams are allowed)
 impl Context<ValueStream> for TemplateContext {
     async fn get_field(
         &self,
         field: &Identifier,
     ) -> Result<ValueStream, RenderError> {
+        // Streams can't be cached because they can only be resolved once. If
+        // the value is cached, it must be eager.
         let guard = match self.get_field_cache_guard(field).await {
             FieldCacheOutcome::Hit(value) => return Ok(value.into()),
             FieldCacheOutcome::Miss(guard) => guard,

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/python/Cargo.toml

@@ -18,13 +18,13 @@ release = false
 tag = false
 
 [lib]
-name = "slumber"
 crate-type = ["cdylib"]
+name = "slumber"
 
 [dependencies]
 async-trait = {workspace = true}
 indexmap = {workspace = true}
-pyo3 = {version = "0.27.2", features = ["experimental-async", "indexmap"]}
+pyo3 = {version = "0.30", features = ["experimental-async", "indexmap"]}
 slumber_config = {workspace = true}
 slumber_console = {workspace = true}
 slumber_core = {workspace = true}

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/python/src/lib.rs

@@ -1,8 +1,8 @@
 use async_trait::async_trait;
 use indexmap::IndexMap;
 use pyo3::{
-    PyErr, PyResult,
-    exceptions::{PyRuntimeError, PyValueError},
+    Py, PyErr, PyResult, Python,
+    exceptions::{PyRuntimeError, PyUnicodeDecodeError, PyValueError},
     pyclass, pymethods, pymodule,
 };
 use slumber_config::Config;
@@ -21,7 +21,6 @@ use std::{
     error::Error,
     fmt::{self, Display},
     path::PathBuf,
-    str::Utf8Error,
     sync::{Arc, LazyLock},
 };
 use tokio::{
@@ -228,8 +227,11 @@ impl Response {
 
     /// Response content decoded as UTF-8
     #[getter]
-    fn text(&self) -> Result<&str, Utf8Error> {
-        std::str::from_utf8(self.response.body.bytes())
+    fn text(&self, py: Python<'_>) -> Result<&str, PyErr> {
+        let bytes = self.response.body.bytes();
+        std::str::from_utf8(bytes).map_err(|error| {
+            PyUnicodeDecodeError::new_err_from_utf8(py, bytes, error)
+        })
     }
 
     /// If the response status code is >= 400, raise an exception

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/util/Cargo.toml

@@ -26,7 +26,7 @@ serde = {workspace = true}
 serde_yaml = {workspace = true}
 thiserror = {workspace = true}
 tracing = {workspace = true}
-tracing-subscriber = {version = "0.3.17", default-features = false, features = ["ansi", "fmt", "registry"]}
+tracing-subscriber = {workspace = true, features = ["ansi", "fmt", "registry"]}
 uuid = {workspace = true, features = ["v4"]}
 winnow = {workspace = true}
 

{slumber_python-5.4.0 → slumber_python-5.4.4}/crates/util/src/lib.rs

@@ -143,11 +143,11 @@ where
 /// use slumber_util::doc_link;
 /// assert_eq!(
 ///     doc_link("api/chain"),
-///     "https://slumber.lucaspickering.me/api/chain.html",
+///     "https://slmbr.dev/api/chain.html",
 /// );
 /// ```
 pub fn doc_link(path: &str) -> String {
-    const ROOT: &str = "https://slumber.lucaspickering.me/";
+    const ROOT: &str = "https://slmbr.dev/";
     if path.is_empty() {
         ROOT.into()
     } else {
@@ -350,21 +350,12 @@ pub fn initialize_tracing(level_filter: LevelFilter, has_stderr: bool) {
             LevelFilter::OFF
         });
 
+    let registry = tracing_subscriber::registry()
+        .with(file_subscriber)
+        .with(stderr_subscriber);
     #[cfg(feature = "tokio_tracing")]
-    {
-        tracing_subscriber::registry()
-            .with(file_subscriber)
-            .with(stderr_subscriber)
-            .with(console_subscriber::spawn())
-            .init();
-    }
-    #[cfg(not(feature = "tokio_tracing"))]
-    {
-        tracing_subscriber::registry()
-            .with(file_subscriber)
-            .with(stderr_subscriber)
-            .init();
-    }
+    let registry = registry.with(console_subscriber::spawn());
+    registry.init();
 }
 
 /// Serialize a list of tuples as a mapping
@@ -414,7 +405,7 @@ mod tests {
     #[case::seconds_longer("100s", Duration::from_secs(100))]
     #[case::minutes("3m", Duration::from_secs(180))]
     #[case::hours("3h", Duration::from_secs(10_800))]
-    #[case::days("2d", Duration::from_secs(172_800))]
+    #[case::days("2d", Duration::from_hours(48))]
     #[case::composite("2d3h10m17s", Duration::from_secs(
         2 * 86400 + 3 * 3600 + 10 * 60 + 17
     ))]