Merge branch 'release/4.0.2'

Author: s3rius

fastapi_template/input_model.py

@@ -4,8 +4,13 @@
 from pydantic import BaseModel
 import click
 import abc
-from simple_term_menu import TerminalMenu
 from collections import UserDict
+from prompt_toolkit.shortcuts import checkboxlist_dialog, radiolist_dialog
+
+try:
+    from simple_term_menu import TerminalMenu
+except Exception:
+    TerminalMenu = None
 
 
 class Database(BaseModel):
@@ -50,6 +55,7 @@ def generated_name(self) -> str:
 class BaseMenuModel(BaseModel, abc.ABC):
     title: str
     entries: list[MenuEntry]
+    description: str = ""
 
     def _preview(self, current_value: str):
 
@@ -122,20 +128,31 @@ def ask(self, context: "BuilderContext") -> Optional["BuilderContext"]:
                     available_entries.append(entry)
                 elif not entry.is_hidden(context):
                     available_entries.append(entry)
-
-            menu = TerminalMenu(
-                title=self.title,
-                menu_entries=[entry.user_view for entry in available_entries],
-                multi_select=False,
-                preview_title="Description",
-                preview_command=self._preview,
-                preview_size=0.5,
-            )
-            idx = menu.show()
-            if idx is None:
-                return None
-
-            chosen_entry = available_entries[idx]
+            if TerminalMenu is not None:
+                menu = TerminalMenu(
+                    title=self.title,
+                    menu_entries=[entry.user_view for entry in available_entries],
+                    multi_select=False,
+                    preview_title="Description",
+                    preview_command=self._preview,
+                    preview_size=0.5,
+                )
+                idx = menu.show()
+                if idx is None:
+                    return None
+
+                chosen_entry = available_entries[idx]
+            else:
+                chosen_entry = (
+                    radiolist_dialog(
+                        title=self.title,
+                        text=self.description,
+                        values=[
+                            (entry, entry.user_view) for entry in available_entries
+                        ],
+                    ).run()
+                    or SKIP_ENTRY
+                )
 
         if chosen_entry == SKIP_ENTRY:
             return
@@ -190,22 +207,29 @@ def ask(self, context: "BuilderContext") -> Optional["BuilderContext"]:
                 elif not entry.is_hidden(context):
                     visible_entries.append(entry)
 
-            menu = TerminalMenu(
-                title=self.title,
-                menu_entries=[entry.user_view for entry in visible_entries],
-                multi_select=True,
-                preview_title="Description",
-                preview_command=self._preview,
-            )
+            if TerminalMenu is not None:
+                menu = TerminalMenu(
+                    title=self.title,
+                    menu_entries=[entry.user_view for entry in visible_entries],
+                    multi_select=True,
+                    preview_title="Description",
+                    preview_command=self._preview,
+                )
 
-            idxs = menu.show()
+                idxs = menu.show()
 
-            if idxs is None:
-                return None
+                if idxs is None:
+                    return None
 
-            chosen_entries = []
-            for idx in idxs:
-                chosen_entries.append(visible_entries[idx])
+                chosen_entries = []
+                for idx in idxs:
+                    chosen_entries.append(visible_entries[idx])
+            else:
+                chosen_entries = checkboxlist_dialog(
+                    title=self.title,
+                    text=self.description,
+                    values=[(entry, entry.user_view) for entry in visible_entries],
+                ).run() or [SKIP_ENTRY]
 
         if chosen_entries == [SKIP_ENTRY]:
             return context
@@ -232,5 +256,5 @@ def __getattr__(self, name: str) -> Any:
     def __setattr__(self, name: str, value: Any) -> None:
         self[name] = value
 
-    def dict(self) -> str:
+    def dict(self) -> dict[str, Any]:
         return self.__dict__["data"]

fastapi_template/template/{{cookiecutter.project_name}}/README.md

@@ -126,7 +126,6 @@ By default it runs:
 * mypy (validates types);
 * isort (sorts imports in all files);
 * flake8 (spots possibe bugs);
-* yesqa (removes useless `# noqa` comments).
 
 
 You can read more about pre-commit here: https://pre-commit.com/

fastapi_template/template/{{cookiecutter.project_name}}/pyproject.toml

@@ -125,7 +125,6 @@ pytest = "^7.1.3"
 flake8 = "~4.0.1"
 mypy = "^0.981"
 isort = "^5.10.1"
-yesqa = "^1.4.0"
 pre-commit = "^2.20.0"
 wemake-python-styleguide = "^0.17.0"
 black = "^22.8.0"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastapi_template"
-version = "4.0.1"
+version = "4.0.2"
 description = "Feature-rich robust FastAPI template"
 authors = ["Pavel Kirilin <win10@list.ru>"]
 packages = [{ include = "fastapi_template" }]