iqm-pulla 11.17.0__tar.gz → 12.0.1__tar.gz

{iqm_pulla-11.17.0 → iqm_pulla-12.0.1}/CHANGELOG.rst

@@ -1,20 +1,55 @@
-=========
-Changelog
-=========
+Version 12.0.1 (2025-12-02)
+===========================
 
-Version 11.17.0 (2025-10-31)
-============================
+Bug fixes
+---------
+
+- Fix version ranges in python package dependencies.
+
+Version 12.0.0 (2025-11-21)
+===========================
+
+Breaking changes
+----------------
+
+- Update ``Pulla`` to use IQMServer in REST communication instead of Station Control service.
+- Many models have been removed from Pulla and similar/same models are used from station control interface models.
+  For example, ``TaskStatus``, ``DDMode``, ``DDStrategy``, ``HeraldingMode``, ``MoveGateFrameTrackingMode``,
+  and ``MoveGateValidationMode``
+- ``CalibrationSet`` model is renamed to ``CalibrationSetValues``.
+- ``calibration_set`` parameter is removed in many classes/methods/functions, use ``calibration_set_values`` instead.
+  For example, for ``find_observation``, ``get_standard_compiler``, ``Compiler``, etc.
+- ``get_calibration`` method in ``Compiler`` is removed, use ``get_calibration_set_values`` instead.
+- ``set_calibration`` method in ``Compiler`` is removed, use ``set_calibration_set_values`` instead.
+- ``get_calibration`` method in ``CalibrationDataProvider`` is removed, use ``get_calibration_set_values`` instead.
+- ``station_control_url`` init parameter for ``Pulla`` is removed, use ``iqm_server_url`` instead.
+- ``get_token_callback`` init parameter for ``Pulla`` is removed, use ``token`` instead.
+- ``fetch_latest_calibration_set`` method in ``Pulla`` is removed, use ``fetch_default_calibration_set`` instead.
+- ``fetch_calibration_set_by_id`` method in ``Pulla`` is removed, use ``fetch_calibration_set_values_by_id`` instead.
+- ``execute`` method in ``Pulla`` is removed, use ``submit_playlist`` instead.
+- ``station_control`` init parameter for ``CalibrationDataProvider`` is removed, use ``iqm_server_client`` instead.
+- ``get_latest_calibration_set`` method in ``CalibrationDataProvider`` is removed,
+  use ``get_default_calibration_set`` instead.
+- ``station_control_result_to_qiskit`` function in ``utils_qiskit`` is removed, use ``sweep_job_to_qiskit`` instead.
+
+Features
+--------
+
+- Minimal changes to support Qiskit v2.0 and v2.1 :issue:`SW-1735`.
+- Updated QIR User Guide example to include a note about ``iqm-qiskit-qir`` not supporting Qiskit v2.x.
+- Removed ``iqm-qiskit-qir`` from the QIR requirements as the package does not support Qiskit 2.X
+- Allow Python 3.12 in project configuration.
+- Verify unit testswith Python 3.12
 
 Bug fixes
 ---------
 
 - CPC calibration set whitelist is updated to include various missing controller settings
   that already were in the calibration set.
-
-Version 11.16.1 (2025-10-27)
-============================
-
-- Bump version for 4.3.1 release. No functional changes.
+- CPC's `CircuitExecutionOptions` are now validated such that active reset cannot be used with the option
+  `CircuitExecutionOptions.convert_terminal_measurements = True` as `measure_fidelity` is not optimized for leakage.
+  In that case we set `CircuitExecutionOptions.convert_terminal_measurements = False` and throw a warning in the
+  compilation
 
 Version 11.16.0 (2025-10-22)
 ============================
@@ -473,7 +508,7 @@ Version 7.1.0 (2025-04-07)
 Features
 --------
 
-- Fix package version in published docs footers, :issue:`SW-1392`. 
+- Fix package version in published docs footers, :issue:`SW-1392`.
 
 Version 7.0.0 (2025-04-04)
 ==========================

iqm_pulla-12.0.1/MANIFEST.in

@@ -0,0 +1,4 @@
+include version.txt
+include LICENSE.txt
+prune tests/*
+exclude .gitlab-ci.yml

{iqm_pulla-11.17.0 → iqm_pulla-12.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iqm-pulla
-Version: 11.17.0
+Version: 12.0.1
 Summary: Client library for pulse-level access to an IQM quantum computer
 Author-email: IQM Finland Oy <developers@meetiqm.com>
 License:                                  Apache License
@@ -205,42 +205,33 @@ License:                                  Apache License
            See the License for the specific language governing permissions and
            limitations under the License.
         
-Project-URL: Documentation, https://iqm-finland.github.io/docs/iqm-pulla/
+Project-URL: Documentation, https://docs.meetiqm.com/iqm-pulla/
 Project-URL: Homepage, https://pypi.org/project/iqm-pulla/
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: Apache Software License
-Requires-Python: <3.12,>=3.11
+Requires-Python: <3.13,>=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 License-File: AUTHORS.rst
-Requires-Dist: iqm-exa-common<28,>=27
-Requires-Dist: iqm-station-control-client<12,>=11
-Requires-Dist: iqm-pulse<13,>=12
 Requires-Dist: iqm-data-definitions<3.0,>=2.18
 Requires-Dist: pylatexenc==2.10
 Requires-Dist: pydantic<3.0,>=2.10.4
+Requires-Dist: iqm-client<34,>=33.0.1
+Requires-Dist: iqm-exa-common<28,>=27.4.1
+Requires-Dist: iqm-pulse<13,>=12.7.1
+Requires-Dist: iqm-station-control-client<13,>=12.0.1
 Provides-Extra: notebook
-Requires-Dist: iqm-exa-common<28,>=27; extra == "notebook"
-Requires-Dist: iqm-station-control-client<12,>=11; extra == "notebook"
-Requires-Dist: iqm-pulse<13,>=12; extra == "notebook"
 Requires-Dist: notebook<7,>=6.4.11; extra == "notebook"
 Requires-Dist: matplotlib<4,>=3.6.3; extra == "notebook"
 Requires-Dist: nbclient~=0.5.10; extra == "notebook"
 Provides-Extra: qir
-Requires-Dist: iqm-exa-common<28,>=27; extra == "qir"
-Requires-Dist: iqm-station-control-client<12,>=11; extra == "qir"
-Requires-Dist: iqm-pulse<13,>=12; extra == "qir"
 Requires-Dist: iqm-pyqir==0.12.0; extra == "qir"
-Requires-Dist: iqm-qiskit-qir==0.8.0; extra == "qir"
+Requires-Dist: qiskit<2.2,>=1.0; extra == "qir"
 Provides-Extra: qiskit
-Requires-Dist: iqm-exa-common<28,>=27; extra == "qiskit"
-Requires-Dist: iqm-station-control-client<12,>=11; extra == "qiskit"
-Requires-Dist: iqm-pulse<13,>=12; extra == "qiskit"
-Requires-Dist: iqm-client<33,>=32; extra == "qiskit"
-Requires-Dist: iqm-client[qiskit]<33,>=32; extra == "qiskit"
+Requires-Dist: iqm-client[qiskit]<34,>=33.0.1; extra == "qiskit"
 
 IQM Pulla
 #########
@@ -286,11 +277,11 @@ e2e testing is execution of all user guides (Jupyter notebooks). User guides cov
 so we achieve two things: end-to-end-test Pulla as a client library, and make sure the user guides are correct.
 (Server-side use of Pulla is e2e-tested as part of CoCoS.)
 
-You have to provide CoCoS and Station Control URLs as environment variables:
+You have to provide IQM Server URL as environment variable:
 
 .. code-block:: bash
 
-    COCOS_URL=<COCOS_URL> STATION_CONTROL_URL=<SC_URL> tox -e e2e
+    IQM_SERVER_URL=<IQM_SERVER_URL> tox -e e2e
 
 Notebooks are executed using `jupyter execute` command. It does not print any output if there are no errors. If you want
 to run a particular notebook and see the output cells printed in the terminal, you can use ``nbconvert`` with ``jq``

{iqm_pulla-11.17.0 → iqm_pulla-12.0.1}/README.rst

@@ -42,11 +42,11 @@ e2e testing is execution of all user guides (Jupyter notebooks). User guides cov
 so we achieve two things: end-to-end-test Pulla as a client library, and make sure the user guides are correct.
 (Server-side use of Pulla is e2e-tested as part of CoCoS.)
 
-You have to provide CoCoS and Station Control URLs as environment variables:
+You have to provide IQM Server URL as environment variable:
 
 .. code-block:: bash
 
-    COCOS_URL=<COCOS_URL> STATION_CONTROL_URL=<SC_URL> tox -e e2e
+    IQM_SERVER_URL=<IQM_SERVER_URL> tox -e e2e
 
 Notebooks are executed using `jupyter execute` command. It does not print any output if there are no errors. If you want
 to run a particular notebook and see the output cells printed in the terminal, you can use ``nbconvert`` with ``jq``

{iqm_pulla-11.17.0 → iqm_pulla-12.0.1}/docs/Compilation Stages.ipynb

@@ -43,7 +43,7 @@
     "from iqm.qiskit_iqm import IQMProvider\n",
     "from iqm.qiskit_iqm.iqm_transpilation import optimize_single_qubit_gates\n",
     "from iqm.pulla.pulla import Pulla\n",
-    "from iqm.pulla.utils_qiskit import station_control_result_to_qiskit"
+    "from iqm.pulla.utils_qiskit import sweep_job_to_qiskit"
    ]
   },
   {
@@ -71,10 +71,10 @@
     }
    ],
    "source": [
-    "cocos_url = os.environ['PULLA_COCOS_URL']  # or set the URL directly here\n",
-    "station_control_url = os.environ['PULLA_STATION_CONTROL_URL']  # or set the URL directly here\n",
+    "iqm_server_url = os.environ['PULLA_IQM_SERVER_URL']  # or set the URL directly here\n",
+    "os.environ[\"IQM_TOKEN\"] = os.environ.get(\"IQM_TOKEN\")  # or set the token directly here\n",
     "\n",
-    "provider = IQMProvider(cocos_url)\n",
+    "provider = IQMProvider(iqm_server_url)\n",
     "backend = provider.get_backend()\n",
     "\n",
     "qc = QuantumCircuit(3, 3)\n",
@@ -175,7 +175,7 @@
    "source": [
     "from iqm.pulla.utils_qiskit import qiskit_to_pulla\n",
     "\n",
-    "p = Pulla(station_control_url)\n",
+    "p = Pulla(iqm_server_url)\n",
     "circuits, compiler = qiskit_to_pulla(p, backend, qc_optimized)\n",
     "\n",
     "pprint(circuits[0])"
@@ -430,7 +430,7 @@
    "source": [
     "## Standard stages\n",
     "\n",
-    "As mentioned earlier, Pulla comes with a pre-defined \"standard\" set of stages which you can use and, if needed, modify. These standard stages are used by CoCoS if you were to submit a circuit to CoCoS (without using Pulla). Thus, if you use the same version of the Pulla library that the remote CoCoS uses, you will be able to produce and inspect the same pulse schedules that CoCoS would (assuming you use the same calibration set). \n",
+    "As mentioned earlier, Pulla comes with a pre-defined \"standard\" set of stages which you can use and, if needed, modify. These standard stages are used by IQM Server if you were to submit a circuit to IQM Server (without using Pulla). Thus, if you use the same version of the Pulla library that the remote IQM Server uses, you will be able to produce and inspect the same pulse schedules that IQM Server would (assuming you use the same calibration set).\n",
     "\n",
     "Let's replace our current single stage with standard stages, and view them:"
    ]
@@ -1205,7 +1205,7 @@
    "id": "c2e9f72a",
    "metadata": {},
    "source": [
-    "At this point everything is ready to be submitted for execution to the server. Namely, these three objects will be used to construct a request to Station Control Service:\n",
+    "At this point everything is ready to be submitted for execution to the server. Namely, these three objects will be used to construct a request to IQM Server:\n",
     "\n",
     "- `playlist`: sequence of instruction schedules corresponding to the batch of circuits to be executed\n",
     "- `settings`: Station Control settings node\n",
@@ -1238,7 +1238,8 @@
     }
    ],
    "source": [
-    "response_data = p.execute(playlist, context, settings, verbose=True)"
+    "job = p.submit_playlist(playlist, settings, context=context)\n",
+    "job.wait_for_completion()"
    ]
   },
   {
@@ -1280,7 +1281,7 @@
     }
    ],
    "source": [
-    "qiskit_result = station_control_result_to_qiskit(response_data, shots=shots, execution_options=context['options'])\n",
+    "qiskit_result = sweep_job_to_qiskit(job, shots=shots, execution_options=context['options'])\n",
     "print(f\"Qiskit result counts: {qiskit_result.get_counts()}\")\n",
     "visualization.plot_histogram(qiskit_result.get_counts())"
    ]
@@ -1289,9 +1290,7 @@
    "cell_type": "markdown",
    "id": "fd2ce976",
    "metadata": {},
-   "source": [
-    "We can also submit the same circuit to CoCoS for execution. CoCoS is essentially a server-side Pulla with fixed standard stages. Since we started with a normal Qiskit backend and a circuit, execution is as simple as:"
-   ]
+   "source": "We can also submit the same circuit to IQM Server for execution. IQM Server uses a server-side Pulla with fixed standard stages. Since we started with a normal Qiskit backend and a circuit, execution is as simple as:"
   },
   {
    "cell_type": "code",

{iqm_pulla-11.17.0 → iqm_pulla-12.0.1}/docs/Configuration and Usage.ipynb

@@ -29,7 +29,6 @@
     "from qiskit import QuantumCircuit\n",
     "from qiskit.compiler import transpile\n",
     "from iqm.qiskit_iqm import IQMProvider\n",
-    "from iqm.qiskit_iqm.iqm_transpilation import optimize_single_qubit_gates\n",
     "from iqm.pulla.utils_qiskit import qiskit_to_pulla"
    ]
   },
@@ -57,9 +56,9 @@
     "- set of implementations for each native operation (including user-defined implementations)\n",
     "- methods for manipulating the calibration, operations, and implementations\n",
     "\n",
-    "Pulla can construct a standard compiler equivalent to the one used by the server side (CoCoS). You can also construct a Compiler manually.\n",
+    "Pulla can construct a standard compiler equivalent to the one used by the server side (IQM Server). You can also construct a Compiler manually.\n",
     "\n",
-    "To create an instance of Pulla, you need to provide the URL of Station Control. Upon successful initialization, some configuration data is printed (the verbosity of such messages will be controlled by a debug level value)."
+    "To create an instance of Pulla, you need to provide the URL of IQM Server. Upon successful initialization, some configuration data is printed (the verbosity of such messages will be controlled by a debug level value)."
    ]
   },
   {
@@ -76,18 +75,17 @@
    "source": [
     "from iqm.pulla.pulla import Pulla\n",
     "\n",
-    "station_control_url = os.environ['PULLA_STATION_CONTROL_URL']  # or set the URL directly here\n",
+    "iqm_server_url = os.environ['PULLA_IQM_SERVER_URL']  # or set the URL directly here\n",
+    "os.environ[\"IQM_TOKEN\"] = os.environ.get(\"IQM_TOKEN\")  # or set the token directly here\n",
     "\n",
-    "p = Pulla(station_control_url)"
+    "p = Pulla(iqm_server_url)"
    ]
   },
   {
    "cell_type": "markdown",
    "id": "378fc082",
    "metadata": {},
-   "source": [
-    "You can access various things like channel properties of the connected station, chip topology, or the current calibration. The initial calibration is the latest calibration of the connected station. "
-   ]
+   "source": "You can access various things like channel properties of the connected station, chip topology, or the current calibration. The initial calibration is the default calibration of the connected station."
   },
   {
    "cell_type": "code",
@@ -148,9 +146,7 @@
    "cell_type": "markdown",
    "id": "02a29eb8",
    "metadata": {},
-   "source": [
-    "Call `get_standard_compiler()` method to get an instance of `Compiler`. It will be pre-populated with the latest default calibration set and standard compilation stages. This standard compiler is the same one that CoCoS uses on the server side when processing circuits."
-   ]
+   "source": "Call `get_standard_compiler()` method to get an instance of `Compiler`. It will be pre-populated with the latest default calibration set and standard compilation stages. This standard compiler is the same one that IQM Server uses on the server side when processing circuits."
   },
   {
    "cell_type": "code",
@@ -185,10 +181,10 @@
     }
    ],
    "source": [
-    "# get_calibration() returns the entire calibration set\n",
+    "# get_calibration_set_values() returns the entire calibration set\n",
     "# here we filter the data to get just the instrument settings of QB1\n",
     "\n",
-    "pprint({k: v for k, v in compiler.get_calibration().items() if k.startswith('controllers.QB1')})"
+    "pprint({k: v for k, v in compiler.get_calibration_set_values().items() if k.startswith('controllers.QB1')})"
    ]
   },
   {
@@ -196,21 +192,21 @@
    "id": "dd9d6ef4",
    "metadata": {},
    "source": [
-    "`get_standard_compiler()` fetches the latest calibration set from the server. This network request takes a few moments. You may want to create many Compiler instances without such delay.\n",
+    "`get_standard_compiler()` fetches the default calibration set from the server. This network request takes a few moments. You may want to create many Compiler instances without such delay.\n",
     "\n",
-    "It may also be possible that, due to human error, the latest calibration set stored on the server is invalid (or incompatible with your version of Pulla or IQM Pulse). In that case `get_standard_compiler()` will fail. \n",
+    "It may also be possible that, due to human error, the default calibration set stored on the server is invalid (or incompatible with your version of Pulla or IQM Pulse). In that case `get_standard_compiler()` will fail.\n",
     "\n",
-    "To avoid this, you can pass the calibration set manually, and Pulla will construct the compiler with it instead of getting one from the server. If you want to reuse the calibration of an existing compiler, call `Compiler.get_calibration()`, e.g.:\n",
+    "To avoid this, you can pass the calibration set manually, and Pulla will construct the compiler with it instead of getting one from the server. If you want to reuse the calibration of an existing compiler, call `Compiler.get_calibration_set_values()`, e.g.:\n",
     "\n",
     "```python\n",
-    "compiler_new = p.get_standard_compiler(calibration_set=compiler_old.get_calibration())\n",
+    "compiler_new = p.get_standard_compiler(calibration_set_values=compiler_old.get_calibration_set_values())\n",
     "```\n",
     "\n",
     "You can also get a specific calibration set from the server if you know its UUID by calling `Pulla.fetch_calibration_set_by_id()`, e.g.:\n",
     "\n",
     "```python\n",
-    "specific_cal_set = p.fetch_calibration_set_by_id('fe026208-19aa-4906-93ab-06ba3c86100f')\n",
-    "compiler = p.get_standard_compiler(calibration_set=specific_cal_set)\n",
+    "specific_cal_set = p.fetch_calibration_set_values_by_id('fe026208-19aa-4906-93ab-06ba3c86100f')\n",
+    "compiler = p.get_standard_compiler(calibration_set_values=specific_cal_set)\n",
     "```"
    ]
   },
@@ -238,7 +234,7 @@
     "\n",
     "For the `constant` implementation of the `measure` operation, the readout type is controlled by the `acquisition_type` parameter. By default, it's set to `\"threshold\"`. Let's change it to `\"complex\"`. The full key in the calibration set dictionary is `gates.measure.constant.QUBIT.acquisition_type`, where `QUBIT` is the physical qubit name. \n",
     "\n",
-    "Note that we call `get_calibration()` to get a copy of the compiler's current calibration set, make changes to the copy, then replace the compiler's set with the copy. The compiler always contains a single calibration set only."
+    "Note that we call `get_calibration_set_values()` to get a copy of the compiler's current calibration set, make changes to the copy, then replace the compiler's set with the copy. The compiler always contains a single calibration set only."
    ]
   },
   {
@@ -263,9 +259,7 @@
     }
    ],
    "source": [
-    "cocos_url = os.environ['PULLA_COCOS_URL']  # or set the URL directly here\n",
-    "\n",
-    "provider = IQMProvider(cocos_url)\n",
+    "provider = IQMProvider(iqm_server_url)\n",
     "backend = provider.get_backend()\n",
     "shots = 10\n",
     "\n",
@@ -279,19 +273,20 @@
     "circuits, compiler = qiskit_to_pulla(p, backend, qc_transpiled)\n",
     "\n",
     "# change the acquisition type to 'complex' in the calibration set\n",
-    "updated_cal_set = compiler.get_calibration()\n",
+    "updated_cal_set = compiler.get_calibration_set_values()\n",
     "for qubit in backend.physical_qubits:\n",
     "    updated_cal_set[f'gates.measure.constant.{qubit}.acquisition_type'] = 'complex'\n",
-    "compiler.set_calibration(updated_cal_set)\n",
+    "compiler.set_calibration_set_values(updated_cal_set)\n",
     "\n",
     "playlist, context = compiler.compile(circuits)\n",
     "settings, context = compiler.build_settings(context, shots=shots)\n",
-    "response_data = p.execute(playlist, context, settings, verbose=False)\n",
+    "job = p.submit_playlist(playlist, settings, context=context)\n",
+    "job.wait_for_completion()\n",
     "\n",
-    "# execute() returns a StationControlResult object; the measurements are in StationControlResult.result\n",
-    "# in addition, by default execute() prints the measurement results; disable it with verbose=False\n",
+    "# Pulla.submit_playlist() returns a SweepJob object.\n",
+    "# The measurements are obtained using SweepJob.result() after SweepJob.wait_for_completion().\n",
     "\n",
-    "print(f\"Raw results:\\n{response_data.result}\\n\")"
+    "print(f\"Raw results:\\n{job.result()}\\n\")"
    ]
   }
  ],

{iqm_pulla-11.17.0 → iqm_pulla-12.0.1}/docs/Custom Gates and Implementations.ipynb

@@ -9,7 +9,7 @@
     "\n",
     "This notebook demonstrates how to work with user-defined quantum operations and gate implementations that go beyond the standard gate set.\n",
     "\n",
-    "Each quantum operation is associated with one or more `GateImplementation`s which translate the high-level concepts to lower-level instructions accepted by the IQM server. This example shows how the user can\n",
+    "Each quantum operation is associated with one or more `GateImplementation`s which translate the high-level concepts to lower-level instructions accepted by the IQM Server. This example shows how the user can\n",
     "\n",
     "- Selecting a non-default implementation for a gate\n",
     "- Add a custom implementation for an existing gate\n",
@@ -19,26 +19,20 @@
    ]
   },
   {
-   "cell_type": "markdown",
-   "id": "e6dceded",
    "metadata": {},
+   "cell_type": "markdown",
    "source": [
     "## Environment setup\n",
     "\n",
-    "Please refer to the `User Guide.ipynb` for basic usage, termninology, and environment setup."
-   ]
+    "Please refer to the `Quick Start.ipynb` for basic usage, terminology, and environment setup."
+   ],
+   "id": "87b897bb5f553e2f"
   },
   {
+   "metadata": {},
    "cell_type": "code",
-   "execution_count": 1,
-   "id": "3ecd000a",
-   "metadata": {
-    "ExecuteTime": {
-     "end_time": "2024-07-15T09:37:29.282407Z",
-     "start_time": "2024-07-15T09:37:17.932145Z"
-    }
-   },
    "outputs": [],
+   "execution_count": null,
    "source": [
     "import os\n",
     "from pprint import pprint\n",
@@ -47,9 +41,9 @@
     "from iqm.pulla.pulla import Pulla\n",
     "from iqm.pulla.utils_qiskit import qiskit_to_pulla\n",
     "from iqm.pulse.playlist.visualisation.base import inspect_playlist\n",
-    "from IPython.core.display import HTML\n",
-    "import logging"
-   ]
+    "from IPython.core.display import HTML"
+   ],
+   "id": "294ec38a8411bffd"
   },
   {
    "cell_type": "code",
@@ -58,12 +52,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "cocos_url = os.environ['PULLA_COCOS_URL']  # or set the URL directly here\n",
-    "station_control_url = os.environ['PULLA_STATION_CONTROL_URL']  # or set the URL directly here\n",
+    "iqm_server_url = os.environ['PULLA_IQM_SERVER_URL']  # or set the URL directly here\n",
+    "os.environ[\"IQM_TOKEN\"] = os.environ.get(\"IQM_TOKEN\")  # or set the token directly here\n",
     "\n",
-    "p = Pulla(station_control_url)\n",
+    "p = Pulla(iqm_server_url)\n",
     "\n",
-    "provider = IQMProvider(cocos_url)\n",
+    "provider = IQMProvider(iqm_server_url)\n",
     "backend = provider.get_backend()"
    ]
   },
@@ -113,7 +107,7 @@
     "## Changing implementations at the circuit level\n",
     "\n",
     "Circuits are usually defined without specifying implementations for any of the gates.\n",
-    "The implementations available in a given calibration set are listed in the corresponding dynamic quantum architecture, through Cocos.\n",
+    "The implementations available in a given calibration set are listed in the corresponding dynamic quantum architecture, through IQM Server.\n",
     "\n",
     "Let's see a list of available implementations, with their parameters:"
    ]
@@ -1019,7 +1013,7 @@
    "source": [
     "from iqm.pulse.gates.prx import PRX_CustomWaveforms\n",
     "from dataclasses import dataclass\n",
-    "from iqm.pulse.playlist.waveforms import Gaussian, GaussianDerivative, Waveform\n",
+    "from iqm.pulse.playlist.waveforms import Waveform\n",
     "import numpy as np\n",
     "\n",
     "\n",
@@ -1222,7 +1216,7 @@
    "id": "831f56e5",
    "metadata": {},
    "source": [
-    "Data with `gates.prx.raised_cosine.*` is now visible in `compiler.get_calibration()`. Note that we added the same calibration data to all qubits. In practice, this rarely makes sense, because each qubit\n",
+    "Data with `gates.prx.raised_cosine.*` is now visible in `compiler.get_calibration_set_values()`. Note that we added the same calibration data to all qubits. In practice, this rarely makes sense, because each qubit\n",
     "is usually calibrated differently.\n",
     "\n",
     "Now the compilation succeeds and we see that `raised_cosine` was used once. Using the schedule visualization you could also verify that the pulse shape is indeed different on the first `prx` instance."