ferroapi 0.0.1__tar.gz → 0.0.2__tar.gz

{ferroapi-0.0.1 → ferroapi-0.0.2}/Cargo.lock

@@ -300,7 +300,7 @@ checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
 
 [[package]]
 name = "ferroapi-core"
-version = "0.0.1"
+version = "0.0.2"
 dependencies = [
  "bytes",
  "ferroapi-http",
@@ -321,7 +321,7 @@ dependencies = [
 
 [[package]]
 name = "ferroapi-http"
-version = "0.0.1"
+version = "0.0.2"
 dependencies = [
  "bytes",
  "codspeed-divan-compat",
@@ -346,7 +346,7 @@ dependencies = [
 
 [[package]]
 name = "ferroapi-python"
-version = "0.0.1"
+version = "0.0.2"
 dependencies = [
  "bytes",
  "ferroapi-core",
@@ -358,7 +358,7 @@ dependencies = [
 
 [[package]]
 name = "ferroapi-router"
-version = "0.0.1"
+version = "0.0.2"
 dependencies = [
  "codspeed-divan-compat",
 ]

{ferroapi-0.0.1 → ferroapi-0.0.2}/Cargo.toml

@@ -3,16 +3,16 @@ resolver = "2"
 members = ["crates/ferroapi-http", "crates/ferroapi-router", "crates/ferroapi-core", "crates/ferroapi-python"]
 
 [workspace.package]
-version = "0.0.1"
+version = "0.0.2"
 edition = "2024"
 rust-version = "1.85"
 license = "MIT"
 repository = "https://github.com/Kludex/ferroapi"
 
 [workspace.dependencies]
-ferroapi-http = { path = "crates/ferroapi-http", version = "=0.0.1" }
-ferroapi-core = { path = "crates/ferroapi-core", version = "=0.0.1" }
-ferroapi-router = { path = "crates/ferroapi-router", version = "=0.0.1" }
+ferroapi-http = { path = "crates/ferroapi-http", version = "=0.0.2" }
+ferroapi-core = { path = "crates/ferroapi-core", version = "=0.0.2" }
+ferroapi-router = { path = "crates/ferroapi-router", version = "=0.0.2" }
 bytes = "1"
 http-body-util = "0.1"
 hyper = { version = "1", features = ["http1", "http2", "server"] }

{ferroapi-0.0.1 → ferroapi-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ferroapi
-Version: 0.0.1
+Version: 0.0.2
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3

{ferroapi-0.0.1 → ferroapi-0.0.2}/crates/ferroapi-core/src/lib.rs

@@ -387,7 +387,7 @@ impl App {
             .push(Box::new(move |py| start(py, &plan.plan, &spawn, raw, &started)));
         let guard = Abandon {
             task,
-            queue: self.queue.clone(),
+            queue: Some(self.queue.clone()),
         };
         let reply = receiver
             .await
@@ -456,19 +456,22 @@ fn too_large() -> Reply {
 /// Cancels the endpoint's task when hyper drops the request before it was answered: the client went away.
 struct Abandon {
     task: Arc<Mutex<Option<Py<PyAny>>>>,
-    queue: Arc<Queue>,
+    queue: Option<Arc<Queue>>,
 }
 
 impl Abandon {
-    fn disarm(self) {
-        let _ = std::mem::ManuallyDrop::new(self);
+    fn disarm(mut self) {
+        self.queue = None;
     }
 }
 
 impl Drop for Abandon {
     fn drop(&mut self) {
+        let Some(queue) = self.queue.take() else {
+            return;
+        };
         let task = self.task.clone();
-        self.queue.push(Box::new(move |py| {
+        queue.push(Box::new(move |py| {
             let task = task.lock().unwrap_or_else(std::sync::PoisonError::into_inner).take();
             if let Some(Err(err)) = task.map(|task| task.call_method0(py, intern!(py, "cancel"))) {
                 report(py, err, None);
@@ -585,12 +588,16 @@ impl App {
     }
 }
 
-fn start(py: Python<'_>, plan: &Py<PyAny>, spawn: &Py<PyAny>, raw: RawRequest, task: &Mutex<Option<Py<PyAny>>>) {
+fn start(py: Python<'_>, plan: &Py<PyAny>, spawn: &Py<PyAny>, raw: RawRequest, task: &Arc<Mutex<Option<Py<PyAny>>>>) {
     let raw = match Py::new(py, raw) {
         Ok(raw) => raw,
         Err(err) => return report(py, err, Some(plan.bind(py))),
     };
-    let started = Py::new(py, Done { raw: raw.clone_ref(py) }).and_then(|done| {
+    let done = Done {
+        raw: raw.clone_ref(py),
+        task: task.clone(),
+    };
+    let started = Py::new(py, done).and_then(|done| {
         let coroutine = plan.call1(py, (raw.clone_ref(py),))?;
         spawn.call1(py, (coroutine, done))
     });
@@ -607,11 +614,17 @@ fn start(py: Python<'_>, plan: &Py<PyAny>, spawn: &Py<PyAny>, raw: RawRequest, t
 #[pyclass(frozen, module = "ferroapi._core")]
 struct Done {
     raw: Py<RawRequest>,
+    /// Shared with the request's `Abandon` guard, and emptied here so the task is released while the GIL is held.
+    task: Arc<Mutex<Option<Py<PyAny>>>>,
 }
 
 #[pymethods]
 impl Done {
     fn __call__(&self, py: Python<'_>, task: &Bound<'_, PyAny>) {
+        self.task
+            .lock()
+            .unwrap_or_else(std::sync::PoisonError::into_inner)
+            .take();
         let raw = self.raw.get();
         report_task(py, raw.bridge.event_loop.bind(py), task);
         raw.fail();