QuLab 2.9.8__cp312-cp312-win_amd64.whl → 2.9.9__cp312-cp312-win_amd64.whl

qulab/executor/analyze.py

@@ -18,8 +18,13 @@ report, history = get_report_{server_port}("tcp://{server_address}:{server_port}
 """
 
 analysis_code = """
+# report.state = 'OK'
 # report.parameters = {}
 # report.oracle = {}
+# report.other_infomation = {}
+
+report.parameters
+
 """
 
 
@@ -86,11 +91,16 @@ class ServerThread(threading.Thread):
 
 
 # 进入分析流程，启动服务并打印等待提示
-def get_result_or_wait_until_timeout(data: tuple[Report, Report | None],
+def get_result_or_wait_until_timeout(report: Report, history: Report | None,
                                      timeout: float) -> Report:
-    server = ServerThread(data, timeout)
+    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,
@@ -116,12 +126,20 @@ def get_result_or_wait_until_timeout(data: tuple[Report, Report | None],
             break
 
     result = server.wait_for_result()
-    return result if result is not None else data
+    if result is None:
+        return (state, parameters, oracle, other_infomation, code)
+    else:
+        return result
 
 
 def manual_analysis(report: Report, history=None, timeout=3600):
     try:
-        report = get_result_or_wait_until_timeout((report, history), timeout)
+        (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
@@ -152,13 +170,19 @@ def submit_report(report: Report, address: str):
     ipy = IPython.get_ipython()
     if ipy is None:
         raise RuntimeError("请在 Jupyter Notebook 中运行此函数。")
-    
-    # ipy.user_ns['In'][-2]
+
+    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(report))
+    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.8"
+__version__ = "2.9.9"

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

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

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

@@ -1,19 +1,19 @@
 qulab/__init__.py,sha256=ulapyzt9DsDgT68EEbzuhniofHb512pNTFc-Sxfrr8Y,375
 qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp312-win_amd64.pyd,sha256=SHPlGq13ZyBsdZeZ7XjHGCZL8LDEw40GAApRFAu1b1g,32256
+qulab/fun.cp312-win_amd64.pyd,sha256=0qVm2aOk9QdRNjF-fATe5A-csnsTNafYyW8Ym15HfTw,32256
 qulab/typing.py,sha256=PRtwbCHWY2ROKK8GHq4Bo8llXrIGo6xC73DrQf7S9os,71
 qulab/utils.py,sha256=65N2Xj7kqRsQ4epoLNY6tL-i5ts6Wk8YuJYee3Te6zI,3077
-qulab/version.py,sha256=yIBbBBe2GVrcVKOqSi44N9VxQXXdByyDHw1T917V4HQ,21
+qulab/version.py,sha256=gB2GONub0WyICh4-SbXI8ce5oNADu2_gH_-ZqWOveM0,21
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=ZTs32yQjvwPIsFjXYWNr4KqEvly0NISIqyh--96qCAY,627
 qulab/cli/config.py,sha256=7h3k0K8FYHhI6LVWt8BoDdKrX2ApFDBAUAUuXhHwst4,3799
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
-qulab/executor/analyze.py,sha256=VdstZ-0GAuxHx0NCOSwdyMByUkbOswOPB-RfHgLPxPg,5124
+qulab/executor/analyze.py,sha256=VoSthE2RTarY6Wj3QFKh4FqReMYL7djSAyuitgHs5K0,5837
 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=dKQM3IlADdTi9qp0fnOYjyycRNEl7KeSCBZhwbmP8bQ,10828
 qulab/executor/transform.py,sha256=rk4CLIKVjGRaFzi5FVSgadUxAKKVLSopEHZCaAzDwDg,3435
 qulab/executor/utils.py,sha256=l_b0y2kMwYKyyXeFtoblPYwKNU-wiFQ9PMo9QlWl9wE,6213
@@ -98,9 +98,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.9.8.dist-info/licenses/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-qulab-2.9.8.dist-info/METADATA,sha256=zo9wM5TloFbCSiHMOCtPEfCWDSAzADYEBOeke5yWbkY,3859
-qulab-2.9.8.dist-info/WHEEL,sha256=ovhA9_Ei_7ok2fAych90j-feDV4goiAxbO7REePtvw0,101
-qulab-2.9.8.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.9.8.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.9.8.dist-info/RECORD,,
+qulab-2.9.9.dist-info/licenses/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+qulab-2.9.9.dist-info/METADATA,sha256=UyXZQG4kRUuwLlEQLdRW06Ww-XIwahMxJ9c2V3Jk8es,3859
+qulab-2.9.9.dist-info/WHEEL,sha256=ovhA9_Ei_7ok2fAych90j-feDV4goiAxbO7REePtvw0,101
+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,,