nidaqmx 1.3.0.dev0__tar.gz → 1.4.0.dev0__tar.gz

{nidaqmx-1.3.0.dev0 → nidaqmx-1.4.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nidaqmx
-Version: 1.3.0.dev0
+Version: 1.4.0.dev0
 Summary: NI-DAQmx Python API
 License: MIT
 Keywords: nidaqmx,nidaq,daqmx,daq
@@ -8,7 +8,7 @@ Author: NI
 Author-email: opensource@ni.com
 Maintainer: Zach Hindes
 Maintainer-email: zach.hindes@ni.com
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.10,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Manufacturing
@@ -17,11 +17,11 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: System :: Hardware :: Hardware Drivers
@@ -31,8 +31,10 @@ Requires-Dist: deprecation (>=2.1)
 Requires-Dist: distro (>=1.9.0) ; sys_platform == "linux"
 Requires-Dist: grpcio (>=1.49.0,<2.0) ; extra == "grpc"
 Requires-Dist: hightime (>=0.2.2)
-Requires-Dist: nitypes (>=0.1.0dev10)
-Requires-Dist: numpy (>=1.22) ; python_version >= "3.9" and python_version < "3.13"
+Requires-Dist: ni-grpcdevice-v1-proto (>=1.0.0) ; extra == "grpc"
+Requires-Dist: ni-protobuf-types (>=1.0.0) ; extra == "grpc"
+Requires-Dist: nitypes (>=1.0.0)
+Requires-Dist: numpy (>=1.22) ; python_version >= "3.10" and python_version < "3.13"
 Requires-Dist: numpy (>=2.1) ; python_version >= "3.13" and python_version < "4.0"
 Requires-Dist: protobuf (>=4.21) ; extra == "grpc"
 Requires-Dist: python-decouple (>=3.8)
@@ -100,7 +102,7 @@ system.
 Python Version Support
 ----------------------
 
-**nidaqmx** supports CPython 3.9+.
+**nidaqmx** supports CPython 3.10+.
 
 **nidaqmx** supports PyPy3 for non-gRPC use cases. For the status of PyPy support for gRPC,
 see `PyPy support (grpc/grpc#4221) <https://github.com/grpc/grpc/issues/4221>`_.

{nidaqmx-1.3.0.dev0 → nidaqmx-1.4.0.dev0}/README.rst

@@ -55,7 +55,7 @@ system.
 Python Version Support
 ----------------------
 
-**nidaqmx** supports CPython 3.9+.
+**nidaqmx** supports CPython 3.10+.
 
 **nidaqmx** supports PyPy3 for non-gRPC use cases. For the status of PyPy support for gRPC,
 see `PyPy support (grpc/grpc#4221) <https://github.com/grpc/grpc/issues/4221>`_.

{nidaqmx-1.3.0.dev0 → nidaqmx-1.4.0.dev0}/generated/nidaqmx/_base_interpreter.py

@@ -4,7 +4,9 @@ from __future__ import annotations
 import abc
 import numpy
 from nitypes.waveform import AnalogWaveform, DigitalWaveform
-from typing import Any, Sequence
+from typing import Any
+
+from collections.abc import Sequence
 from nidaqmx.constants import WaveformAttributeMode
 
 
@@ -1093,6 +1095,10 @@ class BaseInterpreter(abc.ABC):
     def get_timing_attribute_string(self, task, attribute):
         raise NotImplementedError
 
+    @abc.abstractmethod
+    def get_timing_attribute_timestamp(self, task, attribute):
+        raise NotImplementedError
+
     @abc.abstractmethod
     def get_timing_attribute_uint32(self, task, attribute):
         raise NotImplementedError
@@ -1852,6 +1858,11 @@ class BaseInterpreter(abc.ABC):
     def hash_task_handle(self, task_handle):
         raise NotImplementedError
 
+    @property
+    @abc.abstractmethod
+    def driver_version(self):
+        raise NotImplementedError
+
     @abc.abstractmethod
     def read_analog_waveform(
         self,
@@ -1873,7 +1884,7 @@ class BaseInterpreter(abc.ABC):
         waveform_attribute_mode: WaveformAttributeMode
     ) -> int:
         raise NotImplementedError
-        
+
     @abc.abstractmethod
     def read_digital_waveform(
         self,
@@ -1929,7 +1940,7 @@ class BaseInterpreter(abc.ABC):
         timeout: float
     ) -> int:
         raise NotImplementedError
-        
+
     @abc.abstractmethod
     def write_digital_waveform(
         self,
@@ -1939,7 +1950,7 @@ class BaseInterpreter(abc.ABC):
         timeout: float,
     ) -> int:
         raise NotImplementedError
-        
+
     def write_digital_waveforms(
         self,
         task_handle: object,

{nidaqmx-1.3.0.dev0 → nidaqmx-1.4.0.dev0}/generated/nidaqmx/_dotenvpath.py

@@ -45,27 +45,12 @@ def _get_caller_path() -> Path | None:
     for frame, _ in traceback.walk_stack(inspect.currentframe()):
         if frame.f_code.co_filename:
             module_path = Path(frame.f_code.co_filename)
-            if _exists(module_path) and not module_path.is_relative_to(package_path):
+            if module_path.exists() and not module_path.is_relative_to(package_path):
                 return module_path
 
     return None
 
 
-# Path.exists() throws OSError when the path has invalid file characters.
-# https://github.com/python/cpython/issues/79487
-if sys.version_info >= (3, 10):
-
-    def _exists(path: Path) -> bool:
-        return path.exists()
-
-else:
-
-    def _exists(path: Path) -> bool:
-        import os
-
-        return os.path.exists(path)
-
-
 def _get_package_path() -> Path:
     """Get the path of this package."""
     module = sys.modules[__package__]

{nidaqmx-1.3.0.dev0 → nidaqmx-1.4.0.dev0}/generated/nidaqmx/_feature_toggles.py

@@ -4,8 +4,9 @@ from __future__ import annotations
 
 import functools
 import sys
+from collections.abc import Callable
 from enum import Enum
-from typing import TYPE_CHECKING, Callable, TypeVar
+from typing import TYPE_CHECKING, TypeVar
 
 from decouple import AutoConfig, Undefined, undefined
 
@@ -13,10 +14,7 @@ from nidaqmx._dotenvpath import get_dotenv_search_path
 from nidaqmx.errors import FeatureNotSupportedError
 
 if TYPE_CHECKING:
-    if sys.version_info >= (3, 10):
-        from typing import ParamSpec
-    else:
-        from typing_extensions import ParamSpec
+    from typing import ParamSpec
 
     if sys.version_info >= (3, 11):
         from typing import Self

{nidaqmx-1.3.0.dev0 → nidaqmx-1.4.0.dev0}/generated/nidaqmx/_grpc_interpreter.py

@@ -6,10 +6,11 @@ import threading
 import typing
 import warnings
 from nitypes.waveform import AnalogWaveform, DigitalWaveform
-from typing import Any, Callable, Generic, Sequence, TypeVar
+from typing import Any, Generic, TypeVar
+
+from collections.abc import Callable, Sequence
 
 import google.protobuf.message
-from google.protobuf.timestamp_pb2 import Timestamp as GrpcTimestamp
 import grpc
 import numpy
 
@@ -17,10 +18,18 @@ from . import errors as errors
 from nidaqmx._base_interpreter import BaseEventHandler, BaseInterpreter
 from nidaqmx._stubs import nidaqmx_pb2 as grpc_types
 from nidaqmx._stubs import nidaqmx_pb2_grpc as nidaqmx_grpc
-from nidaqmx._stubs import session_pb2 as session_grpc_types
+from ni.protobuf.types.waveform_conversion import (
+    digital_waveform_from_protobuf,
+    digital_waveform_to_protobuf,
+    float64_analog_waveform_from_protobuf,
+    float64_analog_waveform_to_protobuf
+)
 from nidaqmx.constants import WaveformAttributeMode
 from nidaqmx.error_codes import DAQmxErrors
+from nidaqmx.types import DriverVersion
 from nidaqmx._grpc_time import convert_time_to_timestamp, convert_timestamp_to_time
+from nidaqmx._waveform_utils import get_num_samps_per_chan
+from session_pb2 import Session
 
 _logger = logging.getLogger(__name__)
 
@@ -86,11 +95,21 @@ class GrpcStubInterpreter(BaseInterpreter):
     __slots__ = [
         '_grpc_options',
         '_client',
+        '_driver_version',
     ]
 
     def __init__(self, grpc_options):
         self._grpc_options = grpc_options
         self._client = nidaqmx_grpc.NiDAQmxStub(grpc_options.grpc_channel)
+        try:
+            major_version = self.get_system_info_attribute_uint32(0x1272)
+            minor_version = self.get_system_info_attribute_uint32(0x1923)
+            update_version = self.get_system_info_attribute_uint32(0x2f22)
+        except Exception:
+            major_version = 0
+            minor_version = 0
+            update_version = 0
+        self._driver_version = DriverVersion(major_version, minor_version, update_version)
 
     def _invoke(self, func, request, metadata=None):
         try:
@@ -169,6 +188,10 @@ class GrpcStubInterpreter(BaseInterpreter):
         except grpc.RpcError as rpc_error:
             self._handle_rpc_error(rpc_error)
 
+    @property
+    def driver_version(self):
+        return self._driver_version
+
     def add_cdaq_sync_connection(self, port_list):
         response = self._invoke(
             self._client.AddCDAQSyncConnection,
@@ -2181,6 +2204,12 @@ class GrpcStubInterpreter(BaseInterpreter):
             grpc_types.GetTimingAttributeStringRequest(task=task, attribute_raw=attribute))
         return response.value
 
+    def get_timing_attribute_timestamp(self, task, attribute):
+        response = self._invoke(
+            self._client.GetTimingAttributeTimestamp,
+            grpc_types.GetTimingAttributeTimestampRequest(task=task, attribute_raw=attribute))
+        return convert_timestamp_to_time(response.value)
+
     def get_timing_attribute_uint32(self, task, attribute):
         response = self._invoke(
             self._client.GetTimingAttributeUInt32,
@@ -3610,7 +3639,13 @@ class GrpcStubInterpreter(BaseInterpreter):
         waveform: AnalogWaveform[numpy.float64],
         waveform_attribute_mode: WaveformAttributeMode
     ) -> int:
-        raise NotImplementedError
+        return self.read_analog_waveforms(
+            task_handle,
+            number_of_samples_per_channel,
+            timeout,
+            [waveform],
+            waveform_attribute_mode
+        )
 
     def read_analog_waveforms(
         self,
@@ -3620,7 +3655,30 @@ class GrpcStubInterpreter(BaseInterpreter):
         waveforms: Sequence[AnalogWaveform[numpy.float64]],
         waveform_attribute_mode: WaveformAttributeMode
     ) -> int:
-        raise NotImplementedError
+        assert isinstance(task_handle, Session)
+        response = self._invoke(
+            self._client.ReadAnalogWaveforms,
+            grpc_types.ReadAnalogWaveformsRequest(
+                task=task_handle,
+                num_samps_per_chan=number_of_samples_per_channel,
+                timeout=timeout,
+                waveform_attribute_mode_raw=waveform_attribute_mode.value
+            ))
+
+        if len(response.waveforms) != len(waveforms):
+            raise ValueError(f"Expected {len(waveforms)} waveforms but received {len(response.waveforms)} from server")
+
+        for i, grpc_waveform in enumerate(response.waveforms):
+            temp_waveform = float64_analog_waveform_from_protobuf(grpc_waveform)
+            waveforms[i].load_data(temp_waveform.scaled_data)
+
+            waveforms[i].scale_mode = temp_waveform.scale_mode
+            waveforms[i].timing = temp_waveform.timing
+            waveforms[i].extended_properties.clear()
+            waveforms[i].extended_properties.update(temp_waveform.extended_properties)
+
+        self._check_for_error_from_response(response.status, samps_per_chan_read=response.samps_per_chan_read)
+        return response.samps_per_chan_read
 
     def read_digital_waveform(
         self,
@@ -3630,7 +3688,15 @@ class GrpcStubInterpreter(BaseInterpreter):
         waveform: DigitalWaveform[Any],
         waveform_attribute_mode: WaveformAttributeMode
     ) -> int:
-        raise NotImplementedError
+        return self.read_digital_waveforms(
+            task_handle,
+            1,  # channel_count
+            number_of_samples_per_channel,
+            waveform.signal_count,  # number_of_signals_per_sample
+            timeout,
+            [waveform],
+            waveform_attribute_mode
+        )
 
     def read_digital_waveforms(
         self,
@@ -3642,7 +3708,32 @@ class GrpcStubInterpreter(BaseInterpreter):
         waveforms: Sequence[DigitalWaveform[Any]],
         waveform_attribute_mode: WaveformAttributeMode,
     ) -> int:
-        raise NotImplementedError
+        assert isinstance(task_handle, Session)
+        response = self._invoke(
+            self._client.ReadDigitalWaveforms,
+            grpc_types.ReadDigitalWaveformsRequest(
+                task=task_handle,
+                num_samps_per_chan=number_of_samples_per_channel,
+                timeout=timeout,
+                waveform_attribute_mode_raw=waveform_attribute_mode.value
+            ))
+
+        if len(response.waveforms) != len(waveforms):
+            raise ValueError(f"Expected {len(waveforms)} waveforms but received {len(response.waveforms)} from server")
+
+        for i, grpc_waveform in enumerate(response.waveforms):
+            temp_waveform = digital_waveform_from_protobuf(grpc_waveform)
+            data = temp_waveform.data
+            if data.dtype != waveforms[i].dtype:
+                data = data.view(waveforms[i].dtype)
+            waveforms[i].load_data(data)
+
+            waveforms[i].timing = temp_waveform.timing
+            waveforms[i].extended_properties.clear()
+            waveforms[i].extended_properties.update(temp_waveform.extended_properties)
+
+        self._check_for_error_from_response(response.status, samps_per_chan_read=response.samps_per_chan_read)
+        return response.samps_per_chan_read
 
     def read_new_digital_waveforms(
         self,
@@ -3653,7 +3744,20 @@ class GrpcStubInterpreter(BaseInterpreter):
         timeout: float,
         waveform_attribute_mode: WaveformAttributeMode,
     ) -> Sequence[DigitalWaveform[numpy.uint8]]:
-        raise NotImplementedError
+        assert isinstance(task_handle, Session)
+        response = self._invoke(
+            self._client.ReadDigitalWaveforms,
+            grpc_types.ReadDigitalWaveformsRequest(
+                task=task_handle,
+                num_samps_per_chan=number_of_samples_per_channel,
+                timeout=timeout,
+                waveform_attribute_mode_raw=waveform_attribute_mode.value
+            ))
+
+        waveforms = [digital_waveform_from_protobuf(grpc_waveform) for grpc_waveform in response.waveforms]
+
+        self._check_for_error_from_response(response.status, samps_per_chan_read=response.samps_per_chan_read)
+        return waveforms
 
     def write_analog_waveform(
         self,
@@ -3662,7 +3766,7 @@ class GrpcStubInterpreter(BaseInterpreter):
         auto_start: bool,
         timeout: float
     ) -> int:
-        raise NotImplementedError
+        return self.write_analog_waveforms(task_handle, [waveform], auto_start, timeout)
 
     def write_analog_waveforms(
         self,
@@ -3671,7 +3775,22 @@ class GrpcStubInterpreter(BaseInterpreter):
         auto_start: bool,
         timeout: float
     ) -> int:
-        raise NotImplementedError
+        assert isinstance(task_handle, Session)
+        num_samps_per_chan = get_num_samps_per_chan(waveforms)
+
+        grpc_waveforms = [float64_analog_waveform_to_protobuf(waveform) for waveform in waveforms]
+
+        response = self._invoke(
+            self._client.WriteAnalogWaveforms,
+            grpc_types.WriteAnalogWaveformsRequest(
+                task=task_handle,
+                auto_start=auto_start,
+                timeout=timeout,
+                waveforms=grpc_waveforms
+            ))
+
+        self._check_for_error_from_response(response.status, samps_per_chan_written=response.samps_per_chan_written)
+        return response.samps_per_chan_written
 
     def write_digital_waveform(
         self,
@@ -3680,16 +3799,31 @@ class GrpcStubInterpreter(BaseInterpreter):
         auto_start: bool,
         timeout: float,
     ) -> int:
-        raise NotImplementedError
+        return self.write_digital_waveforms(task_handle, [waveform], auto_start, timeout)
 
     def write_digital_waveforms(
         self,
         task_handle: object,
-        waveform: Sequence[DigitalWaveform[Any]],
+        waveforms: Sequence[DigitalWaveform[Any]],
         auto_start: bool,
         timeout: float,
     ) -> int:
-        raise NotImplementedError
+        assert isinstance(task_handle, Session)
+        num_samps_per_chan = get_num_samps_per_chan(waveforms)
+
+        grpc_waveforms = [digital_waveform_to_protobuf(waveform) for waveform in waveforms]
+
+        response = self._invoke(
+            self._client.WriteDigitalWaveforms,
+            grpc_types.WriteDigitalWaveformsRequest(
+                task=task_handle,
+                auto_start=auto_start,
+                timeout=timeout,
+                waveforms=grpc_waveforms
+            ))
+
+        self._check_for_error_from_response(response.status, samps_per_chan_written=response.samps_per_chan_written)
+        return response.samps_per_chan_written
 
 def _assign_numpy_array(numpy_array, grpc_array):
     """

{nidaqmx-1.3.0.dev0 → nidaqmx-1.4.0.dev0}/generated/nidaqmx/_install_daqmx.py

@@ -10,7 +10,7 @@ import subprocess  # nosec: B404
 import sys
 import tempfile
 import zipfile
-from typing import Generator
+from collections.abc import Generator
 from urllib.parse import urlparse
 
 import click

{nidaqmx-1.3.0.dev0 → nidaqmx-1.4.0.dev0}/generated/nidaqmx/_installer_metadata.json

@@ -1,9 +1,9 @@
 {
     "Windows": [
         {
-            "Version": "25.5.0",
-            "Release": "2025Q3",
-            "Location": "https://download.ni.com/support/nipkg/products/ni-d/ni-daqmx/25.5/online/ni-daqmx_25.5_online.exe",
+            "Version": "25.8.0",
+            "Release": "2025Q4",
+            "Location": "https://download.ni.com/support/nipkg/products/ni-d/ni-daqmx/25.8/online/ni-daqmx_25.8_online.exe",
             "supportedOS": [
                 "Windows 11",
                 "Windows Server 2022 64-bit",
@@ -15,10 +15,10 @@
     ],
     "Linux": [
         {
-            "Version": "25.5.0",
-            "Release": "2025Q3",
+            "Version": "25.8.0",
+            "Release": "2025Q4",
             "_comment": "Location url must be of the format 'https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers<Release>/NILinux<Release>DeviceDrivers.zip'. Any change to the format will require a change in the code.",
-            "Location": "https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers2025Q3/NILinux2025Q3DeviceDrivers.zip",
+            "Location": "https://download.ni.com/support/softlib/MasterRepository/LinuxDrivers2025Q4/NILinux2025Q4DeviceDrivers.zip",
             "supportedOS": [
                 "ubuntu 20.04",
                 "ubuntu 22.04",

{nidaqmx-1.3.0.dev0 → nidaqmx-1.4.0.dev0}/generated/nidaqmx/_lib.py

@@ -17,7 +17,7 @@ from nidaqmx.errors import (
 )
 
 if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 
 _DAQ_NOT_FOUND_MESSAGE = (