ni.measurementlink.sessionmanagement.v1.client 0.1.0.dev0__tar.gz → 0.1.0.dev1__tar.gz

{ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev0 → ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: ni.measurementlink.sessionmanagement.v1.client
-Version: 0.1.0.dev0
+Version: 0.1.0.dev1
 Summary: Client gRPC APIs for the session management service
 License: MIT
 Keywords: ni-apis,sessionmanagement
 Author: NI
 Author-email: opensource@ni.com
-Maintainer: Brad Keryan
-Maintainer-email: brad.keryan@emerson.com
+Maintainer: Joe Friedrichsen
+Maintainer-email: joe.friedrichsen@emerson.com
 Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers

{ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev0 → ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev1}/pyproject.toml

@@ -1,15 +1,14 @@
-[tool.poetry]
+[project]
 name = "ni.measurementlink.sessionmanagement.v1.client"
-version = "0.1.0-dev0"
+version = "0.1.0-dev1"
 license = "MIT"
 description = "Client gRPC APIs for the session management service"
-authors = ["NI <opensource@ni.com>"]
+authors = [{name = "NI", email = "opensource@ni.com"}]
 maintainers = [
-  "Brad Keryan <brad.keryan@emerson.com>",
-  "Joe Friedrichsen <joe.friedrichsen@emerson.com>",
+  {name = "Joe Friedrichsen", email = "joe.friedrichsen@emerson.com"},
+  {name = "Brad Keryan", email = "brad.keryan@emerson.com"}
 ]
 readme = "README.md"
-repository = "https://github.com/ni/ni-apis-python"
 keywords = ["ni-apis", "sessionmanagement"]
 classifiers = [
   "Development Status :: 3 - Alpha",
@@ -27,10 +26,17 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: Implementation :: CPython",
 ]
+dynamic = ["dependencies"]
+requires-python = '>=3.9,<4.0'
+
+[project.urls]
+repository = "https://github.com/ni/ni-apis-python"
+
+[tool.poetry]
 packages = [{include = "ni", from = "src"}]
+requires-poetry = '>=2.1,<3.0'
 
 [tool.poetry.dependencies]
-python = "^3.9"
 protobuf = {version=">=4.21"}
 pywin32 = { version = ">=303", platform = "win32" }
 deprecation = ">=2.1"
@@ -53,6 +59,7 @@ ni-measurementlink-discovery-v1-client = { version = ">=0.1.0.dev0", allow-prere
 [tool.poetry.group.dev.dependencies]
 types-grpcio = ">=1.0"
 types-protobuf = ">=4.21"
+types-pywin32 = ">=311.0.0.20250822"
 
 [tool.poetry.group.lint.dependencies]
 bandit = { version = ">=1.7", extras = ["toml"] }
@@ -91,14 +98,18 @@ optional = true
 
 [tool.poetry.group.docs.dependencies]
 # The latest Sphinx requires a recent Python version.
-Sphinx = { version = ">=8.2", python = "^3.11" }
+Sphinx = [
+  { version = ">=7.4", python = ">=3.9,<3.10" },
+  { version = ">=8.1", python = ">=3.10,<3.11" },
+  { version = ">=8.2", python = "^3.11" },
+]
 sphinx-rtd-theme = ">=1.0.0"
 sphinx-autoapi = ">=1.8.4"
 m2r2 = ">=0.3.2"
 toml = ">=0.10.2"
 
 [build-system]
-requires = ["poetry-core>=1.8"]
+requires = ["poetry-core>=2.1.0,<3.0"]
 build-backend = "poetry.core.masonry.api"
 
 
@@ -109,6 +120,7 @@ skips = [
 
 [tool.ni-python-styleguide]
 extend_exclude = "docs,*_pb2_grpc.py,*_pb2_grpc.pyi,*_pb2.py,*_pb2.pyi"
+application-import-names = "ni.measurementlink.sessionmanagement.v1.client"
 
 [tool.black]
 extend-exclude = 'docs/|_pb2(_grpc)?\.(py|pyi)$'

ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev1/src/ni/measurementlink/sessionmanagement/v1/client/_annotations.py

@@ -0,0 +1,79 @@
+import os
+import socket
+import sys
+
+from ni.measurementlink.sessionmanagement.v1.annotations import (
+    REGISTERED_HOSTNAME,
+    REGISTERED_IPADDRESS,
+    REGISTERED_USERNAME,
+    RESERVED_HOSTNAME,
+    RESERVED_IPADDRESS,
+    RESERVED_USERNAME,
+)
+
+
+def get_machine_details() -> tuple[dict[str, str], dict[str, str]]:
+    """Get the machine details for reserved and registered annotations."""
+    hostname = _get_hostname()
+    username = _get_username()
+    ip_address = _get_ip_address()
+
+    reserved = {
+        RESERVED_HOSTNAME: hostname,
+        RESERVED_USERNAME: username,
+        RESERVED_IPADDRESS: ip_address,
+    }
+
+    registered = {
+        REGISTERED_HOSTNAME: hostname,
+        REGISTERED_USERNAME: username,
+        REGISTERED_IPADDRESS: ip_address,
+    }
+
+    return reserved, registered
+
+
+def remove_reservation_annotations(annotations: dict[str, str] | None) -> dict[str, str]:
+    """Remove reserved annotations from the provided annotations."""
+    if annotations is None:
+        return {}
+    reservation_keys = {
+        RESERVED_HOSTNAME,
+        RESERVED_USERNAME,
+        RESERVED_IPADDRESS,
+    }
+    return {k: v for k, v in annotations.items() if k not in reservation_keys}
+
+
+def _get_hostname() -> str:
+    if sys.platform == "win32":
+        try:
+            import win32api  # pyright: ignore[reportMissingModuleSource]
+
+            return win32api.GetComputerName()
+        except Exception:
+            return ""
+    else:
+        return socket.gethostname()
+
+
+def _get_username() -> str:
+    if sys.platform == "win32":
+        try:
+            import win32api  # pyright: ignore[reportMissingModuleSource]
+
+            return win32api.GetUserName()
+        except Exception:
+            return ""
+    else:
+        return os.environ.get("USER", "")
+
+
+def _get_ip_address() -> str:
+    try:
+        ipv4_addresses = [
+            info[4][0] for info in socket.getaddrinfo(socket.gethostname(), None, socket.AF_INET)
+        ]
+        return str(ipv4_addresses[0]) if ipv4_addresses else ""
+    except Exception:
+        return ""

{ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev0 → ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev1}/src/ni/measurementlink/sessionmanagement/v1/client/_client.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import logging
-import threading
 import warnings
 from collections.abc import Iterable, Mapping
 
@@ -14,6 +13,13 @@ import ni.measurementlink.sessionmanagement.v1.session_management_service_pb2_gr
 from ni.measurementlink.discovery.v1.client import DiscoveryClient
 from ni_grpc_extensions.channelpool import GrpcChannelPool
 
+from ni.measurementlink.sessionmanagement.v1.client._annotations import (
+    get_machine_details,
+    remove_reservation_annotations,
+)
+from ni.measurementlink.sessionmanagement.v1.client._client_base import (
+    GrpcServiceClientBase,
+)
 from ni.measurementlink.sessionmanagement.v1.client._constants import (
     GRPC_SERVICE_CLASS,
     GRPC_SERVICE_INTERFACE_NAME,
@@ -32,8 +38,12 @@ from ni.measurementlink.sessionmanagement.v1.client._types import (
 _logger = logging.getLogger(__name__)
 
 
-class SessionManagementClient:
-    """Client for accessing the measurement plug-in session management service."""
+class SessionManagementClient(
+    GrpcServiceClientBase[session_management_service_pb2_grpc.SessionManagementServiceStub]
+):
+    """Client for accessing the NI Session Management Service via gRPC."""
+
+    __slots__ = ("_reserved_annotations", "_registered_annotations")
 
     def __init__(
         self,
@@ -42,54 +52,16 @@ class SessionManagementClient:
         grpc_channel: grpc.Channel | None = None,
         grpc_channel_pool: GrpcChannelPool | None = None,
     ) -> None:
-        """Initialize session management client.
-
-        Args:
-            discovery_client: An optional discovery client (recommended).
-
-            grpc_channel: An optional session management gRPC channel.
-
-            grpc_channel_pool: An optional gRPC channel pool (recommended).
-        """
-        self._initialization_lock = threading.Lock()
-        self._discovery_client = discovery_client
-        self._grpc_channel_pool = grpc_channel_pool
-        self._stub: session_management_service_pb2_grpc.SessionManagementServiceStub | None = None
-
-        if grpc_channel is not None:
-            self._stub = session_management_service_pb2_grpc.SessionManagementServiceStub(
-                grpc_channel
-            )
-
-    def _get_stub(self) -> session_management_service_pb2_grpc.SessionManagementServiceStub:
-        if self._stub is None:
-            with self._initialization_lock:
-                if self._grpc_channel_pool is None:
-                    _logger.debug("Creating unshared GrpcChannelPool.")
-                    self._grpc_channel_pool = GrpcChannelPool()
-                if self._discovery_client is None:
-                    _logger.debug("Creating unshared DiscoveryClient.")
-                    self._discovery_client = DiscoveryClient(
-                        grpc_channel_pool=self._grpc_channel_pool
-                    )
-                if self._stub is None:
-                    compute_nodes = self._discovery_client.enumerate_compute_nodes()
-                    remote_compute_nodes = [node for node in compute_nodes if not node.is_local]
-                    # Use remote node URL as deployment target if only one remote node is found.
-                    # If more than one remote node exists, use empty string for deployment target.
-                    first_remote_node_url = (
-                        remote_compute_nodes[0].url if len(remote_compute_nodes) == 1 else ""
-                    )
-                    service_location = self._discovery_client.resolve_service(
-                        provided_interface=GRPC_SERVICE_INTERFACE_NAME,
-                        deployment_target=first_remote_node_url,
-                        service_class=GRPC_SERVICE_CLASS,
-                    )
-                    channel = self._grpc_channel_pool.get_channel(service_location.insecure_address)
-                    self._stub = session_management_service_pb2_grpc.SessionManagementServiceStub(
-                        channel
-                    )
-        return self._stub
+        """Initialize a SessionManagementClient instance."""
+        self._reserved_annotations, self._registered_annotations = get_machine_details()
+        super().__init__(
+            discovery_client=discovery_client,
+            grpc_channel=grpc_channel,
+            grpc_channel_pool=grpc_channel_pool,
+            service_interface_name=GRPC_SERVICE_INTERFACE_NAME,
+            service_class=GRPC_SERVICE_CLASS,
+            stub_class=session_management_service_pb2_grpc.SessionManagementServiceStub,
+        )
 
     def reserve_session(
         self,
@@ -214,6 +186,7 @@ class SessionManagementClient:
         request = session_management_service_pb2.ReserveSessionsRequest(
             pin_map_context=context._to_grpc(),
             timeout_in_milliseconds=_timeout_to_milliseconds(timeout),
+            annotations=self._reserved_annotations,
         )
         if instrument_type_id is not None:
             request.instrument_type_id = instrument_type_id
@@ -239,6 +212,15 @@ class SessionManagementClient:
         Args:
             session_info: Sessions to register.
         """
+        session_info = [
+            info._replace(
+                annotations={
+                    **remove_reservation_annotations(info.annotations),
+                    **self._registered_annotations,
+                }
+            )
+            for info in session_info
+        ]
         request = session_management_service_pb2.RegisterSessionsRequest(
             sessions=(info._to_grpc_v1() for info in session_info),
         )
@@ -287,7 +269,8 @@ class SessionManagementClient:
             unreserve them.
         """
         request = session_management_service_pb2.ReserveAllRegisteredSessionsRequest(
-            timeout_in_milliseconds=_timeout_to_milliseconds(timeout)
+            timeout_in_milliseconds=_timeout_to_milliseconds(timeout),
+            annotations=self._reserved_annotations,
         )
         if instrument_type_id is not None:
             request.instrument_type_id = instrument_type_id
@@ -307,6 +290,15 @@ class SessionManagementClient:
         Args:
             multiplexer_session_info: Sessions to register.
         """
+        multiplexer_session_info = [
+            info._replace(
+                annotations={
+                    **remove_reservation_annotations(info.annotations),
+                    **self._registered_annotations,
+                }
+            )
+            for info in multiplexer_session_info
+        ]
         request = session_management_service_pb2.RegisterMultiplexerSessionsRequest(
             multiplexer_sessions=(info._to_grpc_v1() for info in multiplexer_session_info),
         )

ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev1/src/ni/measurementlink/sessionmanagement/v1/client/_client_base.py

@@ -0,0 +1,100 @@
+from __future__ import annotations
+
+import logging
+import threading
+from typing import Generic, Protocol, TypeVar
+
+import grpc
+from ni.measurementlink.discovery.v1.client import DiscoveryClient
+from ni_grpc_extensions.channelpool import GrpcChannelPool
+
+_logger = logging.getLogger(__name__)
+
+
+class StubProtocol(Protocol):
+    """Protocol for gRPC stub classes."""
+
+    def __init__(self, channel: grpc.Channel) -> None:
+        """Initialize the gRPC client."""
+
+
+TStub = TypeVar("TStub", bound=StubProtocol)
+
+
+class GrpcServiceClientBase(Generic[TStub]):
+    """Base class for NI gRPC service clients."""
+
+    __slots__ = (
+        "_initialization_lock",
+        "_discovery_client",
+        "_grpc_channel_pool",
+        "_stub",
+        "_service_interface_name",
+        "_service_class",
+        "_stub_class",
+    )
+
+    _initialization_lock: threading.Lock
+    _discovery_client: DiscoveryClient | None
+    _grpc_channel_pool: GrpcChannelPool | None
+    _stub: TStub | None
+    _service_interface_name: str
+    _service_class: str
+    _stub_class: type[TStub]
+
+    def __init__(
+        self,
+        service_interface_name: str,
+        service_class: str,
+        stub_class: type[TStub],
+        *,
+        discovery_client: DiscoveryClient | None = None,
+        grpc_channel: grpc.Channel | None = None,
+        grpc_channel_pool: GrpcChannelPool | None = None,
+    ) -> None:
+        """Initialize the gRPC client.
+
+        Args:
+            service_interface_name: The fully qualified name of the service interface.
+            service_class: The name of the service class.
+            stub_class: The gRPC stub class for the service.
+            discovery_client: An optional discovery client (recommended).
+            grpc_channel: An optional pin map gRPC channel.
+            grpc_channel_pool: An optional gRPC channel pool (recommended).
+        """
+        self._initialization_lock = threading.Lock()
+        self._discovery_client = discovery_client
+        self._grpc_channel_pool = grpc_channel_pool
+        self._stub = stub_class(grpc_channel) if grpc_channel is not None else None
+        self._service_interface_name = service_interface_name
+        self._service_class = service_class
+        self._stub_class = stub_class
+
+    def _get_stub(self) -> TStub:
+        if self._stub is None:
+            with self._initialization_lock:
+                if self._grpc_channel_pool is None:
+                    _logger.debug("Creating unshared GrpcChannelPool.")
+                    self._grpc_channel_pool = GrpcChannelPool()
+
+                if self._discovery_client is None:
+                    _logger.debug("Creating unshared DiscoveryClient.")
+                    self._discovery_client = DiscoveryClient(
+                        grpc_channel_pool=self._grpc_channel_pool
+                    )
+
+                if self._stub is None:
+                    compute_nodes = self._discovery_client.enumerate_compute_nodes()
+                    remote_nodes = [node for node in compute_nodes if not node.is_local]
+                    target_url = remote_nodes[0].url if len(remote_nodes) == 1 else ""
+
+                    service_location = self._discovery_client.resolve_service(
+                        provided_interface=self._service_interface_name,
+                        deployment_target=target_url,
+                        service_class=self._service_class,
+                    )
+
+                    channel = self._grpc_channel_pool.get_channel(service_location.insecure_address)
+                    self._stub = self._stub_class(channel)
+
+        return self._stub

{ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev0 → ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev1}/src/ni/measurementlink/sessionmanagement/v1/client/_reservation.py

@@ -172,15 +172,17 @@ class _BaseSessionContainer(abc.ABC):
 
     @property
     def _discovery_client(self) -> DiscoveryClient:
-        if not self._session_management_client._discovery_client:
+        client = self._session_management_client._discovery_client
+        if client is None:
             raise ValueError("This method requires a discovery client.")
-        return self._session_management_client._discovery_client
+        return client
 
     @property
     def _grpc_channel_pool(self) -> GrpcChannelPool:
-        if not self._session_management_client._grpc_channel_pool:
+        pool = self._session_management_client._grpc_channel_pool
+        if pool is None:
             raise ValueError("This method requires a gRPC channel pool.")
-        return self._session_management_client._grpc_channel_pool
+        return pool
 
 
 class MultiplexerSessionContainer(_BaseSessionContainer):
@@ -274,9 +276,7 @@ class MultiplexerSessionContainer(_BaseSessionContainer):
         return multiplexer_session_infos
 
     @contextlib.contextmanager
-    def _cache_multiplexer_session(
-        self, session_name: str, session: TMultiplexerSession
-    ) -> Generator[None]:  # pyright: ignore[reportInvalidTypeVarUse]
+    def _cache_multiplexer_session(self, session_name: str, session: object) -> Generator[None]:
         if session_name in self._multiplexer_session_cache:
             raise RuntimeError(f"Multiplexer session '{session_name}' already exists.")
         self._multiplexer_session_cache[session_name] = session
@@ -664,7 +664,7 @@ class BaseReservation(_BaseSessionContainer):
         self._session_management_client._unreserve_sessions(self._grpc_session_info)
 
     @contextlib.contextmanager
-    def _cache_session(self, session_name: str, session: TSession) -> Generator[None]:
+    def _cache_session(self, session_name: str, session: object) -> Generator[None]:
         if session_name in self._session_cache:
             raise RuntimeError(f"Session '{session_name}' already exists.")
         self._session_cache[session_name] = session

{ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev0 → ni_measurementlink_sessionmanagement_v1_client-0.1.0.dev1}/src/ni/measurementlink/sessionmanagement/v1/client/_types.py

@@ -139,6 +139,13 @@ class SessionInformation(NamedTuple):
     This field is None until the appropriate initialize_session(s) method is called.
     """
 
+    annotations: dict[str, str] | None = None
+    """Annotations to attach to the session.
+
+    This field is optional and can be used to store any additional metadata
+    related to the session.
+    """
+
     def _check_runtime_type(self, session_type: type) -> None:
         if not isinstance(self.session, session_type):
             raise TypeError(
@@ -162,6 +169,7 @@ class SessionInformation(NamedTuple):
             instrument_type_id=other.instrument_type_id,
             session_exists=other.session_exists,
             channel_mappings=[ChannelMapping._from_grpc_v1(m) for m in other.channel_mappings],
+            annotations=dict(other.annotations) if other.annotations else None,
         )
 
     def _to_grpc_v1(
@@ -174,6 +182,7 @@ class SessionInformation(NamedTuple):
             instrument_type_id=self.instrument_type_id,
             session_exists=self.session_exists,
             channel_mappings=[m._to_grpc_v1() for m in self.channel_mappings],
+            annotations=self.annotations if self.annotations else {},
         )
 
 
@@ -253,6 +262,13 @@ class MultiplexerSessionInformation(NamedTuple):
     This field is None until the appropriate initialize_multiplexer_session(s) method is called.
     """
 
+    annotations: dict[str, str] = {}
+    """Annotations to attach to the session.
+
+    This field is optional and can be used to store any additional metadata
+    related to the session.
+    """
+
     def _check_runtime_type(self, multiplexer_session_type: type) -> None:
         if not isinstance(self.session, multiplexer_session_type):
             raise TypeError(
@@ -274,6 +290,7 @@ class MultiplexerSessionInformation(NamedTuple):
             resource_name=other.resource_name,
             multiplexer_type_id=other.multiplexer_type_id,
             session_exists=other.session_exists,
+            annotations=dict(other.annotations),
         )
 
     def _to_grpc_v1(self) -> session_management_service_pb2.MultiplexerSessionInformation:
@@ -282,6 +299,7 @@ class MultiplexerSessionInformation(NamedTuple):
             resource_name=self.resource_name,
             multiplexer_type_id=self.multiplexer_type_id,
             session_exists=self.session_exists,
+            annotations=self.annotations,
         )