QuLab 2.11.6__py3-none-any.whl → 2.11.8__py3-none-any.whl

qulab/executor/cli.py

@@ -1,7 +1,9 @@
+import ast
 import functools
 import graphlib
 import importlib
 import os
+import re
 import sys
 from pathlib import Path
 
@@ -283,7 +285,49 @@ def boot(bootstrap):
         run_script(bootstrap)
 
 
-@click.command()
+def parse_dynamic_option_value(value):
+    """解析动态参数值"""
+    try:
+        parsed_value = ast.literal_eval(value)
+    except (ValueError, SyntaxError):
+        # 如果解析失败，返回原始字符串
+        parsed_value = value
+    return parsed_value
+
+
+def parse_dynamic_options(args):
+    """解析格式为 key=value 的未知参数列表"""
+    pattern = re.compile(r'^([a-zA-Z_][\w\-]*)=(.+)$')
+    result = {}
+    for arg in args:
+        match = pattern.match(arg)
+        if match:
+            key, value = match.groups()
+            result[key] = parse_dynamic_option_value(value)
+        else:
+            raise ValueError(
+                f"Invalid argument format: {arg}. Expected format is key=value."
+            )
+    return result
+
+
+help_doc = """
+Run a workflow.
+
+If the workflow has entries, run all entries.
+If `--no-dependents` is set, only run the workflow itself.
+If `--retry` is set, retry the workflow when calibration failed.
+If `--freeze` is set, freeze the config table.
+If `--plot` is set, plot the report.
+If `--api` is set, use the api to get and update the config table.
+If `--code` is not set, use the current working directory.
+If `--data` is not set, use the `logs` directory in the code path.
+"""
+
+
+@click.command(context_settings=dict(ignore_unknown_options=True,
+                                     allow_extra_args=True),
+               help=help_doc)
 @click.argument('workflow')
 @click.option('--plot', '-p', is_flag=True, help='Plot the report.')
 @click.option('--no-dependents',
@@ -301,8 +345,10 @@ def boot(bootstrap):
               help='Veryfy the source code.')
 @log_options('run')
 @command_option('run')
+@click.pass_context
 @async_command
-async def run(workflow,
+async def run(ctx,
+              workflow,
               code,
               data,
               api,
@@ -312,18 +358,6 @@ async def run(workflow,
               freeze,
               fail_fast,
               veryfy_source_code=True):
-    """
-    Run a workflow.
-
-    If the workflow has entries, run all entries.
-    If `--no-dependents` is set, only run the workflow itself.
-    If `--retry` is set, retry the workflow when calibration failed.
-    If `--freeze` is set, freeze the config table.
-    If `--plot` is set, plot the report.
-    If `--api` is set, use the api to get and update the config table.
-    If `--code` is not set, use the current working directory.
-    If `--data` is not set, use the `logs` directory in the code path.
-    """
     logger.info(
         f'[CMD]: run {workflow} --code {code} --data {data} --api {api}'
         f'{" --plot" if plot else ""}'
@@ -342,6 +376,13 @@ async def run(workflow,
     code = Path(os.path.expanduser(code))
     data = Path(os.path.expanduser(data))
 
+    extra_args = ctx.args
+    params = parse_dynamic_options(extra_args)
+
+    if params:
+        workflow = (workflow, params)
+        rich.print(workflow)
+
     wf = load_workflow(workflow, code, veryfy_source_code=veryfy_source_code)
     check_toplogy(wf, code, veryfy_source_code=veryfy_source_code)
 

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.11.6"
+__version__ = "2.11.8"

qulab/visualization/plot_layout.py

@@ -6,6 +6,8 @@ import numpy as np
 from matplotlib import cm
 from matplotlib.colors import Normalize
 
+from .rot3d import projection, rot_round
+
 layout_example = {
     'qubits': {
         'Q0': {
@@ -152,7 +154,7 @@ def circle_path(pos, r, n=40):
     return xx, yy
 
 
-def circle_link_path(pos1, pos2, r1, r2, width, n=20):
+def circle_link_path(pos1, pos2, r1, r2, width, n=2):
     width = min(2 * max(r1, r2), width)
 
     x1, y1 = pos1
@@ -204,59 +206,185 @@ def circle_half_directed_link_path(pos1, pos2, r1, r2, width, n=20):
                       xx2[:-1]]), np.hstack([yy2[-1], yy1, a.imag, yy2[:-1]])
 
 
-def draw(layout, ax=None, qubit_cbar=True, coupler_cbar=True, origin='upper'):
+def project(pos, camera=(0, 0, 100), rotation=None):
+    if rotation is None:
+        rotation = {
+            'axis': (0, 0, 1),
+            'angle': 0,
+            'center': (0, 0, 0),
+        }
+    x0, y0, z0 = camera
+    if len(pos) == 2:
+        x, y, z = [*pos, 0]
+    else:
+        x, y, z = pos
+    x, y, z = rot_round(x, y, z, rotation['axis'], rotation['angle'],
+                        rotation['center'])
+    x, y, d = projection(x - x0, y - y0, z, d0=z0)
+    return x + x0, y + y0
+
+
+def _draw_qubit(ax, qubit, pos):
+    path = circle_path(pos, qubit.get('radius', 0.5))
+    plot_range(ax,
+               path,
+               qubit.get('text', ''),
+               qubit.get('color', None),
+               lw=qubit.get('lw', 0.5),
+               fontsize=qubit.get('fontsize', 9),
+               rotation=qubit.get('text_rotation', 0),
+               text_color=qubit.get('text_color', 'k'),
+               bounder_color=qubit.get('bounder_color', 'k'))
+
+
+def _draw_coupler(ax, coupler, layout, q1, q2, pos1, pos2):
+    r1 = layout['qubits'][q1].get('radius', 0.5)
+    r2 = layout['qubits'][q2].get('radius', 0.5)
+    width = coupler.get('width', 0.5)
+    lw = coupler.get('lw', 0.5)
+
+    text_rotation = 180 * np.arctan2(pos2[1] - pos1[1],
+                                     pos2[0] - pos1[0]) / np.pi
+
+    path = circle_link_path(pos1, pos2, r1, r2, width)
+    plot_range(ax,
+               path,
+               coupler.get('text', ''),
+               color=coupler.get('color', None),
+               lw=0,
+               fontsize=coupler.get('fontsize', 9),
+               rotation=coupler.get('text_rotation', text_rotation),
+               text_color=coupler.get('text_color', 'k'))
+    if lw > 0:
+        x, y = circle_link_path(pos1, pos2, r1, r2, width, n=2)
+        ax.plot(x[:2], y[:2], lw=lw, color=coupler.get('bounder_color', 'k'))
+        ax.plot(x[2:], y[2:], lw=lw, color=coupler.get('bounder_color', 'k'))
+
+
+def get_range(layout):
+    coods = []
+    for q in layout['qubits']:
+        pos = layout['qubits'][q]['pos']
+        if len(pos) == 2:
+            x, y, z = [*pos, 0]
+        else:
+            x, y, z = pos
+        coods.append([x, y, z])
+    coods = np.array(coods)
+
+    center = coods.mean(axis=0)
+    radius = np.max(np.sqrt(np.sum((coods - center)**2, axis=1)))
+
+    return center, radius
+
+
+def sorted_by_distance(layout, camera, rotation):
+    qubits = []
+    camera = np.array(camera)
+    for q in layout['qubits']:
+        pos = layout['qubits'][q]['pos']
+        if len(pos) == 2:
+            x, y, z = [*pos, 0]
+        else:
+            x, y, z = pos
+        x, y, z = rot_round(x, y, z, rotation['axis'], rotation['angle'],
+                            rotation['center'])
+        d = np.sqrt(np.sum((np.array([x, y, z]) - camera)**2))
+        qubits.append((d, q))
+    qubits = sorted(qubits, key=lambda x: x[0])
+
+    plot_order = []
+    for _, q in reversed(qubits):
+        for c in layout['qubits'][q]['couplers']:
+            if ('C', c) not in plot_order:
+                plot_order.append(('C', c))
+        plot_order.append(('Q', q))
+    return plot_order
+
+
+def draw(layout,
+         ax=None,
+         qubit_cbar=True,
+         coupler_cbar=True,
+         origin='upper',
+         camera=None,
+         rotation=None):
+    """
+    Draw a layout with qubits and couplers.
+
+    Parameters
+    ----------
+    layout: dict
+        A dictionary containing the layout of the qubits and couplers.
+        The dictionary should have the following structure:
+        {
+            'qubits': {
+                'Q0': {'pos': (x, y), 'radius': r, 'text': 'Q0'},
+                ...
+            },
+            'couplers': {
+                'C0': {'qubits': ['Q0', 'Q1'], 'width': w, 'text': 'C0'},
+                ...
+            }
+        }
+    ax: matplotlib.axes.Axes
+        The axes on which to draw the layout. If None, the current axes will be used.
+    qubit_cbar: bool
+        Whether to draw a colorbar for the qubits.
+    coupler_cbar: bool
+        Whether to draw a colorbar for the couplers.
+    origin: str
+        The origin of the layout. If 'upper', the y-coordinates will be inverted.
+    camera: tuple
+        The position of the camera in 3D space. Default is (0, 0, 1).
+    rotation: dict
+        The rotation of the layout. The dictionary should have the following structure:
+        {
+            'axis': (x, y, z),
+            'angle': angle,
+            'center': (x, y, z)
+        }
+        If None, no rotation will be applied.
+    """
     if ax is None:
         ax = plt.gca()
 
-    for qubit in layout['qubits'].values():
-        pos = qubit['pos']
-        if origin == 'upper':
-            pos = pos[0], -pos[1]
-        path = circle_path(pos, qubit.get('radius', 0.5))
-        plot_range(ax,
-                   path,
-                   qubit.get('text', ''),
-                   qubit.get('color', None),
-                   lw=qubit.get('lw', 0.5),
-                   fontsize=qubit.get('fontsize', 9),
-                   rotation=qubit.get('rotation', 0),
-                   text_color=qubit.get('text_color', 'k'),
-                   bounder_color=qubit.get('bounder_color', 'k'))
-
-    for coupler in layout['couplers'].values():
-        q1, q2 = coupler['qubits']
-        pos1 = layout['qubits'][q1]['pos']
-        pos2 = layout['qubits'][q2]['pos']
-        if origin == 'upper':
-            pos1 = pos1[0], -pos1[1]
-            pos2 = pos2[0], -pos2[1]
-        r1 = layout['qubits'][q1].get('radius', 0.5)
-        r2 = layout['qubits'][q2].get('radius', 0.5)
-        width = coupler.get('width', 0.5)
-        lw = coupler.get('lw', 0.5)
-
-        rotation = 180 * np.arctan2(pos2[1] - pos1[1],
-                                    pos2[0] - pos1[0]) / np.pi
-
-        path = circle_link_path(pos1, pos2, r1, r2, width)
-        plot_range(ax,
-                   path,
-                   coupler.get('text', ''),
-                   color=coupler.get('color', None),
-                   lw=0,
-                   fontsize=coupler.get('fontsize', 9),
-                   rotation=coupler.get('rotation', rotation),
-                   text_color=coupler.get('text_color', 'k'))
-        if lw > 0:
-            x, y = circle_link_path(pos1, pos2, r1, r2, width, n=2)
-            ax.plot(x[:2],
-                    y[:2],
-                    lw=lw,
-                    color=coupler.get('bounder_color', 'k'))
-            ax.plot(x[2:],
-                    y[2:],
-                    lw=lw,
-                    color=coupler.get('bounder_color', 'k'))
+    center, radius = get_range(layout)
+
+    if rotation is None:
+        rotation = {
+            'axis': (0, 0, 1),
+            'angle': 0,
+        }
+    if 'center' not in rotation:
+        rotation['center'] = center
+    if camera is None:
+        camera = (center[0], center[1], center[2] + radius * 5)
+
+    plot_order = sorted_by_distance(layout, camera, rotation)
+
+    if origin == 'upper':
+        camera = [camera[0], -camera[1], camera[2]]
+    for kind, name in plot_order:
+        if kind == 'Q':
+            pos = layout['qubits'][name]['pos']
+            if origin == 'upper':
+                pos = [pos[0], -pos[1], *pos[2:]]
+            pos = project(pos, camera, rotation)
+            _draw_qubit(ax, layout['qubits'][name], pos)
+        elif kind == 'C':
+            coupler = layout['couplers'][name]
+            q1, q2 = coupler['qubits']
+            pos1 = layout['qubits'][q1]['pos']
+            pos2 = layout['qubits'][q2]['pos']
+            if origin == 'upper':
+                pos1 = [pos1[0], -pos1[1], *pos1[2:]]
+                pos2 = [pos2[0], -pos2[1], *pos2[2:]]
+            pos1 = project(pos1, camera, rotation)
+            pos2 = project(pos2, camera, rotation)
+            _draw_coupler(ax, coupler, layout, q1, q2, pos1, pos2)
+        else:
+            pass
 
     ax.axis('equal')
     ax.set_axis_off()

qulab/visualization/rot3d.py

@@ -14,10 +14,36 @@ def _rot(theta, v):
 
 
 def rot_round(x, y, z, v=[0, 0, 1], theta=0, c=[0, 0, 0]):
+    """
+    Rotate a point (x, y, z) around a vector v by an angle theta
+
+    Parameters
+    ----------
+    x, y, z: coordinates of the point to be rotated
+    v: vector to rotate around
+    theta: angle to rotate by (in radians)
+    c: center of rotation
+
+    Returns
+    -------
+    ret: rotated coordinates
+    """
     ret = (np.array([x, y, z]).T - np.array(c)) @ _rot(theta, v) + np.array(c)
     return ret.T
 
 
-def projection(x, y, z, y0=1):
+def projection(x, y, z, d0=1):
+    """
+    Project a point (x, y, z) onto a plane at z = 0
+
+    Parameters
+    ----------
+    x, y, z: coordinates of the point to be projected
+    d0: distance from the camera to the plane
+
+    Returns
+    -------
+    ret: projected coordinates
+    """
     d = np.sqrt(x**2 + y**2 + z**2)
-    return x * y0 / y, z * y0 / y, d
+    return x * d0 / (d0 - z), y * d0 / (d0 - z), d

{qulab-2.11.6.dist-info → qulab-2.11.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuLab
-Version: 2.11.6
+Version: 2.11.8
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>

{qulab-2.11.6.dist-info → qulab-2.11.8.dist-info}/RECORD

@@ -2,14 +2,14 @@ qulab/__init__.py,sha256=hmf6R3jiM5NtJY1mSptogYnH5DMTR2dTzlXykqLxQzg,2027
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
 qulab/utils.py,sha256=w5oSw9Ypux6l0oB-MzlQvT40iX_rzQ5wXcwzr7CIVf8,4107
-qulab/version.py,sha256=Bx8wB0SH56T33xWJQ2wPqk64pcd9l8Qx4gqE_grdxI4,22
+qulab/version.py,sha256=LePXLjmUKQGA1V4KFVXMXBUtYne8QBdsbxVF-1ZmK4k,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=ywKmwbGNBCVASx8OsgrRttaLz9ogwY38ZdKj7I-tdJ4,813
 qulab/cli/config.py,sha256=tZPSBLbf2x_Brb2UBuA1bsni8nC8WOPPGyWIi8m7j1I,5459
 qulab/cli/decorators.py,sha256=oImteZVnDPPWdyhJ4kzf2KYGJLON7VsKGBvZadWLQZo,621
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/analyze.py,sha256=4Hau5LrKUdpweh7W94tcG4ahgxucHOevbM0hm57T7zE,5649
-qulab/executor/cli.py,sha256=ToFVaLnCHCxlpJQG9_LF1XIdPUJyfI_zx2C3lk3s9OA,18727
+qulab/executor/cli.py,sha256=iAyb9_w8r2zWETIwr5xUv3D_5mAVx3DCWcw6jVJaBPE,19862
 qulab/executor/load.py,sha256=eMlzOrrn8GpbP3J3uY5JJ8iO7tL5B1DWP1z2qiGyNhU,20385
 qulab/executor/registry.py,sha256=gym9F5FIDY5eV-cSCZsP99wC4l-6jkx9VMjJMaPOLaQ,4730
 qulab/executor/schedule.py,sha256=7gAJFwj13j1niGjVa1fSzwOS22eNFEN1hdrN3dfTY6A,21410
@@ -91,14 +91,14 @@ qulab/visualization/__init__.py,sha256=26cuHt3QIJXUb3VaMxlJx3IQTOUVJFKlYBZr7WMP5
 qulab/visualization/__main__.py,sha256=9zKK3yZFy0leU40ou6BpRC1Fsetfc1gjjFzIZYIwP6Y,1639
 qulab/visualization/_autoplot.py,sha256=31B7pn1pK19abpQDGYBU9a_27cDL87LBpx9vKqlcYAo,14165
 qulab/visualization/plot_circ.py,sha256=qZS3auNG4qIyUvC-ijTce17xJwGBvpRvPUqPEx64KUY,8759
-qulab/visualization/plot_layout.py,sha256=FaE3I1VgY2dO5wNw_jRMwiVnUC6lHT3C0Wa7RJCUvVI,13833
+qulab/visualization/plot_layout.py,sha256=n9yEmCOl7RJw2l0hXXRVsnLfDOMlK7A52kQZG_Y_NgM,17630
 qulab/visualization/plot_seq.py,sha256=UWTS6p9nfX_7B8ehcYo6UnSTUCjkBsNU9jiOeW2calY,6751
 qulab/visualization/qdat.py,sha256=ZeevBYWkzbww4xZnsjHhw7wRorJCBzbG0iEu-XQB4EA,5735
-qulab/visualization/rot3d.py,sha256=lMrEJlRLwYe6NMBlGkKYpp_V9CTipOAuDy6QW_cQK00,734
+qulab/visualization/rot3d.py,sha256=CuLfG1jw1032HNNZxzC0OWtNzKsbj2e2WRYhMWDgvMQ,1321
 qulab/visualization/widgets.py,sha256=6KkiTyQ8J-ei70LbPQZAK35wjktY47w2IveOa682ftA,3180
-qulab-2.11.6.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-qulab-2.11.6.dist-info/METADATA,sha256=SXXw-hAwWhB0ErJKBJX9RMx9MF4-PIXdSV6jvnKlzyk,3896
-qulab-2.11.6.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-qulab-2.11.6.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.11.6.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.11.6.dist-info/RECORD,,
+qulab-2.11.8.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.11.8.dist-info/METADATA,sha256=3_BeI_HmiV3Rp005N9KSCc6GpUuTKRhI6u3oUdCk850,3896
+qulab-2.11.8.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+qulab-2.11.8.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.11.8.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.11.8.dist-info/RECORD,,

{qulab-2.11.6.dist-info → qulab-2.11.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any