QuLab 2.9.3__cp311-cp311-win_amd64.whl → 2.9.5__cp311-cp311-win_amd64.whl

qulab/executor/load.py

@@ -329,6 +329,23 @@ def load_workflow_from_file(file_name: str,
     return module
 
 
+def _generate_target_file_path(template_path: str | Path, hash_str: str,
+                               content: str, base_path: str | Path) -> Path:
+    path = Path(template_path)
+    if path.stem == 'template':
+        path = path.parent / f'tmp{hash_str}.py'
+    elif path.stem.endswith('_template'):
+        path = path.parent / path.stem.replace('_template',
+                                               f'_tmp{hash_str}.py')
+    else:
+        path = path.parent / f'{path.stem}_tmp{hash_str}.py'
+
+    if 'templates' in path.parts:
+        return Path(*['run' if p == 'templates' else p for p in path.parts])
+    else:
+        return Path('run') / path
+
+
 def load_workflow_from_template(template_path: str,
                                 mapping: dict[str, str],
                                 base_path: str | Path,
@@ -346,13 +363,8 @@ def load_workflow_from_template(template_path: str,
     content, hash_str = inject_mapping(template, mapping, str(path))
 
     if target_path is None:
-        if path.stem == 'template':
-            path = path.parent / f'tmp{hash_str}.py'
-        elif path.stem.endswith('_template'):
-            path = path.parent / path.stem.replace('_template',
-                                                   f'_tmp{hash_str}.py')
-        else:
-            path = path.parent / f'{path.stem}_tmp{hash_str}.py'
+        path = _generate_target_file_path(template_path, hash_str, content,
+                                          base_path)
     else:
         path = target_path
 
@@ -423,7 +435,8 @@ def _load_workflow_list(workflow, lst, code_path):
             ret.append(load_workflow(n, code_path, mtime=workflow.__mtime__))
         except TemplateKeyError as e:
             msg, *_ = e.args
-            e.args = (f"Workflow {workflow.__workflow_id__} entry {i}: {msg}", )
+            e.args = (
+                f"Workflow {workflow.__workflow_id__} entry {i}: {msg}", )
             raise e
     return ret
 

qulab/executor/schedule.py

@@ -150,7 +150,8 @@ def call_check(workflow: WorkflowType, session_id: str, state_path: Path):
                     heads=get_heads(state_path),
                     previous_path=get_head(workflow.__workflow_id__,
                                            state_path),
-                    script_path=save_item(workflow.__source__, state_path))
+                    script_path=save_item(workflow.__source__, 'items',
+                                          state_path))
 
     save_report(workflow.__workflow_id__, report, state_path)
 
@@ -176,7 +177,8 @@ def call_calibrate(workflow: WorkflowType, session_id: str, state_path: Path):
                     heads=get_heads(state_path),
                     previous_path=get_head(workflow.__workflow_id__,
                                            state_path),
-                    script_path=save_item(workflow.__source__, state_path))
+                    script_path=save_item(workflow.__source__, 'items',
+                                          state_path))
 
     save_report(workflow.__workflow_id__, report, state_path)
 
@@ -274,7 +276,8 @@ def check_data(workflow: WorkflowType, state_path: str | Path, plot: bool,
                         heads=get_heads(state_path),
                         previous_path=get_head(workflow.__workflow_id__,
                                                state_path),
-                        script_path=save_item(workflow.__source__, state_path))
+                        script_path=save_item(workflow.__source__, 'items',
+                                              state_path))
         report.in_spec = False
         report.bad_data = False
         return report

qulab/executor/storage.py

@@ -118,14 +118,14 @@ class Report():
     @property
     def config(self):
         if self.config_path is not None and self.base_path is not None:
-            return load_item(self.config_path, self.base_path)
+            return load_item(self.config_path, 'items', self.base_path)
         else:
             return None
 
     @property
     def script(self):
         if self.script_path is not None and self.base_path is not None:
-            source = load_item(self.script_path, self.base_path)
+            source = load_item(self.script_path, 'items', self.base_path)
             if isinstance(source, str):
                 return source
             else:
@@ -137,7 +137,7 @@ class Report():
     @property
     def template_source(self):
         if self.script_path is not None and self.base_path is not None:
-            source = load_item(self.script_path, self.base_path)
+            source = load_item(self.script_path, 'items', self.base_path)
             return source
         else:
             return None
@@ -296,7 +296,7 @@ def create_index(name: str,
     return index
 
 
-def save_item(item, data_path):
+def save_item(item, group, data_path):
     salt = 0
     buf = pickle.dumps(item)
     buf = lzma.compress(buf)
@@ -306,7 +306,7 @@ def save_item(item, data_path):
         h.update(f"{salt}".encode())
         hashstr = h.hexdigest()
         item_id = Path(hashstr[:2]) / hashstr[2:4] / hashstr[4:]
-        path = Path(data_path) / 'items' / item_id
+        path = Path(data_path) / group / item_id
         if not path.exists():
             path.parent.mkdir(parents=True, exist_ok=True)
             with open(path, 'wb') as f:
@@ -318,6 +318,14 @@ def save_item(item, data_path):
     return str(item_id)
 
 
+def append_item_data(data, id, group, base_path):
+    path = Path(base_path) / group / id
+    if not path.exists():
+        raise ValueError(f"Item {id} does not exist.")
+    with open(path, 'ab') as f:
+        f.write(data)
+
+
 def save_config_key_history(key: str, report: Report,
                             base_path: str | Path) -> int:
     global __current_config_cache
@@ -412,20 +420,20 @@ def query_index(name: str, base_path: str | Path, index: int):
 
 
 @lru_cache(maxsize=4096)
-def load_item(id, base_path):
+def load_item(id, group, base_path):
     if isinstance(base_path, str) and base_path.startswith('ssh://'):
         with SSHClient() as client:
             cfg = parse_ssh_uri(base_path)
             remote_base_path = cfg.pop('remote_file_path')
             client.load_system_host_keys()
             client.connect(**cfg)
-            buf = load_item_buf_from_scp(id, remote_base_path, client)
+            buf = load_item_buf_from_scp(id, group, remote_base_path, client)
     else:
         base_path = Path(base_path)
         if zipfile.is_zipfile(base_path):
-            buf = load_item_buf_from_zipfile(id, base_path)
+            buf = load_item_buf_from_zipfile(id, group, base_path)
         else:
-            path = Path(base_path) / 'items' / id
+            path = Path(base_path) / group / id
             with open(path, 'rb') as f:
                 buf = f.read()
     item = pickle.loads(lzma.decompress(buf))
@@ -494,9 +502,9 @@ def query_index_from_zipfile(name: str, base_path: str | Path, index: int):
     return context.rstrip()
 
 
-def load_item_buf_from_zipfile(id, base_path):
+def load_item_buf_from_zipfile(id, group, base_path):
     with zipfile.ZipFile(base_path) as zf:
-        with zf.open(f"{base_path.stem}/items/{id}") as f:
+        with zf.open(f"{base_path.stem}/{group}/{id}") as f:
             return f.read()
 
 
@@ -597,11 +605,11 @@ def query_index_from_scp(name: str, base_path: Path, client: SSHClient,
         return None
 
 
-def load_item_buf_from_scp(id: str, base_path: Path, client: SSHClient):
+def load_item_buf_from_scp(id: str, group: str, base_path: Path,
+                           client: SSHClient):
     try:
         with client.open_sftp() as sftp:
-            with sftp.open(str(Path(base_path) / 'items' / str(id)),
-                           'rb') as f:
+            with sftp.open(str(Path(base_path) / group / str(id)), 'rb') as f:
                 return f.read()
     except SSHException:
         return None

qulab/executor/transform.py

@@ -47,21 +47,21 @@ def obey_the_oracle(report: Report, data_path):
     global __current_config_id
     update_config(report.oracle)
     cfg = export_config()
-    __current_config_id = save_item(cfg, data_path)
+    __current_config_id = save_item(cfg, 'items', data_path)
 
 
 def update_parameters(report: Report, data_path):
     global __current_config_id
     update_config(report.parameters)
     cfg = export_config()
-    __current_config_id = save_item(cfg, data_path)
+    __current_config_id = save_item(cfg, 'items', data_path)
 
 
 def current_config(data_path):
     global __current_config_id
     if __current_config_id is None:
         cfg = export_config()
-        __current_config_id = save_item(cfg, data_path)
+        __current_config_id = save_item(cfg, 'items', data_path)
     return __current_config_id
 
 

qulab/version.py

@@ -1 +1 @@
-__version__ = "2.9.3"
+__version__ = "2.9.5"

{qulab-2.9.3.dist-info → qulab-2.9.5.dist-info}/METADATA

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

{qulab-2.9.3.dist-info → qulab-2.9.5.dist-info}/RECORD

@@ -1,20 +1,20 @@
 qulab/__init__.py,sha256=RrWRvG8Lw27zMr7XP8s-z43b09-wiwPi0ZtiNWbky-c,328
 qulab/__main__.py,sha256=FL4YsGZL1jEtmcPc5WbleArzhOHLMsWl7OH3O-1d1ss,72
 qulab/dicttree.py,sha256=ZoSJVWK4VMqfzj42gPb_n5RqLlM6K1Me0WmLIfLEYf8,14195
-qulab/fun.cp311-win_amd64.pyd,sha256=z3Ke_fZHKSkFH_qzThWK6X2vpkPICSH1SYlO-ejWUcs,31744
+qulab/fun.cp311-win_amd64.pyd,sha256=Pm1z_sRmol7M-Rx_KrxXKWyIthKGbc8M0SWiIbjQmKU,31744
 qulab/typing.py,sha256=PRtwbCHWY2ROKK8GHq4Bo8llXrIGo6xC73DrQf7S9os,71
 qulab/utils.py,sha256=65N2Xj7kqRsQ4epoLNY6tL-i5ts6Wk8YuJYee3Te6zI,3077
-qulab/version.py,sha256=7AHVAaKthvCbj8kmzQbs612AcCI58T1bx-FbdBObElA,21
+qulab/version.py,sha256=w1TrLnI1WG1RnKU5vN73-FD1f7CJlGfGd4-SplmrIUE,21
 qulab/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 qulab/cli/commands.py,sha256=6xd2eYw32k1NmfAuYSu__1kaP12Oz1QVqwbkYXdWno4,588
 qulab/cli/config.py,sha256=7h3k0K8FYHhI6LVWt8BoDdKrX2ApFDBAUAUuXhHwst4,3799
 qulab/executor/__init__.py,sha256=LosPzOMaljSZY1thy_Fxtbrgq7uubJszMABEB7oM7tU,101
 qulab/executor/cli.py,sha256=8d-8bRWZ5lmsMtjASsl1zu1rV-syeAESMNVthvIQxlo,10018
-qulab/executor/load.py,sha256=dUJFpPsDAe-9A19S645ESjymDv5drXToAFCQxGDdL4s,17266
-qulab/executor/schedule.py,sha256=0BV5LGxhqdIlGwW6-o5_5mljAtdtL1La8EDNBFi8pzU,18585
-qulab/executor/storage.py,sha256=OA_XMDoFDfPZCU89caf9-VZ3D6qaWib8MpJno10KUfc,20770
+qulab/executor/load.py,sha256=GBd0FZHO7kLvwzcXAnChStgeaMKJBNVjUi_Yh43PABA,17736
+qulab/executor/schedule.py,sha256=XRimchHYCgnMAOtCvNLjwMv9IkcTAyBAUCHKQs5RBRw,18745
+qulab/executor/storage.py,sha256=PWQIDYjQaoyLGgAKh0X1tlNQTgDWR8bI-HVie4hSkyA,21075
 qulab/executor/template.py,sha256=dKQM3IlADdTi9qp0fnOYjyycRNEl7KeSCBZhwbmP8bQ,10828
-qulab/executor/transform.py,sha256=BDx0c4nqTHMAOLVqju0Ydd91uxNm6EpVIfssjZse0bI,2284
+qulab/executor/transform.py,sha256=ABrnD0l53NI2y2e8ETYO7lmqGtyiE6EAY965kFRqme0,2311
 qulab/executor/utils.py,sha256=l_b0y2kMwYKyyXeFtoblPYwKNU-wiFQ9PMo9QlWl9wE,6213
 qulab/monitor/__init__.py,sha256=xEVDkJF8issrsDeLqQmDsvtRmrf-UiViFcGTWuzdlFU,43
 qulab/monitor/__main__.py,sha256=k2H1H5Zf9LLXTDLISJkbikLH-z0f1e5i5i6wXXYPOrE,105
@@ -97,9 +97,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.3.dist-info/licenses/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
-qulab-2.9.3.dist-info/METADATA,sha256=wNFhe54raEvorrScr8ZVx0FTn-ZbhD0xWLjcP8B5zXU,3826
-qulab-2.9.3.dist-info/WHEEL,sha256=_ZWIY2n7n6SpiuIFl1-RvcMp4Ty36T57FKf-7NzqZHM,101
-qulab-2.9.3.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
-qulab-2.9.3.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
-qulab-2.9.3.dist-info/RECORD,,
+qulab-2.9.5.dist-info/licenses/LICENSE,sha256=b4NRQ-GFVpJMT7RuExW3NwhfbrYsX7AcdB7Gudok-fs,1086
+qulab-2.9.5.dist-info/METADATA,sha256=v4f4OtNOvJnF6m4Zn8Z3eABRc_ddeoIPQmsxAOrQEWE,3826
+qulab-2.9.5.dist-info/WHEEL,sha256=_ZWIY2n7n6SpiuIFl1-RvcMp4Ty36T57FKf-7NzqZHM,101
+qulab-2.9.5.dist-info/entry_points.txt,sha256=b0v1GXOwmxY-nCCsPN_rHZZvY9CtTbWqrGj8u1m8yHo,45
+qulab-2.9.5.dist-info/top_level.txt,sha256=3T886LbAsbvjonu_TDdmgxKYUn939BVTRPxPl9r4cEg,6
+qulab-2.9.5.dist-info/RECORD,,