Merge pull request #7 from staticdev/feature/new-interface-prompt-too…

…lkit

New interface prompt toolkit

.gitignore

@@ -8,6 +8,7 @@
 /docs/_build/
 /src/*.egg-info/
 __pycache__/
+*.xls
 
 # Pycharm
 .idea/

README.rst

@@ -50,7 +50,7 @@ Instale na sua máquina o Python 3.8.0 ou superior (versão 3.10 recomendada) pa
 
 Usuários do Windows devem baixar a versão `Windows x86-64 executable installer` e na tela de instalação marcar a opção `Add Python 3.8 to PATH`:
 
-.. image:: docs/_images/winpath.png
+.. image:: docs/images/winpath.png
   :width: 400
   :alt: Checkbox PATH na instalação Windows
 

noxfile.py

@@ -151,7 +151,7 @@ def coverage(session: Session) -> None:
     session.run("coverage", *args)
 
 
-@session(python=python_versions)
+@session(python=python_versions[0])
 def typeguard(session: Session) -> None:
     """Runtime type checking using Typeguard."""
     session.install(".")
@@ -174,7 +174,7 @@ def xdoctest(session: Session) -> None:
     session.run("python", "-m", "xdoctest", *args)
 
 
-@session(name="docs-build", python="3.10")
+@session(name="docs-build", python=python_versions[0])
 def docs_build(session: Session) -> None:
     """Build the documentation."""
     args = session.posargs or ["docs", "docs/_build"]
@@ -191,7 +191,7 @@ def docs_build(session: Session) -> None:
     session.run("sphinx-build", *args)
 
 
-@session(python="3.10")
+@session(python=python_versions[0])
 def docs(session: Session) -> None:
     """Build and serve the documentation with live reloading on file changes."""
     args = session.posargs or ["--open-browser", "docs", "docs/_build"]

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "irpf-investidor"
-version = "2022.1"
+version = "2021.1"
 description = "IRPF Investidor"
 authors = ["staticdev <staticdev-support@protonmail.com>"]
 license = "MIT"
@@ -19,8 +19,8 @@ Changelog = "https://github.com/staticdev/irpf-investidor/releases"
 python = ">=3.8,<4.0"
 click = ">=8.0.1"
 pandas = ">=1.3.5"
+prompt-toolkit = ">=3.0.24"
 xlrd = ">=2.0.1"
-inquirer = ">=2.9.1"
 
 [tool.poetry.dev-dependencies]
 Pygments = ">=2.10.0"
@@ -73,7 +73,7 @@ show_error_codes = true
 show_error_context = true
 
 [[tool.mypy.overrides]]
-module = ["inquirer", "pandas", "pytest_mock", "xlrd"]
+module = ["pandas", "pytest_mock", "xlrd"]
 ignore_missing_imports = true
 
 [build-system]

src/irpf_investidor/__main__.py

@@ -29,15 +29,6 @@ def main() -> None:
     source_df = irpf_investidor.report_reader.clean_table_cols(source_df)
     source_df = irpf_investidor.report_reader.group_trades(source_df)
     trades = irpf_investidor.report_reader.get_trades(source_df)
-
-    click.secho(
-        (
-            "Para o cálculo dos emolumentos é necessário informar operações"
-            "realizadas em horário de leilão. Essa informação é obtida com "
-            "a sua corretora através de relatórios de ordem de compra."
-        ),
-        fg="green",
-    )
     auction_trades = prompt.select_trades(trades)
     tax_df = irpf_investidor.report_reader.calculate_taxes(source_df, auction_trades)
     irpf_investidor.report_reader.output_taxes(tax_df)

src/irpf_investidor/prompt.py

@@ -1,44 +1,36 @@
 """Prompt module."""
 from __future__ import annotations
 
-from typing import Any
+import prompt_toolkit.shortcuts as shortcuts
 
-import inquirer
 
+TITLE = "IRPF Investidor"
 
-def select_trades(trades: list[tuple[str, int]]) -> Any:
+
+def select_trades(trades: list[tuple[int, str]]) -> list[int]:
     """Checkbox selection of auction trades.
 
     Args:
-        trades (list[tuple[str, int]]): list of all trades and indexes.
+        trades: list of all trades and indexes.
 
     Returns:
-        Any: list of indexes of selected auction trades.
+        list of string indexes of selected auction trades.
     """
+    text = (
+        "Informe as operações realizadas em horário de leilão para cálculo dos "
+        "emolumentos.\nEssa informação é obtida através de sua corretora."
+    )
     while True:
-        selection = inquirer.prompt(
-            [
-                inquirer.Checkbox(
-                    "trades",
-                    message=(
-                        "Quais operações foram realizadas em horário de leilão? "
-                        "(Selecione apertando espaço e ao terminar aperte enter)"
-                    ),
-                    choices=trades,
-                )
-            ]
-        )["trades"]
-        if len(selection) == 0:
-            answer = inquirer.prompt(
-                [
-                    inquirer.List(
-                        "",
-                        message="Nenhuma operação selecionada.\nIsso está correto?",
-                        choices=["Sim", "Não"],
-                    )
-                ]
-            )[""]
-            if answer == "Sim":
+        operations: list[int] = shortcuts.checkboxlist_dialog(
+            title=TITLE,
+            text=text,
+            values=trades,  # type: ignore
+        ).run()
+        if not operations or len(operations) == 0:
+            confirmed = shortcuts.yes_no_dialog(
+                title=TITLE, text="Nenhuma operação selecionada.\nIsso está correto?"
+            ).run()
+            if confirmed:
                 return []
         else:
-            return selection
+            return operations

src/irpf_investidor/report_reader.py

@@ -132,7 +132,7 @@ def clean_table_cols(source_df: pd.DataFrame) -> pd.DataFrame:
     return source_df.dropna(axis="columns", how="all")
 
 
-def get_trades(df: pd.DataFrame) -> list[tuple[str, int]]:
+def get_trades(df: pd.DataFrame) -> list[tuple[int, str]]:
     """Return trades representations.
 
     Args:
@@ -147,7 +147,7 @@ def get_trades(df: pd.DataFrame) -> list[tuple[str, int]]:
     df = df.drop(columns=["Valor Total (R$)"])
     list_of_list = df.astype(str).values.tolist()
     df = df.drop(columns=["total_cost_rs"])
-    return [(" ".join(x), i) for i, x in enumerate(list_of_list)]
+    return [(i, " ".join(x)) for i, x in enumerate(list_of_list)]
 
 
 def group_trades(df: pd.DataFrame) -> pd.DataFrame: