merging main

Author: weinbe58

.github/workflows/deploy_latest.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Wait for dev documentation to deploy
-        uses: lewagon/wait-on-check-action@v1.3.4
+        uses: lewagon/wait-on-check-action@v1.4.0
         with:
           ref: main
           check-name: 'Deploy dev documentation'

.github/workflows/release.yml

@@ -70,7 +70,7 @@ jobs:
         name: python-package-distributions
         path: dist/
     - name: Sign the dists with Sigstore
-      uses: sigstore/gh-action-sigstore-python@v3.0.0
+      uses: sigstore/gh-action-sigstore-python@v3.0.1
       with:
         inputs: >-
           ./dist/*.tar.gz

mkdocs.yml

@@ -12,6 +12,7 @@ nav:
   - Home: 'https://queracomputing.github.io/bloqade/latest/'
   - Digital Tutorials: 'https://queracomputing.github.io/bloqade/latest/digital/'
   - Analog Tutorials: 'https://queracomputing.github.io/bloqade-analog-examples/dev/'
+  - qBook: 'https://qbook.quera.com'
   - Bloqade Analog:
     - index.md
     - Migration Guide to Bloqade Analog: home/migration.md

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "bloqade-analog"
-version = "0.16.5"
+version = "0.16.6"
 description = "Analog neutral atom software development kit"
 authors = [
     { name = "Roger-luo", email = "rluo@quera.com" },

src/bloqade/analog/factory.py

@@ -3,7 +3,9 @@
 from beartype import beartype
 from beartype.typing import TYPE_CHECKING, Any, Dict, List, Union, Optional
 
+from bloqade.analog.ir.scalar import Variable
 from bloqade.analog.builder.typing import ScalarType
+from bloqade.analog.builder.pragmas import Assignable
 from bloqade.analog.ir.routine.base import Routine
 from bloqade.analog.ir.control.waveform import Linear, Constant, Waveform
 
@@ -92,12 +94,12 @@ def piecewise_linear(durations: List[ScalarType], values: List[ScalarType]) -> W
             "The length of values must be one greater than the length of durations"
         )
 
-    pwl_wf = None
-    for duration, start, stop in zip(durations, values[:-1], values[1:]):
-        if pwl_wf is None:
-            pwl_wf = Linear(start, stop, duration)
-        else:
-            pwl_wf = pwl_wf.append(Linear(start, stop, duration))
+    if len(durations) == 0:
+        raise ValueError("The durations and values lists must not be empty.")
+
+    pwl_wf = Linear(values[0], values[1], durations[0])
+    for duration, start, stop in zip(durations[1:], values[1:-1], values[2:]):
+        pwl_wf = pwl_wf.append(Linear(start, stop, duration))
 
     return pwl_wf
 
@@ -128,12 +130,12 @@ def piecewise_constant(
             "The length of values must be the same as the length of durations"
         )
 
-    pwc_wf = None
-    for duration, value in zip(durations, values):
-        if pwc_wf is None:
-            pwc_wf = Constant(value, duration)
-        else:
-            pwc_wf = pwc_wf.append(Constant(value, duration))
+    if len(durations) == 0:
+        raise ValueError("The durations and values lists must not be empty.")
+
+    pwc_wf = Constant(values[0], durations[0])
+    for duration, value in zip(durations[1:], values[1:]):
+        pwc_wf = pwc_wf.append(Constant(value, duration))
 
     return pwc_wf
 
@@ -146,7 +148,7 @@ def rydberg_h(
     phase: Optional[Waveform] = None,
     static_params: Dict[str, Any] = {},
     batch_params: Union[List[Dict[str, Any]], Dict[str, Any]] = [],
-    args: List[str] = [],
+    args: List[str | Variable] = [],
 ) -> Routine:
     """Create a rydberg program with uniform detuning, amplitude, and phase.
 
@@ -181,10 +183,15 @@ def rydberg_h(
         prog = prog.rydberg.detuning.uniform.apply(detuning)
 
     if amplitude is not None:
-        prog = prog.amplitude.uniform.apply(amplitude)
+        prog = prog.rydberg.rabi.amplitude.uniform.apply(amplitude)
 
     if phase is not None:
-        prog = prog.phase.uniform.apply(phase)
+        prog = prog.rydberg.rabi.phase.uniform.apply(phase)
+
+    if not isinstance(prog, Assignable):
+        raise ValueError(
+            "At least one of detuning, amplitude, or phase must be provided."
+        )
 
     prog = prog.assign(**static_params)
 

src/bloqade/analog/task/exclusive.py

@@ -1,12 +1,14 @@
 import os
-import abc
-import uuid
 import re
+import abc
 import time
+import uuid
+from dataclasses import field, dataclass
 
+from requests import get, request
 from beartype.typing import Dict
-from dataclasses import dataclass, field
 
+from bloqade.analog.serialize import Serializer
 from bloqade.analog.task.base import Geometry, CustomRemoteTaskABC
 from bloqade.analog.builder.typing import ParamType
 from bloqade.analog.submission.ir.parallel import ParallelDecoder
@@ -15,8 +17,6 @@
     QuEraTaskStatusCode,
 )
 from bloqade.analog.submission.ir.task_specification import QuEraTaskSpecification
-from requests import request, get
-from bloqade.analog.serialize import Serializer
 
 
 class HTTPHandlerABC:
@@ -102,7 +102,7 @@ def submit_task_via_zapier(
         else:
             print(f"HTTP request failed with status code: {response.status_code}")
             print("HTTP responce: ", response.text)
-            return "Failed"
+            return "HTTP Request Failed"
 
     def query_task_status(self, task_id: str):
         response = request(
@@ -115,21 +115,39 @@ def query_task_status(self, task_id: str):
             },
         )
         if response.status_code != 200:
-            return "Not Found"
+            return "HTTP Request Failed."
         response_data = response.json()
         # Get "matched" from the response
         matches = response_data.get("matches", None)
         # The return is a list of dictionaries
         # Verify if the list contains only one element
         if matches is None:
             print("No task found with the given ID.")
-            return "Failed"
+            return "Task searching Failed"
         elif len(matches) > 1:
             print("Multiple tasks found with the given ID.")
-            return "Failed"
+            return "Task searching Failed"
+
+        record = matches[0]
 
         # Extract the status from the first dictionary
-        status = matches[0].get("status")
+        status = record.get("status")
+
+        if status == "Failed validation":
+            googledoc = record.get("resultsFileUrl")
+
+            # convert the preview URL to download URL
+            googledoc = convert_preview_to_download(googledoc)
+            res = get(googledoc)
+            res.raise_for_status()
+            data = res.json()
+            # get the "statusCode" and "message" from the data and print them out.
+            status_code = data.get("statusCode", "NA")
+            message = data.get("message", "NA")
+            print(
+                f"Task validation failed with status code: {status_code}, message: {message}"
+            )
+
         return status
 
     def fetch_results(self, task_id: str):
@@ -283,7 +301,10 @@ def status(self) -> QuEraTaskStatusCode:
             return QuEraTaskStatusCode.Unsubmitted
         res = self._http_handler.query_task_status(self._task_id)
         if res == "Failed":
-            raise ValueError("Query task status failed.")
+            return QuEraTaskStatusCode.Failed
+        elif res == "Failed validation":
+
+            return QuEraTaskStatusCode.Failed
         elif res == "Submitted":
             return QuEraTaskStatusCode.Enqueued
         # TODO: please add all possible status