Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(jans-cli-tui): update to prompt_toolkit v3 #7491

Merged
merged 3 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions jans-cli-tui/cli_tui/jans_cli_tui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.")


Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/plugins/010_auth_server/agama.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/plugins/010_auth_server/authn.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/plugins/010_auth_server/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/plugins/010_auth_server/message.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/plugins/010_auth_server/ssa.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/plugins/060_scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/plugins/070_users/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/plugins/080_smtp/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/plugins/100_saml/edit_tr_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/cli_tui/utils/background_tasks.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion jans-cli-tui/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down