QuLab 2.9.7__cp310-cp310-macosx_10_9_universal2.whl → 2.9.9__cp310-cp310-macosx_10_9_universal2.whl

qulab/__init__.py

@@ -1,3 +1,4 @@
+from .executor.analyze import manual_analysis
 from .executor.storage import find_report
 from .executor.storage import get_report_by_index as get_report
 from .executor.template import VAR

qulab/executor/analyze.py

@@ -0,0 +1,188 @@
+import pickle
+import threading
+import time
+
+import pyperclip
+import zmq
+
+from .storage import Report
+
+# 需要复制到 Notebook 的代码模板
+clip_template = """
+from qulab.executor.analyze import get_report as get_report_{server_port}
+
+report, history = get_report_{server_port}("tcp://{server_address}:{server_port}")
+# 在这里插入数据处理逻辑
+
+{analysis_code}
+"""
+
+analysis_code = """
+# report.state = 'OK'
+# report.parameters = {}
+# report.oracle = {}
+# report.other_infomation = {}
+
+report.parameters
+
+"""
+
+
+# ZeroMQ 服务线程，用于响应 Notebook 的请求
+class ServerThread(threading.Thread):
+
+    def __init__(self, data, timeout):
+        super().__init__()
+        self.data = data
+        self.result = None
+        self.port = 0
+        self.timeout = timeout
+        self.running = True
+        self.finished = threading.Event()
+        self.context = zmq.Context()
+
+    def find_free_port(self):
+        with zmq.Socket(self.context, zmq.REQ) as s:
+            s.bind_to_random_port("tcp://*")
+            self.port = int(
+                s.getsockopt(zmq.LAST_ENDPOINT).decode().split(":")[-1])
+            s.unbind(s.getsockopt(zmq.LAST_ENDPOINT))
+        return self.port
+
+    def run(self):
+        self.port = self.find_free_port()
+        socket = self.context.socket(zmq.REP)
+        socket.bind(f"tcp://*:{self.port}")
+        # 设置 recv 超时 1 秒
+        socket.RCVTIMEO = 1000
+        start_time = time.time()
+        try:
+            while self.running and (time.time() - start_time < self.timeout):
+                try:
+                    msg = socket.recv()
+                except zmq.Again:
+                    continue  # 超时后继续等待
+
+                # Notebook 端请求数据
+                if msg == b"GET":
+                    socket.send(pickle.dumps(self.data))
+                else:
+                    # Notebook 端提交了处理结果
+                    try:
+                        self.result = pickle.loads(msg)
+                    except Exception as e:
+                        # 如果解析失败，也返回默认 ACK
+                        self.result = None
+                    socket.send(b"ACK")
+                    self.running = False
+                    break
+        finally:
+            socket.close()
+            self.context.term()
+            self.finished.set()
+
+    def stop(self):
+        self.running = False
+        self.finished.set()
+
+    def wait_for_result(self):
+        self.finished.wait()
+        return self.result
+
+
+# 进入分析流程，启动服务并打印等待提示
+def get_result_or_wait_until_timeout(report: Report, history: Report | None,
+                                     timeout: float) -> Report:
+    server = ServerThread((report, history), timeout)
+    server.start()
+
+    parameters = report.parameters
+    oracle = report.oracle
+    other_infomation = report.other_infomation
+    state = report.state
+
+    # 格式化代码模板
+    code = clip_template.format(server_address="127.0.0.1",
+                                server_port=server.port,
+                                analysis_code=analysis_code)
+
+    # 将代码复制到剪切板
+    pyperclip.copy(code)
+
+    # 同时打印到终端，防止误操作导致剪切板内容丢失
+    print("请在 Jupyter Notebook 中运行下面这段代码：")
+    print("-" * 60)
+    print(code)
+    print("-" * 60)
+    print("等待 Notebook 提交处理结果，或等待超时（{} 秒）...".format(timeout))
+
+    start_time = time.time()
+    # 采用循环等待提交结果，间隔 0.5 秒检测一次
+    while server.finished.wait(timeout=0.5) is False:
+        elapsed = time.time() - start_time
+        if elapsed >= timeout:
+            # 超时后结束等待
+            server.stop()
+            break
+
+    result = server.wait_for_result()
+    if result is None:
+        return (state, parameters, oracle, other_infomation, code)
+    else:
+        return result
+
+
+def manual_analysis(report: Report, history=None, timeout=3600):
+    try:
+        (state, parameters, oracle, other_infomation,
+         code) = get_result_or_wait_until_timeout(report, history, timeout)
+        report.parameters = parameters
+        report.oracle = oracle
+        report.state = state
+        report.other_infomation = other_infomation
+    except Exception as e:
+        pass
+    return report
+
+
+def get_report(address: str) -> Report:
+    import IPython
+
+    ipy = IPython.get_ipython()
+    if ipy is None:
+        raise RuntimeError("请在 Jupyter Notebook 中运行此函数。")
+    ipy.set_next_input(("from qulab.executor.analyze import submit_report\n"
+                        "# 处理完成后，提交结果\n"
+                        f"# submit_report(report, \"{address}\")"),
+                       replace=False)
+    context = zmq.Context()
+    sock = context.socket(zmq.REQ)
+    sock.connect(address)
+    # 请求数据
+    sock.send(b"GET")
+    report, history = pickle.loads(sock.recv())
+    return report, history
+
+
+def submit_report(report: Report, address: str):
+    import IPython
+
+    ipy = IPython.get_ipython()
+    if ipy is None:
+        raise RuntimeError("请在 Jupyter Notebook 中运行此函数。")
+
+    code = ipy.user_ns['In'][-2]
+
+    parameters = report.parameters
+    oracle = report.oracle
+    other_infomation = report.other_infomation
+    state = report.state
+
+    context = zmq.Context()
+    sock = context.socket(zmq.REQ)
+    sock.connect(address)
+    # 提交处理后的结果
+    sock.send(pickle.dumps(
+        (state, parameters, oracle, other_infomation, code)))
+    ack = sock.recv()
+    print("结果已提交。")

qulab/executor/storage.py

@@ -65,7 +65,7 @@ class Report():
 
     def __getstate__(self):
         state = self.__dict__.copy()
-        state.pop('base_path')
+        state.pop('base_path', None)
         for k in ['path', 'previous_path', 'config_path', 'script_path']:
             if state[k] is not None:
                 state[k] = str(state[k])

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.9.7"
+__version__ = "2.9.9"

{qulab-2.9.7.dist-info → qulab-2.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: QuLab
-Version: 2.9.7
+Version: 2.9.9
 Summary: contral instruments and manage data
 Author-email: feihoo87 <feihoo87@gmail.com>
 Maintainer-email: feihoo87 <feihoo87@gmail.com>
@@ -36,6 +36,7 @@ Requires-Dist: msgpack>=1.0.5
 Requires-Dist: nevergrad>=1.0.2
 Requires-Dist: numpy>=1.13.3
 Requires-Dist: ply>=3.11
+Requires-Dist: pyperclip>=1.8.2
 Requires-Dist: pyzmq>=25.1.0
 Requires-Dist: scipy>=1.0.0
 Requires-Dist: scikit-optimize>=0.9.0

{qulab-2.9.7.dist-info → qulab-2.9.9.dist-info}/RECORD

@@ -1,18 +1,19 @@
-qulab/__init__.py,sha256=JZ3bn_kTVlnY-P8JXQ5xEdViieFXqfxX8ReLuiiXIpo,321
+qulab/__init__.py,sha256=fL8FSMGk4vzTMXLxWgNHpd1fNWau4yujSWjPEPqudos,367
 qulab/__main__.py,sha256=fjaRSL_uUjNIzBGNgjlGswb9TJ2VD5qnkZHW3hItrD4,68
 qulab/dicttree.py,sha256=tRRMpGZYVOLw0TEByE3_2Ss8FdOmzuGL9e1DWbs8qoY,13684
-qulab/fun.cpython-310-darwin.so,sha256=VrUlHJ1pFO5oNrnp2dTPjzK0QA-z2vCrZbhevORa26o,126864
+qulab/fun.cpython-310-darwin.so,sha256=XWLiXx9_kVCfIZTM2Qd4MQICq-dRez6ZBl7nLoNxMLA,126864
 qulab/typing.py,sha256=vg62sGqxuD9CI5677ejlzAmf2fVdAESZCQjAE_xSxPg,69
 qulab/utils.py,sha256=BdLdlfjpe6m6gSeONYmpAKTTqxDaYHNk4exlz8kZxTg,2982
-qulab/version.py,sha256=YMyATiSQWC8XaFTG2e9YghQWC6WcAk1_57Et_fYwGVs,21
+qulab/version.py,sha256=gB2GONub0WyICh4-SbXI8ce5oNADu2_gH_-ZqWOveM0,21
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=F1LATmSC9lOAdnrOTMK7DRjETCEcOmMsocovWRyjWTc,597
 qulab/cli/config.py,sha256=Ei7eSYnbwPPlluDnm8YmWONYiI4g7WtvlZGQdr1Z6vo,3688
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
+qulab/executor/analyze.py,sha256=4Hau5LrKUdpweh7W94tcG4ahgxucHOevbM0hm57T7zE,5649
 qulab/executor/cli.py,sha256=xceK6XNLnNpAVtqvs0_wOAuG0sgS9jg1iTFYmxVUMWY,11795
 qulab/executor/load.py,sha256=qI-3b3xvsjZMCthRO3hlzHA0BZI-tH9Y_L0XLBcyWV8,18657
 qulab/executor/schedule.py,sha256=XRimchHYCgnMAOtCvNLjwMv9IkcTAyBAUCHKQs5RBRw,18745
-qulab/executor/storage.py,sha256=PWQIDYjQaoyLGgAKh0X1tlNQTgDWR8bI-HVie4hSkyA,21075
+qulab/executor/storage.py,sha256=8K73KGLAVgchJdtd4rKHXkr1CQOJORWH-Gi57w8IYsw,21081
 qulab/executor/template.py,sha256=_HEtsUQ5_jSujCw8FBDAK1PRTMRCa4iD4DduHIpjo3c,10569
 qulab/executor/transform.py,sha256=rk4CLIKVjGRaFzi5FVSgadUxAKKVLSopEHZCaAzDwDg,3435
 qulab/executor/utils.py,sha256=l_b0y2kMwYKyyXeFtoblPYwKNU-wiFQ9PMo9QlWl9wE,6213
@@ -97,9 +98,9 @@ qulab/visualization/plot_seq.py,sha256=UWTS6p9nfX_7B8ehcYo6UnSTUCjkBsNU9jiOeW2ca
 qulab/visualization/qdat.py,sha256=ZeevBYWkzbww4xZnsjHhw7wRorJCBzbG0iEu-XQB4EA,5735
 qulab/visualization/rot3d.py,sha256=lMrEJlRLwYe6NMBlGkKYpp_V9CTipOAuDy6QW_cQK00,734
 qulab/visualization/widgets.py,sha256=6KkiTyQ8J-ei70LbPQZAK35wjktY47w2IveOa682ftA,3180
-qulab-2.9.7.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
-qulab-2.9.7.dist-info/METADATA,sha256=R4asNQDngbtrmIQiaHPnNBGubf76IoqxnODjnKx8GEw,3720
-qulab-2.9.7.dist-info/WHEEL,sha256=qnIvK8L8kOW9FTrzifubcmNsZckgNfGDNKzGG7FMEdE,114
-qulab-2.9.7.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.9.7.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.9.7.dist-info/RECORD,,
+qulab-2.9.9.dist-info/licenses/LICENSE,sha256=PRzIKxZtpQcH7whTG6Egvzl1A0BvnSf30tmR2X2KrpA,1065
+qulab-2.9.9.dist-info/METADATA,sha256=YNn0O6ThCfze52902y9RPVsTFtwpoVUpxzKjzqcrZmE,3752
+qulab-2.9.9.dist-info/WHEEL,sha256=qnIvK8L8kOW9FTrzifubcmNsZckgNfGDNKzGG7FMEdE,114
+qulab-2.9.9.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.9.9.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.9.9.dist-info/RECORD,,