From f93225045c52adb4497fa7bd4f6deac30a51bffa Mon Sep 17 00:00:00 2001 From: Rahul R Date: Wed, 24 Sep 2025 04:59:43 +0530 Subject: [PATCH 1/3] Manually updated grpc for aport api to validate tox --- .../nifake/nifake/_grpc_stub_interpreter.py | 11 +- generated/nifake/nifake/_library.py | 18 ++ .../nifake/nifake/_library_interpreter.py | 16 ++ generated/nifake/nifake/enums.py | 8 + generated/nifake/nifake/session.py | 31 ++++ .../nifake/nifake/unit_tests/_mock_helper.py | 42 +++++ src/nifake/metadata/attributes.py | 2 +- src/nifake/metadata/config.py | 4 +- src/nifake/metadata/enums.py | 38 +++- src/nifake/metadata/functions.py | 170 +++++++++++------- 10 files changed, 264 insertions(+), 76 deletions(-) diff --git a/generated/nifake/nifake/_grpc_stub_interpreter.py b/generated/nifake/nifake/_grpc_stub_interpreter.py index b9e7617da..bcf9df728 100644 --- a/generated/nifake/nifake/_grpc_stub_interpreter.py +++ b/generated/nifake/nifake/_grpc_stub_interpreter.py @@ -95,6 +95,9 @@ def bool_array_output_function(self, number_of_elements): # noqa: N802 ) return response.an_array + def cached_read_status(self): # noqa: N802 + raise NotImplementedError('cached_read_status is not supported over gRPC') + def configure_abc(self): # noqa: N802 self._invoke( self._client.ConfigureAbc, @@ -148,10 +151,7 @@ def function_with_3d_numpy_array_of_numpy_complex128_input_parameter(self, multi raise NotImplementedError('numpy-specific methods are not supported over gRPC') def function_with_intflag_parameter(self, flag): # noqa: N802 - self._invoke( - self._client.FunctionWithIntflagParameter, - grpc_types.FunctionWithIntflagParameterRequest(vi=self._vi, flag=flag.value), - ) + raise NotImplementedError('function_with_intflag_parameter is not supported over gRPC') def function_with_repeated_capability_type(self, site_list): # noqa: N802 raise NotImplementedError('function_with_repeated_capability_type is not supported over gRPC') @@ -394,6 +394,9 @@ def read_from_channel(self, channel_name, maximum_time): # noqa: N802 ) return response.reading + def read_status(self): # noqa: N802 + raise NotImplementedError('read_status is not supported over gRPC') + def return_a_number_and_a_string(self): # noqa: N802 response = self._invoke( self._client.ReturnANumberAndAString, diff --git a/generated/nifake/nifake/_library.py b/generated/nifake/nifake/_library.py index 95a91e2f7..f8b0f0241 100644 --- a/generated/nifake/nifake/_library.py +++ b/generated/nifake/nifake/_library.py @@ -29,6 +29,7 @@ def __init__(self, ctypes_library): self.niFake_Abort_cfunc = None self.niFake_AcceptListOfDurationsInSeconds_cfunc = None self.niFake_BoolArrayOutputFunction_cfunc = None + self.niFake_CachedReadStatus_cfunc = None self.niFake_ConfigureABC_cfunc = None self.niFake_CustomNestedStructRoundtrip_cfunc = None self.niFake_DoubleAllTheNums_cfunc = None @@ -78,6 +79,7 @@ def __init__(self, ctypes_library): self.niFake_PoorlyNamedSimpleFunction_cfunc = None self.niFake_Read_cfunc = None self.niFake_ReadFromChannel_cfunc = None + self.niFake_ReadStatus_cfunc = None self.niFake_ReturnANumberAndAString_cfunc = None self.niFake_ReturnDurationInSeconds_cfunc = None self.niFake_ReturnListOfDurationsInSeconds_cfunc = None @@ -133,6 +135,14 @@ def niFake_BoolArrayOutputFunction(self, vi, number_of_elements, an_array): # n self.niFake_BoolArrayOutputFunction_cfunc.restype = ViStatus # noqa: F405 return self.niFake_BoolArrayOutputFunction_cfunc(vi, number_of_elements, an_array) + def niFake_CachedReadStatus(self, vi, acq_backlog, acq_status): # noqa: N802 + with self._func_lock: + if self.niFake_CachedReadStatus_cfunc is None: + self.niFake_CachedReadStatus_cfunc = self._get_library_function('niFake_CachedReadStatus') + self.niFake_CachedReadStatus_cfunc.argtypes = [ViSession, ctypes.POINTER(ViInt32), ctypes.POINTER(ViInt16)] # noqa: F405 + self.niFake_CachedReadStatus_cfunc.restype = ViStatus # noqa: F405 + return self.niFake_CachedReadStatus_cfunc(vi, acq_backlog, acq_status) + def niFake_ConfigureABC(self, vi): # noqa: N802 with self._func_lock: if self.niFake_ConfigureABC_cfunc is None: @@ -525,6 +535,14 @@ def niFake_ReadFromChannel(self, vi, channel_name, maximum_time, reading): # no self.niFake_ReadFromChannel_cfunc.restype = ViStatus # noqa: F405 return self.niFake_ReadFromChannel_cfunc(vi, channel_name, maximum_time, reading) + def niFake_ReadStatus(self, vi, acquisition_backlog, acquisition_status): # noqa: N802 + with self._func_lock: + if self.niFake_ReadStatus_cfunc is None: + self.niFake_ReadStatus_cfunc = self._get_library_function('niFake_ReadStatus') + self.niFake_ReadStatus_cfunc.argtypes = [ViSession, ctypes.POINTER(ViInt32), ctypes.POINTER(ViInt16)] # noqa: F405 + self.niFake_ReadStatus_cfunc.restype = ViStatus # noqa: F405 + return self.niFake_ReadStatus_cfunc(vi, acquisition_backlog, acquisition_status) + def niFake_ReturnANumberAndAString(self, vi, a_number, a_string): # noqa: N802 with self._func_lock: if self.niFake_ReturnANumberAndAString_cfunc is None: diff --git a/generated/nifake/nifake/_library_interpreter.py b/generated/nifake/nifake/_library_interpreter.py index da7e3881a..2d968b35a 100644 --- a/generated/nifake/nifake/_library_interpreter.py +++ b/generated/nifake/nifake/_library_interpreter.py @@ -150,6 +150,14 @@ def bool_array_output_function(self, number_of_elements): # noqa: N802 errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) return [bool(an_array_ctype[i]) for i in range(number_of_elements_ctype.value)] + def cached_read_status(self): # noqa: N802 + vi_ctype = _visatype.ViSession(self._vi) # case S110 + acq_backlog_ctype = _visatype.ViInt32() # case S220 + acq_status_ctype = _visatype.ViInt16() # case S220 + error_code = self._library.niFake_CachedReadStatus(vi_ctype, None if acq_backlog_ctype is None else (ctypes.pointer(acq_backlog_ctype)), None if acq_status_ctype is None else (ctypes.pointer(acq_status_ctype))) + errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) + return int(acq_backlog_ctype.value), enums.AcquisitionStatus(acq_status_ctype.value) + def configure_abc(self): # noqa: N802 vi_ctype = _visatype.ViSession(self._vi) # case S110 error_code = self._library.niFake_ConfigureABC(vi_ctype) @@ -596,6 +604,14 @@ def read_from_channel(self, channel_name, maximum_time): # noqa: N802 errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) return float(reading_ctype.value) + def read_status(self): # noqa: N802 + vi_ctype = _visatype.ViSession(self._vi) # case S110 + acquisition_backlog_ctype = _visatype.ViInt32() # case S220 + acquisition_status_ctype = _visatype.ViInt16() # case S220 + error_code = self._library.niFake_ReadStatus(vi_ctype, None if acquisition_backlog_ctype is None else (ctypes.pointer(acquisition_backlog_ctype)), None if acquisition_status_ctype is None else (ctypes.pointer(acquisition_status_ctype))) + errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) + return int(acquisition_backlog_ctype.value), enums.AcquisitionStatus(acquisition_status_ctype.value) + def return_a_number_and_a_string(self): # noqa: N802 vi_ctype = _visatype.ViSession(self._vi) # case S110 a_number_ctype = _visatype.ViInt16() # case S220 diff --git a/generated/nifake/nifake/enums.py b/generated/nifake/nifake/enums.py index cd042c61c..8248124e7 100644 --- a/generated/nifake/nifake/enums.py +++ b/generated/nifake/nifake/enums.py @@ -5,6 +5,14 @@ from enum import IntFlag +class AcquisitionStatus(Enum): + RUNNING = 'NIFAKE_VAL_ACQUISITION_STATUS_RUNNING' + FINISHED_WITH_BACKLOG = 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_BACKLOG' + FINISHED_WITH_NO_BACKLOG = 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_NO_BACKLOG' + PAUSED = 'NIFAKE_VAL_ACQUISITION_STATUS_PAUSED' + NO_ACQUISITION_IN_PROGRESS = 'NIFAKE_VAL_ACQUISITION_STATUS_NO_ACQUISITION_IN_PROGRESS' + + class Color(Enum): RED = 1 r''' diff --git a/generated/nifake/nifake/session.py b/generated/nifake/nifake/session.py index d082ac3c9..3440aed88 100644 --- a/generated/nifake/nifake/session.py +++ b/generated/nifake/nifake/session.py @@ -816,6 +816,21 @@ def bool_array_output_function(self, number_of_elements): an_array = self._interpreter.bool_array_output_function(number_of_elements) return an_array + @ivi_synchronized + def cached_read_status(self): + r'''cached_read_status + + TBD + + Returns: + acq_backlog (int): + + acq_status (enums.AcquisitionStatus): + + ''' + acq_backlog, acq_status = self._interpreter.cached_read_status() + return acq_backlog, acq_status + @ivi_synchronized def configure_abc(self): r'''configure_abc @@ -945,6 +960,7 @@ def fetch_waveform_into(self, waveform_data): raise TypeError('waveform_data must be numpy.ndarray of dtype=float64, is ' + str(waveform_data.dtype)) self._interpreter.fetch_waveform_into(waveform_data) + @ivi_synchronized def function_with_3d_numpy_array_of_numpy_complex128_input_parameter(self, multidimensional_array): r'''function_with_3d_numpy_array_of_numpy_complex128_input_parameter @@ -1504,6 +1520,21 @@ def read(self, maximum_time): reading = self._interpreter.read(maximum_time) return reading + @ivi_synchronized + def read_status(self): + r'''read_status + + TBD + + Returns: + acquisition_backlog (int): + + acquisition_status (enums.AcquisitionStatus): + + ''' + acquisition_backlog, acquisition_status = self._interpreter.read_status() + return acquisition_backlog, acquisition_status + @ivi_synchronized def return_a_number_and_a_string(self): r'''return_a_number_and_a_string diff --git a/generated/nifake/nifake/unit_tests/_mock_helper.py b/generated/nifake/nifake/unit_tests/_mock_helper.py index 8c76539e0..ffa0207c0 100644 --- a/generated/nifake/nifake/unit_tests/_mock_helper.py +++ b/generated/nifake/nifake/unit_tests/_mock_helper.py @@ -23,6 +23,10 @@ def __init__(self): self._defaults['BoolArrayOutputFunction'] = {} self._defaults['BoolArrayOutputFunction']['return'] = 0 self._defaults['BoolArrayOutputFunction']['anArray'] = None + self._defaults['CachedReadStatus'] = {} + self._defaults['CachedReadStatus']['return'] = 0 + self._defaults['CachedReadStatus']['acqBacklog'] = None + self._defaults['CachedReadStatus']['acqStatus'] = None self._defaults['ConfigureABC'] = {} self._defaults['ConfigureABC']['return'] = 0 self._defaults['CustomNestedStructRoundtrip'] = {} @@ -166,6 +170,10 @@ def __init__(self): self._defaults['ReadFromChannel'] = {} self._defaults['ReadFromChannel']['return'] = 0 self._defaults['ReadFromChannel']['reading'] = None + self._defaults['ReadStatus'] = {} + self._defaults['ReadStatus']['return'] = 0 + self._defaults['ReadStatus']['acquisitionBacklog'] = None + self._defaults['ReadStatus']['acquisitionStatus'] = None self._defaults['ReturnANumberAndAString'] = {} self._defaults['ReturnANumberAndAString']['return'] = 0 self._defaults['ReturnANumberAndAString']['aNumber'] = None @@ -262,6 +270,21 @@ def niFake_BoolArrayOutputFunction(self, vi, number_of_elements, an_array): # n an_array_ref[i] = test_value[i] return self._defaults['BoolArrayOutputFunction']['return'] + def niFake_CachedReadStatus(self, vi, acq_backlog, acq_status): # noqa: N802 + if self._defaults['CachedReadStatus']['return'] != 0: + return self._defaults['CachedReadStatus']['return'] + # acq_backlog + if self._defaults['CachedReadStatus']['acqBacklog'] is None: + raise MockFunctionCallError("niFake_CachedReadStatus", param='acqBacklog') + if acq_backlog is not None: + acq_backlog.contents.value = self._defaults['CachedReadStatus']['acqBacklog'] + # acq_status + if self._defaults['CachedReadStatus']['acqStatus'] is None: + raise MockFunctionCallError("niFake_CachedReadStatus", param='acqStatus') + if acq_status is not None: + acq_status.contents.value = self._defaults['CachedReadStatus']['acqStatus'] + return self._defaults['CachedReadStatus']['return'] + def niFake_ConfigureABC(self, vi): # noqa: N802 if self._defaults['ConfigureABC']['return'] != 0: return self._defaults['ConfigureABC']['return'] @@ -803,6 +826,21 @@ def niFake_ReadFromChannel(self, vi, channel_name, maximum_time, reading): # no reading.contents.value = self._defaults['ReadFromChannel']['reading'] return self._defaults['ReadFromChannel']['return'] + def niFake_ReadStatus(self, vi, acquisition_backlog, acquisition_status): # noqa: N802 + if self._defaults['ReadStatus']['return'] != 0: + return self._defaults['ReadStatus']['return'] + # acquisition_backlog + if self._defaults['ReadStatus']['acquisitionBacklog'] is None: + raise MockFunctionCallError("niFake_ReadStatus", param='acquisitionBacklog') + if acquisition_backlog is not None: + acquisition_backlog.contents.value = self._defaults['ReadStatus']['acquisitionBacklog'] + # acquisition_status + if self._defaults['ReadStatus']['acquisitionStatus'] is None: + raise MockFunctionCallError("niFake_ReadStatus", param='acquisitionStatus') + if acquisition_status is not None: + acquisition_status.contents.value = self._defaults['ReadStatus']['acquisitionStatus'] + return self._defaults['ReadStatus']['return'] + def niFake_ReturnANumberAndAString(self, vi, a_number, a_string): # noqa: N802 if self._defaults['ReturnANumberAndAString']['return'] != 0: return self._defaults['ReturnANumberAndAString']['return'] @@ -1036,6 +1074,8 @@ def set_side_effects_and_return_values(self, mock_library): mock_library.niFake_AcceptListOfDurationsInSeconds.return_value = 0 mock_library.niFake_BoolArrayOutputFunction.side_effect = MockFunctionCallError("niFake_BoolArrayOutputFunction") mock_library.niFake_BoolArrayOutputFunction.return_value = 0 + mock_library.niFake_CachedReadStatus.side_effect = MockFunctionCallError("niFake_CachedReadStatus") + mock_library.niFake_CachedReadStatus.return_value = 0 mock_library.niFake_ConfigureABC.side_effect = MockFunctionCallError("niFake_ConfigureABC") mock_library.niFake_ConfigureABC.return_value = 0 mock_library.niFake_CustomNestedStructRoundtrip.side_effect = MockFunctionCallError("niFake_CustomNestedStructRoundtrip") @@ -1134,6 +1174,8 @@ def set_side_effects_and_return_values(self, mock_library): mock_library.niFake_Read.return_value = 0 mock_library.niFake_ReadFromChannel.side_effect = MockFunctionCallError("niFake_ReadFromChannel") mock_library.niFake_ReadFromChannel.return_value = 0 + mock_library.niFake_ReadStatus.side_effect = MockFunctionCallError("niFake_ReadStatus") + mock_library.niFake_ReadStatus.return_value = 0 mock_library.niFake_ReturnANumberAndAString.side_effect = MockFunctionCallError("niFake_ReturnANumberAndAString") mock_library.niFake_ReturnANumberAndAString.return_value = 0 mock_library.niFake_ReturnDurationInSeconds.side_effect = MockFunctionCallError("niFake_ReturnDurationInSeconds") diff --git a/src/nifake/metadata/attributes.py b/src/nifake/metadata/attributes.py index 00aebfe5f..7cc8e22b9 100644 --- a/src/nifake/metadata/attributes.py +++ b/src/nifake/metadata/attributes.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d9999 +# This file is generated from NI-FAKE API metadata version 25.8.0d100 attributes = { 1000000: { 'access': 'read-write', diff --git a/src/nifake/metadata/config.py b/src/nifake/metadata/config.py index ea0920715..89a7dcceb 100644 --- a/src/nifake/metadata/config.py +++ b/src/nifake/metadata/config.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d9999 +# This file is generated from NI-FAKE API metadata version 25.8.0d100 config = { - 'api_version': '25.8.0d9999', + 'api_version': '25.8.0d100', 'c_function_prefix': 'niFake_', 'close_function': 'close', 'context_manager_name': { diff --git a/src/nifake/metadata/enums.py b/src/nifake/metadata/enums.py index af3f2b62b..496927618 100644 --- a/src/nifake/metadata/enums.py +++ b/src/nifake/metadata/enums.py @@ -1,6 +1,30 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d9999 +# This file is generated from NI-FAKE API metadata version 25.8.0d100 enums = { + 'AcquisitionStatus': { + 'values': [ + { + 'name': 'NIFAKE_VAL_RUNNING', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_RUNNING' + }, + { + 'name': 'NIFAKE_VAL_FINISHED_WITH_BACKLOG', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_BACKLOG' + }, + { + 'name': 'NIFAKE_VAL_FINISHED_WITH_NO_BACKLOG', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_NO_BACKLOG' + }, + { + 'name': 'NIFAKE_VAL_PAUSED', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_PAUSED' + }, + { + 'name': 'NIFAKE_VAL_NO_ACQUISITION_IN_PROGRESS', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_NO_ACQUISITION_IN_PROGRESS' + } + ] + }, 'AltColor': { 'values': [ { @@ -200,6 +224,18 @@ } ] }, + 'ExtCalParts': { + 'values': [ + { + 'name': 'NIFAKE_EXTCAL_PART1', + 'value': 1 + }, + { + 'name': 'NIFAKE_EXTCAL_PART2', + 'value': 2 + } + ] + }, 'FloatEnum': { 'values': [ { diff --git a/src/nifake/metadata/functions.py b/src/nifake/metadata/functions.py index b50c9265a..226b996b6 100644 --- a/src/nifake/metadata/functions.py +++ b/src/nifake/metadata/functions.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d9999 +# This file is generated from NI-FAKE API metadata version 25.8.0d100 functions = { 'Abort': { 'codegen_method': 'public', 'documentation': { 'description': 'Aborts a previously initiated thingie.' }, - 'included_in_proto': True, + 'included_in_proto': False, 'parameters': [ { 'direction': 'in', @@ -97,6 +97,31 @@ ], 'returns': 'ViStatus' }, + 'CachedReadStatus': { + 'documentation': { + 'description': 'TBD' + }, + 'included_in_proto': False, + 'parameters': [ + { + 'direction': 'in', + 'name': 'vi', + 'type': 'ViSession' + }, + { + 'direction': 'out', + 'name': 'acqBacklog', + 'type': 'ViInt32' + }, + { + 'direction': 'out', + 'enum': 'AcquisitionStatus', + 'name': 'acqStatus', + 'type': 'ViInt16' + } + ], + 'returns': 'ViStatus' + }, 'ConfigureABC': { 'documentation': { 'description': 'TBD' @@ -348,12 +373,52 @@ ], 'returns': 'ViStatus' }, + 'FunctionWith3dNumpyArrayOfNumpyComplex128InputParameter': { + 'codegen_method': 'public', + 'documentation': { + 'description': 'Function that takes a 3D numpy array of numpy complex128 as an input parameter.' + }, + 'grpc_name': 'FunctionWith3DNumpyArrayOfNumpyComplex128InputParameter', + 'included_in_proto': False, + 'method_templates': [ + { + 'documentation_filename': 'numpy_method', + 'library_interpreter_filename': 'numpy_write_method', + 'method_python_name_suffix': '', + 'session_filename': 'numpy_write_method' + } + ], + 'parameters': [ + { + 'direction': 'in', + 'documentation': { + 'description': 'Identifies a particular instrument session.' + }, + 'name': 'vi', + 'type': 'ViSession' + }, + { + 'array_dimensions': 3, + 'complex_array_representation': 'complex_number_array', + 'direction': 'in', + 'documentation': { + 'description': 'Specifies the 3D array of numpy complex numbers to write.' + }, + 'name': 'multidimensionalArray', + 'numpy': True, + 'type': 'NIComplexNumber[]', + 'use_in_python_api': True + } + ], + 'python_name': 'function_with_3d_numpy_array_of_numpy_complex128_input_parameter', + 'returns': 'ViStatus' + }, 'FunctionWithIntflagParameter': { 'codegen_method': 'public', 'documentation': { 'description': "Calls a function that takes a flag parameter which can be OR'd from multiple enum values." }, - 'included_in_proto': True, + 'included_in_proto': False, 'parameters': [ { 'direction': 'in', @@ -369,7 +434,6 @@ 'description': 'A flag parameter that can be a combination (bitwise OR) of IntFlagEnum values.' }, 'enum': 'IntFlagEnum', - 'grpc_enum': None, 'name': 'flag', 'type': 'ViUInt64' } @@ -2073,6 +2137,31 @@ ], 'returns': 'ViStatus' }, + 'ReadStatus': { + 'documentation': { + 'description': 'TBD' + }, + 'included_in_proto': False, + 'parameters': [ + { + 'direction': 'in', + 'name': 'vi', + 'type': 'ViSession' + }, + { + 'direction': 'out', + 'name': 'acquisitionBacklog', + 'type': 'ViInt32' + }, + { + 'direction': 'out', + 'enum': 'AcquisitionStatus', + 'name': 'acquisitionStatus', + 'type': 'ViInt16' + } + ], + 'returns': 'ViStatus' + }, 'ReturnANumberAndAString': { 'codegen_method': 'public', 'documentation': { @@ -2825,10 +2914,10 @@ ], 'returns': 'ViStatus' }, - 'WriteWaveformNumpyComplex64': { + 'WriteWaveformNumpyComplex128': { 'codegen_method': 'public', 'documentation': { - 'description': 'A function that writes a waveform of numpy complex64 samples.' + 'description': 'A function that writes a waveform of numpy complex128 samples.' }, 'included_in_proto': False, 'method_templates': [ @@ -2846,9 +2935,7 @@ 'description': 'Identifies a particular instrument session.' }, 'name': 'vi', - 'type': 'ViSession', - 'use_array': False, - 'use_in_python_api': True + 'type': 'ViSession' }, { 'direction': 'in', @@ -2857,7 +2944,6 @@ }, 'name': 'numberOfSamples', 'type': 'ViInt32', - 'use_array': False, 'use_in_python_api': False }, { @@ -2872,19 +2958,18 @@ 'mechanism': 'len', 'value': 'numberOfSamples' }, - 'type': 'NIComplexNumberF32[]', + 'type': 'NIComplexNumber[]', 'use_in_python_api': True } ], 'returns': 'ViStatus' }, - 'WriteWaveformNumpyComplex128': { + 'WriteWaveformNumpyComplex64': { 'codegen_method': 'public', 'documentation': { - 'description': 'A function that writes a waveform of numpy complex128 samples.' + 'description': 'A function that writes a waveform of numpy complex64 samples.' }, 'included_in_proto': False, - 'is_error_handling': False, 'method_templates': [ { 'documentation_filename': 'numpy_method', @@ -2900,9 +2985,7 @@ 'description': 'Identifies a particular instrument session.' }, 'name': 'vi', - 'type': 'ViSession', - 'use_array': False, - 'use_in_python_api': True + 'type': 'ViSession' }, { 'direction': 'in', @@ -2911,7 +2994,6 @@ }, 'name': 'numberOfSamples', 'type': 'ViInt32', - 'use_array': False, 'use_in_python_api': False }, { @@ -2926,7 +3008,7 @@ 'mechanism': 'len', 'value': 'numberOfSamples' }, - 'type': 'NIComplexNumber[]', + 'type': 'NIComplexNumberF32[]', 'use_in_python_api': True } ], @@ -2938,7 +3020,6 @@ 'description': 'A function that writes a waveform of numpy complex i16 samples.' }, 'included_in_proto': False, - 'is_error_handling': False, 'method_templates': [ { 'documentation_filename': 'numpy_method', @@ -2954,9 +3035,7 @@ 'description': 'Identifies a particular instrument session.' }, 'name': 'vi', - 'type': 'ViSession', - 'use_array': False, - 'use_in_python_api': True + 'type': 'ViSession' }, { 'direction': 'in', @@ -2965,7 +3044,6 @@ }, 'name': 'numberOfSamples', 'type': 'ViInt32', - 'use_array': False, 'use_in_python_api': False }, { @@ -2986,50 +3064,6 @@ ], 'returns': 'ViStatus' }, - 'FunctionWith3dNumpyArrayOfNumpyComplex128InputParameter': { - 'codegen_method': 'public', - 'documentation': { - 'description': 'Function that takes a 3D numpy array of numpy complex128 as an input parameter.' - }, - 'included_in_proto': False, - 'is_error_handling': False, - 'method_templates': [ - { - 'documentation_filename': 'numpy_method', - 'library_interpreter_filename': 'numpy_write_method', - 'method_python_name_suffix': '', - 'session_filename': 'numpy_write_method' - } - ], - 'parameters': [ - { - 'direction': 'in', - 'name': 'vi', - 'documentation': { - 'description': 'Identifies a particular instrument session.' - }, - 'type': 'ViSession', - 'use_array': False, - 'use_in_python_api': True - }, - { - - 'complex_array_representation': 'complex_number_array', - 'direction': 'in', - 'documentation': { - 'description': 'Specifies the 3D array of numpy complex numbers to write.' - }, - 'name': 'multidimensionalArray', - 'type': 'NIComplexNumber[]', - 'numpy': True, - 'use_in_python_api': True, - 'array_dimensions': 3 - }, - ], - 'python_name': 'function_with_3d_numpy_array_of_numpy_complex128_input_parameter', - 'returns': 'ViStatus', - 'use_session_lock': False - }, 'close': { 'codegen_method': 'private', 'documentation': { From d8253498347b9afb0f5947c5c891d26c5c71b2c3 Mon Sep 17 00:00:00 2001 From: Rahul R Date: Wed, 24 Sep 2025 08:59:23 +0530 Subject: [PATCH 2/3] Matching the AzDo for rfsg related apis. --- .../nifake/nifake/_grpc_stub_interpreter.py | 6 --- generated/nifake/nifake/_library.py | 18 ------- .../nifake/nifake/_library_interpreter.py | 16 ------ generated/nifake/nifake/enums.py | 8 --- generated/nifake/nifake/session.py | 30 ----------- .../nifake/nifake/unit_tests/_mock_helper.py | 42 --------------- src/nifake/metadata/attributes.py | 2 +- src/nifake/metadata/config.py | 4 +- src/nifake/metadata/enums.py | 38 +------------ src/nifake/metadata/functions.py | 54 +------------------ 10 files changed, 6 insertions(+), 212 deletions(-) diff --git a/generated/nifake/nifake/_grpc_stub_interpreter.py b/generated/nifake/nifake/_grpc_stub_interpreter.py index bcf9df728..ec0a51cc6 100644 --- a/generated/nifake/nifake/_grpc_stub_interpreter.py +++ b/generated/nifake/nifake/_grpc_stub_interpreter.py @@ -95,9 +95,6 @@ def bool_array_output_function(self, number_of_elements): # noqa: N802 ) return response.an_array - def cached_read_status(self): # noqa: N802 - raise NotImplementedError('cached_read_status is not supported over gRPC') - def configure_abc(self): # noqa: N802 self._invoke( self._client.ConfigureAbc, @@ -394,9 +391,6 @@ def read_from_channel(self, channel_name, maximum_time): # noqa: N802 ) return response.reading - def read_status(self): # noqa: N802 - raise NotImplementedError('read_status is not supported over gRPC') - def return_a_number_and_a_string(self): # noqa: N802 response = self._invoke( self._client.ReturnANumberAndAString, diff --git a/generated/nifake/nifake/_library.py b/generated/nifake/nifake/_library.py index f8b0f0241..95a91e2f7 100644 --- a/generated/nifake/nifake/_library.py +++ b/generated/nifake/nifake/_library.py @@ -29,7 +29,6 @@ def __init__(self, ctypes_library): self.niFake_Abort_cfunc = None self.niFake_AcceptListOfDurationsInSeconds_cfunc = None self.niFake_BoolArrayOutputFunction_cfunc = None - self.niFake_CachedReadStatus_cfunc = None self.niFake_ConfigureABC_cfunc = None self.niFake_CustomNestedStructRoundtrip_cfunc = None self.niFake_DoubleAllTheNums_cfunc = None @@ -79,7 +78,6 @@ def __init__(self, ctypes_library): self.niFake_PoorlyNamedSimpleFunction_cfunc = None self.niFake_Read_cfunc = None self.niFake_ReadFromChannel_cfunc = None - self.niFake_ReadStatus_cfunc = None self.niFake_ReturnANumberAndAString_cfunc = None self.niFake_ReturnDurationInSeconds_cfunc = None self.niFake_ReturnListOfDurationsInSeconds_cfunc = None @@ -135,14 +133,6 @@ def niFake_BoolArrayOutputFunction(self, vi, number_of_elements, an_array): # n self.niFake_BoolArrayOutputFunction_cfunc.restype = ViStatus # noqa: F405 return self.niFake_BoolArrayOutputFunction_cfunc(vi, number_of_elements, an_array) - def niFake_CachedReadStatus(self, vi, acq_backlog, acq_status): # noqa: N802 - with self._func_lock: - if self.niFake_CachedReadStatus_cfunc is None: - self.niFake_CachedReadStatus_cfunc = self._get_library_function('niFake_CachedReadStatus') - self.niFake_CachedReadStatus_cfunc.argtypes = [ViSession, ctypes.POINTER(ViInt32), ctypes.POINTER(ViInt16)] # noqa: F405 - self.niFake_CachedReadStatus_cfunc.restype = ViStatus # noqa: F405 - return self.niFake_CachedReadStatus_cfunc(vi, acq_backlog, acq_status) - def niFake_ConfigureABC(self, vi): # noqa: N802 with self._func_lock: if self.niFake_ConfigureABC_cfunc is None: @@ -535,14 +525,6 @@ def niFake_ReadFromChannel(self, vi, channel_name, maximum_time, reading): # no self.niFake_ReadFromChannel_cfunc.restype = ViStatus # noqa: F405 return self.niFake_ReadFromChannel_cfunc(vi, channel_name, maximum_time, reading) - def niFake_ReadStatus(self, vi, acquisition_backlog, acquisition_status): # noqa: N802 - with self._func_lock: - if self.niFake_ReadStatus_cfunc is None: - self.niFake_ReadStatus_cfunc = self._get_library_function('niFake_ReadStatus') - self.niFake_ReadStatus_cfunc.argtypes = [ViSession, ctypes.POINTER(ViInt32), ctypes.POINTER(ViInt16)] # noqa: F405 - self.niFake_ReadStatus_cfunc.restype = ViStatus # noqa: F405 - return self.niFake_ReadStatus_cfunc(vi, acquisition_backlog, acquisition_status) - def niFake_ReturnANumberAndAString(self, vi, a_number, a_string): # noqa: N802 with self._func_lock: if self.niFake_ReturnANumberAndAString_cfunc is None: diff --git a/generated/nifake/nifake/_library_interpreter.py b/generated/nifake/nifake/_library_interpreter.py index 2d968b35a..da7e3881a 100644 --- a/generated/nifake/nifake/_library_interpreter.py +++ b/generated/nifake/nifake/_library_interpreter.py @@ -150,14 +150,6 @@ def bool_array_output_function(self, number_of_elements): # noqa: N802 errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) return [bool(an_array_ctype[i]) for i in range(number_of_elements_ctype.value)] - def cached_read_status(self): # noqa: N802 - vi_ctype = _visatype.ViSession(self._vi) # case S110 - acq_backlog_ctype = _visatype.ViInt32() # case S220 - acq_status_ctype = _visatype.ViInt16() # case S220 - error_code = self._library.niFake_CachedReadStatus(vi_ctype, None if acq_backlog_ctype is None else (ctypes.pointer(acq_backlog_ctype)), None if acq_status_ctype is None else (ctypes.pointer(acq_status_ctype))) - errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) - return int(acq_backlog_ctype.value), enums.AcquisitionStatus(acq_status_ctype.value) - def configure_abc(self): # noqa: N802 vi_ctype = _visatype.ViSession(self._vi) # case S110 error_code = self._library.niFake_ConfigureABC(vi_ctype) @@ -604,14 +596,6 @@ def read_from_channel(self, channel_name, maximum_time): # noqa: N802 errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) return float(reading_ctype.value) - def read_status(self): # noqa: N802 - vi_ctype = _visatype.ViSession(self._vi) # case S110 - acquisition_backlog_ctype = _visatype.ViInt32() # case S220 - acquisition_status_ctype = _visatype.ViInt16() # case S220 - error_code = self._library.niFake_ReadStatus(vi_ctype, None if acquisition_backlog_ctype is None else (ctypes.pointer(acquisition_backlog_ctype)), None if acquisition_status_ctype is None else (ctypes.pointer(acquisition_status_ctype))) - errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) - return int(acquisition_backlog_ctype.value), enums.AcquisitionStatus(acquisition_status_ctype.value) - def return_a_number_and_a_string(self): # noqa: N802 vi_ctype = _visatype.ViSession(self._vi) # case S110 a_number_ctype = _visatype.ViInt16() # case S220 diff --git a/generated/nifake/nifake/enums.py b/generated/nifake/nifake/enums.py index 8248124e7..cd042c61c 100644 --- a/generated/nifake/nifake/enums.py +++ b/generated/nifake/nifake/enums.py @@ -5,14 +5,6 @@ from enum import IntFlag -class AcquisitionStatus(Enum): - RUNNING = 'NIFAKE_VAL_ACQUISITION_STATUS_RUNNING' - FINISHED_WITH_BACKLOG = 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_BACKLOG' - FINISHED_WITH_NO_BACKLOG = 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_NO_BACKLOG' - PAUSED = 'NIFAKE_VAL_ACQUISITION_STATUS_PAUSED' - NO_ACQUISITION_IN_PROGRESS = 'NIFAKE_VAL_ACQUISITION_STATUS_NO_ACQUISITION_IN_PROGRESS' - - class Color(Enum): RED = 1 r''' diff --git a/generated/nifake/nifake/session.py b/generated/nifake/nifake/session.py index 3440aed88..50ef8c809 100644 --- a/generated/nifake/nifake/session.py +++ b/generated/nifake/nifake/session.py @@ -816,21 +816,6 @@ def bool_array_output_function(self, number_of_elements): an_array = self._interpreter.bool_array_output_function(number_of_elements) return an_array - @ivi_synchronized - def cached_read_status(self): - r'''cached_read_status - - TBD - - Returns: - acq_backlog (int): - - acq_status (enums.AcquisitionStatus): - - ''' - acq_backlog, acq_status = self._interpreter.cached_read_status() - return acq_backlog, acq_status - @ivi_synchronized def configure_abc(self): r'''configure_abc @@ -1520,21 +1505,6 @@ def read(self, maximum_time): reading = self._interpreter.read(maximum_time) return reading - @ivi_synchronized - def read_status(self): - r'''read_status - - TBD - - Returns: - acquisition_backlog (int): - - acquisition_status (enums.AcquisitionStatus): - - ''' - acquisition_backlog, acquisition_status = self._interpreter.read_status() - return acquisition_backlog, acquisition_status - @ivi_synchronized def return_a_number_and_a_string(self): r'''return_a_number_and_a_string diff --git a/generated/nifake/nifake/unit_tests/_mock_helper.py b/generated/nifake/nifake/unit_tests/_mock_helper.py index ffa0207c0..8c76539e0 100644 --- a/generated/nifake/nifake/unit_tests/_mock_helper.py +++ b/generated/nifake/nifake/unit_tests/_mock_helper.py @@ -23,10 +23,6 @@ def __init__(self): self._defaults['BoolArrayOutputFunction'] = {} self._defaults['BoolArrayOutputFunction']['return'] = 0 self._defaults['BoolArrayOutputFunction']['anArray'] = None - self._defaults['CachedReadStatus'] = {} - self._defaults['CachedReadStatus']['return'] = 0 - self._defaults['CachedReadStatus']['acqBacklog'] = None - self._defaults['CachedReadStatus']['acqStatus'] = None self._defaults['ConfigureABC'] = {} self._defaults['ConfigureABC']['return'] = 0 self._defaults['CustomNestedStructRoundtrip'] = {} @@ -170,10 +166,6 @@ def __init__(self): self._defaults['ReadFromChannel'] = {} self._defaults['ReadFromChannel']['return'] = 0 self._defaults['ReadFromChannel']['reading'] = None - self._defaults['ReadStatus'] = {} - self._defaults['ReadStatus']['return'] = 0 - self._defaults['ReadStatus']['acquisitionBacklog'] = None - self._defaults['ReadStatus']['acquisitionStatus'] = None self._defaults['ReturnANumberAndAString'] = {} self._defaults['ReturnANumberAndAString']['return'] = 0 self._defaults['ReturnANumberAndAString']['aNumber'] = None @@ -270,21 +262,6 @@ def niFake_BoolArrayOutputFunction(self, vi, number_of_elements, an_array): # n an_array_ref[i] = test_value[i] return self._defaults['BoolArrayOutputFunction']['return'] - def niFake_CachedReadStatus(self, vi, acq_backlog, acq_status): # noqa: N802 - if self._defaults['CachedReadStatus']['return'] != 0: - return self._defaults['CachedReadStatus']['return'] - # acq_backlog - if self._defaults['CachedReadStatus']['acqBacklog'] is None: - raise MockFunctionCallError("niFake_CachedReadStatus", param='acqBacklog') - if acq_backlog is not None: - acq_backlog.contents.value = self._defaults['CachedReadStatus']['acqBacklog'] - # acq_status - if self._defaults['CachedReadStatus']['acqStatus'] is None: - raise MockFunctionCallError("niFake_CachedReadStatus", param='acqStatus') - if acq_status is not None: - acq_status.contents.value = self._defaults['CachedReadStatus']['acqStatus'] - return self._defaults['CachedReadStatus']['return'] - def niFake_ConfigureABC(self, vi): # noqa: N802 if self._defaults['ConfigureABC']['return'] != 0: return self._defaults['ConfigureABC']['return'] @@ -826,21 +803,6 @@ def niFake_ReadFromChannel(self, vi, channel_name, maximum_time, reading): # no reading.contents.value = self._defaults['ReadFromChannel']['reading'] return self._defaults['ReadFromChannel']['return'] - def niFake_ReadStatus(self, vi, acquisition_backlog, acquisition_status): # noqa: N802 - if self._defaults['ReadStatus']['return'] != 0: - return self._defaults['ReadStatus']['return'] - # acquisition_backlog - if self._defaults['ReadStatus']['acquisitionBacklog'] is None: - raise MockFunctionCallError("niFake_ReadStatus", param='acquisitionBacklog') - if acquisition_backlog is not None: - acquisition_backlog.contents.value = self._defaults['ReadStatus']['acquisitionBacklog'] - # acquisition_status - if self._defaults['ReadStatus']['acquisitionStatus'] is None: - raise MockFunctionCallError("niFake_ReadStatus", param='acquisitionStatus') - if acquisition_status is not None: - acquisition_status.contents.value = self._defaults['ReadStatus']['acquisitionStatus'] - return self._defaults['ReadStatus']['return'] - def niFake_ReturnANumberAndAString(self, vi, a_number, a_string): # noqa: N802 if self._defaults['ReturnANumberAndAString']['return'] != 0: return self._defaults['ReturnANumberAndAString']['return'] @@ -1074,8 +1036,6 @@ def set_side_effects_and_return_values(self, mock_library): mock_library.niFake_AcceptListOfDurationsInSeconds.return_value = 0 mock_library.niFake_BoolArrayOutputFunction.side_effect = MockFunctionCallError("niFake_BoolArrayOutputFunction") mock_library.niFake_BoolArrayOutputFunction.return_value = 0 - mock_library.niFake_CachedReadStatus.side_effect = MockFunctionCallError("niFake_CachedReadStatus") - mock_library.niFake_CachedReadStatus.return_value = 0 mock_library.niFake_ConfigureABC.side_effect = MockFunctionCallError("niFake_ConfigureABC") mock_library.niFake_ConfigureABC.return_value = 0 mock_library.niFake_CustomNestedStructRoundtrip.side_effect = MockFunctionCallError("niFake_CustomNestedStructRoundtrip") @@ -1174,8 +1134,6 @@ def set_side_effects_and_return_values(self, mock_library): mock_library.niFake_Read.return_value = 0 mock_library.niFake_ReadFromChannel.side_effect = MockFunctionCallError("niFake_ReadFromChannel") mock_library.niFake_ReadFromChannel.return_value = 0 - mock_library.niFake_ReadStatus.side_effect = MockFunctionCallError("niFake_ReadStatus") - mock_library.niFake_ReadStatus.return_value = 0 mock_library.niFake_ReturnANumberAndAString.side_effect = MockFunctionCallError("niFake_ReturnANumberAndAString") mock_library.niFake_ReturnANumberAndAString.return_value = 0 mock_library.niFake_ReturnDurationInSeconds.side_effect = MockFunctionCallError("niFake_ReturnDurationInSeconds") diff --git a/src/nifake/metadata/attributes.py b/src/nifake/metadata/attributes.py index 7cc8e22b9..00aebfe5f 100644 --- a/src/nifake/metadata/attributes.py +++ b/src/nifake/metadata/attributes.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d100 +# This file is generated from NI-FAKE API metadata version 25.8.0d9999 attributes = { 1000000: { 'access': 'read-write', diff --git a/src/nifake/metadata/config.py b/src/nifake/metadata/config.py index 89a7dcceb..ea0920715 100644 --- a/src/nifake/metadata/config.py +++ b/src/nifake/metadata/config.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d100 +# This file is generated from NI-FAKE API metadata version 25.8.0d9999 config = { - 'api_version': '25.8.0d100', + 'api_version': '25.8.0d9999', 'c_function_prefix': 'niFake_', 'close_function': 'close', 'context_manager_name': { diff --git a/src/nifake/metadata/enums.py b/src/nifake/metadata/enums.py index 496927618..af3f2b62b 100644 --- a/src/nifake/metadata/enums.py +++ b/src/nifake/metadata/enums.py @@ -1,30 +1,6 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d100 +# This file is generated from NI-FAKE API metadata version 25.8.0d9999 enums = { - 'AcquisitionStatus': { - 'values': [ - { - 'name': 'NIFAKE_VAL_RUNNING', - 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_RUNNING' - }, - { - 'name': 'NIFAKE_VAL_FINISHED_WITH_BACKLOG', - 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_BACKLOG' - }, - { - 'name': 'NIFAKE_VAL_FINISHED_WITH_NO_BACKLOG', - 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_NO_BACKLOG' - }, - { - 'name': 'NIFAKE_VAL_PAUSED', - 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_PAUSED' - }, - { - 'name': 'NIFAKE_VAL_NO_ACQUISITION_IN_PROGRESS', - 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_NO_ACQUISITION_IN_PROGRESS' - } - ] - }, 'AltColor': { 'values': [ { @@ -224,18 +200,6 @@ } ] }, - 'ExtCalParts': { - 'values': [ - { - 'name': 'NIFAKE_EXTCAL_PART1', - 'value': 1 - }, - { - 'name': 'NIFAKE_EXTCAL_PART2', - 'value': 2 - } - ] - }, 'FloatEnum': { 'values': [ { diff --git a/src/nifake/metadata/functions.py b/src/nifake/metadata/functions.py index 226b996b6..ccc106a89 100644 --- a/src/nifake/metadata/functions.py +++ b/src/nifake/metadata/functions.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d100 +# This file is generated from NI-FAKE API metadata version 25.8.0d9999 functions = { 'Abort': { 'codegen_method': 'public', 'documentation': { 'description': 'Aborts a previously initiated thingie.' }, - 'included_in_proto': False, + 'included_in_proto': True, 'parameters': [ { 'direction': 'in', @@ -97,31 +97,6 @@ ], 'returns': 'ViStatus' }, - 'CachedReadStatus': { - 'documentation': { - 'description': 'TBD' - }, - 'included_in_proto': False, - 'parameters': [ - { - 'direction': 'in', - 'name': 'vi', - 'type': 'ViSession' - }, - { - 'direction': 'out', - 'name': 'acqBacklog', - 'type': 'ViInt32' - }, - { - 'direction': 'out', - 'enum': 'AcquisitionStatus', - 'name': 'acqStatus', - 'type': 'ViInt16' - } - ], - 'returns': 'ViStatus' - }, 'ConfigureABC': { 'documentation': { 'description': 'TBD' @@ -2137,31 +2112,6 @@ ], 'returns': 'ViStatus' }, - 'ReadStatus': { - 'documentation': { - 'description': 'TBD' - }, - 'included_in_proto': False, - 'parameters': [ - { - 'direction': 'in', - 'name': 'vi', - 'type': 'ViSession' - }, - { - 'direction': 'out', - 'name': 'acquisitionBacklog', - 'type': 'ViInt32' - }, - { - 'direction': 'out', - 'enum': 'AcquisitionStatus', - 'name': 'acquisitionStatus', - 'type': 'ViInt16' - } - ], - 'returns': 'ViStatus' - }, 'ReturnANumberAndAString': { 'codegen_method': 'public', 'documentation': { From 11d100b782841c2e9707e4cc9eabc76a3bb6d445 Mon Sep 17 00:00:00 2001 From: Rahul R Date: Wed, 24 Sep 2025 11:40:09 +0530 Subject: [PATCH 3/3] Updated generated file --- .../nifake/nifake/_grpc_stub_interpreter.py | 11 ++-- generated/nifake/nifake/_library.py | 18 +++++++ .../nifake/nifake/_library_interpreter.py | 16 ++++++ generated/nifake/nifake/enums.py | 8 +++ generated/nifake/nifake/session.py | 30 +++++++++++ .../nifake/nifake/unit_tests/_mock_helper.py | 42 +++++++++++++++ src/nifake/metadata/attributes.py | 2 +- src/nifake/metadata/config.py | 4 +- src/nifake/metadata/enums.py | 38 ++++++++++++- src/nifake/metadata/functions.py | 54 ++++++++++++++++++- 10 files changed, 213 insertions(+), 10 deletions(-) diff --git a/generated/nifake/nifake/_grpc_stub_interpreter.py b/generated/nifake/nifake/_grpc_stub_interpreter.py index ec0a51cc6..3617f9d25 100644 --- a/generated/nifake/nifake/_grpc_stub_interpreter.py +++ b/generated/nifake/nifake/_grpc_stub_interpreter.py @@ -77,10 +77,7 @@ def _invoke(self, func, request, metadata=None): return response def abort(self): # noqa: N802 - self._invoke( - self._client.Abort, - grpc_types.AbortRequest(vi=self._vi), - ) + raise NotImplementedError('abort is not supported over gRPC') def accept_list_of_durations_in_seconds(self, delays): # noqa: N802 self._invoke( @@ -95,6 +92,9 @@ def bool_array_output_function(self, number_of_elements): # noqa: N802 ) return response.an_array + def cached_read_status(self): # noqa: N802 + raise NotImplementedError('cached_read_status is not supported over gRPC') + def configure_abc(self): # noqa: N802 self._invoke( self._client.ConfigureAbc, @@ -391,6 +391,9 @@ def read_from_channel(self, channel_name, maximum_time): # noqa: N802 ) return response.reading + def read_status(self): # noqa: N802 + raise NotImplementedError('read_status is not supported over gRPC') + def return_a_number_and_a_string(self): # noqa: N802 response = self._invoke( self._client.ReturnANumberAndAString, diff --git a/generated/nifake/nifake/_library.py b/generated/nifake/nifake/_library.py index 95a91e2f7..f8b0f0241 100644 --- a/generated/nifake/nifake/_library.py +++ b/generated/nifake/nifake/_library.py @@ -29,6 +29,7 @@ def __init__(self, ctypes_library): self.niFake_Abort_cfunc = None self.niFake_AcceptListOfDurationsInSeconds_cfunc = None self.niFake_BoolArrayOutputFunction_cfunc = None + self.niFake_CachedReadStatus_cfunc = None self.niFake_ConfigureABC_cfunc = None self.niFake_CustomNestedStructRoundtrip_cfunc = None self.niFake_DoubleAllTheNums_cfunc = None @@ -78,6 +79,7 @@ def __init__(self, ctypes_library): self.niFake_PoorlyNamedSimpleFunction_cfunc = None self.niFake_Read_cfunc = None self.niFake_ReadFromChannel_cfunc = None + self.niFake_ReadStatus_cfunc = None self.niFake_ReturnANumberAndAString_cfunc = None self.niFake_ReturnDurationInSeconds_cfunc = None self.niFake_ReturnListOfDurationsInSeconds_cfunc = None @@ -133,6 +135,14 @@ def niFake_BoolArrayOutputFunction(self, vi, number_of_elements, an_array): # n self.niFake_BoolArrayOutputFunction_cfunc.restype = ViStatus # noqa: F405 return self.niFake_BoolArrayOutputFunction_cfunc(vi, number_of_elements, an_array) + def niFake_CachedReadStatus(self, vi, acq_backlog, acq_status): # noqa: N802 + with self._func_lock: + if self.niFake_CachedReadStatus_cfunc is None: + self.niFake_CachedReadStatus_cfunc = self._get_library_function('niFake_CachedReadStatus') + self.niFake_CachedReadStatus_cfunc.argtypes = [ViSession, ctypes.POINTER(ViInt32), ctypes.POINTER(ViInt16)] # noqa: F405 + self.niFake_CachedReadStatus_cfunc.restype = ViStatus # noqa: F405 + return self.niFake_CachedReadStatus_cfunc(vi, acq_backlog, acq_status) + def niFake_ConfigureABC(self, vi): # noqa: N802 with self._func_lock: if self.niFake_ConfigureABC_cfunc is None: @@ -525,6 +535,14 @@ def niFake_ReadFromChannel(self, vi, channel_name, maximum_time, reading): # no self.niFake_ReadFromChannel_cfunc.restype = ViStatus # noqa: F405 return self.niFake_ReadFromChannel_cfunc(vi, channel_name, maximum_time, reading) + def niFake_ReadStatus(self, vi, acquisition_backlog, acquisition_status): # noqa: N802 + with self._func_lock: + if self.niFake_ReadStatus_cfunc is None: + self.niFake_ReadStatus_cfunc = self._get_library_function('niFake_ReadStatus') + self.niFake_ReadStatus_cfunc.argtypes = [ViSession, ctypes.POINTER(ViInt32), ctypes.POINTER(ViInt16)] # noqa: F405 + self.niFake_ReadStatus_cfunc.restype = ViStatus # noqa: F405 + return self.niFake_ReadStatus_cfunc(vi, acquisition_backlog, acquisition_status) + def niFake_ReturnANumberAndAString(self, vi, a_number, a_string): # noqa: N802 with self._func_lock: if self.niFake_ReturnANumberAndAString_cfunc is None: diff --git a/generated/nifake/nifake/_library_interpreter.py b/generated/nifake/nifake/_library_interpreter.py index da7e3881a..2d968b35a 100644 --- a/generated/nifake/nifake/_library_interpreter.py +++ b/generated/nifake/nifake/_library_interpreter.py @@ -150,6 +150,14 @@ def bool_array_output_function(self, number_of_elements): # noqa: N802 errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) return [bool(an_array_ctype[i]) for i in range(number_of_elements_ctype.value)] + def cached_read_status(self): # noqa: N802 + vi_ctype = _visatype.ViSession(self._vi) # case S110 + acq_backlog_ctype = _visatype.ViInt32() # case S220 + acq_status_ctype = _visatype.ViInt16() # case S220 + error_code = self._library.niFake_CachedReadStatus(vi_ctype, None if acq_backlog_ctype is None else (ctypes.pointer(acq_backlog_ctype)), None if acq_status_ctype is None else (ctypes.pointer(acq_status_ctype))) + errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) + return int(acq_backlog_ctype.value), enums.AcquisitionStatus(acq_status_ctype.value) + def configure_abc(self): # noqa: N802 vi_ctype = _visatype.ViSession(self._vi) # case S110 error_code = self._library.niFake_ConfigureABC(vi_ctype) @@ -596,6 +604,14 @@ def read_from_channel(self, channel_name, maximum_time): # noqa: N802 errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) return float(reading_ctype.value) + def read_status(self): # noqa: N802 + vi_ctype = _visatype.ViSession(self._vi) # case S110 + acquisition_backlog_ctype = _visatype.ViInt32() # case S220 + acquisition_status_ctype = _visatype.ViInt16() # case S220 + error_code = self._library.niFake_ReadStatus(vi_ctype, None if acquisition_backlog_ctype is None else (ctypes.pointer(acquisition_backlog_ctype)), None if acquisition_status_ctype is None else (ctypes.pointer(acquisition_status_ctype))) + errors.handle_error(self, error_code, ignore_warnings=False, is_error_handling=False) + return int(acquisition_backlog_ctype.value), enums.AcquisitionStatus(acquisition_status_ctype.value) + def return_a_number_and_a_string(self): # noqa: N802 vi_ctype = _visatype.ViSession(self._vi) # case S110 a_number_ctype = _visatype.ViInt16() # case S220 diff --git a/generated/nifake/nifake/enums.py b/generated/nifake/nifake/enums.py index cd042c61c..8248124e7 100644 --- a/generated/nifake/nifake/enums.py +++ b/generated/nifake/nifake/enums.py @@ -5,6 +5,14 @@ from enum import IntFlag +class AcquisitionStatus(Enum): + RUNNING = 'NIFAKE_VAL_ACQUISITION_STATUS_RUNNING' + FINISHED_WITH_BACKLOG = 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_BACKLOG' + FINISHED_WITH_NO_BACKLOG = 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_NO_BACKLOG' + PAUSED = 'NIFAKE_VAL_ACQUISITION_STATUS_PAUSED' + NO_ACQUISITION_IN_PROGRESS = 'NIFAKE_VAL_ACQUISITION_STATUS_NO_ACQUISITION_IN_PROGRESS' + + class Color(Enum): RED = 1 r''' diff --git a/generated/nifake/nifake/session.py b/generated/nifake/nifake/session.py index 50ef8c809..3440aed88 100644 --- a/generated/nifake/nifake/session.py +++ b/generated/nifake/nifake/session.py @@ -816,6 +816,21 @@ def bool_array_output_function(self, number_of_elements): an_array = self._interpreter.bool_array_output_function(number_of_elements) return an_array + @ivi_synchronized + def cached_read_status(self): + r'''cached_read_status + + TBD + + Returns: + acq_backlog (int): + + acq_status (enums.AcquisitionStatus): + + ''' + acq_backlog, acq_status = self._interpreter.cached_read_status() + return acq_backlog, acq_status + @ivi_synchronized def configure_abc(self): r'''configure_abc @@ -1505,6 +1520,21 @@ def read(self, maximum_time): reading = self._interpreter.read(maximum_time) return reading + @ivi_synchronized + def read_status(self): + r'''read_status + + TBD + + Returns: + acquisition_backlog (int): + + acquisition_status (enums.AcquisitionStatus): + + ''' + acquisition_backlog, acquisition_status = self._interpreter.read_status() + return acquisition_backlog, acquisition_status + @ivi_synchronized def return_a_number_and_a_string(self): r'''return_a_number_and_a_string diff --git a/generated/nifake/nifake/unit_tests/_mock_helper.py b/generated/nifake/nifake/unit_tests/_mock_helper.py index 8c76539e0..ffa0207c0 100644 --- a/generated/nifake/nifake/unit_tests/_mock_helper.py +++ b/generated/nifake/nifake/unit_tests/_mock_helper.py @@ -23,6 +23,10 @@ def __init__(self): self._defaults['BoolArrayOutputFunction'] = {} self._defaults['BoolArrayOutputFunction']['return'] = 0 self._defaults['BoolArrayOutputFunction']['anArray'] = None + self._defaults['CachedReadStatus'] = {} + self._defaults['CachedReadStatus']['return'] = 0 + self._defaults['CachedReadStatus']['acqBacklog'] = None + self._defaults['CachedReadStatus']['acqStatus'] = None self._defaults['ConfigureABC'] = {} self._defaults['ConfigureABC']['return'] = 0 self._defaults['CustomNestedStructRoundtrip'] = {} @@ -166,6 +170,10 @@ def __init__(self): self._defaults['ReadFromChannel'] = {} self._defaults['ReadFromChannel']['return'] = 0 self._defaults['ReadFromChannel']['reading'] = None + self._defaults['ReadStatus'] = {} + self._defaults['ReadStatus']['return'] = 0 + self._defaults['ReadStatus']['acquisitionBacklog'] = None + self._defaults['ReadStatus']['acquisitionStatus'] = None self._defaults['ReturnANumberAndAString'] = {} self._defaults['ReturnANumberAndAString']['return'] = 0 self._defaults['ReturnANumberAndAString']['aNumber'] = None @@ -262,6 +270,21 @@ def niFake_BoolArrayOutputFunction(self, vi, number_of_elements, an_array): # n an_array_ref[i] = test_value[i] return self._defaults['BoolArrayOutputFunction']['return'] + def niFake_CachedReadStatus(self, vi, acq_backlog, acq_status): # noqa: N802 + if self._defaults['CachedReadStatus']['return'] != 0: + return self._defaults['CachedReadStatus']['return'] + # acq_backlog + if self._defaults['CachedReadStatus']['acqBacklog'] is None: + raise MockFunctionCallError("niFake_CachedReadStatus", param='acqBacklog') + if acq_backlog is not None: + acq_backlog.contents.value = self._defaults['CachedReadStatus']['acqBacklog'] + # acq_status + if self._defaults['CachedReadStatus']['acqStatus'] is None: + raise MockFunctionCallError("niFake_CachedReadStatus", param='acqStatus') + if acq_status is not None: + acq_status.contents.value = self._defaults['CachedReadStatus']['acqStatus'] + return self._defaults['CachedReadStatus']['return'] + def niFake_ConfigureABC(self, vi): # noqa: N802 if self._defaults['ConfigureABC']['return'] != 0: return self._defaults['ConfigureABC']['return'] @@ -803,6 +826,21 @@ def niFake_ReadFromChannel(self, vi, channel_name, maximum_time, reading): # no reading.contents.value = self._defaults['ReadFromChannel']['reading'] return self._defaults['ReadFromChannel']['return'] + def niFake_ReadStatus(self, vi, acquisition_backlog, acquisition_status): # noqa: N802 + if self._defaults['ReadStatus']['return'] != 0: + return self._defaults['ReadStatus']['return'] + # acquisition_backlog + if self._defaults['ReadStatus']['acquisitionBacklog'] is None: + raise MockFunctionCallError("niFake_ReadStatus", param='acquisitionBacklog') + if acquisition_backlog is not None: + acquisition_backlog.contents.value = self._defaults['ReadStatus']['acquisitionBacklog'] + # acquisition_status + if self._defaults['ReadStatus']['acquisitionStatus'] is None: + raise MockFunctionCallError("niFake_ReadStatus", param='acquisitionStatus') + if acquisition_status is not None: + acquisition_status.contents.value = self._defaults['ReadStatus']['acquisitionStatus'] + return self._defaults['ReadStatus']['return'] + def niFake_ReturnANumberAndAString(self, vi, a_number, a_string): # noqa: N802 if self._defaults['ReturnANumberAndAString']['return'] != 0: return self._defaults['ReturnANumberAndAString']['return'] @@ -1036,6 +1074,8 @@ def set_side_effects_and_return_values(self, mock_library): mock_library.niFake_AcceptListOfDurationsInSeconds.return_value = 0 mock_library.niFake_BoolArrayOutputFunction.side_effect = MockFunctionCallError("niFake_BoolArrayOutputFunction") mock_library.niFake_BoolArrayOutputFunction.return_value = 0 + mock_library.niFake_CachedReadStatus.side_effect = MockFunctionCallError("niFake_CachedReadStatus") + mock_library.niFake_CachedReadStatus.return_value = 0 mock_library.niFake_ConfigureABC.side_effect = MockFunctionCallError("niFake_ConfigureABC") mock_library.niFake_ConfigureABC.return_value = 0 mock_library.niFake_CustomNestedStructRoundtrip.side_effect = MockFunctionCallError("niFake_CustomNestedStructRoundtrip") @@ -1134,6 +1174,8 @@ def set_side_effects_and_return_values(self, mock_library): mock_library.niFake_Read.return_value = 0 mock_library.niFake_ReadFromChannel.side_effect = MockFunctionCallError("niFake_ReadFromChannel") mock_library.niFake_ReadFromChannel.return_value = 0 + mock_library.niFake_ReadStatus.side_effect = MockFunctionCallError("niFake_ReadStatus") + mock_library.niFake_ReadStatus.return_value = 0 mock_library.niFake_ReturnANumberAndAString.side_effect = MockFunctionCallError("niFake_ReturnANumberAndAString") mock_library.niFake_ReturnANumberAndAString.return_value = 0 mock_library.niFake_ReturnDurationInSeconds.side_effect = MockFunctionCallError("niFake_ReturnDurationInSeconds") diff --git a/src/nifake/metadata/attributes.py b/src/nifake/metadata/attributes.py index 00aebfe5f..7cc8e22b9 100644 --- a/src/nifake/metadata/attributes.py +++ b/src/nifake/metadata/attributes.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d9999 +# This file is generated from NI-FAKE API metadata version 25.8.0d100 attributes = { 1000000: { 'access': 'read-write', diff --git a/src/nifake/metadata/config.py b/src/nifake/metadata/config.py index ea0920715..89a7dcceb 100644 --- a/src/nifake/metadata/config.py +++ b/src/nifake/metadata/config.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d9999 +# This file is generated from NI-FAKE API metadata version 25.8.0d100 config = { - 'api_version': '25.8.0d9999', + 'api_version': '25.8.0d100', 'c_function_prefix': 'niFake_', 'close_function': 'close', 'context_manager_name': { diff --git a/src/nifake/metadata/enums.py b/src/nifake/metadata/enums.py index af3f2b62b..496927618 100644 --- a/src/nifake/metadata/enums.py +++ b/src/nifake/metadata/enums.py @@ -1,6 +1,30 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d9999 +# This file is generated from NI-FAKE API metadata version 25.8.0d100 enums = { + 'AcquisitionStatus': { + 'values': [ + { + 'name': 'NIFAKE_VAL_RUNNING', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_RUNNING' + }, + { + 'name': 'NIFAKE_VAL_FINISHED_WITH_BACKLOG', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_BACKLOG' + }, + { + 'name': 'NIFAKE_VAL_FINISHED_WITH_NO_BACKLOG', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_FINISHED_WITH_NO_BACKLOG' + }, + { + 'name': 'NIFAKE_VAL_PAUSED', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_PAUSED' + }, + { + 'name': 'NIFAKE_VAL_NO_ACQUISITION_IN_PROGRESS', + 'value': 'NIFAKE_VAL_ACQUISITION_STATUS_NO_ACQUISITION_IN_PROGRESS' + } + ] + }, 'AltColor': { 'values': [ { @@ -200,6 +224,18 @@ } ] }, + 'ExtCalParts': { + 'values': [ + { + 'name': 'NIFAKE_EXTCAL_PART1', + 'value': 1 + }, + { + 'name': 'NIFAKE_EXTCAL_PART2', + 'value': 2 + } + ] + }, 'FloatEnum': { 'values': [ { diff --git a/src/nifake/metadata/functions.py b/src/nifake/metadata/functions.py index ccc106a89..226b996b6 100644 --- a/src/nifake/metadata/functions.py +++ b/src/nifake/metadata/functions.py @@ -1,12 +1,12 @@ # -*- coding: utf-8 -*- -# This file is generated from NI-FAKE API metadata version 25.8.0d9999 +# This file is generated from NI-FAKE API metadata version 25.8.0d100 functions = { 'Abort': { 'codegen_method': 'public', 'documentation': { 'description': 'Aborts a previously initiated thingie.' }, - 'included_in_proto': True, + 'included_in_proto': False, 'parameters': [ { 'direction': 'in', @@ -97,6 +97,31 @@ ], 'returns': 'ViStatus' }, + 'CachedReadStatus': { + 'documentation': { + 'description': 'TBD' + }, + 'included_in_proto': False, + 'parameters': [ + { + 'direction': 'in', + 'name': 'vi', + 'type': 'ViSession' + }, + { + 'direction': 'out', + 'name': 'acqBacklog', + 'type': 'ViInt32' + }, + { + 'direction': 'out', + 'enum': 'AcquisitionStatus', + 'name': 'acqStatus', + 'type': 'ViInt16' + } + ], + 'returns': 'ViStatus' + }, 'ConfigureABC': { 'documentation': { 'description': 'TBD' @@ -2112,6 +2137,31 @@ ], 'returns': 'ViStatus' }, + 'ReadStatus': { + 'documentation': { + 'description': 'TBD' + }, + 'included_in_proto': False, + 'parameters': [ + { + 'direction': 'in', + 'name': 'vi', + 'type': 'ViSession' + }, + { + 'direction': 'out', + 'name': 'acquisitionBacklog', + 'type': 'ViInt32' + }, + { + 'direction': 'out', + 'enum': 'AcquisitionStatus', + 'name': 'acquisitionStatus', + 'type': 'ViInt16' + } + ], + 'returns': 'ViStatus' + }, 'ReturnANumberAndAString': { 'codegen_method': 'public', 'documentation': {