Skip to content

Commit 42d4da6

Browse files
pzhan9meta-codesync[bot]
authored andcommitted
Remove unused def undeliverable_receiver from PyMailbox (#1436)
Summary: Pull Request resolved: #1436 Originally added in D77456497 2 months ago but it was never used. Remove it to reduce unnecessary maintenance burden. We can add it back when we need it again. Reviewed By: mariusae Differential Revision: D83912653 fbshipit-source-id: d48b2e7b468b423309d37d4fbd4aac05d9b44865
1 parent 9f676d3 commit 42d4da6

File tree

2 files changed

+0
-84
lines changed

2 files changed

+0
-84
lines changed

monarch_hyperactor/src/mailbox.rs

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ use crate::instance_dispatch;
5252
use crate::proc::PyActorId;
5353
use crate::pytokio::PyPythonTask;
5454
use crate::pytokio::PythonTask;
55-
use crate::runtime::signal_safe_block_on;
5655

5756
#[derive(Clone, Debug)]
5857
#[pyclass(
@@ -146,22 +145,6 @@ impl PyMailbox {
146145
}
147146
}
148147

149-
fn undeliverable_receiver<'py>(
150-
&self,
151-
py: Python<'py>,
152-
) -> PyResult<Py<PythonUndeliverablePortReceiver>> {
153-
let (handle, receiver) = self.inner.open_port();
154-
handle.bind_to(Undeliverable::<MessageEnvelope>::port());
155-
let receiver = Py::new(
156-
py,
157-
PythonUndeliverablePortReceiver {
158-
inner: Arc::new(tokio::sync::Mutex::new(receiver)),
159-
},
160-
)?;
161-
162-
Ok(receiver)
163-
}
164-
165148
fn __repr__(&self) -> String {
166149
format!("{:?}", self.inner)
167150
}
@@ -281,22 +264,6 @@ impl PythonPortHandle {
281264
}
282265
}
283266

284-
#[derive(Clone, Debug)]
285-
#[pyclass(
286-
name = "UndeliverablePortHandle",
287-
module = "monarch._rust_bindings.monarch_hyperactor.mailbox"
288-
)]
289-
pub(super) struct PythonUndeliverablePortHandle {
290-
inner: PortHandle<Undeliverable<MessageEnvelope>>,
291-
}
292-
293-
#[pymethods]
294-
impl PythonUndeliverablePortHandle {
295-
fn bind_undeliverable(&self) {
296-
self.inner.bind_to(Undeliverable::<MessageEnvelope>::port());
297-
}
298-
}
299-
300267
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
301268
#[pyclass(
302269
name = "PortRef",
@@ -437,46 +404,6 @@ impl PythonUndeliverableMessageEnvelope {
437404
}
438405
}
439406

440-
#[derive(Debug)]
441-
#[pyclass(
442-
name = "UndeliverablePortReceiver",
443-
module = "monarch._rust_bindings.monarch_hyperactor.mailbox"
444-
)]
445-
pub(super) struct PythonUndeliverablePortReceiver {
446-
inner: Arc<tokio::sync::Mutex<PortReceiver<Undeliverable<MessageEnvelope>>>>,
447-
}
448-
449-
#[pymethods]
450-
impl PythonUndeliverablePortReceiver {
451-
fn recv<'py>(&mut self, py: Python<'py>) -> PyResult<Bound<'py, PyAny>> {
452-
let receiver = self.inner.clone();
453-
crate::runtime::future_into_py(py, async move {
454-
let message = receiver
455-
.lock()
456-
.await
457-
.recv()
458-
.await
459-
.map_err(|err| PyErr::new::<PyEOFError, _>(format!("Port closed: {}", err)))?;
460-
Ok(PythonUndeliverableMessageEnvelope {
461-
inner: Some(message),
462-
})
463-
})
464-
}
465-
466-
fn blocking_recv<'py>(
467-
&mut self,
468-
py: Python<'py>,
469-
) -> PyResult<PythonUndeliverableMessageEnvelope> {
470-
let receiver = self.inner.clone();
471-
let message = signal_safe_block_on(py, async move { receiver.lock().await.recv().await })?
472-
.map_err(|err| PyErr::new::<PyEOFError, _>(format!("Port closed: {}", err)))?;
473-
474-
Ok(PythonUndeliverableMessageEnvelope {
475-
inner: Some(message),
476-
})
477-
}
478-
}
479-
480407
#[derive(Debug)]
481408
#[pyclass(
482409
name = "OncePortHandle",
@@ -728,10 +655,8 @@ pub fn register_python_bindings(hyperactor_mod: &Bound<'_, PyModule>) -> PyResul
728655
hyperactor_mod.add_class::<PyMailbox>()?;
729656
hyperactor_mod.add_class::<PyPortId>()?;
730657
hyperactor_mod.add_class::<PythonPortHandle>()?;
731-
hyperactor_mod.add_class::<PythonUndeliverablePortHandle>()?;
732658
hyperactor_mod.add_class::<PythonPortRef>()?;
733659
hyperactor_mod.add_class::<PythonPortReceiver>()?;
734-
hyperactor_mod.add_class::<PythonUndeliverablePortReceiver>()?;
735660
hyperactor_mod.add_class::<PythonOncePortHandle>()?;
736661
hyperactor_mod.add_class::<PythonOncePortRef>()?;
737662
hyperactor_mod.add_class::<PythonOncePortReceiver>()?;

python/monarch/_rust_bindings/monarch_hyperactor/mailbox.pyi

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,6 @@ class Mailbox:
160160
"""
161161
...
162162

163-
def undeliverable_receiver(self) -> UndeliverablePortReceiver:
164-
"""
165-
Open a port to receive undeliverable messages.
166-
167-
This may only be called at most once per mailbox. Calling it
168-
more than once may panic due to the port already being bound.
169-
"""
170-
...
171-
172163
@property
173164
def actor_id(self) -> ActorId: ...
174165

0 commit comments

Comments
 (0)