Remove duplicate session_pb2 codegen, add ni-apis submodule and dependency on ni.grpcdevice.v1.proto

build/defines.mak

@@ -67,8 +67,6 @@ DEFAULT_PY_FILES_TO_GENERATE := \
         $(basename $(notdir $(PROTO_FILE)))_pb2_grpc.py \
         nidevice_pb2.py \
         nidevice_pb2_grpc.py \
-        session_pb2.py \
-        session_pb2_grpc.py \
     ) \
 
 DEFAULT_PY_FILES_TO_COPY := \

build/rules.mak

@@ -60,7 +60,6 @@ $(MODULE_DIR)/%: %.mako $(BUILD_HELPER_SCRIPTS) $(METADATA_FILES)
 $(MODULE_DIR)/%_pb2.py: %.proto
 	$(call trace_to_console, "Generating",$@ and $(notdir $*)_pb2_grpc.py)
 	$(_hide_cmds)$(call log_command,python -m grpc_tools.protoc $(addprefix -I=,$(PROTO_DIRS)) --python_out=$(MODULE_DIR) --grpc_python_out=$(MODULE_DIR) $*.proto)
-	$(_hide_cmds)$(call log_command,sed -i 's/^import session_pb2/from . import session_pb2/' $(MODULE_DIR)/$*_pb2*.py)
 	$(_hide_cmds)$(call log_command,sed -i 's/^import nidevice_pb2/from . import nidevice_pb2/' $(MODULE_DIR)/$*_pb2*.py)
 	$(_hide_cmds)$(call log_command,sed -i 's/^import $(notdir $*)_pb2/from . import $(notdir $*)_pb2/' $(MODULE_DIR)/$*_pb2*.py)
 

build/templates/_grpc_stub_interpreter.py.mako

@@ -13,6 +13,7 @@ are_complex_parameters_used = helper.are_complex_parameters_used(functions)
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
@@ -25,7 +26,6 @@ from . import nidevice_pb2 as grpc_complex_types  # noqa: F401
 % endif
 from . import ${proto_name}_pb2 as grpc_types
 from . import ${proto_name}_pb2_grpc as ${module_name}_grpc
-from . import session_pb2 as session_grpc_types
 % for c in config['custom_types']:
 
 from . import ${c['file_name']} as ${c['file_name']}  # noqa: F401

build/templates/setup.py.mako

@@ -52,7 +52,8 @@ setup(
     extras_require={
         'grpc': [
             'grpcio>=1.59.0,<2.0',
-            'protobuf>=4.21.6'
+            'protobuf>=4.21.6',
+            'ni.grpcdevice.v1.proto>=1.0.0'
         ],
     },
     % endif

generated/nidcpower/nidcpower/_grpc_stub_interpreter.py

@@ -3,14 +3,14 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
 from . import enums as enums  # noqa: F401
 from . import errors as errors
 from . import nidcpower_pb2 as grpc_types
 from . import nidcpower_pb2_grpc as nidcpower_grpc
-from . import session_pb2 as session_grpc_types
 
 from . import lcr_measurement as lcr_measurement  # noqa: F401
 

generated/nidcpower/setup.py

@@ -36,7 +36,8 @@ def read_contents(file_to_read):
     extras_require={
         'grpc': [
             'grpcio>=1.59.0,<2.0',
-            'protobuf>=4.21.6'
+            'protobuf>=4.21.6',
+            'ni.grpcdevice.v1.proto>=1.0.0'
         ],
     },
     classifiers=[

generated/nidigital/nidigital/_grpc_stub_interpreter.py

@@ -3,14 +3,14 @@
 
 import grpc
 import hightime  # noqa: F401
+import session_pb2 as session_grpc_types
 import threading
 import warnings
 
 from . import enums as enums  # noqa: F401
 from . import errors as errors
 from . import nidigitalpattern_pb2 as grpc_types
 from . import nidigitalpattern_pb2_grpc as nidigital_grpc
-from . import session_pb2 as session_grpc_types
 
 from . import history_ram_cycle_information as history_ram_cycle_information  # noqa: F401