QuLab 2.7.11__cp311-cp311-win_amd64.whl → 2.7.13__cp311-cp311-win_amd64.whl

qulab/cli/config.py

@@ -68,6 +68,10 @@ def log_options(func):
                   type=click.Path(),
                   default=lambda: get_config_value("log", Path),
                   help=f"Log file path")
+    @click.option("--debug-log",
+                  type=click.Path(),
+                  default=lambda: get_config_value("debug_log", Path),
+                  help=f"Debug log file path")
     @click.option("--quiet",
                   is_flag=True,
                   default=get_config_value("quiet", bool),
@@ -76,6 +80,7 @@ def log_options(func):
     def wrapper(*args, **kwargs):
         debug = bool(kwargs.pop("debug"))
         log = kwargs.pop("log")
+        debug_log = kwargs.pop("debug_log")
         quiet = bool(kwargs.pop("quiet"))
 
         if debug:
@@ -85,7 +90,17 @@ def log_options(func):
 
         handlers = []
         if log is not None:
-            handlers.append(dict(sink=log, level=log_level))
+            handlers.append(
+                dict(sink=log,
+                     level="INFO",
+                     rotation="monday at 7:00",
+                     compression="zip"))
+        if debug_log is not None:
+            handlers.append(
+                dict(sink=debug_log,
+                     level="DEBUG",
+                     rotation="monday at 7:00",
+                     compression="zip"))
         if not quiet or debug:
             handlers.append(dict(sink=sys.stderr, level=log_level))
 

qulab/executor/schedule.py

@@ -1,4 +1,5 @@
 import functools
+import inspect
 import pickle
 import uuid
 from datetime import datetime, timedelta
@@ -231,21 +232,7 @@ def call_analyzer(node: WorkflowType,
     if hasattr(node, 'oracle') and callable(node.oracle):
         logger.debug(
             f'"{node.__workflow_id__}" has oracle method, calling ...')
-        try:
-            report = node.oracle(report,
-                                 history=history,
-                                 system_state=get_heads(report.base_path))
-        except Exception as e:
-            logger.exception(e)
-            report.oracle = {}
-        if not isinstance(report, Report):
-            raise TypeError(
-                f'"{node.__workflow_id__}" : function "oracle" must return a Report object'
-            )
-        if not is_pickleable(report.oracle):
-            raise TypeError(
-                f'"{node.__workflow_id__}" : function "oracle" return not pickleable data'
-            )
+        report = call_oracle(node, report, history)
     report.fully_calibrated = True
     save_report(node.__workflow_id__, report, state_path, overwrite=True)
     if plot:
@@ -253,6 +240,35 @@ def call_analyzer(node: WorkflowType,
     return report
 
 
+def call_oracle(node: WorkflowType, report: Report, history: Report | None):
+    sig = inspect.signature(node.oracle)
+    try:
+        if 'history' in sig.parameters and 'system_state' in sig.parameters:
+            report = node.oracle(report,
+                                 history=history,
+                                 system_state=get_heads(report.base_path))
+        elif 'history' in sig.parameters:
+            report = node.oracle(report, history=history)
+        elif 'system_state' in sig.parameters:
+            report = node.oracle(report,
+                                 system_state=get_heads(report.base_path))
+        else:
+            report = node.oracle(report)
+    except Exception as e:
+        logger.exception(e)
+        report.oracle = {}
+        return report
+    if not isinstance(report, Report):
+        raise TypeError(
+            f'"{node.__workflow_id__}" : function "oracle" must return a Report object'
+        )
+    if not is_pickleable(report.oracle):
+        raise TypeError(
+            f'"{node.__workflow_id__}" : function "oracle" return not pickleable data'
+        )
+    return report
+
+
 def check_data(workflow: WorkflowType, state_path: str | Path, plot: bool,
                session_id: str) -> Report:
     """
@@ -387,6 +403,7 @@ def diagnose(workflow: WorkflowType, code_path: str | Path,
             f'"{workflow.__workflow_id__}": All dependents passed, but calibration failed!'
         )
     update_parameters(report, state_path)
+    logger.debug(f'"{workflow.__workflow_id__}": parameters updated')
     return True
 
 
@@ -451,6 +468,9 @@ def maintain(workflow: WorkflowType,
         )
     if not freeze:
         update_parameters(report, state_path)
+        logger.debug(f'"{workflow.__workflow_id__}": parameters updated')
+    else:
+        logger.debug(f'"{workflow.__workflow_id__}": parameters freezed')
     return
 
 
@@ -471,4 +491,7 @@ def run(workflow: WorkflowType,
         )
     if not freeze:
         update_parameters(report, state_path)
+        logger.debug(f'"{workflow.__workflow_id__}": parameters updated')
+    else:
+        logger.debug(f'"{workflow.__workflow_id__}": parameters freezed')
     return

qulab/tools/__init__.py

@@ -0,0 +1,39 @@
+class _Missing():
+
+    def __repr__(self):
+        return "Missing"
+
+
+Missing = _Missing()
+
+
+def connect_trace(*mappings):
+    if not mappings:
+        return {}
+    result = {}
+    first_mapping = mappings[0]
+    for key in first_mapping:
+        current_value = key
+        trajectory = []
+        for mapping in mappings:
+            if current_value is Missing:
+                trajectory.append(Missing)
+                continue
+            if current_value in mapping:
+                next_value = mapping[current_value]
+                trajectory.append(next_value)
+                current_value = next_value
+            else:
+                trajectory.append(Missing)
+                current_value = Missing
+        result[key] = trajectory
+    return result
+
+
+def connect(*mappings):
+    if not mappings:
+        return {}
+    return {
+        k: v[-1]
+        for k, v in connect_trace(*mappings).items() if v[-1] is not Missing
+    }

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.7.11"
+__version__ = "2.7.13"

{QuLab-2.7.11.dist-info → qulab-2.7.13.dist-info}/METADATA

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

{QuLab-2.7.11.dist-info → qulab-2.7.13.dist-info}/RECORD

@@ -1,17 +1,17 @@
 qulab/__init__.py,sha256=RZme5maBSMZpP6ckXymqZpo2sRYttwEpTYCIzIvys1c,292
 qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp311-win_amd64.pyd,sha256=_hMMu2UoQ3yN4lnys2JMZerHezGvXi7COeVHn_U6Nik,31744
+qulab/fun.cp311-win_amd64.pyd,sha256=3wiH83Z0sdScaevWUlGhVmyfkMsIgJgRSv-djBbJG14,31744
 qulab/typing.py,sha256=PRtwbCHWY2ROKK8GHq4Bo8llXrIGo6xC73DrQf7S9os,71
 qulab/utils.py,sha256=UyZNPIyvis5t2MJBkXXLO5EmYP3mQZbt87zmYAHgoyk,1291
-qulab/version.py,sha256=1KL8md1HXIKNwnebAea7SJ7-uBme-7LHKGfuCG29ZiU,22
+qulab/version.py,sha256=aT1ObWeGn4CAPTB2n1JwBZCtp9XDVJssGu0Z4ACIIQ4,22
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
-qulab/cli/config.py,sha256=tNmH4ggdgrFqcQa2WZKLpidiYTg95_UnT0paDJ4fi4c,3204
+qulab/cli/config.py,sha256=7h3k0K8FYHhI6LVWt8BoDdKrX2ApFDBAUAUuXhHwst4,3799
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/cli.py,sha256=gGka2M6xccfM8facsIJ2qZ1y2Yx8C4BRhc1JG6nK9mo,8932
 qulab/executor/load.py,sha256=4FY_SwumLDUewC265v4j_ZGGpfYOgH4c8PtglYcWpBw,18077
-qulab/executor/schedule.py,sha256=137OlWojJICEsq2BSz1ybOa1Gy8-f8U4KSC6YLgdjZ4,18061
+qulab/executor/schedule.py,sha256=9pTOVWzKiDc7ip8iuB_47poJcYOvoBI9eQwTrDTA3p0,19044
 qulab/executor/storage.py,sha256=gI6g28BmKKEZ_Pl-hFwvpiOj3mF8Su-yjj3hfMXs1VY,11630
 qulab/executor/transform.py,sha256=4DyGXv1Iw36cCPqbqXlsn0Lw6gFjQpp_6Hcta50YQxU,2181
 qulab/executor/utils.py,sha256=cF6-2jlvlHyTjNHdxXKG04Fjfm3_3wfDQAF1G8DQphk,5686
@@ -85,6 +85,7 @@ qulab/sys/rpc/socket.py,sha256=W3bPwe8um1IeR_3HLx-ad6iCcbeuUQcSg11Ze4w6DJg,742
 qulab/sys/rpc/utils.py,sha256=BurIcqh8CS-Hsk1dYP6IiefK4qHivaEqD9_rBY083SA,619
 qulab/sys/rpc/worker.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/sys/rpc/zmq_socket.py,sha256=aoIm-C-IdJjm9_PQXckvbqTxc9kCeJrT4PyYytoDIHo,8492
+qulab/tools/__init__.py,sha256=-qZJcLsfueyHMihcbMp3HU3VRwz8zB0wnlosSjKp6R0,985
 qulab/visualization/__init__.py,sha256=Bkt9AK5c45d6HFLlT-f8cIppywXziHtJqhDtVxOoKKo,6317
 qulab/visualization/__main__.py,sha256=WduINFl21B-XMsi2rg2cVhIyU11hKKX3zOsjc56QLiQ,1710
 qulab/visualization/_autoplot.py,sha256=gK3m5STiUigcQdJ3NzqD5jEITkPAsTsWMnmw6nUJfvE,14629
@@ -94,9 +95,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.7.11.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-QuLab-2.7.11.dist-info/METADATA,sha256=ZWK3GzveHjjVhPbhGV2e3XIGxCSbmsU3KgUlb4-nwEo,3804
-QuLab-2.7.11.dist-info/WHEEL,sha256=yNnHoQL2GZYIUXm9YvoaBpFjGlUoK9qq9oqYeudrWlE,101
-QuLab-2.7.11.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-QuLab-2.7.11.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-QuLab-2.7.11.dist-info/RECORD,,
+qulab-2.7.13.dist-info/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+qulab-2.7.13.dist-info/METADATA,sha256=xjqn4NNAHSvgY79ASBUx7tCaHHqJ_vQVkAH62v4sEJY,3804
+qulab-2.7.13.dist-info/WHEEL,sha256=lPxm9M09dVYWZ0wAh0Zu0ADFguuSXLRXmaW8X9Lg2rA,101
+qulab-2.7.13.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.7.13.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.7.13.dist-info/RECORD,,

{QuLab-2.7.11.dist-info → qulab-2.7.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: false
 Tag: cp311-cp311-win_amd64