QuLab 2.7.11__tar.gz → 2.7.13__tar.gz

{qulab-2.7.11 → qulab-2.7.13}/PKG-INFO

@@ -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 → qulab-2.7.13}/QuLab.egg-info/PKG-INFO

@@ -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 → qulab-2.7.13}/QuLab.egg-info/SOURCES.txt

@@ -95,6 +95,7 @@ qulab/sys/rpc/socket.py
 qulab/sys/rpc/utils.py
 qulab/sys/rpc/worker.py
 qulab/sys/rpc/zmq_socket.py
+qulab/tools/__init__.py
 qulab/visualization/__init__.py
 qulab/visualization/__main__.py
 qulab/visualization/_autoplot.py

{qulab-2.7.11 → qulab-2.7.13}/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-2.7.11 → qulab-2.7.13}/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-2.7.13/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-2.7.13/qulab/version.py

@@ -0,0 +1 @@
+__version__ = "2.7.13"

qulab-2.7.11/qulab/version.py

@@ -1 +0,0 @@
-__version__ = "2.7.11"