QuLab 2.7.0__tar.gz → 2.7.2__tar.gz

{qulab-2.7.0 → qulab-2.7.2}/PKG-INFO

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

{qulab-2.7.0 → qulab-2.7.2}/QuLab.egg-info/PKG-INFO

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

{qulab-2.7.0 → qulab-2.7.2}/QuLab.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ qulab/__init__.py
 qulab/__main__.py
 qulab/dicttree.py
 qulab/typing.py
+qulab/utils.py
 qulab/version.py
 qulab/cli/__init__.py
 qulab/cli/commands.py

{qulab-2.7.0 → qulab-2.7.2}/qulab/executor/load.py

@@ -24,6 +24,7 @@ class SetConfigWorkflow():
 
     def __init__(self, key):
         self.key = key
+        self.__workflow_id__ = f"cfg:{self.key}"
 
     def depends(self):
         return []
@@ -31,7 +32,7 @@ class SetConfigWorkflow():
     def check_state(self, history: Result) -> bool:
         from . import transform
         try:
-            return self._equal(history.params[self.key],
+            return self._equal(history.parameters[self.key],
                                transform.query_config(self.key))
         except:
             return False
@@ -50,18 +51,22 @@ class SetConfigWorkflow():
         return result
 
     def check(self):
-        from .transform import query_config
-        return query_config(self.key)
+        return self.calibrate()
 
-    def check_analyze(self, result: Result, history: Result):
-        result.state = 'Outdated'
-        result.parameters = {self.key: result.data}
+    def check_analyze(self, result: Result, history: Result | None):
+        if self.check_state(history):
+            result.state = 'OK'
+            result.parameters = {self.key: history.data}
+        else:
+            result.state = 'Outdated'
         return result
 
     @staticmethod
     def _equal(a, b):
         import numpy as np
 
+        if a is b:
+            return True
         try:
             return a == b
         except:

{qulab-2.7.0 → qulab-2.7.2}/qulab/executor/schedule.py

@@ -7,8 +7,8 @@ from pathlib import Path
 from loguru import logger
 
 from .load import WorkflowType, get_dependents
-from .storage import (Result, find_result, renew_result, revoke_result,
-                      save_result)
+from .storage import (Result, find_result, get_heads, renew_result,
+                      revoke_result, save_result)
 from .transform import current_config, obey_the_oracle, update_parameters
 
 
@@ -47,7 +47,7 @@ def check_state(workflow: WorkflowType, code_path: str | Path,
     3. No dependencies have been recalibrated since the last time check data or calibrate was run on this cal.
     4. All dependencies pass check state.
     """
-    logger.debug(f'check_state: "{workflow}"')
+    logger.debug(f'check_state: "{workflow.__workflow_id__}"')
     result = find_result(workflow.__workflow_id__, state_path)
     if not result:
         logger.debug(
@@ -104,13 +104,19 @@ def call_analyzer(node,
             logger.debug(
                 f'"{node.__workflow_id__}" has oracle method, calling ...')
             try:
-                result = node.oracle(result, history=history)
+                result = node.oracle(result,
+                                     history=history,
+                                     system_state=get_heads(result.base_path))
             except Exception as e:
                 logger.exception(e)
                 result.oracle = {}
+            if not isinstance(result, Result):
+                raise TypeError(
+                    f'"{node.__workflow_id__}" : function "oracle" must return a Result object'
+                )
             if not is_pickleable(result.oracle):
                 raise TypeError(
-                    f'"{node.__workflow_id__}" : "oracle" return not pickleable data'
+                    f'"{node.__workflow_id__}" : function "oracle" return not pickleable data'
                 )
         result.fully_calibrated = True
         if plot:
@@ -201,7 +207,7 @@ def check_data(workflow: WorkflowType, code_path: str | Path,
                         base_path=state_path)
         save_result(workflow.__workflow_id__, result, state_path)
 
-        logger.debug(f'Calibrated "{workflow}" !')
+        logger.debug(f'Calibrated "{workflow.__workflow_id__}" !')
         result = call_analyzer(workflow,
                                result,
                                history,

{qulab-2.7.0 → qulab-2.7.2}/qulab/executor/storage.py

@@ -12,6 +12,8 @@ from loguru import logger
 
 from ..cli.config import get_config_value
 
+__current_config_cache = None
+
 
 @dataclass
 class Result():
@@ -85,10 +87,56 @@ def random_path(base: Path) -> Path:
             return path
 
 
+def save_config_key_history(key: str, result: Result,
+                            base_path: str | Path) -> int:
+    global __current_config_cache
+    base_path = Path(base_path) / 'state'
+    base_path.mkdir(parents=True, exist_ok=True)
+
+    if __current_config_cache is None:
+        if (base_path / 'parameters.pkl').exists():
+            with open(base_path / 'parameters.pkl', 'rb') as f:
+                __current_config_cache = pickle.load(f)
+        else:
+            __current_config_cache = {}
+
+    __current_config_cache[key] = result.data
+
+    with open(base_path / 'parameters.pkl', 'wb') as f:
+        pickle.dump(__current_config_cache, f)
+    return 0
+
+
+def find_config_key_history(key: str, base_path: str | Path) -> Result | None:
+    global __current_config_cache
+    base_path = Path(base_path) / 'state'
+    if __current_config_cache is None:
+        if (base_path / 'parameters.pkl').exists():
+            with open(base_path / 'parameters.pkl', 'rb') as f:
+                __current_config_cache = pickle.load(f)
+        else:
+            __current_config_cache = {}
+
+    if key in __current_config_cache:
+        value = __current_config_cache.get(key, None)
+        result = Result(workflow=f'cfg:{key}',
+                        bad_data=False,
+                        in_spec=True,
+                        fully_calibrated=True,
+                        parameters={key: value},
+                        data=value)
+        result.bad_data = False
+        return result
+    return None
+
+
 def save_result(workflow: str,
                 result: Result,
                 base_path: str | Path,
                 overwrite: bool = False) -> int:
+    if workflow.startswith("cfg:"):
+        return save_config_key_history(workflow[4:], result, base_path)
+
     logger.debug(
         f'Saving result for "{workflow}", {result.in_spec=}, {result.bad_data=}, {result.fully_calibrated=}'
     )
@@ -132,6 +180,9 @@ def load_result(path: str | Path, base_path: str | Path) -> Result | None:
 def find_result(
     workflow: str, base_path: str | Path = get_config_value("data", Path)
 ) -> Result | None:
+    if workflow.startswith("cfg:"):
+        return find_config_key_history(workflow[4:], base_path)
+
     base_path = Path(base_path)
     path = get_head(workflow, base_path)
     if path is None:

{qulab-2.7.0 → qulab-2.7.2}/qulab/executor/utils.py

@@ -135,7 +135,9 @@ def check_analyze(result: Result, history: Result | None = None) -> Result:
     return result
 
 
-def oracle(result: Result, history: Result | None = None):
+def oracle(result: Result,
+           history: Result | None = None,
+           system_state: dict[str:str] | None = None) -> Result:
     \"\"\"
     谕示：指凭直觉或经验判断，改动某些配置，以期望下次校准成功。
     
@@ -145,7 +147,6 @@ def oracle(result: Result, history: Result | None = None):
 
     该函数代入的参数 result 是 analyze 函数的返回值。
     \"\"\"
-    result.oracle = {{}}
 
     # result.oracle['Q0.bias'] = 0.1
     # result.oracle['Q1.bias'] = -0.03

qulab-2.7.2/qulab/utils.py

@@ -0,0 +1,31 @@
+import subprocess
+import sys
+
+
+def run_detached_with_terminal(executable_path):
+    """
+    启动可执行文件并在新终端窗口中保持运行，Python退出后进程仍存在。
+    适用于Windows、Linux和macOS。
+    """
+    try:
+        if sys.platform == 'win32':
+            # Windows：使用start命令启动新cmd窗口
+            cmd = f'start cmd /k "{executable_path}"'
+            subprocess.Popen(cmd, shell=True)
+        elif sys.platform == 'darwin':
+            # macOS：通过AppleScript在Terminal中执行命令
+            escaped_path = executable_path.replace('"', r'\"')
+            script = f'tell application "Terminal" to do script "{escaped_path}"'
+            subprocess.Popen(['osascript', '-e', script],
+                             start_new_session=True)
+        else:
+            # Linux：尝试gnome-terminal或xterm
+            try:
+                subprocess.Popen(['gnome-terminal', '--', executable_path],
+                                 start_new_session=True)
+            except FileNotFoundError:
+                subprocess.Popen(['xterm', '-e', executable_path],
+                                 start_new_session=True)
+    except Exception as e:
+        print(f"启动失败: {e}")
+        sys.exit(1)

qulab-2.7.2/qulab/version.py

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

qulab-2.7.0/qulab/version.py

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