Skip to content

expose entities global id #602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OlivierHecart merged 2 commits into from
Oct 9, 2025
Merged

expose entities global id #602

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80903e3
expose entities global id
wyfo Oct 9, 2025
69bb501
Merge branch 'main' into session-id
OlivierHecart Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions src/ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,11 @@ impl AdvancedPublisher {
Ok(py.None())
}

#[getter]
fn id(&self) -> PyResult<EntityGlobalId> {
Ok(self.get_ref()?.id().into())
}

#[getter]
fn key_expr(&self) -> PyResult<KeyExpr> {
Ok(self.get_ref()?.key_expr().clone().into())
Expand Down Expand Up @@ -545,6 +550,11 @@ impl AdvancedSubscriber {
Ok(py.None())
}

#[getter]
fn id(&self) -> PyResult<EntityGlobalId> {
Ok(self.get_ref()?.id().into())
}

#[getter]
fn key_expr(&self) -> PyResult<KeyExpr> {
Ok(self.get_ref()?.key_expr().clone().into())
Expand Down
11 changes: 11 additions & 0 deletions src/pubsub.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ use crate::{
matching::{MatchingListener, MatchingStatus},
qos::{CongestionControl, Priority, Reliability},
sample::Sample,
session::EntityGlobalId,
time::Timestamp,
utils::{generic, wait},
};
Expand All @@ -48,6 +49,11 @@ impl Publisher {
Ok(py.None())
}

#[getter]
fn id(&self) -> PyResult<EntityGlobalId> {
Ok(self.get_ref()?.id().into())
}

#[getter]
fn key_expr(&self) -> PyResult<KeyExpr> {
Ok(self.get_ref()?.key_expr().clone().into())
Expand Down Expand Up @@ -154,6 +160,11 @@ impl Subscriber {
Ok(py.None())
}

#[getter]
fn id(&self) -> PyResult<EntityGlobalId> {
Ok(self.get_ref()?.id().into())
}

#[getter]
fn key_expr(&self) -> PyResult<KeyExpr> {
Ok(self.get_ref()?.key_expr().clone().into())
Expand Down
10 changes: 10 additions & 0 deletions src/query.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,11 @@ impl Queryable {
Ok(py.None())
}

#[getter]
fn id(&self) -> PyResult<EntityGlobalId> {
Ok(self.get_ref()?.id().into())
}

#[getter]
fn key_expr(&self) -> PyResult<KeyExpr> {
Ok(self.get_ref()?.key_expr().clone().into())
Expand Down Expand Up @@ -340,6 +345,11 @@ impl Querier {
Ok(py.None())
}

#[getter]
fn id(&self) -> PyResult<EntityGlobalId> {
Ok(self.get_ref()?.id().into())
}

#[getter]
fn key_expr(&self) -> PyResult<KeyExpr> {
Ok(self.get_ref()?.key_expr().clone().into())
Expand Down
5 changes: 5 additions & 0 deletions src/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ impl Session {
Ok(py.None())
}

#[getter]
fn id(&self) -> EntityGlobalId {
self.0.id().into()
}

fn zid(&self) -> PyResult<ZenohId> {
Ok(self.0.zid().into())
}
Expand Down
15 changes: 15 additions & 0 deletions zenoh/__init__.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,9 @@ class Publisher:

def __enter__(self) -> Self: ...
def __exit__(self, *_args, **_kwargs): ...
@_unstable
@property
def id(self) -> EntityGlobalId: ...
@property
def key_expr(self) -> KeyExpr: ...
@property
Expand Down Expand Up @@ -618,6 +621,9 @@ class Queryable(Generic[_H]):

def __enter__(self) -> Self: ...
def __exit__(self, *_args, **_kwargs): ...
@_unstable
@property
def id(self) -> EntityGlobalId: ...
@property
def key_expr(self) -> KeyExpr: ...
@property
Expand All @@ -643,6 +649,9 @@ class Querier:

def __enter__(self) -> Self: ...
def __exit__(self, *_args, **_kwargs): ...
@_unstable
@property
def id(self) -> EntityGlobalId: ...
@property
def key_expr(self) -> KeyExpr: ...
@property
Expand Down Expand Up @@ -872,6 +881,9 @@ class Session:
def __exit__(self, *_args, **_kwargs): ...
@property
def info(self) -> SessionInfo: ...
@_unstable
@property
def id(self) -> EntityGlobalId: ...
def zid(self) -> ZenohId:
"""Returns the identifier of the current session. zid() is a convenient shortcut."""

Expand Down Expand Up @@ -1145,6 +1157,9 @@ class Subscriber(Generic[_H]):

def __enter__(self) -> Self: ...
def __exit__(self, *_args, **_kwargs): ...
@_unstable
@property
def id(self) -> EntityGlobalId: ...
@property
def key_expr(self) -> KeyExpr: ...
@property
Expand Down
Loading
Loading