diff --git a/jans-cli-tui/cli_tui/jans_cli_tui.py b/jans-cli-tui/cli_tui/jans_cli_tui.py index 448d448833a..d64747feee1 100755 --- a/jans-cli-tui/cli_tui/jans_cli_tui.py +++ b/jans-cli-tui/cli_tui/jans_cli_tui.py @@ -36,7 +36,7 @@ sys.exit() import prompt_toolkit -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from prompt_toolkit.application import Application, get_app_session from prompt_toolkit.application.current import get_app from prompt_toolkit.key_binding import KeyBindings @@ -190,8 +190,6 @@ def __init__(self): self.main_nav_selection_changed(self.nav_bar.navbar_entries[0][0]) self.plugins_initialised = False - self.create_background_task(self.check_jans_cli_ini()) - async def progress_coroutine(self) -> None: """asyncio corotune for progress bar @@ -1040,7 +1038,7 @@ def get_confirm_dialog( def run(): with patch_stdout(application): - result = application.run() + result = application.run(pre_run=lambda: application.create_background_task(application.check_jans_cli_ini())) print("See you next time.") diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/agama.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/agama.py index 6419219187a..bdcfb2376df 100644 --- a/jans-cli-tui/cli_tui/plugins/010_auth_server/agama.py +++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/agama.py @@ -7,7 +7,7 @@ from typing import Any from types import SimpleNamespace from prompt_toolkit.application import Application -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from prompt_toolkit.layout.dimension import D from prompt_toolkit.lexers import PygmentsLexer, DynamicLexer diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/attributes.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/attributes.py index e14be49b7ab..37c2269a8e4 100644 --- a/jans-cli-tui/cli_tui/plugins/010_auth_server/attributes.py +++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/attributes.py @@ -3,7 +3,7 @@ from typing import Optional, Any from prompt_toolkit.application import Application -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from prompt_toolkit.layout.dimension import D from prompt_toolkit.layout.containers import HSplit, VSplit, DynamicContainer, HorizontalAlign from prompt_toolkit.widgets import Button diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/authn.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/authn.py index 64227bbfde9..701835a0d47 100644 --- a/jans-cli-tui/cli_tui/plugins/010_auth_server/authn.py +++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/authn.py @@ -3,7 +3,7 @@ from functools import partial from prompt_toolkit.application import Application -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from prompt_toolkit.layout.dimension import D from prompt_toolkit.layout.containers import HSplit, VSplit, HorizontalAlign, Window from prompt_toolkit.widgets import Button, Label, Dialog, Box diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/edit_client_dialog.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/edit_client_dialog.py index af922777f3e..79ab7b8c16f 100644 --- a/jans-cli-tui/cli_tui/plugins/010_auth_server/edit_client_dialog.py +++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/edit_client_dialog.py @@ -44,7 +44,7 @@ from prompt_toolkit.formatted_text import AnyFormattedText from typing import Optional, Sequence from typing import Callable -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop import asyncio import json diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/main.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/main.py index 06b45051217..f8fed3528fe 100755 --- a/jans-cli-tui/cli_tui/plugins/010_auth_server/main.py +++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/main.py @@ -4,7 +4,7 @@ from functools import partial from typing import Any, Optional from prompt_toolkit.application.current import get_app -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from prompt_toolkit.layout.containers import ( HSplit, VSplit, diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/message.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/message.py index b43c98d0f66..83fc2b7aebd 100644 --- a/jans-cli-tui/cli_tui/plugins/010_auth_server/message.py +++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/message.py @@ -1,7 +1,7 @@ import asyncio from prompt_toolkit.layout.dimension import D -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from prompt_toolkit.layout.containers import HSplit, VSplit, DynamicContainer, HorizontalAlign from prompt_toolkit.widgets import Button, Frame, RadioList diff --git a/jans-cli-tui/cli_tui/plugins/010_auth_server/ssa.py b/jans-cli-tui/cli_tui/plugins/010_auth_server/ssa.py index b6cf601b48b..5807906efbe 100644 --- a/jans-cli-tui/cli_tui/plugins/010_auth_server/ssa.py +++ b/jans-cli-tui/cli_tui/plugins/010_auth_server/ssa.py @@ -4,7 +4,7 @@ from typing import Any from prompt_toolkit.application import Application -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from prompt_toolkit.layout.dimension import D from prompt_toolkit.layout.containers import HSplit, VSplit from prompt_toolkit.layout.containers import DynamicContainer, Window diff --git a/jans-cli-tui/cli_tui/plugins/060_scripts/main.py b/jans-cli-tui/cli_tui/plugins/060_scripts/main.py index 536f6cd5a49..c78d5a8f493 100755 --- a/jans-cli-tui/cli_tui/plugins/060_scripts/main.py +++ b/jans-cli-tui/cli_tui/plugins/060_scripts/main.py @@ -2,7 +2,7 @@ from functools import partial from prompt_toolkit.application.current import get_app -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from prompt_toolkit.layout.containers import ( HSplit, VSplit, diff --git a/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py b/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py index 3fc71b630f6..66961effd43 100644 --- a/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py +++ b/jans-cli-tui/cli_tui/plugins/070_users/edit_user_dialog.py @@ -6,7 +6,7 @@ DynamicContainer, Window from prompt_toolkit.widgets import Button, Label, CheckboxList, Dialog -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from utils.static import DialogResult from wui_components.jans_dialog_with_nav import JansDialogWithNav from wui_components.jans_cli_dialog import JansGDialog diff --git a/jans-cli-tui/cli_tui/plugins/070_users/main.py b/jans-cli-tui/cli_tui/plugins/070_users/main.py index dd962d61f4c..7d55128b76d 100755 --- a/jans-cli-tui/cli_tui/plugins/070_users/main.py +++ b/jans-cli-tui/cli_tui/plugins/070_users/main.py @@ -10,7 +10,7 @@ from prompt_toolkit.layout.containers import HSplit, VSplit, DynamicContainer, HorizontalAlign from prompt_toolkit.layout.dimension import D from prompt_toolkit.widgets import Button, Dialog -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from wui_components.jans_vetrical_nav import JansVerticalNav from edit_user_dialog import EditUserDialog diff --git a/jans-cli-tui/cli_tui/plugins/080_smtp/main.py b/jans-cli-tui/cli_tui/plugins/080_smtp/main.py index f7025046e38..b2d624f9a3b 100755 --- a/jans-cli-tui/cli_tui/plugins/080_smtp/main.py +++ b/jans-cli-tui/cli_tui/plugins/080_smtp/main.py @@ -4,7 +4,7 @@ from typing import Any import prompt_toolkit -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from prompt_toolkit.layout.containers import HSplit, DynamicContainer,\ VSplit, Window, HorizontalAlign, Window from prompt_toolkit.layout.dimension import D diff --git a/jans-cli-tui/cli_tui/plugins/100_saml/edit_identity_provider_dialog.py b/jans-cli-tui/cli_tui/plugins/100_saml/edit_identity_provider_dialog.py index cfbdfacc0dc..572ba9abaac 100644 --- a/jans-cli-tui/cli_tui/plugins/100_saml/edit_identity_provider_dialog.py +++ b/jans-cli-tui/cli_tui/plugins/100_saml/edit_identity_provider_dialog.py @@ -12,7 +12,7 @@ from prompt_toolkit.widgets import Button, Label, CheckboxList, Dialog, TextArea,\ Frame -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from utils.static import DialogResult from wui_components.jans_dialog_with_nav import JansDialogWithNav from wui_components.jans_label_container import JansLabelContainer diff --git a/jans-cli-tui/cli_tui/plugins/100_saml/edit_tr_dialog.py b/jans-cli-tui/cli_tui/plugins/100_saml/edit_tr_dialog.py index 1195ab7a657..4e5725ec8f0 100644 --- a/jans-cli-tui/cli_tui/plugins/100_saml/edit_tr_dialog.py +++ b/jans-cli-tui/cli_tui/plugins/100_saml/edit_tr_dialog.py @@ -12,7 +12,7 @@ from prompt_toolkit.widgets import Button, Label, CheckboxList, Dialog, TextArea,\ Frame -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from utils.static import DialogResult from wui_components.jans_dialog_with_nav import JansDialogWithNav from wui_components.jans_label_container import JansLabelContainer diff --git a/jans-cli-tui/cli_tui/utils/background_tasks.py b/jans-cli-tui/cli_tui/utils/background_tasks.py index 390e19964e6..e80f77fe4cb 100644 --- a/jans-cli-tui/cli_tui/utils/background_tasks.py +++ b/jans-cli-tui/cli_tui/utils/background_tasks.py @@ -1,4 +1,4 @@ -from prompt_toolkit.eventloop import get_event_loop +from asyncio import get_event_loop from utils.utils import common_data from utils.static import common_strings diff --git a/jans-cli-tui/setup.py b/jans-cli-tui/setup.py index a28fbefc35f..2923f0bb54f 100644 --- a/jans-cli-tui/setup.py +++ b/jans-cli-tui/setup.py @@ -86,7 +86,7 @@ def find_version(*file_paths): "ruamel.yaml>=0.16.5,<0.18.0", "PyJWT==2.4.0", "pygments", - "prompt_toolkit==3.0.33", + "prompt_toolkit>=3.0.33,<4.0.0", "requests", "urllib3", "pyDes",