mirror of
https://github.com/koloideal/Argenta.git
synced 2026-06-10 18:15:28 +03:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cbf7d3c578 | |||
| ea2d068022 | |||
| 5991851207 | |||
| f628c3b5b5 | |||
| 05379712f4 | |||
| ed1cbf0fcf | |||
| 471f05369b | |||
| 13f7e33db1 | |||
| 9a78aa9263 | |||
| 58ccd6b26d | |||
| 73144f7ba4 | |||
| 650f4c9036 | |||
| 393f5c7d81 | |||
| 9eb2bb6c46 | |||
| 79b275eac7 |
@@ -27,4 +27,4 @@ jobs:
|
|||||||
pip install ruff
|
pip install ruff
|
||||||
|
|
||||||
- name: Run linter
|
- name: Run linter
|
||||||
run: ruff check ./argenta
|
run: ruff check ./src
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
.venv
|
*venv
|
||||||
.idea
|
.idea
|
||||||
dist
|
dist
|
||||||
uv.lock
|
uv.lock
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 1.5 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.9 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 928 KiB |
@@ -0,0 +1,46 @@
|
|||||||
|
<?xml version="1.0" standalone="no"?>
|
||||||
|
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
|
||||||
|
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
|
||||||
|
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
|
||||||
|
width="809.000000pt" height="809.000000pt" viewBox="0 0 809.000000 809.000000"
|
||||||
|
preserveAspectRatio="xMidYMid meet">
|
||||||
|
|
||||||
|
<g transform="translate(0.000000,809.000000) scale(0.100000,-0.100000)"
|
||||||
|
fill="#000000" stroke="none">
|
||||||
|
<path d="M3845 7600 c-683 -38 -1333 -259 -1875 -639 -702 -492 -1223 -1251
|
||||||
|
-1434 -2089 -83 -330 -111 -602 -103 -980 6 -273 19 -393 67 -632 167 -829
|
||||||
|
642 -1593 1321 -2122 512 -399 1133 -656 1794 -745 165 -22 666 -25 825 -5
|
||||||
|
779 99 1451 397 2020 898 687 603 1095 1401 1201 2344 17 147 17 571 0 715
|
||||||
|
-59 518 -204 977 -442 1402 -180 322 -355 552 -629 823 -518 515 -1164 850
|
||||||
|
-1887 979 -254 45 -594 66 -858 51z m655 -234 c545 -76 1005 -248 1445 -541
|
||||||
|
195 -130 336 -245 506 -415 457 -456 758 -987 909 -1605 134 -547 132 -1119
|
||||||
|
-5 -1665 -149 -593 -445 -1112 -885 -1550 -624 -623 -1414 -966 -2315 -1006
|
||||||
|
-412 -18 -935 73 -1339 232 -656 259 -1228 720 -1610 1299 -298 450 -461 890
|
||||||
|
-538 1451 -28 210 -31 620 -4 819 103 786 437 1477 975 2016 149 149 266 249
|
||||||
|
417 357 315 225 692 405 1059 506 211 58 342 81 675 120 87 10 601 -3 710 -18z"/>
|
||||||
|
<path d="M3691 6759 c-231 -17 -522 -67 -660 -114 -227 -77 -354 -211 -381
|
||||||
|
-400 -14 -105 -13 -628 2 -643 9 -9 158 -12 611 -12 598 0 628 -2 649 -34 14
|
||||||
|
-21 8 -66 -12 -86 -20 -20 -33 -20 -908 -20 -857 0 -892 -1 -967 -20 -294 -75
|
||||||
|
-500 -321 -599 -715 -49 -195 -61 -309 -60 -585 0 -221 3 -272 23 -385 44
|
||||||
|
-251 116 -418 232 -540 78 -82 143 -123 254 -162 78 -27 85 -27 351 -31 l272
|
||||||
|
-4 16 23 c14 20 16 58 16 259 0 334 20 446 107 613 80 153 268 310 447 374
|
||||||
|
128 45 138 46 881 52 683 7 713 8 786 28 201 56 353 177 437 348 80 162 86
|
||||||
|
240 74 905 -11 608 -10 600 -84 743 -80 153 -240 271 -453 332 -252 73 -653
|
||||||
|
101 -1034 74z m-383 -466 c126 -78 147 -245 44 -355 -144 -154 -396 -54 -395
|
||||||
|
157 0 97 62 187 154 222 54 20 143 10 197 -24z"/>
|
||||||
|
<path d="M5451 5491 c-20 -20 -21 -30 -21 -283 0 -276 -7 -351 -42 -458 -81
|
||||||
|
-251 -281 -454 -523 -534 -149 -48 -151 -48 -890 -56 -678 -6 -703 -7 -780
|
||||||
|
-28 -139 -38 -219 -84 -315 -181 -61 -61 -95 -105 -117 -151 -65 -134 -64
|
||||||
|
-129 -75 -780 -12 -665 -10 -694 47 -817 122 -265 419 -429 895 -494 127 -18
|
||||||
|
592 -18 730 -1 377 48 646 169 785 355 57 75 67 94 96 182 20 64 23 94 27 325
|
||||||
|
4 238 3 257 -15 278 l-18 23 -551 -1 c-399 0 -559 3 -577 11 -51 23 -56 102
|
||||||
|
-8 126 9 4 439 10 956 13 1044 7 981 2 1125 75 178 89 305 255 386 502 84 257
|
||||||
|
111 618 73 973 -39 364 -167 655 -351 801 -63 50 -121 80 -213 110 -64 20 -93
|
||||||
|
23 -337 27 -260 4 -267 3 -287 -17z m-2104 -1698 c78 -52 531 -413 561 -447
|
||||||
|
17 -19 33 -48 37 -65 15 -71 3 -84 -323 -356 -275 -229 -310 -255 -342 -255
|
||||||
|
-78 1 -112 75 -61 134 9 10 86 75 171 144 247 201 355 294 358 311 1 9 -15 28
|
||||||
|
-38 44 -127 89 -503 393 -512 413 -23 50 20 103 82 104 15 0 45 -12 67 -27z
|
||||||
|
m1388 -1244 c59 -15 129 -77 151 -134 36 -96 0 -204 -88 -262 -36 -24 -51 -28
|
||||||
|
-118 -28 -67 0 -82 4 -118 28 -153 101 -124 338 48 392 57 17 71 18 125 4z"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.9 KiB |
@@ -8,8 +8,8 @@ from argenta.orchestrator.argparser import ArgParser
|
|||||||
from argenta.orchestrator.argparser.arguments import BooleanArgument
|
from argenta.orchestrator.argparser.arguments import BooleanArgument
|
||||||
|
|
||||||
|
|
||||||
arg_parser = ArgParser(processed_args=[BooleanArgument('repeat')])
|
arg_parser = ArgParser(processed_args=[BooleanArgument("repeat")])
|
||||||
app: App = App(autocompleter=AutoCompleter('.hist'))
|
app: App = App(autocompleter=AutoCompleter(".hist"))
|
||||||
orchestrator: Orchestrator = Orchestrator()
|
orchestrator: Orchestrator = Orchestrator()
|
||||||
|
|
||||||
|
|
||||||
@@ -22,5 +22,6 @@ def main():
|
|||||||
|
|
||||||
orchestrator.start_polling(app)
|
orchestrator.start_polling(app)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|||||||
+81
-15
@@ -1,23 +1,89 @@
|
|||||||
from argenta.response import Response, Status
|
|
||||||
from argenta.app import App
|
|
||||||
from argenta.app.dividing_line import StaticDividingLine, DynamicDividingLine
|
|
||||||
from argenta.app.autocompleter import AutoCompleter
|
|
||||||
from argenta.app.defaults import PredefinedMessages
|
|
||||||
from argenta.command import Command
|
|
||||||
from argenta.command.flags import Flags, InputFlags, InvalidValueInputFlags, UndefinedInputFlags, ValidInputFlags
|
|
||||||
from argenta.command.flag import Flag, InputFlag
|
|
||||||
from argenta.command.flag.defaults import PredefinedFlags
|
|
||||||
from argenta.router import Router
|
from argenta.router import Router
|
||||||
|
from argenta.command import Command
|
||||||
|
from argenta.response import Response
|
||||||
|
from argenta.response.status import Status
|
||||||
|
from argenta.command.flag import Flag
|
||||||
|
from argenta.command.flags import Flags
|
||||||
|
from argenta.app import App
|
||||||
from argenta.orchestrator import Orchestrator
|
from argenta.orchestrator import Orchestrator
|
||||||
|
|
||||||
from argenta.command.models import InputCommand
|
# Создание маршрутизатора
|
||||||
import inspect
|
file_router = Router("Операции с файлами")
|
||||||
|
|
||||||
|
# Определение флагов для команды копирования
|
||||||
|
copy_flags = Flags(
|
||||||
|
Flag('source', '--'),
|
||||||
|
Flag('destination', '--'),
|
||||||
|
Flag('recursive', '--', False), # Булевый флаг без значения
|
||||||
|
Flag('force', '-', False) # Короткий булевый флаг
|
||||||
|
)
|
||||||
|
@file_router.command(Command('case', aliases=['cp', 'ch']))
|
||||||
|
def handler(response: Response):
|
||||||
|
print('test')
|
||||||
|
|
||||||
|
# Регистрация команды копирования
|
||||||
|
@file_router.command(Command(
|
||||||
|
trigger="ch",
|
||||||
|
description="Копирование файлов",
|
||||||
|
flags=copy_flags,
|
||||||
|
aliases=["cp"]
|
||||||
|
))
|
||||||
|
def copy_files(response: Response):
|
||||||
|
# Получаем значения корректных флагов
|
||||||
|
source = None
|
||||||
|
destination = None
|
||||||
|
recursive = False
|
||||||
|
force = False
|
||||||
|
|
||||||
|
for flag in response.valid_flags:
|
||||||
|
if flag.get_name() == "source":
|
||||||
|
source = flag.get_value()
|
||||||
|
elif flag.get_name() == "destination":
|
||||||
|
destination = flag.get_value()
|
||||||
|
elif flag.get_name() == "recursive":
|
||||||
|
recursive = True
|
||||||
|
elif flag.get_name() == "force":
|
||||||
|
force = True
|
||||||
|
|
||||||
|
# Проверка обязательных параметров
|
||||||
|
if not source or not destination:
|
||||||
|
print("Ошибка: необходимо указать источник и назначение")
|
||||||
|
return
|
||||||
|
|
||||||
|
print(f"Копирование из {source} в {destination}")
|
||||||
|
if recursive:
|
||||||
|
print("Рекурсивное копирование включено")
|
||||||
|
if force:
|
||||||
|
print("Принудительное копирование включено")
|
||||||
|
|
||||||
|
# Обработка неопределенных флагов
|
||||||
|
if response.undefined_flags:
|
||||||
|
print("\nПредупреждение: обнаружены незарегистрированные флаги:")
|
||||||
|
for flag in response.undefined_flags:
|
||||||
|
print(f" - {flag.get_name()}" +
|
||||||
|
(f" = {flag.get_value()}" if flag.get_value() else ""))
|
||||||
|
|
||||||
|
# Обработка флагов с некорректными значениями
|
||||||
|
if response.invalid_value_flags:
|
||||||
|
print("\nПредупреждение: обнаружены флаги с некорректными значениями:")
|
||||||
|
for flag in response.invalid_value_flags:
|
||||||
|
print(f" - {flag.get_name()} = {flag.get_value()}")
|
||||||
|
|
||||||
|
# Принятие решения на основе статуса
|
||||||
|
if response.status != Status.ALL_FLAGS_VALID:
|
||||||
|
print("\nВыполнение с предупреждениями из-за проблем с флагами.")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
app = App()
|
||||||
|
app.include_router(file_router)
|
||||||
|
orchestrator = Orchestrator()
|
||||||
|
|
||||||
|
orchestrator.start_polling(app)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
router = Router()
|
|
||||||
|
|
||||||
|
|
||||||
@router.command(Command('some'))
|
|
||||||
def handler(res: Response) -> Response:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ console = Console()
|
|||||||
|
|
||||||
|
|
||||||
def help_command():
|
def help_command():
|
||||||
console.print("[italic bold]The main functionality of the script is to convert an expression from a string "
|
console.print(
|
||||||
"to a mathematical one and then calculate this expression. "
|
"[italic bold]The main functionality of the script is to convert an expression from a string "
|
||||||
"Project GitHub: https://github.com/koloideal/WordMath[/italic bold]")
|
"to a mathematical one and then calculate this expression. "
|
||||||
|
"Project GitHub: https://github.com/koloideal/WordMath[/italic bold]"
|
||||||
|
)
|
||||||
|
|||||||
@@ -7,12 +7,19 @@ from argenta.response import Response
|
|||||||
from argenta.router import Router
|
from argenta.router import Router
|
||||||
|
|
||||||
|
|
||||||
work_router: Router = Router(title='Work points:')
|
work_router: Router = Router(title="Work points:")
|
||||||
|
|
||||||
console = Console()
|
console = Console()
|
||||||
|
|
||||||
|
|
||||||
@work_router.command(Command('get', 'Get Help', aliases=['help', 'Get_help'], flags=Flags(PredefinedFlags.PORT, PredefinedFlags.HOST)))
|
@work_router.command(
|
||||||
|
Command(
|
||||||
|
"get",
|
||||||
|
"Get Help",
|
||||||
|
aliases=["help", "Get_help"],
|
||||||
|
flags=Flags(PredefinedFlags.PORT, PredefinedFlags.HOST),
|
||||||
|
)
|
||||||
|
)
|
||||||
def command_help(response: Response):
|
def command_help(response: Response):
|
||||||
print(response.status)
|
print(response.status)
|
||||||
print(response.undefined_flags.get_flags())
|
print(response.undefined_flags.get_flags())
|
||||||
@@ -20,12 +27,9 @@ def command_help(response: Response):
|
|||||||
print(response.invalid_value_flags.get_flags())
|
print(response.invalid_value_flags.get_flags())
|
||||||
|
|
||||||
|
|
||||||
@work_router.command('run')
|
@work_router.command("run")
|
||||||
def command_start_solving(response: Response):
|
def command_start_solving(response: Response):
|
||||||
print(response.status)
|
print(response.status)
|
||||||
print(response.undefined_flags.get_flags())
|
print(response.undefined_flags.get_flags())
|
||||||
print(response.valid_flags.get_flags())
|
print(response.valid_flags.get_flags())
|
||||||
print(response.invalid_value_flags.get_flags())
|
print(response.invalid_value_flags.get_flags())
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,10 +9,12 @@ from argenta.orchestrator.argparser import ArgParser
|
|||||||
from argenta.orchestrator.argparser.arguments import BooleanArgument
|
from argenta.orchestrator.argparser.arguments import BooleanArgument
|
||||||
|
|
||||||
|
|
||||||
arg_parser = ArgParser(processed_args=[BooleanArgument('repeat')])
|
arg_parser = ArgParser(processed_args=[BooleanArgument("repeat")])
|
||||||
app: App = App(dividing_line=DynamicDividingLine(),
|
app: App = App(
|
||||||
autocompleter=AutoCompleter('./mock/.hist'),
|
dividing_line=DynamicDividingLine(),
|
||||||
repeat_command_groups=False,)
|
autocompleter=AutoCompleter(),
|
||||||
|
repeat_command_groups=False,
|
||||||
|
)
|
||||||
orchestrator: Orchestrator = Orchestrator(arg_parser)
|
orchestrator: Orchestrator = Orchestrator(arg_parser)
|
||||||
|
|
||||||
|
|
||||||
@@ -25,5 +27,6 @@ def main():
|
|||||||
|
|
||||||
orchestrator.start_polling(app)
|
orchestrator.start_polling(app)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
|
|||||||
+2
-7
@@ -1,9 +1,9 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "argenta"
|
name = "argenta"
|
||||||
version = "1.0.0-beta2"
|
version = "1.0.3"
|
||||||
description = "Python library for building modular CLI applications"
|
description = "Python library for building modular CLI applications"
|
||||||
authors = [{ name = "kolo", email = "kolo.is.main@gmail.com" }]
|
authors = [{ name = "kolo", email = "kolo.is.main@gmail.com" }]
|
||||||
requires-python = ">=3.11, <4.0"
|
requires-python = ">=3.8"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
license = { text = "MIT" }
|
license = { text = "MIT" }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
@@ -12,11 +12,6 @@ dependencies = [
|
|||||||
"pyreadline3>=3.5.4",
|
"pyreadline3>=3.5.4",
|
||||||
]
|
]
|
||||||
|
|
||||||
[dependency-groups]
|
|
||||||
dev = [
|
|
||||||
"pydoc-markdown>=4.8.2,<5",
|
|
||||||
]
|
|
||||||
|
|
||||||
[tool.ruff]
|
[tool.ruff]
|
||||||
exclude = [
|
exclude = [
|
||||||
".idea",
|
".idea",
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
import os
|
import os
|
||||||
import readline
|
import readline
|
||||||
|
from typing import Never
|
||||||
|
|
||||||
|
|
||||||
class AutoCompleter:
|
class AutoCompleter:
|
||||||
def __init__(self, history_filename: str = False, autocomplete_button: str = 'tab') -> None:
|
def __init__(
|
||||||
|
self, history_filename: str = False, autocomplete_button: str = "tab"
|
||||||
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Public. Configures and implements auto-completion of input command
|
Public. Configures and implements auto-completion of input command
|
||||||
:param history_filename: the name of the file for saving the history of the autocompleter
|
:param history_filename: the name of the file for saving the history of the autocompleter
|
||||||
@@ -12,7 +15,6 @@ class AutoCompleter:
|
|||||||
"""
|
"""
|
||||||
self.history_filename = history_filename
|
self.history_filename = history_filename
|
||||||
self.autocomplete_button = autocomplete_button
|
self.autocomplete_button = autocomplete_button
|
||||||
self.matches: list[str] = []
|
|
||||||
|
|
||||||
def _complete(self, text, state) -> str | None:
|
def _complete(self, text, state) -> str | None:
|
||||||
"""
|
"""
|
||||||
@@ -21,16 +23,22 @@ class AutoCompleter:
|
|||||||
:param state: the current cursor position is relative to the beginning of the line
|
:param state: the current cursor position is relative to the beginning of the line
|
||||||
:return: the desired candidate as str or None
|
:return: the desired candidate as str or None
|
||||||
"""
|
"""
|
||||||
matches: list[str] = sorted(cmd for cmd in self.get_history_items() if cmd.startswith(text))
|
matches: list[str] = sorted(
|
||||||
|
cmd for cmd in self.get_history_items() if cmd.startswith(text)
|
||||||
|
)
|
||||||
if len(matches) > 1:
|
if len(matches) > 1:
|
||||||
common_prefix = matches[0]
|
common_prefix = matches[0]
|
||||||
for match in matches[1:]:
|
for match in matches[1:]:
|
||||||
i = 0
|
i = 0
|
||||||
while i < len(common_prefix) and i < len(match) and common_prefix[i] == match[i]:
|
while (
|
||||||
|
i < len(common_prefix)
|
||||||
|
and i < len(match)
|
||||||
|
and common_prefix[i] == match[i]
|
||||||
|
):
|
||||||
i += 1
|
i += 1
|
||||||
common_prefix = common_prefix[:i]
|
common_prefix = common_prefix[:i]
|
||||||
if state == 0:
|
if state == 0:
|
||||||
readline.insert_text(common_prefix[len(text):])
|
readline.insert_text(common_prefix[len(text) :])
|
||||||
readline.redisplay()
|
readline.redisplay()
|
||||||
return None
|
return None
|
||||||
elif len(matches) == 1:
|
elif len(matches) == 1:
|
||||||
@@ -52,21 +60,32 @@ class AutoCompleter:
|
|||||||
readline.add_history(line)
|
readline.add_history(line)
|
||||||
|
|
||||||
readline.set_completer(self._complete)
|
readline.set_completer(self._complete)
|
||||||
readline.set_completer_delims(readline.get_completer_delims().replace(' ', ''))
|
readline.set_completer_delims(readline.get_completer_delims().replace(" ", ""))
|
||||||
readline.parse_and_bind(f'{self.autocomplete_button}: complete')
|
readline.parse_and_bind(f"{self.autocomplete_button}: complete")
|
||||||
|
|
||||||
def exit_setup(self) -> None:
|
def exit_setup(self, all_commands: list[str]) -> None:
|
||||||
"""
|
"""
|
||||||
Private. Exit setup function
|
Private. Exit setup function
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
if self.history_filename:
|
if self.history_filename:
|
||||||
readline.write_history_file(self.history_filename)
|
readline.write_history_file(self.history_filename)
|
||||||
|
with open(self.history_filename, "r") as history_file:
|
||||||
|
raw_history = history_file.read()
|
||||||
|
pretty_history: list[str] = []
|
||||||
|
for line in set(raw_history.strip().split("\n")):
|
||||||
|
if line.split()[0] in all_commands:
|
||||||
|
pretty_history.append(line)
|
||||||
|
with open(self.history_filename, "w") as history_file:
|
||||||
|
history_file.write("\n".join(pretty_history))
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_history_items() -> list[str] | list:
|
def get_history_items() -> list[str] | list[Never]:
|
||||||
"""
|
"""
|
||||||
Private. Returns a list of all commands entered by the user
|
Private. Returns a list of all commands entered by the user
|
||||||
:return: all commands entered by the user as list[str]
|
:return: all commands entered by the user as list[str] | list[Never]
|
||||||
"""
|
"""
|
||||||
return [readline.get_history_item(i) for i in range(1, readline.get_current_history_length() + 1)]
|
return [
|
||||||
|
readline.get_history_item(i)
|
||||||
|
for i in range(1, readline.get_current_history_length() + 1)
|
||||||
|
]
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
from dataclasses import dataclass
|
from enum import Enum
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
class PredefinedMessages(Enum):
|
||||||
class PredefinedMessages:
|
|
||||||
"""
|
"""
|
||||||
Public. A dataclass with predetermined messages for quick use
|
Public. A dataclass with predetermined messages for quick use
|
||||||
"""
|
"""
|
||||||
USAGE = '[b dim]Usage[/b dim]: [i]<command> <[green]flags[/green]>[/i]'
|
USAGE = "[b dim]Usage[/b dim]: [i]<command> <[green]flags[/green]>[/i]"
|
||||||
HELP = '[b dim]Help[/b dim]: [i]<command>[/i] [b red]--help[/b red]'
|
HELP = "[b dim]Help[/b dim]: [i]<command>[/i] [b red]--help[/b red]"
|
||||||
AUTOCOMPLETE = '[b dim]Autocomplete[/b dim]: [i]<part>[/i] [bold]<tab>'
|
AUTOCOMPLETE = "[b dim]Autocomplete[/b dim]: [i]<part>[/i] [bold]<tab>"
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ from abc import ABC
|
|||||||
|
|
||||||
|
|
||||||
class BaseDividingLine(ABC):
|
class BaseDividingLine(ABC):
|
||||||
def __init__(self, unit_part: str = '-') -> None:
|
def __init__(self, unit_part: str = "-") -> None:
|
||||||
"""
|
"""
|
||||||
Private. The basic dividing line
|
Private. The basic dividing line
|
||||||
:param unit_part: the single part of the dividing line
|
:param unit_part: the single part of the dividing line
|
||||||
@@ -16,13 +16,13 @@ class BaseDividingLine(ABC):
|
|||||||
:return: unit_part of dividing line as str
|
:return: unit_part of dividing line as str
|
||||||
"""
|
"""
|
||||||
if len(self._unit_part) == 0:
|
if len(self._unit_part) == 0:
|
||||||
return ' '
|
return " "
|
||||||
else:
|
else:
|
||||||
return self._unit_part[0]
|
return self._unit_part[0]
|
||||||
|
|
||||||
|
|
||||||
class StaticDividingLine(BaseDividingLine):
|
class StaticDividingLine(BaseDividingLine):
|
||||||
def __init__(self, unit_part: str = '-', length: int = 25) -> None:
|
def __init__(self, unit_part: str = "-", length: int = 25) -> None:
|
||||||
"""
|
"""
|
||||||
Public. The static dividing line
|
Public. The static dividing line
|
||||||
:param unit_part: the single part of the dividing line
|
:param unit_part: the single part of the dividing line
|
||||||
@@ -39,13 +39,13 @@ class StaticDividingLine(BaseDividingLine):
|
|||||||
:return: full line of dividing line as str
|
:return: full line of dividing line as str
|
||||||
"""
|
"""
|
||||||
if is_override:
|
if is_override:
|
||||||
return f'\n{self.length * self.get_unit_part()}\n'
|
return f"\n{self.length * self.get_unit_part()}\n"
|
||||||
else:
|
else:
|
||||||
return f'\n[dim]{self.length * self.get_unit_part()}[/dim]\n'
|
return f"\n[dim]{self.length * self.get_unit_part()}[/dim]\n"
|
||||||
|
|
||||||
|
|
||||||
class DynamicDividingLine(BaseDividingLine):
|
class DynamicDividingLine(BaseDividingLine):
|
||||||
def __init__(self, unit_part: str = '-') -> None:
|
def __init__(self, unit_part: str = "-") -> None:
|
||||||
"""
|
"""
|
||||||
Public. The dynamic dividing line
|
Public. The dynamic dividing line
|
||||||
:param unit_part: the single part of the dividing line
|
:param unit_part: the single part of the dividing line
|
||||||
@@ -61,8 +61,6 @@ class DynamicDividingLine(BaseDividingLine):
|
|||||||
:return: full line of dividing line as str
|
:return: full line of dividing line as str
|
||||||
"""
|
"""
|
||||||
if is_override:
|
if is_override:
|
||||||
return f'\n{length * self.get_unit_part()}\n'
|
return f"\n{length * self.get_unit_part()}\n"
|
||||||
else:
|
else:
|
||||||
return f'\n[dim]{self.get_unit_part() * length}[/dim]\n'
|
return f"\n[dim]{self.get_unit_part() * length}[/dim]\n"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+133
-83
@@ -11,15 +11,16 @@ from argenta.router import Router
|
|||||||
from argenta.router.defaults import system_router
|
from argenta.router.defaults import system_router
|
||||||
from argenta.app.autocompleter import AutoCompleter
|
from argenta.app.autocompleter import AutoCompleter
|
||||||
from argenta.app.dividing_line.models import StaticDividingLine, DynamicDividingLine
|
from argenta.app.dividing_line.models import StaticDividingLine, DynamicDividingLine
|
||||||
from argenta.command.exceptions import (UnprocessedInputFlagException,
|
from argenta.command.exceptions import (
|
||||||
RepeatedInputFlagsException,
|
UnprocessedInputFlagException,
|
||||||
EmptyInputCommandException,
|
RepeatedInputFlagsException,
|
||||||
BaseInputCommandException)
|
EmptyInputCommandException,
|
||||||
|
BaseInputCommandException,
|
||||||
|
)
|
||||||
from argenta.app.registered_routers.entity import RegisteredRouters
|
from argenta.app.registered_routers.entity import RegisteredRouters
|
||||||
from argenta.response import Response
|
from argenta.response import Response
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class BaseApp:
|
class BaseApp:
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
prompt: str,
|
prompt: str,
|
||||||
@@ -33,7 +34,6 @@ class BaseApp:
|
|||||||
override_system_messages: bool,
|
override_system_messages: bool,
|
||||||
autocompleter: AutoCompleter,
|
autocompleter: AutoCompleter,
|
||||||
print_func: Callable[[str], None]) -> None:
|
print_func: Callable[[str], None]) -> None:
|
||||||
|
|
||||||
self._prompt = prompt
|
self._prompt = prompt
|
||||||
self._print_func = print_func
|
self._print_func = print_func
|
||||||
self._exit_command = exit_command
|
self._exit_command = exit_command
|
||||||
@@ -47,20 +47,18 @@ class BaseApp:
|
|||||||
self._farewell_message = farewell_message
|
self._farewell_message = farewell_message
|
||||||
self._initial_message = initial_message
|
self._initial_message = initial_message
|
||||||
|
|
||||||
|
self._description_message_gen: Callable[[str, str], str] = (lambda command, description: f"[{command}] *=*=* {description}")
|
||||||
self._description_message_gen: Callable[[str, str], str] = lambda command, description: f'[{command}] *=*=* {description}'
|
|
||||||
self._registered_routers: RegisteredRouters = RegisteredRouters()
|
self._registered_routers: RegisteredRouters = RegisteredRouters()
|
||||||
self._messages_on_startup: list[str] = []
|
self._messages_on_startup: list[str] = []
|
||||||
|
|
||||||
self._all_registered_triggers_in_lower: list[str] = []
|
self._all_registered_triggers_in_lower_case: list[str] = []
|
||||||
self._all_registered_triggers_in_default_case: list[str] = []
|
self._all_registered_triggers_in_default_case: list[str] = []
|
||||||
|
|
||||||
self._invalid_input_flags_handler: Callable[[str], None] = lambda raw_command: print_func(f'Incorrect flag syntax: {raw_command}')
|
self._incorrect_input_syntax_handler: Callable[[str], None] = (lambda raw_command: print_func(f"Incorrect flag syntax: {raw_command}"))
|
||||||
self._repeated_input_flags_handler: Callable[[str], None] = lambda raw_command: print_func(f'Repeated input flags: {raw_command}')
|
self._repeated_input_flags_handler: Callable[[str], None] = (lambda raw_command: print_func(f"Repeated input flags: {raw_command}"))
|
||||||
self._empty_input_command_handler: Callable[[], None] = lambda: print_func('Empty input command')
|
self._empty_input_command_handler: Callable[[], None] = lambda: print_func("Empty input command")
|
||||||
self._unknown_command_handler: Callable[[InputCommand], None] = lambda command: print_func(f"Unknown command: {command.get_trigger()}")
|
self._unknown_command_handler: Callable[[InputCommand], None] = (lambda command: print_func(f"Unknown command: {command.get_trigger()}"))
|
||||||
self._exit_command_handler: Callable[[Response], None] = lambda response: print_func(self._farewell_message)
|
self._exit_command_handler: Callable[[Response], None] = (lambda response: print_func(self._farewell_message))
|
||||||
|
|
||||||
|
|
||||||
def set_description_message_pattern(self, _: Callable[[str, str], str]) -> None:
|
def set_description_message_pattern(self, _: Callable[[str, str], str]) -> None:
|
||||||
"""
|
"""
|
||||||
@@ -70,15 +68,13 @@ class BaseApp:
|
|||||||
"""
|
"""
|
||||||
self._description_message_gen: Callable[[str, str], str] = _
|
self._description_message_gen: Callable[[str, str], str] = _
|
||||||
|
|
||||||
|
def set_incorrect_input_syntax_handler(self, _: Callable[[str], None]) -> None:
|
||||||
def set_invalid_input_flags_handler(self, _: Callable[[str], None]) -> None:
|
|
||||||
"""
|
"""
|
||||||
Public. Sets the handler for incorrect flags when entering a command
|
Public. Sets the handler for incorrect flags when entering a command
|
||||||
:param _: handler for incorrect flags when entering a command
|
:param _: handler for incorrect flags when entering a command
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
self._invalid_input_flags_handler = _
|
self._incorrect_input_syntax_handler = _
|
||||||
|
|
||||||
|
|
||||||
def set_repeated_input_flags_handler(self, _: Callable[[str], None]) -> None:
|
def set_repeated_input_flags_handler(self, _: Callable[[str], None]) -> None:
|
||||||
"""
|
"""
|
||||||
@@ -88,7 +84,6 @@ class BaseApp:
|
|||||||
"""
|
"""
|
||||||
self._repeated_input_flags_handler = _
|
self._repeated_input_flags_handler = _
|
||||||
|
|
||||||
|
|
||||||
def set_unknown_command_handler(self, _: Callable[[str], None]) -> None:
|
def set_unknown_command_handler(self, _: Callable[[str], None]) -> None:
|
||||||
"""
|
"""
|
||||||
Public. Sets the handler for unknown commands when entering a command
|
Public. Sets the handler for unknown commands when entering a command
|
||||||
@@ -97,7 +92,6 @@ class BaseApp:
|
|||||||
"""
|
"""
|
||||||
self._unknown_command_handler = _
|
self._unknown_command_handler = _
|
||||||
|
|
||||||
|
|
||||||
def set_empty_command_handler(self, _: Callable[[], None]) -> None:
|
def set_empty_command_handler(self, _: Callable[[], None]) -> None:
|
||||||
"""
|
"""
|
||||||
Public. Sets the handler for empty commands when entering a command
|
Public. Sets the handler for empty commands when entering a command
|
||||||
@@ -106,7 +100,6 @@ class BaseApp:
|
|||||||
"""
|
"""
|
||||||
self._empty_input_command_handler = _
|
self._empty_input_command_handler = _
|
||||||
|
|
||||||
|
|
||||||
def set_exit_command_handler(self, _: Callable[[], None]) -> None:
|
def set_exit_command_handler(self, _: Callable[[], None]) -> None:
|
||||||
"""
|
"""
|
||||||
Public. Sets the handler for exit command when entering a command
|
Public. Sets the handler for exit command when entering a command
|
||||||
@@ -115,21 +108,22 @@ class BaseApp:
|
|||||||
"""
|
"""
|
||||||
self._exit_command_handler = _
|
self._exit_command_handler = _
|
||||||
|
|
||||||
|
|
||||||
def _print_command_group_description(self) -> None:
|
def _print_command_group_description(self) -> None:
|
||||||
"""
|
"""
|
||||||
Private. Prints the description of the available commands
|
Private. Prints the description of the available commands
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
for registered_router in self._registered_routers:
|
for registered_router in self._registered_routers:
|
||||||
if registered_router.get_title():
|
if registered_router.title:
|
||||||
self._print_func(registered_router.get_title())
|
self._print_func(registered_router.title)
|
||||||
for command_handler in registered_router.get_command_handlers():
|
for command_handler in registered_router.get_command_handlers():
|
||||||
self._print_func(self._description_message_gen(
|
self._print_func(
|
||||||
|
self._description_message_gen(
|
||||||
command_handler.get_handled_command().get_trigger(),
|
command_handler.get_handled_command().get_trigger(),
|
||||||
command_handler.get_handled_command().get_description()))
|
command_handler.get_handled_command().get_description(),
|
||||||
self._print_func('')
|
)
|
||||||
|
)
|
||||||
|
self._print_func("")
|
||||||
|
|
||||||
def _print_framed_text(self, text: str) -> None:
|
def _print_framed_text(self, text: str) -> None:
|
||||||
"""
|
"""
|
||||||
@@ -138,19 +132,36 @@ class BaseApp:
|
|||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
if isinstance(self._dividing_line, StaticDividingLine):
|
if isinstance(self._dividing_line, StaticDividingLine):
|
||||||
self._print_func(self._dividing_line.get_full_static_line(self._override_system_messages))
|
self._print_func(
|
||||||
print(text.strip('\n'))
|
self._dividing_line.get_full_static_line(self._override_system_messages)
|
||||||
self._print_func(self._dividing_line.get_full_static_line(self._override_system_messages))
|
)
|
||||||
|
print(text.strip("\n"))
|
||||||
|
self._print_func(
|
||||||
|
self._dividing_line.get_full_static_line(self._override_system_messages)
|
||||||
|
)
|
||||||
|
|
||||||
elif isinstance(self._dividing_line, DynamicDividingLine):
|
elif isinstance(self._dividing_line, DynamicDividingLine):
|
||||||
clear_text = re.sub(r'\u001b\[[0-9;]*m', '', text)
|
clear_text = re.sub(r"\u001b\[[0-9;]*m", "", text)
|
||||||
max_length_line = max([len(line) for line in clear_text.split('\n')])
|
max_length_line = max([len(line) for line in clear_text.split("\n")])
|
||||||
max_length_line = max_length_line if 10 <= max_length_line <= 80 else 80 if max_length_line > 80 else 10
|
max_length_line = (
|
||||||
|
max_length_line
|
||||||
self._print_func(self._dividing_line.get_full_dynamic_line(max_length_line, self._override_system_messages))
|
if 10 <= max_length_line <= 80
|
||||||
print(text.strip('\n'))
|
else 80
|
||||||
self._print_func(self._dividing_line.get_full_dynamic_line(max_length_line, self._override_system_messages))
|
if max_length_line > 80
|
||||||
|
else 10
|
||||||
|
)
|
||||||
|
|
||||||
|
self._print_func(
|
||||||
|
self._dividing_line.get_full_dynamic_line(
|
||||||
|
max_length_line, self._override_system_messages
|
||||||
|
)
|
||||||
|
)
|
||||||
|
print(text.strip("\n"))
|
||||||
|
self._print_func(
|
||||||
|
self._dividing_line.get_full_dynamic_line(
|
||||||
|
max_length_line, self._override_system_messages
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
def _is_exit_command(self, command: InputCommand) -> bool:
|
def _is_exit_command(self, command: InputCommand) -> bool:
|
||||||
"""
|
"""
|
||||||
@@ -159,9 +170,14 @@ class BaseApp:
|
|||||||
:return: is it an exit command or not as bool
|
:return: is it an exit command or not as bool
|
||||||
"""
|
"""
|
||||||
if self._ignore_command_register:
|
if self._ignore_command_register:
|
||||||
if command.get_trigger().lower() == self._exit_command.get_trigger().lower():
|
if (
|
||||||
|
command.get_trigger().lower()
|
||||||
|
== self._exit_command.get_trigger().lower()
|
||||||
|
):
|
||||||
return True
|
return True
|
||||||
elif command.get_trigger().lower() in [x.lower() for x in self._exit_command.get_aliases()]:
|
elif command.get_trigger().lower() in [
|
||||||
|
x.lower() for x in self._exit_command.get_aliases()
|
||||||
|
]:
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
if command.get_trigger() == self._exit_command.get_trigger():
|
if command.get_trigger() == self._exit_command.get_trigger():
|
||||||
@@ -170,7 +186,6 @@ class BaseApp:
|
|||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def _is_unknown_command(self, command: InputCommand) -> bool:
|
def _is_unknown_command(self, command: InputCommand) -> bool:
|
||||||
"""
|
"""
|
||||||
Private. Checks if the given command is an unknown command
|
Private. Checks if the given command is an unknown command
|
||||||
@@ -179,15 +194,16 @@ class BaseApp:
|
|||||||
"""
|
"""
|
||||||
input_command_trigger = command.get_trigger()
|
input_command_trigger = command.get_trigger()
|
||||||
if self._ignore_command_register:
|
if self._ignore_command_register:
|
||||||
if input_command_trigger.lower() in self._all_registered_triggers_in_lower:
|
if input_command_trigger.lower() in self._all_registered_triggers_in_lower_case:
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
if input_command_trigger in self._all_registered_triggers_in_default_case:
|
if input_command_trigger in self._all_registered_triggers_in_default_case:
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
def _error_handler(
|
||||||
def _error_handler(self, error: BaseInputCommandException, raw_command: str) -> None:
|
self, error: BaseInputCommandException, raw_command: str
|
||||||
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Private. Handles parsing errors of the entered command
|
Private. Handles parsing errors of the entered command
|
||||||
:param error: error being handled
|
:param error: error being handled
|
||||||
@@ -196,19 +212,18 @@ class BaseApp:
|
|||||||
"""
|
"""
|
||||||
match error:
|
match error:
|
||||||
case UnprocessedInputFlagException():
|
case UnprocessedInputFlagException():
|
||||||
self._invalid_input_flags_handler(raw_command)
|
self._incorrect_input_syntax_handler(raw_command)
|
||||||
case RepeatedInputFlagsException():
|
case RepeatedInputFlagsException():
|
||||||
self._repeated_input_flags_handler(raw_command)
|
self._repeated_input_flags_handler(raw_command)
|
||||||
case EmptyInputCommandException():
|
case EmptyInputCommandException():
|
||||||
self._empty_input_command_handler()
|
self._empty_input_command_handler()
|
||||||
|
|
||||||
|
|
||||||
def _setup_system_router(self) -> None:
|
def _setup_system_router(self) -> None:
|
||||||
"""
|
"""
|
||||||
Private. Sets up system router
|
Private. Sets up system router
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
system_router.set_title(self._system_router_title)
|
system_router.title = self._system_router_title
|
||||||
|
|
||||||
@system_router.command(self._exit_command)
|
@system_router.command(self._exit_command)
|
||||||
def exit_command(response: Response) -> None:
|
def exit_command(response: Response) -> None:
|
||||||
@@ -218,12 +233,19 @@ class BaseApp:
|
|||||||
system_router.set_command_register_ignore(self._ignore_command_register)
|
system_router.set_command_register_ignore(self._ignore_command_register)
|
||||||
self._registered_routers.add_registered_router(system_router)
|
self._registered_routers.add_registered_router(system_router)
|
||||||
|
|
||||||
|
|
||||||
def _most_similar_command(self, unknown_command: str) -> str | None:
|
def _most_similar_command(self, unknown_command: str) -> str | None:
|
||||||
all_commands = self._all_registered_triggers_in_lower if self._ignore_command_register else self._all_registered_triggers_in_default_case
|
all_commands = (
|
||||||
matches: list[str] | list = sorted(cmd for cmd in all_commands if cmd.startswith(unknown_command))
|
self._all_registered_triggers_in_lower_case
|
||||||
|
if self._ignore_command_register
|
||||||
|
else self._all_registered_triggers_in_default_case
|
||||||
|
)
|
||||||
|
matches: list[str] | list = sorted(
|
||||||
|
cmd for cmd in all_commands if cmd.startswith(unknown_command)
|
||||||
|
)
|
||||||
if not matches:
|
if not matches:
|
||||||
matches: list[str] | list = sorted(cmd for cmd in all_commands if unknown_command.startswith(cmd))
|
matches: list[str] | list = sorted(
|
||||||
|
cmd for cmd in all_commands if unknown_command.startswith(cmd)
|
||||||
|
)
|
||||||
if len(matches) == 1:
|
if len(matches) == 1:
|
||||||
return matches[0]
|
return matches[0]
|
||||||
elif len(matches) > 1:
|
elif len(matches) > 1:
|
||||||
@@ -231,33 +253,49 @@ class BaseApp:
|
|||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def _setup_default_view(self) -> None:
|
def _setup_default_view(self) -> None:
|
||||||
"""
|
"""
|
||||||
Private. Sets up default app view
|
Private. Sets up default app view
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
self._prompt = '[italic dim bold]What do you want to do?\n'
|
self._prompt = "[italic dim bold]What do you want to do?\n"
|
||||||
self._initial_message = f'\n[bold red]{text2art(self._initial_message, font="tarty1")}\n'
|
self._initial_message = (
|
||||||
self._farewell_message = (f'[bold red]\n{text2art(f"\n{self._farewell_message}\n", font="chanky")}[/bold red]\n'
|
f"\n[bold red]{text2art(self._initial_message, font='tarty1')}\n"
|
||||||
f'[red i]github.com/koloideal/Argenta[/red i] | [red bold i]made by kolo[/red bold i]\n')
|
)
|
||||||
self._description_message_gen = lambda command, description: (f'[bold red]{escape("[" + command + "]")}[/bold red] '
|
self._farewell_message = (
|
||||||
f'[blue dim]*=*=*[/blue dim] '
|
f"[bold red]\n{text2art(f'\n{self._farewell_message}\n', font='chanky')}[/bold red]\n"
|
||||||
f'[bold yellow italic]{escape(description)}')
|
f"[red i]github.com/koloideal/Argenta[/red i] | [red bold i]made by kolo[/red bold i]\n"
|
||||||
self._invalid_input_flags_handler = lambda raw_command: self._print_func(f'[red bold]Incorrect flag syntax: {escape(raw_command)}')
|
)
|
||||||
self._repeated_input_flags_handler = lambda raw_command: self._print_func(f'[red bold]Repeated input flags: {escape(raw_command)}')
|
self._description_message_gen = lambda command, description: (
|
||||||
self._empty_input_command_handler = lambda: self._print_func('[red bold]Empty input command')
|
f"[bold red]{escape('[' + command + ']')}[/bold red] "
|
||||||
|
f"[blue dim]*=*=*[/blue dim] "
|
||||||
|
f"[bold yellow italic]{escape(description)}"
|
||||||
|
)
|
||||||
|
self._incorrect_input_syntax_handler = lambda raw_command: self._print_func(
|
||||||
|
f"[red bold]Incorrect flag syntax: {escape(raw_command)}"
|
||||||
|
)
|
||||||
|
self._repeated_input_flags_handler = lambda raw_command: self._print_func(
|
||||||
|
f"[red bold]Repeated input flags: {escape(raw_command)}"
|
||||||
|
)
|
||||||
|
self._empty_input_command_handler = lambda: self._print_func(
|
||||||
|
"[red bold]Empty input command"
|
||||||
|
)
|
||||||
|
|
||||||
def unknown_command_handler(command: InputCommand) -> None:
|
def unknown_command_handler(command: InputCommand) -> None:
|
||||||
cmd_trg: str = command.get_trigger()
|
cmd_trg: str = command.get_trigger()
|
||||||
mst_sim_cmd: str | None = self._most_similar_command(cmd_trg)
|
mst_sim_cmd: str | None = self._most_similar_command(cmd_trg)
|
||||||
first_part_of_text = f"[red]Unknown command:[/red] [blue]{escape(cmd_trg)}[/blue]"
|
first_part_of_text = (
|
||||||
second_part_of_text = ('[red], most similar:[/red] ' + ('[blue]' + mst_sim_cmd + '[/blue]')) if mst_sim_cmd else ''
|
f"[red]Unknown command:[/red] [blue]{escape(cmd_trg)}[/blue]"
|
||||||
|
)
|
||||||
|
second_part_of_text = (
|
||||||
|
("[red], most similar:[/red] " + ("[blue]" + mst_sim_cmd + "[/blue]"))
|
||||||
|
if mst_sim_cmd
|
||||||
|
else ""
|
||||||
|
)
|
||||||
self._print_func(first_part_of_text + second_part_of_text)
|
self._print_func(first_part_of_text + second_part_of_text)
|
||||||
|
|
||||||
self._unknown_command_handler = unknown_command_handler
|
self._unknown_command_handler = unknown_command_handler
|
||||||
|
|
||||||
|
|
||||||
def _pre_cycle_setup(self) -> None:
|
def _pre_cycle_setup(self) -> None:
|
||||||
"""
|
"""
|
||||||
Private. Configures various aspects of the application before the start of the cycle
|
Private. Configures various aspects of the application before the start of the cycle
|
||||||
@@ -269,10 +307,19 @@ class BaseApp:
|
|||||||
self._all_registered_triggers_in_default_case.extend(router_entity.get_triggers())
|
self._all_registered_triggers_in_default_case.extend(router_entity.get_triggers())
|
||||||
self._all_registered_triggers_in_default_case.extend(router_entity.get_aliases())
|
self._all_registered_triggers_in_default_case.extend(router_entity.get_aliases())
|
||||||
|
|
||||||
self._all_registered_triggers_in_lower.extend([x.lower() for x in router_entity.get_triggers()])
|
self._all_registered_triggers_in_lower_case.extend([x.lower() for x in router_entity.get_triggers()])
|
||||||
self._all_registered_triggers_in_lower.extend([x.lower() for x in router_entity.get_aliases()])
|
self._all_registered_triggers_in_lower_case.extend([x.lower() for x in router_entity.get_aliases()])
|
||||||
|
|
||||||
self._autocompleter.initial_setup(self._all_registered_triggers_in_lower)
|
self._autocompleter.initial_setup(self._all_registered_triggers_in_lower_case)
|
||||||
|
|
||||||
|
if self._ignore_command_register:
|
||||||
|
for cmd in set(self._all_registered_triggers_in_lower_case):
|
||||||
|
if self._all_registered_triggers_in_lower_case.count(cmd) != 1:
|
||||||
|
Console().print(f"\n[b red]WARNING:[/b red] Overlapping trigger or alias: [b blue]{cmd}[/b blue]")
|
||||||
|
else:
|
||||||
|
for cmd in set(self._all_registered_triggers_in_default_case):
|
||||||
|
if self._all_registered_triggers_in_default_case.count(cmd) != 1:
|
||||||
|
Console().print(f"\n[b red]WARNING:[/b red] Overlapping trigger or alias: [b blue]{cmd}[/b blue]")
|
||||||
|
|
||||||
if not self._override_system_messages:
|
if not self._override_system_messages:
|
||||||
self._setup_default_view()
|
self._setup_default_view()
|
||||||
@@ -282,20 +329,19 @@ class BaseApp:
|
|||||||
for message in self._messages_on_startup:
|
for message in self._messages_on_startup:
|
||||||
self._print_func(message)
|
self._print_func(message)
|
||||||
if self._messages_on_startup:
|
if self._messages_on_startup:
|
||||||
print('\n')
|
print("\n")
|
||||||
|
|
||||||
if not self._repeat_command_groups_description:
|
if not self._repeat_command_groups_description:
|
||||||
self._print_command_group_description()
|
self._print_command_group_description()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class App(BaseApp):
|
class App(BaseApp):
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
prompt: str = 'What do you want to do?\n',
|
prompt: str = "What do you want to do?\n",
|
||||||
initial_message: str = '\nArgenta\n',
|
initial_message: str = "Argenta\n",
|
||||||
farewell_message: str = '\nSee you\n',
|
farewell_message: str = "\nSee you\n",
|
||||||
exit_command: Command = Command('Q', 'Exit command'),
|
exit_command: Command = Command("Q", "Exit command"),
|
||||||
system_router_title: str | None = 'System points:',
|
system_router_title: str | None = "System points:",
|
||||||
ignore_command_register: bool = True,
|
ignore_command_register: bool = True,
|
||||||
dividing_line: StaticDividingLine | DynamicDividingLine = StaticDividingLine(),
|
dividing_line: StaticDividingLine | DynamicDividingLine = StaticDividingLine(),
|
||||||
repeat_command_groups: bool = True,
|
repeat_command_groups: bool = True,
|
||||||
@@ -330,7 +376,6 @@ class App(BaseApp):
|
|||||||
autocompleter=autocompleter,
|
autocompleter=autocompleter,
|
||||||
print_func=print_func)
|
print_func=print_func)
|
||||||
|
|
||||||
|
|
||||||
def run_polling(self) -> None:
|
def run_polling(self) -> None:
|
||||||
"""
|
"""
|
||||||
Private. Starts the user input processing cycle
|
Private. Starts the user input processing cycle
|
||||||
@@ -344,7 +389,9 @@ class App(BaseApp):
|
|||||||
raw_command: str = Console().input(self._prompt)
|
raw_command: str = Console().input(self._prompt)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
input_command: InputCommand = InputCommand.parse(raw_command=raw_command)
|
input_command: InputCommand = InputCommand.parse(
|
||||||
|
raw_command=raw_command
|
||||||
|
)
|
||||||
except BaseInputCommandException as error:
|
except BaseInputCommandException as error:
|
||||||
with redirect_stdout(io.StringIO()) as f:
|
with redirect_stdout(io.StringIO()) as f:
|
||||||
self._error_handler(error, raw_command)
|
self._error_handler(error, raw_command)
|
||||||
@@ -354,7 +401,14 @@ class App(BaseApp):
|
|||||||
|
|
||||||
if self._is_exit_command(input_command):
|
if self._is_exit_command(input_command):
|
||||||
system_router.finds_appropriate_handler(input_command)
|
system_router.finds_appropriate_handler(input_command)
|
||||||
self._autocompleter.exit_setup()
|
if self._ignore_command_register:
|
||||||
|
self._autocompleter.exit_setup(
|
||||||
|
self._all_registered_triggers_in_lower_case
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
self._autocompleter.exit_setup(
|
||||||
|
self._all_registered_triggers_in_default_case
|
||||||
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
if self._is_unknown_command(input_command):
|
if self._is_unknown_command(input_command):
|
||||||
@@ -370,7 +424,6 @@ class App(BaseApp):
|
|||||||
res: str = f.getvalue()
|
res: str = f.getvalue()
|
||||||
self._print_framed_text(res)
|
self._print_framed_text(res)
|
||||||
|
|
||||||
|
|
||||||
def include_router(self, router: Router) -> None:
|
def include_router(self, router: Router) -> None:
|
||||||
"""
|
"""
|
||||||
Public. Registers the router in the application
|
Public. Registers the router in the application
|
||||||
@@ -380,7 +433,6 @@ class App(BaseApp):
|
|||||||
router.set_command_register_ignore(self._ignore_command_register)
|
router.set_command_register_ignore(self._ignore_command_register)
|
||||||
self._registered_routers.add_registered_router(router)
|
self._registered_routers.add_registered_router(router)
|
||||||
|
|
||||||
|
|
||||||
def include_routers(self, *routers: Router) -> None:
|
def include_routers(self, *routers: Router) -> None:
|
||||||
"""
|
"""
|
||||||
Public. Registers the routers in the application
|
Public. Registers the routers in the application
|
||||||
@@ -390,7 +442,6 @@ class App(BaseApp):
|
|||||||
for router in routers:
|
for router in routers:
|
||||||
self.include_router(router)
|
self.include_router(router)
|
||||||
|
|
||||||
|
|
||||||
def add_message_on_startup(self, message: str) -> None:
|
def add_message_on_startup(self, message: str) -> None:
|
||||||
"""
|
"""
|
||||||
Public. Adds a message that will be displayed when the application is launched
|
Public. Adds a message that will be displayed when the application is launched
|
||||||
@@ -398,4 +449,3 @@ class App(BaseApp):
|
|||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
self._messages_on_startup.append(message)
|
self._messages_on_startup.append(message)
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ class BaseInputCommandException(Exception):
|
|||||||
"""
|
"""
|
||||||
Private. Base exception class for all exceptions raised when parse input command
|
Private. Base exception class for all exceptions raised when parse input command
|
||||||
"""
|
"""
|
||||||
|
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
@@ -12,6 +13,7 @@ class UnprocessedInputFlagException(BaseInputCommandException):
|
|||||||
"""
|
"""
|
||||||
Private. Raised when an unprocessed input flag is detected
|
Private. Raised when an unprocessed input flag is detected
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "Unprocessed Input Flags"
|
return "Unprocessed Input Flags"
|
||||||
|
|
||||||
@@ -20,16 +22,21 @@ class RepeatedInputFlagsException(BaseInputCommandException):
|
|||||||
"""
|
"""
|
||||||
Private. Raised when repeated input flags are detected
|
Private. Raised when repeated input flags are detected
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __init__(self, flag: Flag | InputFlag):
|
def __init__(self, flag: Flag | InputFlag):
|
||||||
self.flag = flag
|
self.flag = flag
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return ("Repeated Input Flags\n"
|
return (
|
||||||
f"Duplicate flag was detected in the input: '{self.flag.get_string_entity()}'")
|
"Repeated Input Flags\n"
|
||||||
|
f"Duplicate flag was detected in the input: '{self.flag.get_string_entity()}'"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class EmptyInputCommandException(BaseInputCommandException):
|
class EmptyInputCommandException(BaseInputCommandException):
|
||||||
"""
|
"""
|
||||||
Private. Raised when an empty input command is detected
|
Private. Raised when an empty input command is detected
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "Input Command is empty"
|
return "Input Command is empty"
|
||||||
|
|||||||
@@ -8,17 +8,24 @@ class PredefinedFlags:
|
|||||||
"""
|
"""
|
||||||
Public. A dataclass with predefined flags and most frequently used flags for quick use
|
Public. A dataclass with predefined flags and most frequently used flags for quick use
|
||||||
"""
|
"""
|
||||||
HELP = Flag(name='help', possible_values=False)
|
|
||||||
SHORT_HELP = Flag(name='H', prefix='-', possible_values=False)
|
|
||||||
|
|
||||||
INFO = Flag(name='info', possible_values=False)
|
HELP = Flag(name="help", possible_values=False)
|
||||||
SHORT_INFO = Flag(name='I', prefix='-', possible_values=False)
|
SHORT_HELP = Flag(name="H", prefix="-", possible_values=False)
|
||||||
|
|
||||||
ALL = Flag(name='all', possible_values=False)
|
INFO = Flag(name="info", possible_values=False)
|
||||||
SHORT_ALL = Flag(name='A', prefix='-', possible_values=False)
|
SHORT_INFO = Flag(name="I", prefix="-", possible_values=False)
|
||||||
|
|
||||||
HOST = Flag(name='host', possible_values=re.compile(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$'))
|
ALL = Flag(name="all", possible_values=False)
|
||||||
SHORT_HOST = Flag(name='H', prefix='-', possible_values=re.compile(r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$'))
|
SHORT_ALL = Flag(name="A", prefix="-", possible_values=False)
|
||||||
|
|
||||||
PORT = Flag(name='port', possible_values=re.compile(r'^\d{1,5}$'))
|
HOST = Flag(
|
||||||
SHORT_PORT = Flag(name='P', prefix='-', possible_values=re.compile(r'^\d{1,5}$'))
|
name="host", possible_values=re.compile(r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$")
|
||||||
|
)
|
||||||
|
SHORT_HOST = Flag(
|
||||||
|
name="H",
|
||||||
|
prefix="-",
|
||||||
|
possible_values=re.compile(r"^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$"),
|
||||||
|
)
|
||||||
|
|
||||||
|
PORT = Flag(name="port", possible_values=re.compile(r"^\d{1,5}$"))
|
||||||
|
SHORT_PORT = Flag(name="P", prefix="-", possible_values=re.compile(r"^\d{1,5}$"))
|
||||||
|
|||||||
@@ -1,10 +1,8 @@
|
|||||||
from typing import Literal, Pattern
|
from typing import Literal, Pattern
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class BaseFlag:
|
class BaseFlag:
|
||||||
def __init__(self, name: str,
|
def __init__(self, name: str, prefix: Literal["-", "--", "---"] = "--") -> None:
|
||||||
prefix: Literal['-', '--', '---'] = '--') -> None:
|
|
||||||
"""
|
"""
|
||||||
Private. Base class for flags
|
Private. Base class for flags
|
||||||
:param name: the name of the flag
|
:param name: the name of the flag
|
||||||
@@ -41,9 +39,12 @@ class BaseFlag:
|
|||||||
|
|
||||||
|
|
||||||
class Flag(BaseFlag):
|
class Flag(BaseFlag):
|
||||||
def __init__(self, name: str,
|
def __init__(
|
||||||
prefix: Literal['-', '--', '---'] = '--',
|
self,
|
||||||
possible_values: list[str] | Pattern[str] | False = True) -> None:
|
name: str,
|
||||||
|
prefix: Literal["-", "--", "---"] = "--",
|
||||||
|
possible_values: list[str] | Pattern[str] | False = True,
|
||||||
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Public. The entity of the flag being registered for subsequent processing
|
Public. The entity of the flag being registered for subsequent processing
|
||||||
:param name: The name of the flag
|
:param name: The name of the flag
|
||||||
@@ -85,9 +86,9 @@ class Flag(BaseFlag):
|
|||||||
|
|
||||||
|
|
||||||
class InputFlag(BaseFlag):
|
class InputFlag(BaseFlag):
|
||||||
def __init__(self, name: str,
|
def __init__(
|
||||||
prefix: Literal['-', '--', '---'] = '--',
|
self, name: str, prefix: Literal["-", "--", "---"] = "--", value: str = None
|
||||||
value: str = None):
|
):
|
||||||
"""
|
"""
|
||||||
Public. The entity of the flag of the entered command
|
Public. The entity of the flag of the entered command
|
||||||
:param name: the name of the input flag
|
:param name: the name of the input flag
|
||||||
@@ -114,5 +115,7 @@ class InputFlag(BaseFlag):
|
|||||||
self._flag_value = value
|
self._flag_value = value
|
||||||
|
|
||||||
def __eq__(self, other) -> bool:
|
def __eq__(self, other) -> bool:
|
||||||
return self.get_string_entity() == other.get_string_entity() and self.get_value() == other.get_value()
|
return (
|
||||||
|
self.get_string_entity() == other.get_string_entity()
|
||||||
|
and self.get_value() == other.get_value()
|
||||||
|
)
|
||||||
|
|||||||
@@ -1,10 +1,16 @@
|
|||||||
__all__ = ["Flags", "InputFlags",
|
__all__ = [
|
||||||
"UndefinedInputFlags",
|
"Flags",
|
||||||
"InvalidValueInputFlags",
|
"InputFlags",
|
||||||
"ValidInputFlags"]
|
"UndefinedInputFlags",
|
||||||
|
"InvalidValueInputFlags",
|
||||||
|
"ValidInputFlags",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
from argenta.command.flags.models import (Flags, InputFlags,
|
from argenta.command.flags.models import (
|
||||||
UndefinedInputFlags,
|
Flags,
|
||||||
InvalidValueInputFlags,
|
InputFlags,
|
||||||
ValidInputFlags)
|
UndefinedInputFlags,
|
||||||
|
InvalidValueInputFlags,
|
||||||
|
ValidInputFlags,
|
||||||
|
)
|
||||||
|
|||||||
@@ -2,8 +2,7 @@ from argenta.command.flag.models import InputFlag, Flag
|
|||||||
from typing import Generic, TypeVar
|
from typing import Generic, TypeVar
|
||||||
|
|
||||||
|
|
||||||
|
FlagType = TypeVar("FlagType")
|
||||||
FlagType = TypeVar('FlagType')
|
|
||||||
|
|
||||||
|
|
||||||
class BaseFlags(Generic[FlagType]):
|
class BaseFlags(Generic[FlagType]):
|
||||||
@@ -71,17 +70,21 @@ class BaseFlags(Generic[FlagType]):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
class Flags(BaseFlags[Flag]): pass
|
class Flags(BaseFlags[Flag]):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class InputFlags(BaseFlags[InputFlag]): pass
|
class InputFlags(BaseFlags[InputFlag]):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class ValidInputFlags(InputFlags): pass
|
class ValidInputFlags(InputFlags):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class UndefinedInputFlags(InputFlags): pass
|
class UndefinedInputFlags(InputFlags):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class InvalidValueInputFlags(InputFlags): pass
|
class InvalidValueInputFlags(InputFlags):
|
||||||
|
pass
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
from argenta.command.flag.models import Flag, InputFlag
|
from argenta.command.flag.models import Flag, InputFlag
|
||||||
from argenta.command.flags.models import InputFlags, Flags
|
from argenta.command.flags.models import InputFlags, Flags
|
||||||
from argenta.command.exceptions import (UnprocessedInputFlagException,
|
from argenta.command.exceptions import (
|
||||||
RepeatedInputFlagsException,
|
UnprocessedInputFlagException,
|
||||||
EmptyInputCommandException)
|
RepeatedInputFlagsException,
|
||||||
|
EmptyInputCommandException,
|
||||||
|
)
|
||||||
from typing import Generic, TypeVar, cast, Literal
|
from typing import Generic, TypeVar, cast, Literal
|
||||||
|
|
||||||
|
|
||||||
InputCommandType = TypeVar('InputCommandType')
|
InputCommandType = TypeVar("InputCommandType")
|
||||||
|
|
||||||
|
|
||||||
class BaseCommand:
|
class BaseCommand:
|
||||||
@@ -26,10 +28,13 @@ class BaseCommand:
|
|||||||
|
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
def __init__(self, trigger: str,
|
def __init__(
|
||||||
description: str = None,
|
self,
|
||||||
flags: Flag | Flags = None,
|
trigger: str,
|
||||||
aliases: list[str] = None):
|
description: str = None,
|
||||||
|
flags: Flag | Flags = None,
|
||||||
|
aliases: list[str] = None,
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Public. The command that can and should be registered in the Router
|
Public. The command that can and should be registered in the Router
|
||||||
:param trigger: A string trigger, which, when entered by the user, indicates that the input corresponds to the command
|
:param trigger: A string trigger, which, when entered by the user, indicates that the input corresponds to the command
|
||||||
@@ -38,8 +43,14 @@ class Command(BaseCommand):
|
|||||||
:param aliases: string synonyms for the main trigger
|
:param aliases: string synonyms for the main trigger
|
||||||
"""
|
"""
|
||||||
super().__init__(trigger)
|
super().__init__(trigger)
|
||||||
self._registered_flags: Flags = flags if isinstance(flags, Flags) else Flags(flags) if isinstance(flags, Flag) else Flags()
|
self._registered_flags: Flags = (
|
||||||
self._description = f'Very useful command' if not description else description
|
flags
|
||||||
|
if isinstance(flags, Flags)
|
||||||
|
else Flags(flags)
|
||||||
|
if isinstance(flags, Flag)
|
||||||
|
else Flags()
|
||||||
|
)
|
||||||
|
self._description = "Very useful command" if not description else description
|
||||||
self._aliases = aliases if isinstance(aliases, list) else []
|
self._aliases = aliases if isinstance(aliases, list) else []
|
||||||
|
|
||||||
def get_registered_flags(self) -> Flags:
|
def get_registered_flags(self) -> Flags:
|
||||||
@@ -56,7 +67,9 @@ class Command(BaseCommand):
|
|||||||
"""
|
"""
|
||||||
return self._aliases
|
return self._aliases
|
||||||
|
|
||||||
def validate_input_flag(self, flag: InputFlag) -> Literal['Undefined', 'Valid', 'Invalid']:
|
def validate_input_flag(
|
||||||
|
self, flag: InputFlag
|
||||||
|
) -> Literal["Undefined", "Valid", "Invalid"]:
|
||||||
"""
|
"""
|
||||||
Private. Validates the input flag
|
Private. Validates the input flag
|
||||||
:param flag: input flag for validation
|
:param flag: input flag for validation
|
||||||
@@ -66,23 +79,27 @@ class Command(BaseCommand):
|
|||||||
if registered_flags:
|
if registered_flags:
|
||||||
if isinstance(registered_flags, Flag):
|
if isinstance(registered_flags, Flag):
|
||||||
if registered_flags.get_string_entity() == flag.get_string_entity():
|
if registered_flags.get_string_entity() == flag.get_string_entity():
|
||||||
is_valid = registered_flags.validate_input_flag_value(flag.get_value())
|
is_valid = registered_flags.validate_input_flag_value(
|
||||||
|
flag.get_value()
|
||||||
|
)
|
||||||
if is_valid:
|
if is_valid:
|
||||||
return 'Valid'
|
return "Valid"
|
||||||
else:
|
else:
|
||||||
return 'Invalid'
|
return "Invalid"
|
||||||
else:
|
else:
|
||||||
return 'Undefined'
|
return "Undefined"
|
||||||
else:
|
else:
|
||||||
for registered_flag in registered_flags:
|
for registered_flag in registered_flags:
|
||||||
if registered_flag.get_string_entity() == flag.get_string_entity():
|
if registered_flag.get_string_entity() == flag.get_string_entity():
|
||||||
is_valid = registered_flag.validate_input_flag_value(flag.get_value())
|
is_valid = registered_flag.validate_input_flag_value(
|
||||||
|
flag.get_value()
|
||||||
|
)
|
||||||
if is_valid:
|
if is_valid:
|
||||||
return 'Valid'
|
return "Valid"
|
||||||
else:
|
else:
|
||||||
return 'Invalid'
|
return "Invalid"
|
||||||
return 'Undefined'
|
return "Undefined"
|
||||||
return 'Undefined'
|
return "Undefined"
|
||||||
|
|
||||||
def get_description(self) -> str:
|
def get_description(self) -> str:
|
||||||
"""
|
"""
|
||||||
@@ -92,10 +109,8 @@ class Command(BaseCommand):
|
|||||||
return self._description
|
return self._description
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class InputCommand(BaseCommand, Generic[InputCommandType]):
|
class InputCommand(BaseCommand, Generic[InputCommandType]):
|
||||||
def __init__(self, trigger: str,
|
def __init__(self, trigger: str, input_flags: InputFlag | InputFlags = None):
|
||||||
input_flags: InputFlag | InputFlags = None):
|
|
||||||
"""
|
"""
|
||||||
Private. The model of the input command, after parsing
|
Private. The model of the input command, after parsing
|
||||||
:param trigger:the trigger of the command
|
:param trigger:the trigger of the command
|
||||||
@@ -103,7 +118,13 @@ class InputCommand(BaseCommand, Generic[InputCommandType]):
|
|||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
super().__init__(trigger)
|
super().__init__(trigger)
|
||||||
self._input_flags: InputFlags = input_flags if isinstance(input_flags, InputFlags) else InputFlags(input_flags) if isinstance(input_flags, InputFlag) else InputFlags()
|
self._input_flags: InputFlags = (
|
||||||
|
input_flags
|
||||||
|
if isinstance(input_flags, InputFlags)
|
||||||
|
else InputFlags(input_flags)
|
||||||
|
if isinstance(input_flags, InputFlag)
|
||||||
|
else InputFlags()
|
||||||
|
)
|
||||||
|
|
||||||
def _set_input_flags(self, input_flags: InputFlags) -> None:
|
def _set_input_flags(self, input_flags: InputFlags) -> None:
|
||||||
"""
|
"""
|
||||||
@@ -120,7 +141,6 @@ class InputCommand(BaseCommand, Generic[InputCommandType]):
|
|||||||
"""
|
"""
|
||||||
return self._input_flags
|
return self._input_flags
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def parse(raw_command: str) -> InputCommandType:
|
def parse(raw_command: str) -> InputCommandType:
|
||||||
"""
|
"""
|
||||||
@@ -138,8 +158,8 @@ class InputCommand(BaseCommand, Generic[InputCommandType]):
|
|||||||
current_flag_name, current_flag_value = None, None
|
current_flag_name, current_flag_value = None, None
|
||||||
|
|
||||||
for k, _ in enumerate(list_of_tokens):
|
for k, _ in enumerate(list_of_tokens):
|
||||||
if _.startswith('-'):
|
if _.startswith("-"):
|
||||||
if len(_) < 2 or len(_[:_.rfind('-')]) > 3:
|
if len(_) < 2 or len(_[: _.rfind("-")]) > 3:
|
||||||
raise UnprocessedInputFlagException()
|
raise UnprocessedInputFlagException()
|
||||||
current_flag_name = _
|
current_flag_name = _
|
||||||
else:
|
else:
|
||||||
@@ -148,16 +168,22 @@ class InputCommand(BaseCommand, Generic[InputCommandType]):
|
|||||||
current_flag_value = _
|
current_flag_value = _
|
||||||
|
|
||||||
if current_flag_name:
|
if current_flag_name:
|
||||||
if not len(list_of_tokens) == k+1:
|
if not len(list_of_tokens) == k + 1:
|
||||||
if not list_of_tokens[k+1].startswith('-'):
|
if not list_of_tokens[k + 1].startswith("-"):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
input_flag = InputFlag(name=current_flag_name[current_flag_name.rfind('-') + 1:],
|
input_flag = InputFlag(
|
||||||
prefix=cast(Literal['-', '--', '---'],
|
name=current_flag_name[current_flag_name.rfind("-") + 1 :],
|
||||||
current_flag_name[:current_flag_name.rfind('-')+1]),
|
prefix=cast(
|
||||||
value=current_flag_value)
|
Literal["-", "--", "---"],
|
||||||
|
current_flag_name[: current_flag_name.rfind("-") + 1],
|
||||||
|
),
|
||||||
|
value=current_flag_value,
|
||||||
|
)
|
||||||
|
|
||||||
all_flags = [flag.get_string_entity() for flag in input_flags.get_flags()]
|
all_flags = [
|
||||||
|
flag.get_string_entity() for flag in input_flags.get_flags()
|
||||||
|
]
|
||||||
if input_flag.get_string_entity() not in all_flags:
|
if input_flag.get_string_entity() not in all_flags:
|
||||||
input_flags.add_flag(input_flag)
|
input_flags.add_flag(input_flag)
|
||||||
else:
|
else:
|
||||||
@@ -169,4 +195,3 @@ class InputCommand(BaseCommand, Generic[InputCommandType]):
|
|||||||
raise UnprocessedInputFlagException()
|
raise UnprocessedInputFlagException()
|
||||||
else:
|
else:
|
||||||
return InputCommand(trigger=command, input_flags=input_flags)
|
return InputCommand(trigger=command, input_flags=input_flags)
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
__all__ = ["BooleanArgument", "PositionalArgument", "OptionalArgument"]
|
__all__ = ["BooleanArgument", "PositionalArgument", "OptionalArgument"]
|
||||||
|
|
||||||
|
|
||||||
from argenta.orchestrator.argparser.arguments.models import (BooleanArgument,
|
from argenta.orchestrator.argparser.arguments.models import (
|
||||||
PositionalArgument,
|
BooleanArgument,
|
||||||
OptionalArgument)
|
PositionalArgument,
|
||||||
|
OptionalArgument,
|
||||||
|
)
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ class BaseArgument(ABC):
|
|||||||
"""
|
"""
|
||||||
Private. Base class for all arguments
|
Private. Base class for all arguments
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def get_string_entity(self) -> str:
|
def get_string_entity(self) -> str:
|
||||||
"""
|
"""
|
||||||
@@ -28,7 +29,7 @@ class PositionalArgument(BaseArgument):
|
|||||||
|
|
||||||
|
|
||||||
class OptionalArgument(BaseArgument):
|
class OptionalArgument(BaseArgument):
|
||||||
def __init__(self, name: str, prefix: Literal['-', '--', '---'] = '--'):
|
def __init__(self, name: str, prefix: Literal["-", "--", "---"] = "--"):
|
||||||
"""
|
"""
|
||||||
Public. Optional argument, must have the value
|
Public. Optional argument, must have the value
|
||||||
:param name: name of the argument
|
:param name: name of the argument
|
||||||
@@ -42,7 +43,7 @@ class OptionalArgument(BaseArgument):
|
|||||||
|
|
||||||
|
|
||||||
class BooleanArgument(BaseArgument):
|
class BooleanArgument(BaseArgument):
|
||||||
def __init__(self, name: str, prefix: Literal['-', '--', '---'] = '--'):
|
def __init__(self, name: str, prefix: Literal["-", "--", "---"] = "--"):
|
||||||
"""
|
"""
|
||||||
Public. Boolean argument, does not require a value
|
Public. Boolean argument, does not require a value
|
||||||
:param name: name of the argument
|
:param name: name of the argument
|
||||||
|
|||||||
@@ -1,16 +1,20 @@
|
|||||||
from argparse import ArgumentParser
|
from argparse import ArgumentParser
|
||||||
|
|
||||||
from argenta.orchestrator.argparser.arguments.models import (BooleanArgument,
|
from argenta.orchestrator.argparser.arguments.models import (
|
||||||
OptionalArgument,
|
BooleanArgument,
|
||||||
PositionalArgument)
|
OptionalArgument,
|
||||||
|
PositionalArgument,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class ArgParser:
|
class ArgParser:
|
||||||
def __init__(self,
|
def __init__(
|
||||||
processed_args: list[PositionalArgument | OptionalArgument | BooleanArgument],
|
self,
|
||||||
name: str = 'Argenta',
|
processed_args: list[PositionalArgument | OptionalArgument | BooleanArgument],
|
||||||
description: str = 'Argenta available arguments',
|
name: str = "Argenta",
|
||||||
epilog: str = 'github.com/koloideal/Argenta | made by kolo') -> None:
|
description: str = "Argenta available arguments",
|
||||||
|
epilog: str = "github.com/koloideal/Argenta | made by kolo",
|
||||||
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Public. Cmd argument parser and configurator at startup
|
Public. Cmd argument parser and configurator at startup
|
||||||
:param name: the name of the ArgParse instance
|
:param name: the name of the ArgParse instance
|
||||||
@@ -22,10 +26,16 @@ class ArgParser:
|
|||||||
self.description = description
|
self.description = description
|
||||||
self.epilog = epilog
|
self.epilog = epilog
|
||||||
|
|
||||||
self.entity: ArgumentParser = ArgumentParser(prog=name, description=description, epilog=epilog)
|
self.entity: ArgumentParser = ArgumentParser(
|
||||||
self.args: list[PositionalArgument | OptionalArgument | BooleanArgument] | None = processed_args
|
prog=name, description=description, epilog=epilog
|
||||||
|
)
|
||||||
|
self.args: (
|
||||||
|
list[PositionalArgument | OptionalArgument | BooleanArgument] | None
|
||||||
|
) = processed_args
|
||||||
|
|
||||||
def set_args(self, *args: PositionalArgument | OptionalArgument | BooleanArgument) -> None:
|
def set_args(
|
||||||
|
self, *args: PositionalArgument | OptionalArgument | BooleanArgument
|
||||||
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Public. Sets the arguments to be processed
|
Public. Sets the arguments to be processed
|
||||||
:param args: processed arguments
|
:param args: processed arguments
|
||||||
@@ -46,4 +56,4 @@ class ArgParser:
|
|||||||
elif type(arg) is OptionalArgument:
|
elif type(arg) is OptionalArgument:
|
||||||
self.entity.add_argument(arg.get_string_entity())
|
self.entity.add_argument(arg.get_string_entity())
|
||||||
elif type(arg) is BooleanArgument:
|
elif type(arg) is BooleanArgument:
|
||||||
self.entity.add_argument(arg.get_string_entity(), action='store_true')
|
self.entity.add_argument(arg.get_string_entity(), action="store_true")
|
||||||
|
|||||||
@@ -33,4 +33,3 @@ class Orchestrator:
|
|||||||
return self.arg_parser.entity.parse_args()
|
return self.arg_parser.entity.parse_args()
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@@ -1,19 +1,21 @@
|
|||||||
from argenta.response.status import Status
|
from argenta.response.status import Status
|
||||||
from argenta.command.flags import (ValidInputFlags,
|
from argenta.command.flags import (
|
||||||
UndefinedInputFlags,
|
ValidInputFlags,
|
||||||
InvalidValueInputFlags)
|
UndefinedInputFlags,
|
||||||
|
InvalidValueInputFlags,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class Response:
|
class Response:
|
||||||
__slots__ = ('status',
|
__slots__ = ("status", "valid_flags", "undefined_flags", "invalid_value_flags")
|
||||||
'valid_flags',
|
|
||||||
'undefined_flags',
|
|
||||||
'invalid_value_flags')
|
|
||||||
|
|
||||||
def __init__(self, status: Status = None,
|
def __init__(
|
||||||
valid_flags: ValidInputFlags = ValidInputFlags(),
|
self,
|
||||||
undefined_flags: UndefinedInputFlags = UndefinedInputFlags(),
|
status: Status = None,
|
||||||
invalid_value_flags: InvalidValueInputFlags = InvalidValueInputFlags()):
|
valid_flags: ValidInputFlags = ValidInputFlags(),
|
||||||
|
undefined_flags: UndefinedInputFlags = UndefinedInputFlags(),
|
||||||
|
invalid_value_flags: InvalidValueInputFlags = InvalidValueInputFlags(),
|
||||||
|
):
|
||||||
"""
|
"""
|
||||||
Public. The entity of the user input sent to the handler
|
Public. The entity of the user input sent to the handler
|
||||||
:param status: the status of the response
|
:param status: the status of the response
|
||||||
|
|||||||
@@ -2,8 +2,7 @@ from enum import Enum
|
|||||||
|
|
||||||
|
|
||||||
class Status(Enum):
|
class Status(Enum):
|
||||||
ALL_FLAGS_VALID = 'ALL_FLAGS_VALID'
|
ALL_FLAGS_VALID = "ALL_FLAGS_VALID"
|
||||||
UNDEFINED_FLAGS = 'UNDEFINED_FLAGS'
|
UNDEFINED_FLAGS = "UNDEFINED_FLAGS"
|
||||||
INVALID_VALUE_FLAGS = 'INVALID_VALUE_FLAGS'
|
INVALID_VALUE_FLAGS = "INVALID_VALUE_FLAGS"
|
||||||
UNDEFINED_AND_INVALID_FLAGS = 'UNDEFINED_AND_INVALID_FLAGS'
|
UNDEFINED_AND_INVALID_FLAGS = "UNDEFINED_AND_INVALID_FLAGS"
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from argenta.router import Router
|
from argenta.router import Router
|
||||||
|
|
||||||
|
|
||||||
system_router = Router(title='System points:')
|
system_router = Router(title="System points:")
|
||||||
|
|||||||
@@ -6,29 +6,33 @@ from argenta.command import Command
|
|||||||
from argenta.command.models import InputCommand
|
from argenta.command.models import InputCommand
|
||||||
from argenta.response import Response, Status
|
from argenta.response import Response, Status
|
||||||
from argenta.router.command_handler.entity import CommandHandlers, CommandHandler
|
from argenta.router.command_handler.entity import CommandHandlers, CommandHandler
|
||||||
from argenta.command.flags.models import (Flags, InputFlags,
|
from argenta.command.flags.models import (
|
||||||
UndefinedInputFlags,
|
Flags,
|
||||||
ValidInputFlags,
|
InputFlags,
|
||||||
InvalidValueInputFlags)
|
UndefinedInputFlags,
|
||||||
from argenta.router.exceptions import (RepeatedFlagNameException,
|
ValidInputFlags,
|
||||||
TooManyTransferredArgsException,
|
InvalidValueInputFlags,
|
||||||
RequiredArgumentNotPassedException,
|
)
|
||||||
TriggerContainSpacesException)
|
from argenta.router.exceptions import (
|
||||||
|
RepeatedFlagNameException,
|
||||||
|
TooManyTransferredArgsException,
|
||||||
|
RequiredArgumentNotPassedException,
|
||||||
|
TriggerContainSpacesException,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class Router:
|
class Router:
|
||||||
def __init__(self, title: str = None):
|
def __init__(self, title: str | None = "Awesome title"):
|
||||||
"""
|
"""
|
||||||
Public. Directly configures and manages handlers
|
Public. Directly configures and manages handlers
|
||||||
:param title: the title of the router, displayed when displaying the available commands
|
:param title: the title of the router, displayed when displaying the available commands
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
self._title = title
|
self.title = title
|
||||||
|
|
||||||
self._command_handlers: CommandHandlers = CommandHandlers()
|
self._command_handlers: CommandHandlers = CommandHandlers()
|
||||||
self._ignore_command_register: bool = False
|
self._ignore_command_register: bool = False
|
||||||
|
|
||||||
|
|
||||||
def command(self, command: Command | str) -> Callable:
|
def command(self, command: Command | str) -> Callable:
|
||||||
"""
|
"""
|
||||||
Public. Registers handler
|
Public. Registers handler
|
||||||
@@ -45,11 +49,11 @@ class Router:
|
|||||||
|
|
||||||
def wrapper(*args, **kwargs):
|
def wrapper(*args, **kwargs):
|
||||||
return func(*args, **kwargs)
|
return func(*args, **kwargs)
|
||||||
|
|
||||||
return wrapper
|
return wrapper
|
||||||
|
|
||||||
return command_decorator
|
return command_decorator
|
||||||
|
|
||||||
|
|
||||||
def finds_appropriate_handler(self, input_command: InputCommand) -> None:
|
def finds_appropriate_handler(self, input_command: InputCommand) -> None:
|
||||||
"""
|
"""
|
||||||
Private. Finds the appropriate handler for given input command and passes control to it
|
Private. Finds the appropriate handler for given input command and passes control to it
|
||||||
@@ -66,8 +70,9 @@ class Router:
|
|||||||
if input_command_name.lower() in handle_command.get_aliases():
|
if input_command_name.lower() in handle_command.get_aliases():
|
||||||
self.process_input_command(input_command_flags, command_handler)
|
self.process_input_command(input_command_flags, command_handler)
|
||||||
|
|
||||||
|
def process_input_command(
|
||||||
def process_input_command(self, input_command_flags: InputFlags, command_handler: CommandHandler) -> None:
|
self, input_command_flags: InputFlags, command_handler: CommandHandler
|
||||||
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Private. Processes input command with the appropriate handler
|
Private. Processes input command with the appropriate handler
|
||||||
:param input_command_flags: input command flags as InputFlags
|
:param input_command_flags: input command flags as InputFlags
|
||||||
@@ -78,7 +83,9 @@ class Router:
|
|||||||
response: Response = Response()
|
response: Response = Response()
|
||||||
if handle_command.get_registered_flags().get_flags():
|
if handle_command.get_registered_flags().get_flags():
|
||||||
if input_command_flags.get_flags():
|
if input_command_flags.get_flags():
|
||||||
response: Response = self._structuring_input_flags(handle_command, input_command_flags)
|
response: Response = self._structuring_input_flags(
|
||||||
|
handle_command, input_command_flags
|
||||||
|
)
|
||||||
command_handler.handling(response)
|
command_handler.handling(response)
|
||||||
else:
|
else:
|
||||||
response.status = Status.ALL_FLAGS_VALID
|
response.status = Status.ALL_FLAGS_VALID
|
||||||
@@ -93,9 +100,10 @@ class Router:
|
|||||||
response.status = Status.ALL_FLAGS_VALID
|
response.status = Status.ALL_FLAGS_VALID
|
||||||
command_handler.handling(response)
|
command_handler.handling(response)
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _structuring_input_flags(handled_command: Command, input_flags: InputFlags) -> Response:
|
def _structuring_input_flags(
|
||||||
|
handled_command: Command, input_flags: InputFlags
|
||||||
|
) -> Response:
|
||||||
"""
|
"""
|
||||||
Private. Validates flags of input command
|
Private. Validates flags of input command
|
||||||
:param handled_command: entity of the handled command
|
:param handled_command: entity of the handled command
|
||||||
@@ -106,29 +114,41 @@ class Router:
|
|||||||
invalid_value_input_flags: InvalidValueInputFlags = InvalidValueInputFlags()
|
invalid_value_input_flags: InvalidValueInputFlags = InvalidValueInputFlags()
|
||||||
undefined_input_flags: UndefinedInputFlags = UndefinedInputFlags()
|
undefined_input_flags: UndefinedInputFlags = UndefinedInputFlags()
|
||||||
for flag in input_flags:
|
for flag in input_flags:
|
||||||
flag_status: Literal['Undefined', 'Valid', 'Invalid'] = handled_command.validate_input_flag(flag)
|
flag_status: Literal["Undefined", "Valid", "Invalid"] = (
|
||||||
|
handled_command.validate_input_flag(flag)
|
||||||
|
)
|
||||||
match flag_status:
|
match flag_status:
|
||||||
case 'Valid':
|
case "Valid":
|
||||||
valid_input_flags.add_flag(flag)
|
valid_input_flags.add_flag(flag)
|
||||||
case 'Undefined':
|
case "Undefined":
|
||||||
undefined_input_flags.add_flag(flag)
|
undefined_input_flags.add_flag(flag)
|
||||||
case 'Invalid':
|
case "Invalid":
|
||||||
invalid_value_input_flags.add_flag(flag)
|
invalid_value_input_flags.add_flag(flag)
|
||||||
|
|
||||||
if not invalid_value_input_flags.get_flags() and not undefined_input_flags.get_flags():
|
if (
|
||||||
|
not invalid_value_input_flags.get_flags()
|
||||||
|
and not undefined_input_flags.get_flags()
|
||||||
|
):
|
||||||
status = Status.ALL_FLAGS_VALID
|
status = Status.ALL_FLAGS_VALID
|
||||||
elif invalid_value_input_flags.get_flags() and not undefined_input_flags.get_flags():
|
elif (
|
||||||
|
invalid_value_input_flags.get_flags()
|
||||||
|
and not undefined_input_flags.get_flags()
|
||||||
|
):
|
||||||
status = Status.INVALID_VALUE_FLAGS
|
status = Status.INVALID_VALUE_FLAGS
|
||||||
elif not invalid_value_input_flags.get_flags() and undefined_input_flags.get_flags():
|
elif (
|
||||||
|
not invalid_value_input_flags.get_flags()
|
||||||
|
and undefined_input_flags.get_flags()
|
||||||
|
):
|
||||||
status = Status.UNDEFINED_FLAGS
|
status = Status.UNDEFINED_FLAGS
|
||||||
else:
|
else:
|
||||||
status = Status.UNDEFINED_AND_INVALID_FLAGS
|
status = Status.UNDEFINED_AND_INVALID_FLAGS
|
||||||
|
|
||||||
return Response(invalid_value_flags=invalid_value_input_flags,
|
return Response(
|
||||||
valid_flags=valid_input_flags,
|
invalid_value_flags=invalid_value_input_flags,
|
||||||
status=status,
|
valid_flags=valid_input_flags,
|
||||||
undefined_flags=undefined_input_flags)
|
status=status,
|
||||||
|
undefined_flags=undefined_input_flags,
|
||||||
|
)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _validate_command(command: Command | str) -> None:
|
def _validate_command(command: Command | str) -> None:
|
||||||
@@ -138,20 +158,19 @@ class Router:
|
|||||||
:return: None if command is valid else raise exception
|
:return: None if command is valid else raise exception
|
||||||
"""
|
"""
|
||||||
match type(command).__name__:
|
match type(command).__name__:
|
||||||
case 'Command':
|
case "Command":
|
||||||
command_name: str = command.get_trigger()
|
command_name: str = command.get_trigger()
|
||||||
if command_name.find(' ') != -1:
|
if command_name.find(" ") != -1:
|
||||||
raise TriggerContainSpacesException()
|
raise TriggerContainSpacesException()
|
||||||
flags: Flags = command.get_registered_flags()
|
flags: Flags = command.get_registered_flags()
|
||||||
if flags:
|
if flags:
|
||||||
flags_name: list = [x.get_string_entity().lower() for x in flags]
|
flags_name: list = [x.get_string_entity().lower() for x in flags]
|
||||||
if len(set(flags_name)) < len(flags_name):
|
if len(set(flags_name)) < len(flags_name):
|
||||||
raise RepeatedFlagNameException()
|
raise RepeatedFlagNameException()
|
||||||
case 'str':
|
case "str":
|
||||||
if command.find(' ') != -1:
|
if command.find(" ") != -1:
|
||||||
raise TriggerContainSpacesException()
|
raise TriggerContainSpacesException()
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _validate_func_args(func: Callable) -> None:
|
def _validate_func_args(func: Callable) -> None:
|
||||||
"""
|
"""
|
||||||
@@ -173,13 +192,12 @@ class Router:
|
|||||||
pass
|
pass
|
||||||
else:
|
else:
|
||||||
file_path: str = getsourcefile(func)
|
file_path: str = getsourcefile(func)
|
||||||
source_line: int = getsourcelines(func)[1]+1
|
source_line: int = getsourcelines(func)[1]
|
||||||
fprint = Console().print
|
fprint = Console().print
|
||||||
fprint(f'\nFile "{file_path}", line {source_line}\n[b red]WARNING:[/b red] [i]The typehint '
|
fprint(f'\nFile "{file_path}", line {source_line}\n[b red]WARNING:[/b red] [i]The typehint '
|
||||||
f'of argument([green]{transferred_arg}[/green]) passed to the handler is [/i][bold blue]{Response}[/bold blue],'
|
f"of argument([green]{transferred_arg}[/green]) passed to the handler is [/i][bold blue]{Response}[/bold blue],"
|
||||||
f' [i]but[/i] [bold blue]{arg_annotation}[/bold blue] [i]is specified[/i]\n', highlight=False)
|
f" [i]but[/i] [bold blue]{arg_annotation}[/bold blue] [i]is specified[/i]",
|
||||||
|
highlight=False)
|
||||||
|
|
||||||
|
|
||||||
def set_command_register_ignore(self, _: bool) -> None:
|
def set_command_register_ignore(self, _: bool) -> None:
|
||||||
"""
|
"""
|
||||||
@@ -189,7 +207,6 @@ class Router:
|
|||||||
"""
|
"""
|
||||||
self._ignore_command_register = _
|
self._ignore_command_register = _
|
||||||
|
|
||||||
|
|
||||||
def get_triggers(self) -> list[str]:
|
def get_triggers(self) -> list[str]:
|
||||||
"""
|
"""
|
||||||
Public. Gets registered triggers
|
Public. Gets registered triggers
|
||||||
@@ -200,7 +217,6 @@ class Router:
|
|||||||
all_triggers.append(command_handler.get_handled_command().get_trigger())
|
all_triggers.append(command_handler.get_handled_command().get_trigger())
|
||||||
return all_triggers
|
return all_triggers
|
||||||
|
|
||||||
|
|
||||||
def get_aliases(self) -> list[str]:
|
def get_aliases(self) -> list[str]:
|
||||||
"""
|
"""
|
||||||
Public. Gets registered aliases
|
Public. Gets registered aliases
|
||||||
@@ -212,27 +228,9 @@ class Router:
|
|||||||
all_aliases.extend(command_handler.get_handled_command().get_aliases())
|
all_aliases.extend(command_handler.get_handled_command().get_aliases())
|
||||||
return all_aliases
|
return all_aliases
|
||||||
|
|
||||||
|
|
||||||
def get_command_handlers(self) -> CommandHandlers:
|
def get_command_handlers(self) -> CommandHandlers:
|
||||||
"""
|
"""
|
||||||
Private. Gets registered command handlers
|
Private. Gets registered command handlers
|
||||||
:return: registered command handlers as CommandHandlers
|
:return: registered command handlers as CommandHandlers
|
||||||
"""
|
"""
|
||||||
return self._command_handlers
|
return self._command_handlers
|
||||||
|
|
||||||
|
|
||||||
def get_title(self) -> str | None:
|
|
||||||
"""
|
|
||||||
Public. Gets title of the router
|
|
||||||
:return: the title of the router as str or None
|
|
||||||
"""
|
|
||||||
return self._title
|
|
||||||
|
|
||||||
|
|
||||||
def set_title(self, title: str) -> None:
|
|
||||||
"""
|
|
||||||
Public. Sets the title of the router
|
|
||||||
:param title: title that will be setted
|
|
||||||
:return: None
|
|
||||||
"""
|
|
||||||
self._title = title
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ class RepeatedFlagNameException(Exception):
|
|||||||
"""
|
"""
|
||||||
Private. Raised when a repeated flag name is registered
|
Private. Raised when a repeated flag name is registered
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "Repeated registered flag names in register command"
|
return "Repeated registered flag names in register command"
|
||||||
|
|
||||||
@@ -10,6 +11,7 @@ class TooManyTransferredArgsException(Exception):
|
|||||||
"""
|
"""
|
||||||
Private. Raised when too many arguments are passed
|
Private. Raised when too many arguments are passed
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "Too many transferred arguments"
|
return "Too many transferred arguments"
|
||||||
|
|
||||||
@@ -18,6 +20,7 @@ class RequiredArgumentNotPassedException(Exception):
|
|||||||
"""
|
"""
|
||||||
Private. Raised when a required argument is not passed
|
Private. Raised when a required argument is not passed
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "Required argument not passed"
|
return "Required argument not passed"
|
||||||
|
|
||||||
@@ -26,5 +29,6 @@ class TriggerContainSpacesException(Exception):
|
|||||||
"""
|
"""
|
||||||
Private. Raised when there is a space in the trigger being registered
|
Private. Raised when there is a space in the trigger being registered
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return "Command trigger cannot contain spaces"
|
return "Command trigger cannot contain spaces"
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ class TestSystemHandlerNormalWork(TestCase):
|
|||||||
app = App(override_system_messages=True,
|
app = App(override_system_messages=True,
|
||||||
print_func=print)
|
print_func=print)
|
||||||
app.include_router(router)
|
app.include_router(router)
|
||||||
app.set_invalid_input_flags_handler(lambda command: print(f'Incorrect flag syntax: "{command}"'))
|
app.set_incorrect_input_syntax_handler(lambda command: print(f'Incorrect flag syntax: "{command}"'))
|
||||||
orchestrator.start_polling(app)
|
orchestrator.start_polling(app)
|
||||||
|
|
||||||
output = mock_stdout.getvalue()
|
output = mock_stdout.getvalue()
|
||||||
|
|||||||
@@ -33,13 +33,13 @@ class MyTestCase(unittest.TestCase):
|
|||||||
def test_is_unknown_command1(self):
|
def test_is_unknown_command1(self):
|
||||||
app = App()
|
app = App()
|
||||||
app.set_unknown_command_handler(lambda command: None)
|
app.set_unknown_command_handler(lambda command: None)
|
||||||
app._all_registered_triggers_in_lower = ['fr', 'tr', 'de']
|
app._all_registered_triggers_in_lower_case = ['fr', 'tr', 'de']
|
||||||
self.assertEqual(app._is_unknown_command(InputCommand('fr')), False)
|
self.assertEqual(app._is_unknown_command(InputCommand('fr')), False)
|
||||||
|
|
||||||
def test_is_unknown_command2(self):
|
def test_is_unknown_command2(self):
|
||||||
app = App()
|
app = App()
|
||||||
app.set_unknown_command_handler(lambda command: None)
|
app.set_unknown_command_handler(lambda command: None)
|
||||||
app._all_registered_triggers_in_lower = ['fr', 'tr', 'de']
|
app._all_registered_triggers_in_lower_case = ['fr', 'tr', 'de']
|
||||||
self.assertEqual(app._is_unknown_command(InputCommand('cr')), True)
|
self.assertEqual(app._is_unknown_command(InputCommand('cr')), True)
|
||||||
|
|
||||||
def test_is_unknown_command3(self):
|
def test_is_unknown_command3(self):
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
from argenta.command.flag import InputFlag, Flag
|
from argenta.command.flag import InputFlag, Flag
|
||||||
from argenta.command.flags import Flags, InputFlags, UndefinedInputFlags, InvalidValueInputFlags, ValidInputFlags
|
from argenta.command.flags import Flags, InputFlags, UndefinedInputFlags, InvalidValueInputFlags, ValidInputFlags
|
||||||
from argenta.response import Response
|
|
||||||
from argenta.router import Router
|
from argenta.router import Router
|
||||||
from argenta.command import Command
|
from argenta.command import Command
|
||||||
from argenta.router.exceptions import (TriggerContainSpacesException,
|
from argenta.router.exceptions import (TriggerContainSpacesException,
|
||||||
@@ -13,9 +12,6 @@ import re
|
|||||||
|
|
||||||
|
|
||||||
class TestRouter(unittest.TestCase):
|
class TestRouter(unittest.TestCase):
|
||||||
def test_get_router_title(self):
|
|
||||||
self.assertEqual(Router(title='test title').get_title(), 'test title')
|
|
||||||
|
|
||||||
def test_register_command_with_spaces_in_trigger(self):
|
def test_register_command_with_spaces_in_trigger(self):
|
||||||
router = Router()
|
router = Router()
|
||||||
with self.assertRaises(TriggerContainSpacesException):
|
with self.assertRaises(TriggerContainSpacesException):
|
||||||
|
|||||||
Reference in New Issue
Block a user