service: Update channelpool/loggers imports

bkeryan · bkeryan · commit 3af84c52c0f6 · 2023-12-08T11:51:34.000-06:00
diff --git a/ni_measurementlink_service/_drivers/_grpcdevice.py b/ni_measurementlink_service/_drivers/_grpcdevice.py
@@ -7,12 +7,12 @@
 
 import grpc
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._configuration import (
     GRPC_DEVICE_SERVER_ADDRESS,
     USE_GRPC_DEVICE_SERVER,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient, ServiceLocation
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 
 _logger = logging.getLogger(__name__)
 
diff --git a/ni_measurementlink_service/_drivers/_nidaqmx.py b/ni_measurementlink_service/_drivers/_nidaqmx.py
@@ -4,11 +4,11 @@
 
 import nidaqmx
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._drivers._grpcdevice import (
     get_insecure_grpc_device_server_channel,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management._types import (
     SessionInformation,
     SessionInitializationBehavior,
diff --git a/ni_measurementlink_service/_drivers/_nidcpower.py b/ni_measurementlink_service/_drivers/_nidcpower.py
@@ -4,12 +4,12 @@
 
 import nidcpower
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._configuration import NIDCPOWER_OPTIONS
 from ni_measurementlink_service._drivers._grpcdevice import (
     get_insecure_grpc_device_server_channel,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management._types import (
     SessionInformation,
     SessionInitializationBehavior,
diff --git a/ni_measurementlink_service/_drivers/_nidigital.py b/ni_measurementlink_service/_drivers/_nidigital.py
@@ -4,12 +4,12 @@
 
 import nidigital
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._configuration import NIDIGITAL_OPTIONS
 from ni_measurementlink_service._drivers._grpcdevice import (
     get_insecure_grpc_device_server_channel,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management._types import (
     SessionInformation,
     SessionInitializationBehavior,
diff --git a/ni_measurementlink_service/_drivers/_nidmm.py b/ni_measurementlink_service/_drivers/_nidmm.py
@@ -4,12 +4,12 @@
 
 import nidmm
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._configuration import NIDMM_OPTIONS
 from ni_measurementlink_service._drivers._grpcdevice import (
     get_insecure_grpc_device_server_channel,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management._types import (
     SessionInformation,
     SessionInitializationBehavior,
diff --git a/ni_measurementlink_service/_drivers/_nifgen.py b/ni_measurementlink_service/_drivers/_nifgen.py
@@ -4,12 +4,12 @@
 
 import nifgen
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._configuration import NIFGEN_OPTIONS
 from ni_measurementlink_service._drivers._grpcdevice import (
     get_insecure_grpc_device_server_channel,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management._types import (
     SessionInformation,
     SessionInitializationBehavior,
diff --git a/ni_measurementlink_service/_drivers/_niscope.py b/ni_measurementlink_service/_drivers/_niscope.py
@@ -4,12 +4,12 @@
 
 import niscope
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._configuration import NISCOPE_OPTIONS
 from ni_measurementlink_service._drivers._grpcdevice import (
     get_insecure_grpc_device_server_channel,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management._types import (
     SessionInformation,
     SessionInitializationBehavior,
diff --git a/ni_measurementlink_service/_drivers/_niswitch.py b/ni_measurementlink_service/_drivers/_niswitch.py
@@ -4,12 +4,12 @@
 
 import niswitch
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._configuration import NISWITCH_OPTIONS
 from ni_measurementlink_service._drivers._grpcdevice import (
     get_insecure_grpc_device_server_channel,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management._types import (
     SessionInformation,
     SessionInitializationBehavior,
diff --git a/ni_measurementlink_service/_internal/service_manager.py b/ni_measurementlink_service/_internal/service_manager.py
@@ -16,8 +16,8 @@
 from ni_measurementlink_service._internal.stubs.ni.measurementlink.measurement.v2 import (
     measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
 )
-from ni_measurementlink_service._loggers import ServerLogger
 from ni_measurementlink_service.discovery import DiscoveryClient, ServiceLocation
+from ni_measurementlink_service.grpc.loggers import ServerLogger
 from ni_measurementlink_service.measurement.info import MeasurementInfo, ServiceInfo
 
 _logger = logging.getLogger(__name__)
diff --git a/ni_measurementlink_service/discovery/_client.py b/ni_measurementlink_service/discovery/_client.py
@@ -6,13 +6,13 @@
 import grpc
 from deprecation import deprecated
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._internal.stubs.ni.measurementlink.discovery.v1 import (
     discovery_service_pb2,
     discovery_service_pb2_grpc,
 )
 from ni_measurementlink_service.discovery._support import _get_discovery_service_address
 from ni_measurementlink_service.discovery._types import ServiceLocation
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.measurement.info import MeasurementInfo, ServiceInfo
 
 _logger = logging.getLogger(__name__)
diff --git a/ni_measurementlink_service/grpc/__init__.py b/ni_measurementlink_service/grpc/__init__.py
@@ -1 +1 @@
-"""gRPC extensions."""
+"""gRPC extensions."""
diff --git a/ni_measurementlink_service/grpc/channelpool.py b/ni_measurementlink_service/grpc/channelpool.py
@@ -13,7 +13,7 @@
 
 import grpc
 
-from ni_measurementlink_service._loggers import ClientLogger
+from ni_measurementlink_service.grpc.loggers import ClientLogger
 
 if TYPE_CHECKING:
     if sys.version_info >= (3, 11):
diff --git a/ni_measurementlink_service/measurement/service.py b/ni_measurementlink_service/measurement/service.py
@@ -28,9 +28,6 @@
 from google.protobuf.descriptor import EnumDescriptor
 
 from ni_measurementlink_service import _datatypeinfo
-from ni_measurementlink_service._channelpool import (  # re-export
-    GrpcChannelPool as GrpcChannelPool,
-)
 from ni_measurementlink_service._featuretoggles import (
     SESSION_MANAGEMENT_2024Q1,
     requires_feature,
@@ -41,6 +38,9 @@
 )
 from ni_measurementlink_service._internal.service_manager import GrpcService
 from ni_measurementlink_service.discovery import DiscoveryClient, ServiceLocation
+from ni_measurementlink_service.grpc.channelpool import (  # re-export
+    GrpcChannelPool as GrpcChannelPool,
+)
 from ni_measurementlink_service.measurement.info import (
     DataType,
     MeasurementInfo,
diff --git a/ni_measurementlink_service/session_management/_client.py b/ni_measurementlink_service/session_management/_client.py
@@ -8,12 +8,12 @@
 
 import grpc
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._internal.stubs.ni.measurementlink.sessionmanagement.v1 import (
     session_management_service_pb2,
     session_management_service_pb2_grpc,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management._constants import (
     GRPC_SERVICE_CLASS,
     GRPC_SERVICE_INTERFACE_NAME,
diff --git a/ni_measurementlink_service/session_management/_reservation.py b/ni_measurementlink_service/session_management/_reservation.py
@@ -29,7 +29,6 @@
     cast,
 )
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._drivers import (
     closing_session,
     closing_session_with_ts_code_module_support,
@@ -42,6 +41,7 @@
     session_management_service_pb2,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management._constants import (
     INSTRUMENT_TYPE_NI_DAQMX,
     INSTRUMENT_TYPE_NI_DCPOWER,
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -7,10 +7,10 @@
 import pytest
 from pytest_mock import MockerFixture
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._internal import grpc_servicer
 from ni_measurementlink_service._internal.grpc_servicer import MeasurementServiceContext
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.measurement.service import MeasurementService
 from ni_measurementlink_service.session_management import (
     MultiSessionReservation,
diff --git a/tests/unit/test_discovery_client.py b/tests/unit/test_discovery_client.py
@@ -12,7 +12,6 @@
 import pytest
 from pytest_mock import MockerFixture
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._internal.stubs.ni.measurementlink.discovery.v1.discovery_service_pb2 import (
     RegisterServiceRequest,
     RegisterServiceResponse,
@@ -31,6 +30,7 @@
     _open_key_file,
     _start_service,
 )
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.measurement.info import MeasurementInfo, ServiceInfo
 from tests.utilities.fake_rpc_error import FakeRpcError
 
diff --git a/tests/unit/test_session_management.py b/tests/unit/test_session_management.py
@@ -5,7 +5,6 @@
 import pytest
 from pytest_mock import MockerFixture
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._internal.stubs import session_pb2
 from ni_measurementlink_service._internal.stubs.ni.measurementlink.sessionmanagement.v1 import (
     session_management_service_pb2,
@@ -14,6 +13,7 @@
     SessionManagementServiceStub,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 from ni_measurementlink_service.session_management import (
     MultiSessionReservation,
     PinMapContext,
diff --git a/tests/utilities/pin_map_client.py b/tests/utilities/pin_map_client.py
@@ -6,12 +6,12 @@
 
 import grpc
 
-from ni_measurementlink_service._channelpool import GrpcChannelPool
 from ni_measurementlink_service._internal.stubs.ni.measurementlink.pinmap.v1 import (
     pin_map_service_pb2,
     pin_map_service_pb2_grpc,
 )
 from ni_measurementlink_service.discovery import DiscoveryClient
+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool
 
 _logger = logging.getLogger(__name__)
 

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`	`from ni_measurementlink_service._internal.stubs.ni.measurementlink.measurement.v2 import (`
`17`	`17`	`measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,`
`18`	`18`	`)`
`19`		`-from ni_measurementlink_service._loggers import ServerLogger`
`20`	`19`	`from ni_measurementlink_service.discovery import DiscoveryClient, ServiceLocation`
	`20`	`+from ni_measurementlink_service.grpc.loggers import ServerLogger`
`21`	`21`	`from ni_measurementlink_service.measurement.info import MeasurementInfo, ServiceInfo`
`22`	`22`
`23`	`23`	`_logger = logging.getLogger(__name__)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-"""gRPC extensions."""`
	`1`	`+"""gRPC extensions."""`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@`
`29`	`29`	`cast,`
`30`	`30`	`)`
`31`	`31`
`32`		`-from ni_measurementlink_service._channelpool import GrpcChannelPool`
`33`	`32`	`from ni_measurementlink_service._drivers import (`
`34`	`33`	`closing_session,`
`35`	`34`	`closing_session_with_ts_code_module_support,`
`@@ -42,6 +41,7 @@`
`42`	`41`	`session_management_service_pb2,`
`43`	`42`	`)`
`44`	`43`	`from ni_measurementlink_service.discovery import DiscoveryClient`
	`44`	`+from ni_measurementlink_service.grpc.channelpool import GrpcChannelPool`
`45`	`45`	`from ni_measurementlink_service.session_management._constants import (`
`46`	`46`	`INSTRUMENT_TYPE_NI_DAQMX,`
`47`	`47`	`INSTRUMENT_TYPE_NI_DCPOWER,`