ni.datamonikers.v1.client 0.1.0.dev0__tar.gz → 0.1.0.dev1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ni.datamonikers.v1.client
-Version: 0.1.0.dev0
+Version: 0.1.0.dev1
 Summary: gRPC Client for NI Data Moniker Service
 License: MIT
 Keywords: data-moniker,client

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

@@ -1,6 +1,6 @@
 [project]
 name = "ni.datamonikers.v1.client"
-version = "0.1.0-dev0"
+version = "0.1.0-dev1"
 license = "MIT"
 description = "gRPC Client for NI Data Moniker Service"
 authors = [{name = "NI", email = "opensource@ni.com"}]

{ni_datamonikers_v1_client-0.1.0.dev0 → ni_datamonikers_v1_client-0.1.0.dev1}/src/ni/datamonikers/v1/client/_client.py

@@ -3,14 +3,23 @@
 from __future__ import annotations
 
 import logging
+import sys
 import threading
-from typing import Iterator
+from types import TracebackType
+from typing import TYPE_CHECKING, Iterator
 
 import grpc
 import ni.datamonikers.v1.data_moniker_pb2 as data_moniker_pb2
 import ni.datamonikers.v1.data_moniker_pb2_grpc as data_moniker_pb2_grpc
 from ni_grpc_extensions.channelpool import GrpcChannelPool
 
+if TYPE_CHECKING:
+    if sys.version_info >= (3, 11):
+        from typing import Self
+    else:
+        from typing_extensions import Self
+
+
 _logger = logging.getLogger(__name__)
 
 
@@ -18,13 +27,15 @@ class MonikerClient:
     """Client for accessing the NI Data Moniker Service."""
 
     __slots__ = (
-        "_initialization_lock",
+        "_lock",
+        "_owns_grpc_channel_pool",
         "_service_location",
         "_grpc_channel_pool",
         "_stub",
     )
 
-    _initialization_lock: threading.Lock
+    _lock: threading.Lock
+    _owns_grpc_channel_pool: bool
     _service_location: str | None
     _grpc_channel_pool: GrpcChannelPool | None
     _stub: data_moniker_pb2_grpc.MonikerServiceStub | None
@@ -51,7 +62,8 @@ class MonikerClient:
         if service_location is None and grpc_channel is None:
             raise ValueError("Either 'service_location' or 'grpc_channel' must be provided.")
 
-        self._initialization_lock = threading.Lock()
+        self._lock = threading.Lock()
+        self._owns_grpc_channel_pool = False
         self._service_location = service_location
         self._grpc_channel_pool = grpc_channel_pool
         self._stub = (
@@ -60,12 +72,35 @@ class MonikerClient:
             else None
         )
 
+    def __enter__(self) -> Self:
+        """Enter the runtime context of the MonikerClient."""
+        return self
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_val: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
+        """Exit the runtime context of the MonikerClient."""
+        self.close()
+
+    def close(self) -> None:
+        """Close the client and clean up resources that it owns."""
+        with self._lock:
+            self._stub = None
+            if self._owns_grpc_channel_pool and self._grpc_channel_pool:
+                self._grpc_channel_pool.close()
+            self._grpc_channel_pool = None
+            self._owns_grpc_channel_pool = False
+
     def _get_stub(self) -> data_moniker_pb2_grpc.MonikerServiceStub:
         if self._stub is None:
-            with self._initialization_lock:
+            with self._lock:
                 if self._grpc_channel_pool is None:
                     _logger.debug("Creating unshared GrpcChannelPool.")
                     self._grpc_channel_pool = GrpcChannelPool()
+                    self._owns_grpc_channel_pool = True
 
                 if self._stub is None:
                     channel = self._grpc_channel_pool.get_channel(self._service_location)  # type: ignore