fast-dev-cli 0.25.4__tar.gz → 0.25.6__tar.gz

{fast_dev_cli-0.25.4 → fast_dev_cli-0.25.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.25.4
+Version: 0.25.6
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta

fast_dev_cli-0.25.6/fast_dev_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.25.6"

{fast_dev_cli-0.25.4 → fast_dev_cli-0.25.6}/fast_dev_cli/cli.py

@@ -1200,6 +1200,7 @@ class LintCode(DryRun):
         strict: bool = False,
         ty: bool = False,
         fix: bool = True,
+        unsafe: bool = False,
     ) -> None:
         self.args = args
         self.check_only = check_only
@@ -1213,6 +1214,7 @@ class LintCode(DryRun):
         self._strict = strict
         self._ty = _ensure_bool(ty)
         self._fix = _ensure_bool(fix)
+        self._unsafe = _ensure_bool(unsafe)
         super().__init__(_exit, dry)
 
     @staticmethod
@@ -1260,6 +1262,7 @@ class LintCode(DryRun):
         mypy_strict: bool = False,
         prefer_ty: bool = False,
         ruff_check_fix: bool = True,
+        unsafe_fixes: bool = False,
     ) -> str:
         path_args = shlex.split(paths) if isinstance(paths, str) else paths
         if not path_args:
@@ -1279,6 +1282,8 @@ class LintCode(DryRun):
             and (not load_bool("NO_FIX") and not load_bool("FASTDEVCLI_NO_FIX"))
         ):
             ruff_check += " --fix"
+            if unsafe_fixes:
+                ruff_check += " --unsafe-fixes"
         tools = ["ruff format", ruff_check, "mypy"]
         if check_only:
             tools[0] += " --check"
@@ -1299,53 +1304,9 @@ class LintCode(DryRun):
         requires_mypy = any(tool.startswith("mypy") for tool in tools)
         global_mypy = False
         if requires_mypy:
-            # TODO: move this long logic to a single function
-            local_bin = Path.home().joinpath(".local/bin")
-            if local_bin.joinpath("mypy").exists():
-                global_mypy = True
-                mypy_opt = "--python-executable=.venv/bin/python"
-                for i, t in enumerate(tools):
-                    if t.startswith("mypy"):
-                        if mypy_opt not in t:
-                            tools[i] = t + " " + mypy_opt
-                        break
-            if not should_run_by_tool:
-                if is_venv() and Path(sys.argv[0]).parent != local_bin:
-                    # Virtual environment activated and fast-dev-cli is installed in it
-                    if not ruff_exists:
-                        should_run_by_tool = True
-                        command = "pipx install ruff"
-                        if shutil.which("pipx") is None:
-                            ensure_pipx = (
-                                "pip install --user pipx\n  pipx ensurepath\n  "
-                            )
-                            command = ensure_pipx + command
-                        elif prefer_uv_tool():
-                            command = "uv tool install ruff"
-                        yellow_warn(
-                            "You may need to run the following command"
-                            f" to install ruff:\n\n  {command}\n"
-                        )
-                    elif global_mypy:
-                        should_run_by_tool = True
-                    elif cls.missing_mypy_exec():
-                        should_run_by_tool = True
-                        if check_call('python -c "import fast_dev_cli"'):
-                            command = "python -m pip install -U mypy"
-                            yellow_warn(
-                                "You may need to run the following command"
-                                f" to install lint tools:\n\n  {command}\n"
-                            )
-                elif tool == ToolOption.default:
-                    root = Project.get_work_dir(allow_cwd=True)
-                    if py := shutil.which("python"):
-                        try:
-                            Path(py).relative_to(root)
-                        except ValueError:
-                            # Virtual environment not activated
-                            should_run_by_tool = True
-                else:
-                    should_run_by_tool = True
+            should_run_by_tool, global_mypy = cls._parse_mypy(
+                tool, should_run_by_tool, ruff_exists, tools, global_mypy
+            )
         if should_run_by_tool and tool:
             if tool == ToolOption.default:
                 tool = Project.get_manage_tool() or ""
@@ -1385,6 +1346,66 @@ class LintCode(DryRun):
             cmd += " && " + command
         return cmd
 
+    @staticmethod
+    def global_mypy_installed(local_bin: Path) -> bool:
+        # Make it easy to mock for testing
+        return local_bin.joinpath("mypy").exists()
+
+    @classmethod
+    def _parse_mypy(
+        cls,
+        tool: str,
+        should_run_by_tool: bool,
+        ruff_exists: bool,
+        tools: list[str],
+        global_mypy: bool,
+    ) -> tuple[bool, bool]:
+        local_bin = Path.home().joinpath(".local/bin")
+        if cls.global_mypy_installed(local_bin):
+            global_mypy = True
+            mypy_opt = "--python-executable=.venv/bin/python"
+            for i, t in enumerate(tools):
+                if t.startswith("mypy"):
+                    if mypy_opt not in t:
+                        tools[i] = t + " " + mypy_opt
+                    break
+        if not should_run_by_tool:
+            if is_venv() and Path(sys.argv[0]).parent != local_bin:
+                # Virtual environment activated and fast-dev-cli is installed in it
+                if not ruff_exists:
+                    should_run_by_tool = True
+                    command = "pipx install ruff"
+                    if shutil.which("pipx") is None:
+                        ensure_pipx = "pip install --user pipx\n  pipx ensurepath\n  "
+                        command = ensure_pipx + command
+                    elif prefer_uv_tool():
+                        command = "uv tool install ruff"
+                    yellow_warn(
+                        "You may need to run the following command"
+                        f" to install ruff:\n\n  {command}\n"
+                    )
+                elif global_mypy:
+                    should_run_by_tool = True
+                elif cls.missing_mypy_exec():
+                    should_run_by_tool = True
+                    if check_call('python -c "import fast_dev_cli"'):
+                        command = "python -m pip install -U mypy"
+                        yellow_warn(
+                            "You may need to run the following command"
+                            f" to install lint tools:\n\n  {command}\n"
+                        )
+            elif tool == ToolOption.default:
+                root = Project.get_work_dir(allow_cwd=True)
+                if py := shutil.which("python"):
+                    try:
+                        Path(py).relative_to(root)
+                    except ValueError:
+                        # Virtual environment not activated
+                        should_run_by_tool = True
+            else:
+                should_run_by_tool = True
+        return should_run_by_tool, global_mypy
+
     def gen(self) -> str:
         paths = ["."]
         if args := self.args:
@@ -1421,6 +1442,7 @@ class LintCode(DryRun):
             mypy_strict=self._strict,
             prefer_ty=self._ty,
             ruff_check_fix=self._fix,
+            unsafe_fixes=self._unsafe,
         )
 
 
@@ -1441,6 +1463,7 @@ def lint(
     strict: bool = False,
     ty: bool = False,
     fix: bool = True,
+    unsafe: bool = False,
 ) -> None:
     if files is None:
         files = parse_files(sys.argv[1:])
@@ -1459,6 +1482,7 @@ def lint(
         strict=strict,
         ty=ty,
         fix=fix,
+        unsafe=unsafe,
     ).run()
 
 
@@ -1519,6 +1543,7 @@ def make_style(
     strict: bool = Option(False, help="Whether run mypy with --strict"),
     ty: bool = Option(False, help="Whether use ty instead of mypy"),
     fix: bool | None = Option(None, help="Whether ruff check with --fix"),
+    unsafe: bool = Option(False, help="Whether ruff check with --unsafe-fixes"),
     auto_bandit: bool | None = Option(
         None, help="Whether to run bandit if `[tool.bandit]` in pyproject.toml"
     ),
@@ -1537,6 +1562,7 @@ def make_style(
     up = _ensure_bool(up)
     sim = _ensure_bool(sim)
     strict = _ensure_bool(strict)
+    unsafe = _ensure_bool(unsafe)
     kwargs = {"dry": dry, "skip_mypy": skip, "dmypy": dmypy, "bandit": bandit}
     if _ensure_bool(check_only):
         run = check
@@ -1544,7 +1570,7 @@ def make_style(
         prefix = _ensure_bool(prefix)
         if fix is None or not isinstance(fix, bool):
             fix = load_bool("FASTDEVCLI_FIX", True)
-        run = functools.partial(lint, prefix=prefix, fix=fix)
+        run = functools.partial(lint, prefix=prefix, fix=fix, unsafe=unsafe)
     run(files, tool=tool, up=up, sim=sim, strict=strict, ty=ty, **kwargs)
 
 
@@ -1767,7 +1793,12 @@ def _load_fastapi_entrypoint() -> str:
         except EnvError:
             return ""
         doc = tomllib.loads(toml_text)
-        return doc["tool"]["fastapi"]["entrypoint"]
+        entrypoint = doc["tool"]["fastapi"]["entrypoint"]
+        if isinstance(entrypoint, str):
+            return entrypoint
+        secho(
+            f"Unexpected value type: tool.fastapi.{entrypoint=}", fg=typer.colors.YELLOW
+        )
     return ""
 
 
@@ -1847,7 +1878,7 @@ def dev(
     file: str | None | ArgumentInfo = None,
     dry: bool = False,
 ) -> None:
-    if just is not False and should_use_just():
+    if just is True or (just is None and should_use_just()):
         args = [i for i in sys.argv[2:] if i != "--dry"]
         cmd = "just dev"
     else:

{fast_dev_cli-0.25.4 → fast_dev_cli-0.25.6}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
 ]
-version = "0.25.4"
+version = "0.25.6"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -179,6 +179,7 @@ extend-select = [
     "B",
     "C4",
     "UP",
+    "ANN",
 ]
 
 [tool.ruff.lint.per-file-ignores]
@@ -186,15 +187,18 @@ extend-select = [
     "E501",
     "BLE001",
     "PLW1510",
+    "ANN",
 ]
 "scripts/*.py" = [
     "UP009",
     "UP032",
     "PLW1510",
+    "ANN",
 ]
 "fast_dev_cli/cli.py" = [
     "UP007",
     "UP045",
+    "ANN401",
 ]
 
 [tool.bandit]

fast_dev_cli-0.25.4/fast_dev_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.25.4"