Add set_runtime_environment functionality to nidmm (#1973)

* Update dmm metadata to add set_runtime_environment functionality

* Update CHANGELOG

Author: ni-jfitzger

CHANGELOG.md

@@ -47,6 +47,7 @@ All notable changes to this project will be documented in this file.
     * #### Removed
 * ### `nidmm` (NI-DMM)
     * #### Added
+        * Pass Python interpreter information if the driver runtime version supports it. This is used by NI in order to better understand client usage.
     * #### Changed
     * #### Removed
 * ### `nifgen` (NI-FGEN)

generated/nidmm/nidmm/_grpc_stub_interpreter.py

@@ -360,6 +360,9 @@ def set_attribute_vi_string(self, channel_name, attribute_id, attribute_value):
             grpc_types.SetAttributeViStringRequest(vi=self._vi, channel_name=channel_name, attribute_id=attribute_id, attribute_value_raw=attribute_value),
         )
 
+    def set_runtime_environment(self, environment, environment_version, reserved1, reserved2):  # noqa: N802
+        raise NotImplementedError('set_runtime_environment is not supported over gRPC')
+
     def unlock(self):  # noqa: N802
         self._lock.release()
 

generated/nidmm/nidmm/_library.py

@@ -63,6 +63,7 @@ def __init__(self, ctypes_library):
         self.niDMM_SetAttributeViInt32_cfunc = None
         self.niDMM_SetAttributeViReal64_cfunc = None
         self.niDMM_SetAttributeViString_cfunc = None
+        self.niDMM_SetRuntimeEnvironment_cfunc = None
         self.niDMM_UnlockSession_cfunc = None
         self.niDMM_close_cfunc = None
         self.niDMM_error_message_cfunc = None
@@ -428,6 +429,14 @@ def niDMM_SetAttributeViString(self, vi, channel_name, attribute_id, attribute_v
                 self.niDMM_SetAttributeViString_cfunc.restype = ViStatus  # noqa: F405
         return self.niDMM_SetAttributeViString_cfunc(vi, channel_name, attribute_id, attribute_value)
 
+    def niDMM_SetRuntimeEnvironment(self, environment, environment_version, reserved1, reserved2):  # noqa: N802
+        with self._func_lock:
+            if self.niDMM_SetRuntimeEnvironment_cfunc is None:
+                self.niDMM_SetRuntimeEnvironment_cfunc = self._get_library_function('niDMM_SetRuntimeEnvironment')
+                self.niDMM_SetRuntimeEnvironment_cfunc.argtypes = [ctypes.POINTER(ViChar), ctypes.POINTER(ViChar), ctypes.POINTER(ViChar), ctypes.POINTER(ViChar)]  # noqa: F405
+                self.niDMM_SetRuntimeEnvironment_cfunc.restype = ViStatus  # noqa: F405
+        return self.niDMM_SetRuntimeEnvironment_cfunc(environment, environment_version, reserved1, reserved2)
+
     def niDMM_UnlockSession(self, vi, caller_has_lock):  # noqa: N802
         with self._func_lock:
             if self.niDMM_UnlockSession_cfunc is None:

generated/nidmm/nidmm/_library_interpreter.py

@@ -4,12 +4,17 @@
 import array
 import ctypes
 import hightime  # noqa: F401
+import platform
+
 import nidmm._library_singleton as _library_singleton
 import nidmm._visatype as _visatype
 import nidmm.enums as enums  # noqa: F401
 import nidmm.errors as errors
 
 
+_was_runtime_environment_set = None
+
+
 # Helper functions for creating ctypes needed for calling into the driver DLL
 def _get_ctypes_pointer_for_buffer(value=None, library_type=None, size=None):
     if isinstance(value, array.array):
@@ -56,6 +61,21 @@ class LibraryInterpreter(object):
     def __init__(self, encoding):
         self._encoding = encoding
         self._library = _library_singleton.get()
+        global _was_runtime_environment_set
+        if _was_runtime_environment_set is None:
+            try:
+                runtime_env = platform.python_implementation()
+                version = platform.python_version()
+                self.set_runtime_environment(
+                    runtime_env,
+                    version,
+                    '',
+                    ''
+                )
+            except errors.DriverTooOldError:
+                pass
+            finally:
+                _was_runtime_environment_set = True
         # Initialize _vi to 0 for now.
         # Session will directly update it once the driver runtime init function has been called and
         # we have a valid session handle.
@@ -491,6 +511,15 @@ def set_attribute_vi_string(self, channel_name, attribute_id, attribute_value):
         errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
         return
 
+    def set_runtime_environment(self, environment, environment_version, reserved1, reserved2):  # noqa: N802
+        environment_ctype = ctypes.create_string_buffer(environment.encode(self._encoding))  # case C020
+        environment_version_ctype = ctypes.create_string_buffer(environment_version.encode(self._encoding))  # case C020
+        reserved1_ctype = ctypes.create_string_buffer(reserved1.encode(self._encoding))  # case C020
+        reserved2_ctype = ctypes.create_string_buffer(reserved2.encode(self._encoding))  # case C020
+        error_code = self._library.niDMM_SetRuntimeEnvironment(environment_ctype, environment_version_ctype, reserved1_ctype, reserved2_ctype)
+        errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False)
+        return
+
     def unlock(self):  # noqa: N802
         vi_ctype = _visatype.ViSession(self._vi)  # case S110
         error_code = self._library.niDMM_UnlockSession(vi_ctype, None)

generated/nidmm/nidmm/unit_tests/_mock_helper.py

@@ -138,6 +138,8 @@ def __init__(self):
         self._defaults['SetAttributeViReal64']['return'] = 0
         self._defaults['SetAttributeViString'] = {}
         self._defaults['SetAttributeViString']['return'] = 0
+        self._defaults['SetRuntimeEnvironment'] = {}
+        self._defaults['SetRuntimeEnvironment']['return'] = 0
         self._defaults['UnlockSession'] = {}
         self._defaults['UnlockSession']['return'] = 0
         self._defaults['UnlockSession']['callerHasLock'] = None
@@ -581,6 +583,11 @@ def niDMM_SetAttributeViString(self, vi, channel_name, attribute_id, attribute_v
             return self._defaults['SetAttributeViString']['return']
         return self._defaults['SetAttributeViString']['return']
 
+    def niDMM_SetRuntimeEnvironment(self, environment, environment_version, reserved1, reserved2):  # noqa: N802
+        if self._defaults['SetRuntimeEnvironment']['return'] != 0:
+            return self._defaults['SetRuntimeEnvironment']['return']
+        return self._defaults['SetRuntimeEnvironment']['return']
+
     def niDMM_UnlockSession(self, vi, caller_has_lock):  # noqa: N802
         if self._defaults['UnlockSession']['return'] != 0:
             return self._defaults['UnlockSession']['return']
@@ -724,6 +731,8 @@ def set_side_effects_and_return_values(self, mock_library):
         mock_library.niDMM_SetAttributeViReal64.return_value = 0
         mock_library.niDMM_SetAttributeViString.side_effect = MockFunctionCallError("niDMM_SetAttributeViString")
         mock_library.niDMM_SetAttributeViString.return_value = 0
+        mock_library.niDMM_SetRuntimeEnvironment.side_effect = MockFunctionCallError("niDMM_SetRuntimeEnvironment")
+        mock_library.niDMM_SetRuntimeEnvironment.return_value = 0
         mock_library.niDMM_UnlockSession.side_effect = MockFunctionCallError("niDMM_UnlockSession")
         mock_library.niDMM_UnlockSession.return_value = 0
         mock_library.niDMM_close.side_effect = MockFunctionCallError("niDMM_close")

src/nidmm/metadata/attributes.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# This file is generated from NI-DMM API metadata version 23.0.0f147
+# This file is generated from NI-DMM API metadata version 23.5.0d140
 attributes = {
     1050005: {
         'access': 'read-write',

src/nidmm/metadata/config.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-# This file is generated from NI-DMM API metadata version 23.0.0f147
+# This file is generated from NI-DMM API metadata version 23.5.0d140
 config = {
-    'api_version': '23.0.0f147',
+    'api_version': '23.5.0d140',
     'c_function_prefix': 'niDMM_',
     'close_function': 'close',
     'context_manager_name': {

src/nidmm/metadata/enums.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# This file is generated from NI-DMM API metadata version 23.0.0f147
+# This file is generated from NI-DMM API metadata version 23.5.0d140
 enums = {
     'ADCCalibration': {
         'values': [

src/nidmm/metadata/functions.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# This file is generated from NI-DMM API metadata version 23.0.0f147
+# This file is generated from NI-DMM API metadata version 23.5.0d140
 functions = {
     'Abort': {
         'documentation': {
@@ -2093,6 +2093,44 @@
         ],
         'returns': 'ViStatus'
     },
+    'SetRuntimeEnvironment': {
+        'codegen_method': 'private',
+        'documentation': {
+            'description': 'TBD'
+        },
+        'included_in_proto': False,
+        'method_templates': [
+            {
+                'documentation_filename': 'none',
+                'library_interpreter_filename': 'default_method',
+                'method_python_name_suffix': '',
+                'session_filename': 'none'
+            }
+        ],
+        'parameters': [
+            {
+                'direction': 'in',
+                'name': 'environment',
+                'type': 'ViConstString'
+            },
+            {
+                'direction': 'in',
+                'name': 'environmentVersion',
+                'type': 'ViConstString'
+            },
+            {
+                'direction': 'in',
+                'name': 'reserved1',
+                'type': 'ViConstString'
+            },
+            {
+                'direction': 'in',
+                'name': 'reserved2',
+                'type': 'ViConstString'
+            }
+        ],
+        'returns': 'ViStatus'
+    },
     'UnlockSession': {
         'documentation': {
             'description': '\nThis function releases a lock that you acquired on an instrument session\nusing niDMM_LockSession. Refer to niDMM_LockSession for additional\ninformation on session locks.\n'