QuLab 2.8.0__cp310-cp310-win_amd64.whl → 2.9.0__cp310-cp310-win_amd64.whl

qulab/__init__.py

@@ -1,5 +1,6 @@
 from .executor.storage import find_report
 from .executor.storage import get_report_by_index as get_report
+from .executor.template import VAR
 from .executor.utils import debug_analyze
 from .scan import Scan, get_record, load_record, lookup, lookup_list
 from .version import __version__

qulab/executor/storage.py

@@ -1,6 +1,7 @@
 import hashlib
 import lzma
 import pickle
+import re
 import uuid
 import zipfile
 from dataclasses import dataclass, field
@@ -8,6 +9,7 @@ from datetime import datetime, timedelta
 from functools import lru_cache
 from pathlib import Path
 from typing import Any, Literal
+from urllib.parse import parse_qs
 
 from loguru import logger
 
@@ -15,10 +17,15 @@ try:
     from paramiko import SSHClient
     from paramiko.ssh_exception import SSHException
 except:
+    import warnings
+
+    warnings.warn("Can't import paramiko, ssh support will be disabled.")
+
     class SSHClient:
 
         def __init__(self):
-            raise ImportError("Can't import paramiko, ssh support will be disabled.")
+            raise ImportError(
+                "Can't import paramiko, ssh support will be disabled.")
 
         def __enter__(self):
             return self
@@ -26,6 +33,9 @@ except:
         def __exit__(self, exc_type, exc_value, traceback):
             pass
 
+    class SSHException(Exception):
+        pass
+
 
 from ..cli.config import get_config_value
 
@@ -48,7 +58,7 @@ class Report():
     index: int = -1
     previous_path: Path | None = field(default=None, repr=False)
     heads: dict[str, Path] = field(default_factory=dict, repr=False)
-    base_path: Path | None = field(default=None, repr=False)
+    base_path: str | Path | None = field(default=None, repr=False)
     path: Path | None = field(default=None, repr=False)
     config_path: Path | None = field(default=None, repr=False)
     script_path: Path | None = field(default=None, repr=False)
@@ -335,12 +345,15 @@ def save_config_key_history(key: str, report: Report,
 
 
 def load_report(path: str | Path, base_path: str | Path) -> Report | None:
-    if isinstance(base_path, str) and base_path.startswith('ssh '):
+    if isinstance(base_path, str) and base_path.startswith('ssh://'):
         with SSHClient() as client:
-            cfg, base_path = _pase_ssh_config(base_path[4:])
+            cfg = parse_ssh_uri(base_path)
+            remote_base_path = cfg.pop('remote_file_path')
             client.load_system_host_keys()
             client.connect(**cfg)
-            return load_report_from_scp(path, base_path, client)
+            report = load_report_from_scp(path, remote_base_path, client)
+            report.base_path = base_path
+            return report
 
     base_path = Path(base_path)
     if zipfile.is_zipfile(base_path):
@@ -357,12 +370,13 @@ def load_report(path: str | Path, base_path: str | Path) -> Report | None:
 
 
 def get_heads(base_path: str | Path) -> Path | None:
-    if isinstance(base_path, str) and base_path.startswith('ssh '):
+    if isinstance(base_path, str) and base_path.startswith('ssh://'):
         with SSHClient() as client:
-            cfg, base_path = _pase_ssh_config(base_path[4:])
+            cfg = parse_ssh_uri(base_path)
+            remote_base_path = cfg.pop('remote_file_path')
             client.load_system_host_keys()
             client.connect(**cfg)
-            return get_heads_from_scp(base_path, client)
+            return get_heads_from_scp(remote_base_path, client)
 
     base_path = Path(base_path)
     if zipfile.is_zipfile(base_path):
@@ -377,12 +391,13 @@ def get_heads(base_path: str | Path) -> Path | None:
 
 @lru_cache(maxsize=4096)
 def query_index(name: str, base_path: str | Path, index: int):
-    if isinstance(base_path, str) and base_path.startswith('ssh '):
+    if isinstance(base_path, str) and base_path.startswith('ssh://'):
         with SSHClient() as client:
-            cfg, base_path = _pase_ssh_config(base_path[4:])
+            cfg = parse_ssh_uri(base_path)
+            remote_base_path = cfg.pop('remote_file_path')
             client.load_system_host_keys()
             client.connect(**cfg)
-            return query_index_from_scp(name, base_path, client, index)
+            return query_index_from_scp(name, remote_base_path, client, index)
 
     base_path = Path(base_path)
     if zipfile.is_zipfile(base_path):
@@ -398,12 +413,13 @@ def query_index(name: str, base_path: str | Path, index: int):
 
 @lru_cache(maxsize=4096)
 def load_item(id, base_path):
-    if isinstance(base_path, str) and base_path.startswith('ssh '):
+    if isinstance(base_path, str) and base_path.startswith('ssh://'):
         with SSHClient() as client:
-            cfg, base_path = _pase_ssh_config(base_path[4:])
+            cfg = parse_ssh_uri(base_path)
+            remote_base_path = cfg.pop('remote_file_path')
             client.load_system_host_keys()
             client.connect(**cfg)
-            buf = load_item_buf_from_scp(id, base_path, client)
+            buf = load_item_buf_from_scp(id, remote_base_path, client)
     else:
         base_path = Path(base_path)
         if zipfile.is_zipfile(base_path):
@@ -489,15 +505,56 @@ def load_item_buf_from_zipfile(id, base_path):
 #########################################################################
 
 
-def _pase_ssh_config(config: str):
-    config = config.split()
-    base_path = ' '.join(config[4:])
+def parse_ssh_uri(uri):
+    """
+    解析 SSH URI 字符串，返回包含连接参数和路径的字典。
+    
+    格式：ssh://[{username}[:{password}]@]{host}[:{port}][?key_filename={key_path}][/{remote_file_path}]
+
+    返回示例：
+    {
+        "username": "user",
+        "password": "pass",
+        "host": "example.com",
+        "port": 22,
+        "key_filename": "/path/to/key",
+        "remote_file_path": "/data/file.txt"
+    }
+    """
+    pattern = re.compile(
+        r"^ssh://"  # 协议头
+        r"(?:([^:@/]+))(?::([^@/]+))?@?"  # 用户名和密码（可选）
+        r"([^:/?#]+)"  # 主机名（必须）
+        r"(?::(\d+))?"  # 端口（可选）
+        r"(/?[^?#]*)?"  # 远程路径（可选）
+        r"(?:\?([^#]+))?"  # 查询参数（如 key_filename）
+        r"$",
+        re.IGNORECASE)
+
+    match = pattern.match(uri)
+    if not match:
+        raise ValueError(f"Invalid SSH URI format: {uri}")
+
+    # 提取分组
+    username, password, host, port, path, query = match.groups()
+
+    # 处理查询参数
+    key_filename = None
+    if query:
+        params = parse_qs(query)
+        key_filename = params.get("key_filename", [None])[0]  # 取第一个值
+
+    # 清理路径开头的斜杠
+    remote_file_path = path
+
     return {
-        'hostname': config[0],
-        'port': int(config[1]),
-        'username': config[2],
-        'key_filename': config[3]
-    }, Path(base_path)
+        "username": username,
+        "password": password,
+        "hostname": host,
+        "port": int(port) if port else 22,  # 默认端口 22
+        "key_filename": key_filename,
+        "remote_file_path": remote_file_path
+    }
 
 
 def load_report_from_scp(path: str | Path, base_path: Path,
@@ -508,7 +565,6 @@ def load_report_from_scp(path: str | Path, base_path: Path,
             with sftp.open(str(Path(base_path) / 'reports' / path), 'rb') as f:
                 index = int.from_bytes(f.read(8), 'big')
                 report = pickle.loads(lzma.decompress(f.read()))
-                report.base_path = path
                 report.index = index
                 return report
     except SSHException:
@@ -532,7 +588,7 @@ def query_index_from_scp(name: str, base_path: Path, client: SSHClient,
             s = str(Path(base_path) / 'index' / f'{name}.width')
             with sftp.open(s, 'rb') as f:
                 width = int(f.read().decode())
-            with sftp.open(str(base_path / 'index' / f'{name}.idx'),
+            with sftp.open(str(Path(base_path) / 'index' / f'{name}.idx'),
                            'rb') as f:
                 f.seek(index * (width + 1))
                 context = f.read(width).decode()

qulab/executor/template.py

@@ -8,6 +8,12 @@ import string
 import textwrap
 from typing import Any
 
+_notset = object()
+
+
+def VAR(name: str, /, *, default: Any = _notset) -> Any:
+    return name
+
 
 def encode_mapping(mapping):
     mapping_bytes = lzma.compress(pickle.dumps(mapping))
@@ -68,26 +74,67 @@ class TemplateVarExtractor(ast.NodeVisitor):
     def visit_Call(self, node):
         if isinstance(node.func, ast.Name) and node.func.id == 'VAR':
             arg = node.args[0]
-            if isinstance(arg, ast.Constant) and isinstance(arg.value, str):
-                if arg.value not in self.mapping:
-                    raise TemplateKeyError(
-                        f"The variable '{arg.value}' is not provided in mapping. {self.fname}:{node.lineno}"
+            if not isinstance(arg, ast.Constant) or not isinstance(
+                    arg.value, str):
+                raise SyntaxError(
+                    f"Argument of VAR function must be a string. {self.fname}:{node.lineno}"
+                )
+            if len(node.args) != 1:
+                raise SyntaxError(
+                    f"VAR function only accept one argument. {self.fname}:{node.lineno}"
+                )
+            default = _notset
+            for k in node.keywords:
+                if k.arg == 'default':
+                    pass
+                    # if isinstance(k.value, ast.Constant):
+                    #     # default = k.value.value
+                    #     default = k.value
+                    # else:
+                    #     default = k.value
+                    #     # raise SyntaxError(
+                    #     #     f"Argument of 'default' must be a constant. {self.fname}:{node.lineno}"
+                    #     # )
+                else:
+                    raise SyntaxError(
+                        f"VAR function only accept keyword argument 'default'. {self.fname}:{node.lineno}"
                     )
-                self.variables.add(arg.value)
+
+            if default is _notset:
                 # new_node = ast.Subscript(value=ast.Name(id="__VAR",
                 #                                         ctx=ast.Load()),
                 #                          slice=ast.Constant(value=arg.value),
                 #                          ctx=ast.Load())
-                # ast.fix_missing_locations(new_node)
-                # new_source = ast.unparse(new_node)
+                if arg.value not in self.mapping:
+                    raise TemplateKeyError(
+                        f"The variable '{arg.value}' is not provided in mapping. {self.fname}:{node.lineno}"
+                    )
                 self.replacements[(node.lineno, node.end_lineno,
                                    node.col_offset,
                                    node.end_col_offset)] = ('VAR', arg.value,
                                                             None, None)
             else:
-                raise SyntaxError(
-                    f"Argument of VAR function must be a string. {self.fname}:{node.lineno}"
-                )
+                # new_node = ast.Call(
+                #     func=ast.Attribute(value=ast.Name(id='__VAR',
+                #                                       ctx=ast.Load()),
+                #                        attr='get',
+                #                        ctx=ast.Load()),
+                #     args=[ast.Constant(value=arg.value)],
+                #     keywords=[
+                #         ast.keyword(arg='default',
+                #                     value=value)
+                #     ],
+                #     ctx=ast.Load())
+                self.replacements[(node.lineno, node.end_lineno,
+                                   node.col_offset,
+                                   node.end_col_offset)] = ('VAR', arg.value,
+                                                            None, None)
+            # ast.fix_missing_locations(new_node)
+            # new_source = ast.unparse(new_node)
+            # print(new_source)
+
+            self.variables.add(arg.value)
+
         self.generic_visit(node)
 
     def _process_string(self, s: str, lineno: int, col_offset: int,
@@ -160,8 +207,24 @@ def inject_mapping(source: str, mapping: dict[str, Any],
                 lines_offset[end_lineno - 1] += len(
                     lines[end_lineno - 1]) - length_of_last_line
         else:
-            pattern = re.compile(r'VAR\s*\(\s*(["\'])(\w+)\1\s*\)')
-            replacement = f'__VAR_{hash_str}' + r'[\1\2\1]'
+            pattern = re.compile(
+                r'VAR\s*\(\s*'         # VAR(
+                r'(["\'])(\w+)\1'      # 第一个参数（引号包裹的变量名）
+                r'(?:\s*,\s*(.*?))?'   # 可选的其他参数
+                r'\s*\)',              # 闭合括号
+                re.DOTALL              # 允许.匹配换行符
+            ) # yapf: disable
+
+            def replacement(match):
+                quote = match.group(1)
+                var_name = match.group(2)
+                extra_args = match.group(3)
+                base = f'__VAR_{hash_str}'
+                if extra_args is not None:
+                    return f'{base}.get({quote}{var_name}{quote}, {extra_args})'
+                else:
+                    return f'{base}[{quote}{var_name}{quote}]'
+
             new_content = re.sub(pattern, replacement, content)
 
             if lineno == end_lineno:
@@ -172,7 +235,7 @@ def inject_mapping(source: str, mapping: dict[str, Any],
                 lines[lineno - 1] = head + new_content[:-1]
                 for i in range(lineno, end_lineno - 1):
                     lines[i] = ''
-                lines[end_lineno - 1] = ']' + tail
+                lines[end_lineno - 1] = new_content[-1] + tail
                 lines_offset[end_lineno - 1] += len(
                     lines[end_lineno - 1]) - length_of_last_line
 

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.8.0"
+__version__ = "2.9.0"

{qulab-2.8.0.dist-info → qulab-2.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: QuLab
-Version: 2.8.0
+Version: 2.9.0
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>
@@ -44,6 +44,7 @@ Requires-Dist: watchdog>=4.0.0
 Requires-Dist: waveforms>=1.9.4
 Provides-Extra: full
 Requires-Dist: uvloop>=0.19.0; extra == "full"
+Dynamic: license-file
 
 # QuLab
 [![View build status](https://travis-ci.org/feihoo87/QuLab.svg?branch=master)](https://travis-ci.org/feihoo87/QuLab)

{qulab-2.8.0.dist-info → qulab-2.9.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
-qulab/__init__.py,sha256=RZme5maBSMZpP6ckXymqZpo2sRYttwEpTYCIzIvys1c,292
+qulab/__init__.py,sha256=RrWRvG8Lw27zMr7XP8s-z43b09-wiwPi0ZtiNWbky-c,328
 qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp310-win_amd64.pyd,sha256=IFR7znN7dCxfNQ3OHZgTsi1G8b8cSlyLacwV_oGBWnI,31744
+qulab/fun.cp310-win_amd64.pyd,sha256=63fEHjls7G98kQqq6YbxcB-nLL4DNhUV4U_oDAWjNUM,31744
 qulab/typing.py,sha256=PRtwbCHWY2ROKK8GHq4Bo8llXrIGo6xC73DrQf7S9os,71
 qulab/utils.py,sha256=65N2Xj7kqRsQ4epoLNY6tL-i5ts6Wk8YuJYee3Te6zI,3077
-qulab/version.py,sha256=HoslYmXXy3WAQMEXd5jNDwMD2rL7bVPI5DzutSN5GNc,21
+qulab/version.py,sha256=a31Mxt9ZbwomFaywnjMS--InOBZRSD7ltY06SX9P5q0,21
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
 qulab/cli/config.py,sha256=7h3k0K8FYHhI6LVWt8BoDdKrX2ApFDBAUAUuXhHwst4,3799
@@ -12,8 +12,8 @@ qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,10
 qulab/executor/cli.py,sha256=8d-8bRWZ5lmsMtjASsl1zu1rV-syeAESMNVthvIQxlo,10018
 qulab/executor/load.py,sha256=YndvzagvWR8Sg6WHZ-gP-Of0FrFOyh_E_a3VXsjDf1Q,17502
 qulab/executor/schedule.py,sha256=0BV5LGxhqdIlGwW6-o5_5mljAtdtL1La8EDNBFi8pzU,18585
-qulab/executor/storage.py,sha256=2YWUxYis8QlYLhzvvwoS2Wmyb9UYaojEh6X20ICePWI,19014
-qulab/executor/template.py,sha256=bKMoOBPfa3XMgTfGHQK6pDTswH1vcIjnopaWE3UKpP0,7726
+qulab/executor/storage.py,sha256=OA_XMDoFDfPZCU89caf9-VZ3D6qaWib8MpJno10KUfc,20770
+qulab/executor/template.py,sha256=KOSOC-MTcHHCudtBVgZwNpK5dstTz_os7bcU1Yx0mAs,10372
 qulab/executor/transform.py,sha256=BDx0c4nqTHMAOLVqju0Ydd91uxNm6EpVIfssjZse0bI,2284
 qulab/executor/utils.py,sha256=l_b0y2kMwYKyyXeFtoblPYwKNU-wiFQ9PMo9QlWl9wE,6213
 qulab/monitor/__init__.py,sha256=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
@@ -97,9 +97,9 @@ qulab/visualization/plot_seq.py,sha256=Uo1-dB1YE9IN_A9tuaOs9ZG3S5dKDQ_l98iD2Wbxp
 qulab/visualization/qdat.py,sha256=HubXFu4nfcA7iUzghJGle1C86G6221hicLR0b-GqhKQ,5887
 qulab/visualization/rot3d.py,sha256=jGHJcqj1lEWBUV-W4GUGONGacqjrYvuFoFCwPse5h1Y,757
 qulab/visualization/widgets.py,sha256=HcYwdhDtLreJiYaZuN3LfofjJmZcLwjMfP5aasebgDo,3266
-qulab-2.8.0.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-qulab-2.8.0.dist-info/METADATA,sha256=7GHqBOgAMQ_zxJaGPbsc6AbwGMQ7IObgjC9Dh5k7ggM,3803
-qulab-2.8.0.dist-info/WHEEL,sha256=H72wNgFePEN0L06A2Z11ydRFbMa6Lsr93VFntInNpxE,101
-qulab-2.8.0.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.8.0.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.8.0.dist-info/RECORD,,
+qulab-2.9.0.dist-info/licenses/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+qulab-2.9.0.dist-info/METADATA,sha256=5OizsNx2VbjgbNg5S1euXqlf9CrmsKbGW1oSoNFkVrs,3826
+qulab-2.9.0.dist-info/WHEEL,sha256=3P80pz7aU84nVq-51hAoVw99hqBBuyZ6hPufE-F7jcM,101
+qulab-2.9.0.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.9.0.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.9.0.dist-info/RECORD,,

{qulab-2.8.0.dist-info → qulab-2.9.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (77.0.3)
 Root-Is-Purelib: false
 Tag: cp310-cp310-win_amd64