Merge branch 'dev' of https://github.com/ColibrITD-SAS/mpqp into dev

Author: Henri-ColibrITD

docs/execution-extras.rst

@@ -64,7 +64,7 @@ __________
 Connection setup script 
 -----------------------
 
-.. automodule:: mpqp.execution.connection.setup_connections
+.. automodule:: mpqp_scripts.setup_connections
 
 The details on how to get these information can be found in the section 
 :ref:`Setting up a remote device`.

mpqp/__init__.py

@@ -1,5 +1,5 @@
 # pyright: reportUnusedImport=false
 from mpqp.core.circuit import QCircuit
+from mpqp.core.instruction import Instruction
 from mpqp.core.instruction.barrier import Barrier
 from mpqp.core.languages import Language
-from mpqp.core.instruction import Instruction

mpqp/tools/choice_tree.py

@@ -50,24 +50,29 @@ def run_choice_tree(question: QuestionNode):
     Args:
         question: Root question from which the choice tree will start
     """
-    # 3M-TODO: allow exit with Ctrl+C and Q
+    # 3M-TODO: allow exit with Q
     prev_args = []
     prev_message = ""
     next_question = question
-    while True:
-        option, _ = pick(
-            list(map(lambda a: a.label, next_question.answers)) + ["Exit"],
-            prev_message + "\n\n" + next_question.label,
-            indicator="=>",
-        )
-        if option == "Exit":
-            return
-        selected_answer = find(next_question.answers, lambda a: a.label == option)
-        prev_message, prev_args = selected_answer.action(*prev_args)
-        next_question = selected_answer.next_question
-        if next_question is None:
-            pick(["Press 'Enter' to continue"], prev_message, indicator="")
-            return
+    try:
+        while True:
+            option, _ = pick(
+                list(map(lambda a: a.label, next_question.answers)) + ["Exit"],
+                prev_message + "\n\n" + next_question.label,
+                indicator="=>",
+            )
+            if option == "Exit":
+                return
+            selected_answer = find(next_question.answers, lambda a: a.label == option)
+            prev_message, prev_args = selected_answer.action(*prev_args)
+            next_question = selected_answer.next_question
+            if next_question is None:
+                pick(["Press 'Enter' to continue"], prev_message, indicator="")
+                return
+
+    except KeyboardInterrupt:
+        print()
+        pass
 
 
 # Example:

mpqp/execution/connection/setup_connections.py mpqp_scripts/setup_connections.py

@@ -1,21 +1,23 @@
 #! /usr/bin/env python3
-"""This script helps you configuring the connections for all the supported 
-remote backends. In time, it will also guide you to retrieve the tokens,
-passwords, etc... but for now, it is a prerequisite that you already have these
-credentials to use this script.
+"""The ``setup_connections`` script helps you configuring the connections for
+all the supported remote backends. In time, it will also guide you to retrieve
+the tokens, passwords, etc... but for now, it is a prerequisite that you already
+have these credentials to use this script.
 
-Information concerning which provider is configured and related
-credentials are stored in the ``~/.mpqp`` file."""
+Information concerning which provider is configured and related credentials are
+stored in the ``~/.mpqp`` file."""
 
-import mpqp.execution.connection.aws_connection as awsc
-import mpqp.execution.connection.env_manager as env_m
-import mpqp.execution.connection.ibm_connection as ibmqc
-import mpqp.execution.connection.qlm_connection as qlmc
-from mpqp.tools.choice_tree import AnswerNode, QuestionNode, run_choice_tree
-from mpqp.tools.errors import IBMRemoteExecutionError
+import os
+
+os.environ["FOR_DISABLE_CONSOLE_CTRL_HANDLER"] = "1"
 
 
 def print_config_info():
+    import mpqp.execution.connection.aws_connection as awsc
+    import mpqp.execution.connection.env_manager as env_m
+    import mpqp.execution.connection.ibm_connection as ibmqc
+    from mpqp.tools.errors import IBMRemoteExecutionError
+
     """Prints the info concerning each provider's registered account."""
     print("===== IBM Quantum info : ===== ")
     try:
@@ -45,6 +47,10 @@ def print_config_info():
 def main_setup():
     """Function called by the script bellow to setup all connections or to get
     information about the existing ones."""
+    import mpqp.execution.connection.aws_connection as awsc
+    import mpqp.execution.connection.ibm_connection as ibmqc
+    import mpqp.execution.connection.qlm_connection as qlmc
+    from mpqp.tools.choice_tree import AnswerNode, QuestionNode, run_choice_tree
 
     setup_tree = QuestionNode(
         "~~~~~ MPQP REMOTE CONFIGURATION ~~~~~",
@@ -63,4 +69,7 @@ def main_setup():
 
 
 if __name__ == "__main__":
-    main_setup()
+    try:
+        main_setup()
+    except KeyboardInterrupt:
+        exit()

requirements.txt

@@ -2,14 +2,13 @@ numpy>=1.23.2
 scipy>=1.11.4
 amazon-braket-sdk==1.64.2
 aws-configure==2.1.8
-boto3>=1.34.5
 myqlm==1.9.3
 qlmaas==1.9.1
 myqlm-interop==1.9.3
-qiskit==0.45.0
-qiskit_aer==0.13.1
-qiskit_ibm_provider==0.7.2
-qiskit-ibm-runtime==0.17.0
+qiskit==1.0.0
+qiskit_aer 
+qiskit_ibm_provider
+qiskit-ibm-runtime==0.21.2
 python_dotenv==1.0.0
 typeguard>=4.1.5
 pylatexenc==2.10
@@ -18,5 +17,6 @@ sympy==1.10.1
 pick==2.2.0
 termcolor==2.4.0
 aenum==3.1.15
-symengine==0.9.2
+symengine==0.11
+boto3>=1.34.5 
 cirq==1.3.0

setup.py

@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import find_packages, setup
 
 with open("README.md", "r", encoding="utf-8") as f:
     long_description = f.read()
@@ -32,7 +32,7 @@
     packages=find_packages(include=["mpqp*"]),
     entry_points={
         "console_scripts": [
-            "setup_connections = mpqp.execution.connection.setup_connections:main_setup",
+            "setup_connections = mpqp_scripts.setup_connections:main_setup",
         ]
     },
     project_urls={