Source info api update

src/query.rs

@@ -190,6 +190,11 @@ impl Query {
         wait(py, build)
     }
 
+    #[getter]
+    fn source_info(&self) -> PyResult<Option<SourceInfo>> {
+        Ok(self.get_ref()?.source_info().cloned().map_into())
+    }
+
     fn drop(&mut self) {
         Python::with_gil(|gil| gil.allow_threads(|| drop(self.0.take())));
     }

src/sample.rs

@@ -91,8 +91,8 @@ impl Sample {
     }
 
     #[getter]
-    fn source_info(&self) -> SourceInfo {
-        self.0.source_info().clone().into()
+    fn source_info(&self) -> Option<SourceInfo> {
+        self.0.source_info().cloned().map_into()
     }
 
     fn __repr__(&self) -> String {
@@ -105,20 +105,17 @@ wrapper!(zenoh::sample::SourceInfo: Clone);
 #[pymethods]
 impl SourceInfo {
     #[new]
-    fn new(source_id: Option<EntityGlobalId>, source_sn: Option<SourceSn>) -> Self {
-        Self(zenoh::sample::SourceInfo::new(
-            source_id.map_into(),
-            source_sn,
-        ))
+    fn new(source_id: EntityGlobalId, source_sn: SourceSn) -> Self {
+        Self(zenoh::sample::SourceInfo::new(source_id.into(), source_sn))
     }
 
     #[getter]
-    fn source_id(&self) -> Option<EntityGlobalId> {
-        self.0.source_id().cloned().map_into()
+    fn source_id(&self) -> EntityGlobalId {
+        (*self.0.source_id()).into()
     }
 
     #[getter]
-    fn source_sn(&self) -> Option<SourceSn> {
+    fn source_sn(&self) -> SourceSn {
         self.0.source_sn()
     }
 }

zenoh/__init__.pyi

@@ -833,6 +833,11 @@ class Query:
            See the class documentation for important details about which key expression to use for replies.
         """
 
+    @_unstable
+    @property
+    def source_info(self) -> SourceInfo | None:
+        """Gets info on the source of this Query."""
+
     def drop(self):
         """Drop the instance of a query.
         The query will only be finalized when all query instances (one per queryable
@@ -1174,7 +1179,7 @@ class Sample:
 
     @_unstable
     @property
-    def source_info(self) -> SourceInfo:
+    def source_info(self) -> SourceInfo | None:
         """Gets info on the source of this Sample."""
 
 @final
@@ -1635,15 +1640,13 @@ class SourceInfo:
     global identifier and sequence number.
     """
 
-    def __new__(
-        cls, source_id: EntityGlobalId | None = None, source_sn: SourceSn | None = None
-    ) -> Self: ...
+    def __new__(cls, source_id: EntityGlobalId, source_sn: SourceSn) -> Self: ...
     @property
-    def source_id(self) -> EntityGlobalId | None:
+    def source_id(self) -> EntityGlobalId:
         """The EntityGlobalId of the zenoh entity that published the Sample in question."""
 
     @property
-    def source_sn(self) -> SourceSn | None:
+    def source_sn(self) -> SourceSn:
         """The sequence number of the Sample from the source."""
 
 SourceSn = int