Updating the changes specifix to multi dimension

Author: rahulr-NI

build/helper/codegen_helper.py

@@ -257,7 +257,7 @@ def get_ctype_variable_declaration_snippet(parameter, parameters, ivi_dance_step
         module_name = '_visatype'
 
     # Use _complextype.py file for complex parameter
-    if parameter.get('complex_array_representation') is not None:
+    if parameter['complex_type'] is not None:
         module_name = '_complextype'
 
     if parameter['is_string'] is True:
@@ -368,7 +368,7 @@ def _get_ctype_variable_definition_snippet_for_scalar(parameter, parameters, ivi
             # Parameter denotes the size of another (the "corresponding") parameter.
             # Interleaved array length is going to be double the length of number of samples.
             # This is used for complex waveforms, where the real and imaginary parts are interleaved in the array.
-            if corresponding_buffer_parameters[0].get('complex_array_representation') == 'interleaved_real_number_array':
+            if corresponding_buffer_parameters[0]['complex_type'] == 'interleaved':
                 definitions.append(parameter['ctypes_variable_name'] + ' = {0}.{1}(0 if {2} is None else len({2}) // 2)  # case S160'.format(module_name, parameter['ctypes_type'], corresponding_buffer_parameters[0]['python_name']))
             else:
                 definitions.append(parameter['ctypes_variable_name'] + ' = {0}.{1}(0 if {2} is None else len({2}))  # case S160'.format(module_name, parameter['ctypes_type'], corresponding_buffer_parameters[0]['python_name']))
@@ -435,7 +435,7 @@ def _get_ctype_variable_definition_snippet_for_buffers(parameter, parameters, iv
     definition = None
 
     if parameter['numpy'] is True and use_numpy_array is True:
-        if parameter.get('complex_array_representation') is None:
+        if parameter['complex_type'] is None:
             definition = '_get_ctypes_pointer_for_buffer(value={})  # case B510'.format(parameter['python_name'])
         else:
             definition = '_get_ctypes_pointer_for_buffer(value={}, library_type={}.{})  # case B510'.format(parameter['python_name'], module_name, parameter['ctypes_type'])

build/helper/metadata_add_all.py

@@ -126,10 +126,10 @@ def _add_ctypes_type(parameter, config):
         parameter['ctypes_type_library_call'] = module_name + parameter['ctypes_type']
 
 
-def _add_complex_array_representation(parameter):
-    '''Adds a complex_array_representation parameter to the metadata for complex numbers'''
-    if 'complex_array_representation' not in parameter:
-        parameter['complex_array_representation'] = None
+def _add_complex_type(parameter):
+    '''Adds a complex_type parameter to the metadata for complex numbers'''
+    if 'complex_type' not in parameter:
+        parameter['complex_type'] = None
 
 
 def _add_array_dimensions(parameter):
@@ -462,7 +462,7 @@ def add_all_function_metadata(functions, config):
             _add_python_type(p, config)
             _add_ctypes_variable_name(p)
             _add_ctypes_type(p, config)
-            _add_complex_array_representation(p)
+            _add_complex_type(p)
             _add_array_dimensions(p)
             _add_numpy_info(p, functions[f]['parameters'], config)
             _add_default_value_name(p)

build/unit_tests/test_metadata_add_all.py

@@ -259,7 +259,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'vi=self._vi',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'vi',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -294,7 +294,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'name=name',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'name',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -332,7 +332,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'pin_data_buffer_size=pin_data_buffer_size',
                 'use_in_python_api': False,
                 'python_name_or_default_for_init': 'pin_data_buffer_size',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -370,7 +370,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'python_code_input=2 ** 14',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'python_code_input',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -408,7 +408,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'actual_num_pin_data=actual_num_pin_data',
                 'use_in_python_api': False,
                 'python_name_or_default_for_init': 'actual_num_pin_data',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -448,7 +448,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'expected_pin_states=expected_pin_states',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'expected_pin_states',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -486,7 +486,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'custom_type_input=custom_type_input._create_copy(grpc_types.CustomStruct)',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'custom_type_input',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -524,7 +524,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'custom_type_output=custom_type_output._create_copy(grpc_types.CustomStruct)',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'custom_type_output',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -562,7 +562,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'custom_type_without_struct_prefix_input=custom_type_without_struct_prefix_input._create_copy(grpc_types.CustomStruct)',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'custom_type_without_struct_prefix_input',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -600,7 +600,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'custom_type_without_struct_prefix_output=custom_type_without_struct_prefix_output._create_copy(grpc_types.CustomStruct)',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'custom_type_without_struct_prefix_output',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
         ],
@@ -649,7 +649,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'vi=self._vi',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'vi',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -687,7 +687,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'status=status',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'status',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -725,7 +725,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'data_buffer_size=data_buffer_size',
                 'use_in_python_api': False,
                 'python_name_or_default_for_init': 'data_buffer_size',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
             {
@@ -764,7 +764,7 @@ def _compare_dicts(actual, expected):
                 'grpc_request_snippet': 'data=data',
                 'use_in_python_api': True,
                 'python_name_or_default_for_init': 'data',
-                'complex_array_representation': None,
+                'complex_type': None,
                 'array_dimensions': 1,
             },
         ],

generated/nifake/nifake/_grpc_stub_interpreter.py

@@ -148,7 +148,10 @@ 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
-        raise NotImplementedError('function_with_intflag_parameter is not supported over gRPC')
+        self._invoke(
+            self._client.FunctionWithIntflagParameter,
+            grpc_types.FunctionWithIntflagParameterRequest(vi=self._vi, flag=flag.value),
+        )
 
     def function_with_repeated_capability_type(self, site_list):  # noqa: N802
         raise NotImplementedError('function_with_repeated_capability_type is not supported over gRPC')

generated/nifake/nifake/enums.py

@@ -63,9 +63,9 @@ class IntFlagEnum(IntFlag):
     r'''
     Flag B option.
     '''
-    E = 1073741824
+    C = 9223372036854775808
     r'''
-    Flag E option.
+    Flag C option.
     '''
 
 

generated/nifake/nifake/session.py

@@ -945,7 +945,6 @@ 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
 
@@ -1712,10 +1711,10 @@ def write_waveform_numpy(self, waveform):
     def write_waveform_numpy_complex128(self, waveform_data_array):
         r'''write_waveform_numpy_complex128
 
-        A method that writes a waveform of numpy complex128 samples.
+        A method that writes a waveform of numpy complex128 numbers.
 
         Args:
-            waveform_data_array (numpy.array(dtype=numpy.complex128)): Specifies the array of data to load into the waveform.
+            waveform_data_array (numpy.array(dtype=numpy.complex128)): Specifies the array of data to load into the waveform. Array should be numberOfSamples big.
 
         '''
         import numpy
@@ -1734,10 +1733,10 @@ def write_waveform_numpy_complex128(self, waveform_data_array):
     def write_waveform_numpy_complex64(self, waveform_data_array):
         r'''write_waveform_numpy_complex64
 
-        A method that writes a waveform of numpy complex64 samples.
+        A method that writes a waveform of numpy complex64 numbers.
 
         Args:
-            waveform_data_array (numpy.array(dtype=numpy.complex64)): Specifies the array of data to load into the waveform.
+            waveform_data_array (numpy.array(dtype=numpy.complex64)): Specifies the array of data to load into the waveform. Array should be numberOfSamples big.
 
         '''
         import numpy
@@ -1756,10 +1755,10 @@ def write_waveform_numpy_complex64(self, waveform_data_array):
     def write_waveform_numpy_complex_interleaved_i16(self, waveform_data_array):
         r'''write_waveform_numpy_complex_interleaved_i16
 
-        A method that writes a waveform of numpy complex i16 samples.
+        A method that writes a waveform of numpy complex i16 numbers.
 
         Args:
-            waveform_data_array (numpy.array(dtype=numpy.int16)): Specifies the array of data to load into the waveform.
+            waveform_data_array (numpy.array(dtype=numpy.int16)): Specifies the array of data to load into the waveform. Array should be numberOfSamples big.
 
         '''
         import numpy

generated/nifake/nifake/unit_tests/test_session.py

@@ -839,12 +839,12 @@ def test_return_timedeltas(self):
             self.patched_library_interpreter.return_list_of_durations_in_seconds.assert_called_once_with(len(time_values))
 
     def test_with_valid_intflag_parameter(self):
-        flags = nifake.IntFlagEnum.E | nifake.IntFlagEnum.A
+        flags = nifake.IntFlagEnum.C | nifake.IntFlagEnum.A
         self.patched_library_interpreter.function_with_intflag_parameter.side_effect = None
         self.patched_library_interpreter.function_with_intflag_parameter.return_value = None
         with nifake.Session('dev1') as session:
             session.function_with_intflag_parameter(flags)
-        self.patched_library_interpreter.function_with_intflag_parameter.assert_called_once_with(1073741825)
+        self.patched_library_interpreter.function_with_intflag_parameter.assert_called_once_with(9223372036854775809)
 
     def test_with_intflag_parameter_invalid(self):
         invalid_flag = 5

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 24.8.0f100
 attributes = {
     1000000: {
         'access': 'read-write',

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 24.8.0f100
 config = {
-    'api_version': '25.8.0d9999',
+    'api_version': '24.8.0f100',
     'c_function_prefix': 'niFake_',
     'close_function': 'close',
     'context_manager_name': {

src/nifake/metadata/enums.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 24.8.0f100
 enums = {
     'AltColor': {
         'values': [
@@ -200,18 +200,6 @@
             }
         ]
     },
-    'ExtCalParts': {
-        'values': [
-            {
-                'name': 'NIFAKE_EXTCAL_PART1',
-                'value': 1
-            },
-            {
-                'name': 'NIFAKE_EXTCAL_PART2',
-                'value': 2
-            }
-        ]
-    },
     'FloatEnum': {
         'values': [
             {
@@ -252,8 +240,8 @@
         ]
     },
     'IntFlagEnum': {
-        'class': 'IntFlag',
         'codegen_method': 'public',
+        'enum_class': 'IntFlag',
         'values': [
             {
                 'documentation': {
@@ -271,10 +259,10 @@
             },
             {
                 'documentation': {
-                    'description': 'Flag E option.'
+                    'description': 'Flag C option.'
                 },
-                'name': 'NIFAKE_VAL_FLAG_E',
-                'value': 1073741824
+                'name': 'NIFAKE_VAL_FLAG_C',
+                'value': 9223372036854775808
             }
         ]
     },