Fixed something.

Author: s3rius

python/natsrpy/__init__.py

@@ -7,4 +7,5 @@
 __all__ = [
     "Nats",
     "Subscription",
+    "Message",
 ]

python/natsrpy/_inner/__init__.pyi

@@ -1,9 +1,5 @@
 from natsrpy._inner.js import JetStream
-
-class Message:
-    subject: str
-    reply: str | None
-    payload: bytes
+from natsrpy._inner.message import Message
 
 class Subscription:
     def __aiter__(self) -> "Subscription": ...

python/natsrpy/_inner/message.pyi

@@ -8,3 +8,6 @@ class Message:
     status: int | None
     description: str | None
     length: int
+
+    def __repr__(self) -> str: ...
+    def __str__(self) -> str: ...

src/js/jetstream.rs

@@ -101,11 +101,27 @@ impl JetStream {
         })
     }
 
-    pub fn delete_kv<'py>(&self, py: Python<'py>, bucket: String) -> NatsrpyResult<Bound<'py, PyAny>> {
+    pub fn delete_kv<'py>(
+        &self,
+        py: Python<'py>,
+        bucket: String,
+    ) -> NatsrpyResult<Bound<'py, PyAny>> {
         let ctx = self.ctx.clone();
         natsrpy_future(py, async move {
             let js = ctx.read().await;
             Ok(js.delete_key_value(bucket).await?.success)
         })
     }
+
+    pub fn get_consumer<'py>(
+        &self,
+        py: Python<'py>,
+        bucket: String,
+    ) -> NatsrpyResult<Bound<'py, PyAny>> {
+        let ctx = self.ctx.clone();
+        natsrpy_future(py, async move {
+            let js = ctx.read().await;
+            Ok(KeyValue::new(js.get_key_value(bucket).await?))
+        })
+    }
 }

src/lib.rs

@@ -15,6 +15,8 @@ pub mod _inner {
     use super::nats_cls::NatsCls;
     #[pymodule_export]
     use super::subscription::Subscription;
+    #[pymodule_export]
+    use super::message::Message;
 
     #[pymodule_export]
     use super::js::pymod as js;

src/message.rs

@@ -47,3 +47,24 @@ impl Message {
         })
     }
 }
+
+#[pyo3::pymethods]
+impl Message {
+    pub fn __repr__(&self) -> String {
+        self.to_string()
+    }
+}
+
+impl ToString for Message {
+    fn to_string(&self) -> String {
+        format!(
+            r#"Message<subject="{subject}", reply={reply}, payload={payload}, headers={headers}, description={description}, length={len}>"#,
+            subject = self.subject,
+            reply = format!("{:?}", self.reply),
+            payload = self.payload.to_string(),
+            headers = self.headers.to_string(),
+            description = format!("{:?}", self.description),
+            len = self.length,
+        )
+    }
+}

src/utils/py.rs

@@ -10,12 +10,9 @@ fn _inner_init(module: &Bound<'_, PyModule>, path: &str) -> PyResult<()> {
         let submod_name = submod_name.extract::<String>()?;
         let submod = module.getattr(&submod_name)?;
         let modpath = format!("{path}.{submod_name}");
-        match submod.cast::<PyModule>() {
-            Ok(submod) => {
-                _inner_init(&submod, &modpath)?;
-                sys_modules.set_item(&modpath, submod)?;
-            }
-            _ => continue,
+        if let Ok(submod) = submod.cast::<PyModule>() {
+            _inner_init(&submod, &modpath)?;
+            sys_modules.set_item(&modpath, submod)?;
         }
     }
     Ok(())