nsqdriver 0.4.2__cp310-cp310-macosx_11_0_x86_64.whl → 0.5.1__cp310-cp310-macosx_11_0_x86_64.whl

nsqdriver/NS_MCI.py

@@ -1,7 +1,10 @@
+import enum
+import traceback
 import pickle
 import socket
 import atexit
 import struct
+import warnings
 import xmlrpc.client
 from xmlrpc.client import Transport
 from multiprocessing import shared_memory
@@ -57,11 +60,11 @@ def solve_rpc_exception(func):
         try:
             return func(*args, **kwargs)
         except xmlrpc.client.Fault as e:
+            pack = RPCFaultPack.from_fault(e)
             print(f'************{args[0].__class__}: {args[0].addr}************')
-            print(f'远程函数报错: {e.faultString}')
-            print(args[0].handle.get_all_status())
-            print(f'远程函数报错: {e.faultString}')
-            print('*****************************')
+            print(f'*-*-*-*-*-*-*-远程函数报错: {pack.type}::{pack.name} -*-*-*-*-*-*-*-*')
+            print(pack.message)
+            print(f'*-*-*-*-*-*-*-远程函数报错: {pack.type}::{pack.name} -*-*-*-*-*-*-*-*')
         except TimeoutError as e:
             print(f'************{args[0].__class__}: {args[0].addr}************')
             print(f'Driver报错: 无法连接到 {args[0].addr}\n请检查网络、设备开机状态、设备是否正在程序更新等')
@@ -71,19 +74,19 @@ def solve_rpc_exception(func):
         except socket.timeout as e:
             print(f'************{args[0].__class__}: {args[0].addr}************')
             print(f'Driver报错: 获取数据超时 {e}')
-            print(args[0].handle.get_all_status())
             print('*****************************')
-
     return wrapper
 
 
 class Driver(BaseDriver):
     CHs = list(range(1, 25))
+    segment = ('ns', '111|112|113|114|115')
 
     quants = [
-        Quantity('ReInit', value={}, ch=1),  # set/get, 设备重新初始化
+        Quantity('ReInit', value={}, ch=1),  # set, 设备重新初始化
+        Quantity('Instruction', value=None, ch=1),  # set   参数化波形指令队列配置
         # 采集运行参数
-        Quantity('Shot', value=1024, ch=1),  # set/get,运行次数
+        Quantity('Shot', value=1024, ch=1),  # set,运行次数
         Quantity('PointNumber', value=16384, unit='point'),  # set/get,AD采样点数
         Quantity('TriggerDelay', value=0, ch=1, unit='s'),  # set/get,AD采样延时
         Quantity('FrequencyList', value=[], ch=1, unit='Hz'),  # set/get,解调频率列表，list，单位Hz
@@ -130,6 +133,8 @@ class Driver(BaseDriver):
     ]
 
     SystemParameter = {
+        'ExcLimit': -1,   # 设备traceback打印信息的回溯深度
+        'Warning': True,  # 开启后台警告上报
         'MixMode': 2,  # Mix模式，1：第一奈奎斯特去； 2：第二奈奎斯特区
         'PLLFreq': 100e6,  # 参考时钟频率, 单位为Hz
         'RefClock': 'out',  # 参考时钟选择： ‘out’：外参考时钟；‘in’：内参考时钟
@@ -224,8 +229,6 @@ class Driver(BaseDriver):
         if name in {'Coefficient'}:
             data, f_list, numberOfPoints, phases = get_coef(value, 4e9)
             self.set('DemodulationParam', data, channel)
-        elif name in {'CaptureMode', 'SystemSync', 'ResetTrig', 'TrigPeriod', 'TrigFrom'}:
-            pass
         else:
             return self.set(name, value, channel)
 
@@ -259,16 +262,10 @@ class Driver(BaseDriver):
                 value = {}
             self.init_device(system_parameter=value)
             return
-        elif name in {'CaptureMode', 'SystemSync', 'ResetTrig', 'TrigPeriod', 'TrigFrom'}:
-            return
 
         value = RPCValueParser.dump(value)
-        if name in {'Waveform', 'GenWave', 'MultiGenWave', 'GenWaveIQ', 'DemodulationParam', 'Coefficient',
-                    'Instruction'}:
-            func = self.fast_rpc.rpc_set
-            name = 'GenWave' if name == 'Waveform' and value[0] == RPCValueParser.dump_tag_waveform else name
-        else:
-            func = self.handle.rpc_set
+        func = self.fast_rpc.rpc_set
+        name = 'GenWave' if name == 'Waveform' and value[0] == RPCValueParser.dump_tag_waveform else name
 
         if self.has_start_capture and name == 'StartCapture':
             return
@@ -315,11 +312,13 @@ class Driver(BaseDriver):
                 if key.endswith('version'):
                     version = version[key][1:].split('-')[0]
                     version = tuple(int(v) for v in version.split('.'))
+                    break
                 else:
                     version = (0, 0, 0)
         self.backend_version = version
         if version >= (1, 2, 7):
-            return self.set('InitSystem')
+            self.set('InitSystem')
+            return True
         else:
             return self.__exec_command('初始化')
 
@@ -353,12 +352,63 @@ class Driver(BaseDriver):
         _string = [f'*********设备{self.addr}开启成功*********']
         for key in keys:
             _string.append(f'{key}: {status.get(key, "nan")}')
-        # for i in range(len(status['rfsoc_addr'])):
-        #     _string.append(f'sub_device{status["rfsoc_addr"][i]}: '
-        #                    f'{status["ref_clock_lock"][i]}{status["ref_clock_from"][i]}')
         print('\n'.join(_string))
 
 
+class RPCFaultPack:
+    split_flag = '|+*+-*-+*+|*-*|'
+
+    class FaultType(str, enum.Enum):
+        EXCEPTION = 'exception'
+        WARNING = 'warning'
+        INFO = 'info'
+
+    def __init__(self, _type: str, name: str, message: str):
+        self.type: RPCFaultPack.FaultType = self.FaultType(_type)
+        self.name = name
+        self.message = message
+
+    @classmethod
+    def from_string(cls, string: str):
+        self = cls(cls.FaultType.INFO, '', '')
+        self.string = string
+        return self
+
+    @classmethod
+    def from_fault(cls, fault: xmlrpc.client.Fault):
+        return cls.from_string(fault.faultString)
+
+    @classmethod
+    def from_exception(cls, exc: Exception, limit=0):
+        message = traceback.format_exception(exc, limit=limit)
+        return cls(cls.FaultType.EXCEPTION, exc.__class__.__name__, ''.join(message))
+
+    @classmethod
+    def from_warning(cls, warns: "list[warnings.WarningMessage]"):
+        warn = [str(warn.category.__name__) for warn in warns]
+        warn = str(warn[0]) if len(warn) == 1 else str(warn)
+        messages = [str(warn.message) for warn in warns]
+        return cls(cls.FaultType.WARNING, warn, '\n'.join(messages))
+
+    @property
+    def string(self):
+        return self.split_flag.join([self.type, self.name, self.message])
+
+    @string.setter
+    def string(self, value: str):
+        _p = value.split(self.split_flag)
+        if len(_p) == 1:
+            _p = (self.FaultType.INFO, 'Default', _p[0])
+        elif len(_p) == 2:
+            _p = (self.FaultType.INFO, _p[0], _p[1])
+        else:
+            _p = _p[:3]
+        self.type, self.name, self.message = _p
+
+    def __str__(self):
+        return self.string
+
+
 class FastRPC:
     def __init__(self, address, timeout):
         self.addr = address
@@ -368,9 +418,6 @@ class FastRPC:
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         sock.connect((self.addr, 10800))
         sock.settimeout(self.timeout)
-        # sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, True)
-        # sock.ioctl(socket.SIO_KEEPALIVE_VALS, (1, 60 * 1000, 30 * 1000))
-        # sock.close()
         return sock
 
     def rpc_set(self, *param):

nsqdriver/NS_QSYNC.py

@@ -99,6 +99,7 @@ class Driver(BaseDriver):
 
     _scanning_lock = _scanning_lock
     _device_set = DEVICE_SET
+    segment = ('ns', '111|112|113|114|115')
 
     icd_head_reset = 0x41000002
     icd_head_status = 0x4100000E
@@ -131,6 +132,7 @@ class Driver(BaseDriver):
         'TrigPeriod': 200e-6,  # 触发信号重复周期
         'TrigWidth': 800e-9,  # 触发信号高电平宽度 单位s
         'TrigDelay': 0,  # 触发信号相对开启通知的延迟
+        'Shot': 1024,
         'DiscoveryMode': ScannMode.local,  # QC/QR等被同步设备的发现方式，见DiscoveryMode说明
     }
 
@@ -142,7 +144,7 @@ class Driver(BaseDriver):
         self.gen_trig_num = 0
         self.addr = addr
 
-        self.param = {'Shot': 1024, 'period': 200e-6, 'MixMode': 2}
+        self.param = {'Shot': 1024, 'TrigPeriod': 200e-6, 'MixMode': 2}
         print_debug(f'QSYNC: 实例化成功{addr}')
 
     @property
@@ -542,11 +544,11 @@ class DeviceCmdHandle:
         res = []
         errors = []
         for board, future in zip(boards, futures):
-            if board.has_ip and board.has_dma:
-                _id = (board.dma_id & 0xFF) << 24
+            if board.has_cmd_link and board.has_stream_link:
+                _id = (board.ds_id & 0xFF) << 24
                 _res = struct.unpack('IIIII', future.result())[-1] & 0xFFFFFF
                 if _res:
-                    errors.append(f'指令{cmd_data[4:8].tobytes()}向{board.board_ip}转发失败\n')
+                    errors.append(f'指令{cmd_data[4:8].tobytes()}向{board.cs_target}转发失败\n')
                 res.append(_id + _res)
         return b''.join((head, cmd_data[4:12], struct.pack('=I' + 'I' * len(res), 16 + len(res) * 4, *res))), errors
 
@@ -554,8 +556,8 @@ class DeviceCmdHandle:
     def packing_fake_result(boards: Iterable["MCIBoard"], cmd_data: memoryview, head: bytes) -> bytes:
         res = []
         for board in boards:
-            if board.has_ip and board.has_dma:
-                _id = (board.dma_id & 0xFF) << 24
+            if board.has_cmd_link and board.has_stream_link:
+                _id = (board.ds_id & 0xFF) << 24
                 res.append(_id + 0)
         return b''.join((head, cmd_data[4:12], struct.pack('=I' + 'I' * len(res), 16 + len(res) * 4, *res)))
 

nsqdriver/__init__.py

@@ -4,7 +4,7 @@ from .NS_CST import Driver as CSTDriver
 from .compiler.ns_wave import InsChannel
 from .compiler.py_wave_asm import nsw_config, AssemblyError
 
-version_pack = (0, 4, 2)
+version_pack = (0, 5, 1)
 
 __version__ = '.'.join(str(_) for _ in version_pack)
 __all__ = ['MCIDriver', 'QSYNCDriver', 'CSTDriver', 'InsChannel']

{nsqdriver-0.4.2.dist-info → nsqdriver-0.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nsqdriver
-Version: 0.4.2
+Version: 0.5.1
 Summary: Naishu Q series quantum measurement and control equipment driver interface
 Home-page: https://g2hoyqcmh4.feishu.cn/wiki/wikcnzvyMd82DLZUe2NsI6HxsFc
 Author: Naishu Technology
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Requires-Dist: numpy (>=1.18)
+Requires-Dist: numpy >=1.18
 Provides-Extra: waveforms
 Requires-Dist: waveforms ; extra == 'waveforms'
 

nsqdriver-0.5.1.dist-info/RECORD

@@ -0,0 +1,18 @@
+nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
+nsqdriver/NS_MCI.py,sha256=Cr881PBY0S-uIc-eY4DDrU1XcvNbm_dVrgOiLGzOH7c,20859
+nsqdriver/NS_QSYNC.py,sha256=YoulCgRt1uWZE7IAiIV2oeyMClFjmaCAXq9bNX3E5aI,23378
+nsqdriver/__init__.py,sha256=GjuV-Zm3KjSQ_7_XIC6W3cbeliiP-T_ByGYhAWAM2-s,371
+nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
+nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver/compiler/assembler.cpython-310-darwin.so,sha256=JSjH0ATiOkH52UmO8lyLEhu1k0Id9REuq3BIunOlsjQ,559536
+nsqdriver/compiler/ns_wave.cpython-310-darwin.so,sha256=-NI0GjJyxm0XxW-EokpgF0HiHrA2mNH2G5IbP3j9LZc,406336
+nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
+nsqdriver/compiler/py_wave_asm.cpython-310-darwin.so,sha256=iuhnR7v5KHv2UYSHURgTIvgfwjlIR8RVNaHlTpHBugM,533464
+nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
+nsqdriver/wrapper/AWG_ADC.py,sha256=8K5xLEa_3CKnStWcoJeTj8ufEQfrx6o4l4XGNuOP3Ug,19211
+nsqdriver/wrapper/ND_NSMCI.py,sha256=gTyrDObhbggl35V_q-kpDoPsfttIEnDFc6f0-pk_P0k,6288
+nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nsqdriver-0.5.1.dist-info/METADATA,sha256=St0AOpM7wAuF0S976k9krAm2UlX5F8IObvxurAd5xBo,4359
+nsqdriver-0.5.1.dist-info/WHEEL,sha256=TncAKGvnfXJs-WUZUGzl_RwrBY6HmH7BWWQjmjUD8NU,111
+nsqdriver-0.5.1.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
+nsqdriver-0.5.1.dist-info/RECORD,,

{nsqdriver-0.4.2.dist-info → nsqdriver-0.5.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_11_0_x86_64
 

nsqdriver-0.4.2.dist-info/RECORD

@@ -1,17 +0,0 @@
-nsqdriver/NS_CST.py,sha256=_QYCjg1YglIJ4YVmxvISqvy5rExWGlMhyrK9zYIRbRY,7877
-nsqdriver/NS_MCI.py,sha256=ejn6eY9AT6P-t1TDzCqYu54vTNzUL2UAKc0RV02Sa4k,19624
-nsqdriver/NS_QSYNC.py,sha256=68qFZ04KVXb0MSaeKIZVZYqR0UV_tkJYWz7KSz4Dvg0,23281
-nsqdriver/__init__.py,sha256=53CoOtEV8lR_jU3q8NYZPPVdz6hwdv57GsbxFZJaXK0,371
-nsqdriver/common.py,sha256=IHfShqgNN3THbe7KD7ICdfFY7JKC_kQj0_KJk-449gQ,499
-nsqdriver/compiler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver/compiler/ns_wave.cpython-310-darwin.so,sha256=5A7_gnr7dE2n5LhZ_L_VxCmVP6FGaw4fTbGxdbn_B28,437240
-nsqdriver/compiler/ns_wave.pyi,sha256=JQiE_9HqCzm00bS6c2JaaIXwt7xN_x9XXax-BBrE7-o,3824
-nsqdriver/compiler/py_wave_asm.cpython-310-darwin.so,sha256=7CJoj83vtgmClN8HqP7zuHRZTrw3IIckN7crHPtFE38,538552
-nsqdriver/compiler/py_wave_asm.pyi,sha256=w2PWlBrns4tfDYjTLyOBfNgjjjVA_xzMJZYYyDPKce4,656
-nsqdriver/wrapper/AWG_ADC.py,sha256=8K5xLEa_3CKnStWcoJeTj8ufEQfrx6o4l4XGNuOP3Ug,19211
-nsqdriver/wrapper/ND_NSMCI.py,sha256=gTyrDObhbggl35V_q-kpDoPsfttIEnDFc6f0-pk_P0k,6288
-nsqdriver/wrapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nsqdriver-0.4.2.dist-info/METADATA,sha256=d2X7Uf5bT9-Gz2AgH7IwGsbN-_kkB7nINS7TQRIk-zc,4361
-nsqdriver-0.4.2.dist-info/WHEEL,sha256=tNYyggI0QC5GD4MVHQuiVTUUU_cLi9bibpSukmwhhdM,111
-nsqdriver-0.4.2.dist-info/top_level.txt,sha256=o7EbQoFO6BoaG3KGbS9Lg_aRheZSY5KYzoYuI9vx-AI,10
-nsqdriver-0.4.2.dist-info/RECORD,,