QuLab 2.9.8__tar.gz → 2.9.10__tar.gz

{qulab-2.9.8 → qulab-2.9.10}/PKG-INFO

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

{qulab-2.9.8 → qulab-2.9.10}/QuLab.egg-info/PKG-INFO

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

{qulab-2.9.8 → qulab-2.9.10}/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-2.9.8 → qulab-2.9.10}/qulab/executor/load.py

@@ -1,7 +1,7 @@
-import graphlib
+import atexit
 import inspect
 import pickle
-import sys
+import tempfile
 import warnings
 from importlib.util import module_from_spec, spec_from_file_location
 from pathlib import Path
@@ -333,17 +333,18 @@ def load_workflow_from_file(file_name: str,
 def load_workflow_from_source_code(workflow_id: str,
                                    source_code: str,
                                    package='workflows') -> WorkflowType:
-    path = Path(workflow_id)
-    module_name = f"{package}.{'.'.join([*path.parts[:-1], path.stem])}"
+    workflow_path = Path(workflow_id)
+    module_name = f"{package}.{'.'.join([*workflow_path.parts[:-1], workflow_path.stem])}"
+
+    temp_file = tempfile.NamedTemporaryFile(delete=False, suffix='.py').name
+    with open(temp_file, 'w') as f:
+        f.write(source_code)
+
+    atexit.register(lambda f=temp_file: Path(f).unlink(missing_ok=True))
 
-    # 创建一个新的模块对象
-    module = ModuleType(module_name)
-    # 将模块注册到sys.modules中
-    sys.modules[module_name] = module
-    # 将源代码编译成字节码
-    code = compile(source_code, '<string>', 'exec')
-    # 在模块的命名空间中执行字节码
-    exec(code, module.__dict__)
+    spec = spec_from_file_location(module_name, temp_file)
+    module = module_from_spec(spec)
+    spec.loader.exec_module(module)
 
     module.__source__ = source_code
     module.__mtime__ = 0

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

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

qulab-2.9.8/qulab/version.py

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