fast-dev-cli 0.22.0__tar.gz → 0.23.1__tar.gz

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.1}/PKG-INFO

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

fast_dev_cli-0.23.1/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.1}/fast_dev_cli/cli.py

@@ -15,7 +15,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, Literal, cast, get_args, overload
 
 import typer
-from click import UsageError
 from typer import Exit, Option, echo, secho
 from typer.models import ArgumentInfo, OptionInfo
 
@@ -98,6 +97,14 @@ def is_windows() -> bool:
     return platform.system() == "Windows"
 
 
+@functools.cache
+def prefer_uv_tool() -> bool:
+    if shutil.which("uv") is None:
+        return False
+    cmd = "uv tool list"
+    return Shell(cmd).capture_output() != "No tools installed"
+
+
 def yellow_warn(msg: str) -> None:
     if is_windows() and (encoding := sys.stdout.encoding) != "utf-8":
         msg = msg.encode(encoding, errors="ignore").decode(encoding)
@@ -281,7 +288,7 @@ def _get_frontend_version() -> tuple[Path, str] | None:
     except ImportError:
         from json import loads as json_loads  # type:ignore[assignment]
     content = frontend_version_file.read_bytes()
-    metadata: dict[str, str] = json_loads(content)  # type:ignore[assignment]
+    metadata: dict[str, str] = json_loads(content)  # type:ignore
     try:
         current_version = metadata["version"]
     except (KeyError, TypeError):
@@ -731,6 +738,12 @@ class Project:
                     if t in backend:
                         cls._tool = t
                         return cls._tool
+        return cls._get_manage_tool(text, backend, skip_uv)
+
+    @classmethod
+    def _get_manage_tool(
+        cls: type[Self], text: str, backend: str, skip_uv: bool
+    ) -> ToolName | None:
         work_dir: Path | None = None
         uv_lock_exists: bool | None = None
         if skip_uv:
@@ -755,6 +768,12 @@ class Project:
         if uv_lock_exists:
             cls._tool = "uv"
             return cls._tool
+        return cls._parse_manage_tool(work_dir, text, backend)
+
+    @classmethod
+    def _parse_manage_tool(
+        cls: type[Self], work_dir: Path, text: str, backend: str
+    ) -> ToolName | None:
         pdm_lock_exists = Path(work_dir, "pdm.lock").exists()
         poetry_lock_exists = Path(work_dir, "poetry.lock").exists()
         match pdm_lock_exists + poetry_lock_exists:
@@ -1078,7 +1097,7 @@ class GitTag(DryRun):
 
     def run(self) -> None:
         if self.mark_tag() and not self.dry:
-            echo("You may want to publish package:\n poetry publish --build")
+            echo("You may want to publish package:\n pdm publish")
 
 
 @cli.command()
@@ -1173,17 +1192,21 @@ class LintCode(DryRun):
     ) -> str:
         if paths != "." and all(i.endswith(".html") for i in paths.split()):
             return f"prettier -w {paths}"
-        cmd = ""
-        ruff_check = "ruff check --extend-select=I,B,SIM" + " --fix" * ruff_check_fix
+        ruff_rules = ["I", "B"]
+        if ruff_check_sim and not load_bool("FASTDEVCLI_NO_SIM"):
+            ruff_rules.append("SIM")
+        if ruff_check_up or load_bool("FASTDEVCLI_UP"):
+            ruff_rules.append("UP")
+        ruff_check = "ruff check --extend-select=" + ",".join(ruff_rules)
+        if (
+            ruff_check_fix
+            and not check_only
+            and (not load_bool("NO_FIX") and not load_bool("FASTDEVCLI_NO_FIX"))
+        ):
+            ruff_check += " --fix"
         tools = ["ruff format", ruff_check, "mypy"]
         if check_only:
             tools[0] += " --check"
-        if check_only or load_bool("NO_FIX"):
-            tools[1] = tools[1].replace(" --fix", "")
-        if ruff_check_up or load_bool("FASTDEVCLI_UP"):
-            tools[1] = tools[1].replace(",SIM", ",SIM,UP")
-        if not ruff_check_sim or load_bool("FASTDEVCLI_NO_SIM"):
-            tools[1] = tools[1].replace(",SIM", "")
         if skip_mypy or load_bool("SKIP_MYPY") or load_bool("FASTDEVCLI_NO_MYPY"):
             # Sometimes mypy is too slow
             tools = tools[:-1]
@@ -1195,23 +1218,11 @@ class LintCode(DryRun):
                     tools[-1] += " --ignore-missing-imports"
                 if mypy_strict or load_bool("FASTDEVCLI_STRICT"):
                     tools[-1] += " --strict"
-        lint_them = " && ".join(
-            "{0}{" + str(i) + "} {1}" for i in range(2, len(tools) + 2)
-        )
-        if ruff_exists := cls.check_lint_tool_installed():
-            # `ruff <command>` get the same result with `pdm run ruff <command>`
-            # While `mypy .`(installed global and env not activated),
-            #   does not the same as `pdm run mypy .`
-            lint_them = " && ".join(
-                ("" if tool.startswith("ruff") else "{0}")
-                + (
-                    "{%d} {1}" % i  # noqa: UP031
-                )
-                for i, tool in enumerate(tools, 2)
-            )
+        ruff_exists = cls.check_lint_tool_installed()
         prefix = ""
         should_run_by_tool = with_prefix
-        if not should_run_by_tool and "mypy" in str(tools):
+        requires_mypy = any(tool.startswith("mypy") for tool in tools)
+        if requires_mypy and not should_run_by_tool:
             if is_venv() and Path(sys.argv[0]).parent != Path.home().joinpath(
                 ".local/bin"
             ):  # Virtual environment activated and fast-dev-cli is installed in it
@@ -1221,6 +1232,8 @@ class LintCode(DryRun):
                     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"
@@ -1228,7 +1241,7 @@ class LintCode(DryRun):
                 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 "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"
@@ -1255,7 +1268,17 @@ class LintCode(DryRun):
                         prefix = bin_dir
         if cls.prefer_dmypy(paths, tools, use_dmypy=use_dmypy):
             tools[-1] = "dmypy run"
-        cmd += lint_them.format(prefix, paths, *tools)
+        cmd = " && ".join(
+            (
+                tool
+                # `ruff <command>` get the same result with `pdm run ruff <command>`.
+                # Other tools should run inside the selected environment.
+                if ruff_exists and tool.startswith("ruff")
+                else prefix + tool
+            )
+            + f" {paths}"
+            for tool in tools
+        )
         if bandit or load_bool("FASTDEVCLI_BANDIT"):
             command = prefix + "bandit"
             if Path("pyproject.toml").exists():
@@ -1565,6 +1588,59 @@ def should_use_just() -> bool:
     return False
 
 
+def _parse_serve_file(uvicorn, filename: str, cmd: str, args: list) -> str:
+    if m := re.search(r"(.*):(\d+)$", filename):
+        h, p = m.group(1), m.group(2)
+        if h and "--host" not in str(args):
+            if h == "0":
+                args.append("--host=0.0.0.0")
+            else:
+                args.append(f"--host={h}")
+        args.append(f"--port={p}")
+        if uvicorn:
+            p = Path("main.py")
+            if p.exists():
+                cmd += " main:app"
+            elif Path("app", p.name).exists():
+                cmd += " app.main:app"
+            elif Path("app.py").exists():
+                cmd += " app:app"
+        return cmd
+    if uvicorn and ((filepath := Path(filename)).is_file() or filepath.suffix == ".py"):
+        filename = filepath.stem + ":app"
+        parent_names = [j for i in filepath.parents if (j := i.name)]
+        if parent_names:
+            filename = ".".join([*parent_names[::-1], filename])
+    cmd += " " + filename
+    return cmd
+
+
+def _runserver(uvicorn, host, port, file) -> tuple[str, list[str]]:
+    cmd = "uvicorn" if uvicorn else "fastapi dev"
+    args = []
+    if (host := getattr(host, "default", host)) and host not in (
+        "localhost",
+        "127.0.0.1",
+    ):
+        args.append(f"--host={host}")
+    no_port_yet = True
+    if file is not None:
+        filename = str(file)
+        try:
+            port = int(filename)
+        except ValueError:
+            cmd = _parse_serve_file(uvicorn, filename, cmd, args)
+        else:
+            if port != 8000:
+                args.append(f"--port={port}")
+                no_port_yet = False
+    if no_port_yet and (port := getattr(port, "default", port)) and str(port) != "8000":
+        args.append(f"--port={port}")
+    if shutil.which("pdm") is not None:
+        cmd = "pdm run " + cmd
+    return cmd, args
+
+
 def dev(
     port: int | None | OptionInfo,
     host: str | None | OptionInfo,
@@ -1579,56 +1655,7 @@ def dev(
         args = [i for i in sys.argv[2:] if i != "--dry"]
         cmd = "just dev"
     else:
-        cmd = "uvicorn" if uvicorn else "fastapi dev"
-        args = []
-        if (host := getattr(host, "default", host)) and host not in (
-            "localhost",
-            "127.0.0.1",
-        ):
-            args.append(f"--host={host}")
-        no_port_yet = True
-        if file is not None:
-            try:
-                port = int(str(file))
-            except ValueError:
-                if m := re.search(r"(.*):(\d+)$", str(file)):
-                    h, p = m.group(1), m.group(2)
-                    if h and "--host" not in str(args):
-                        if h == "0":
-                            args.append("--host=0.0.0.0")
-                        else:
-                            args.append(f"--host={h}")
-                    args.append(f"--port={p}")
-                    if uvicorn:
-                        p = Path("main.py")
-                        if p.exists():
-                            cmd += " main:app"
-                        elif Path("app", p.name).exists():
-                            cmd += " app.main:app"
-                        elif Path("app.py").exists():
-                            cmd += " app:app"
-                else:
-                    if uvicorn and (
-                        (filepath := Path(str(file))).is_file()
-                        or filepath.suffix == ".py"
-                    ):
-                        file = filepath.stem + ":app"
-                        parent_names = [j for i in filepath.parents if (j := i.name)]
-                        if parent_names:
-                            file = ".".join([*parent_names[::-1], file])
-                    cmd += f" {file}"
-            else:
-                if port != 8000:
-                    args.append(f"--port={port}")
-                    no_port_yet = False
-        if (
-            no_port_yet
-            and (port := getattr(port, "default", port))
-            and str(port) != "8000"
-        ):
-            args.append(f"--port={port}")
-        if shutil.which("pdm") is not None:
-            cmd = "pdm run " + cmd
+        cmd, args = _runserver(uvicorn, host, port, file)
     if args:
         cmd += " " + " ".join(args)
     exit_if_run_failed(cmd, dry=dry)
@@ -1717,7 +1744,7 @@ class MakeDeps(DryRun):
             if self.should_ensure_pip():
                 cmd = f"python -m ensurepip && {upgrade} && {cmd}"
             elif self.should_upgrade_pip():
-                cmd = "{upgrade} && {cmd}"
+                cmd = f"{upgrade} && {cmd}"
             return cmd
 
 
@@ -1743,7 +1770,10 @@ def make_deps(
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
     if use_uv + use_pdm + use_pip + use_poetry > 1:
-        raise UsageError("`--uv/--pdm/--pip/--poetry` can only choose one!")
+        raise typer.BadParameter(
+            "can only choose one",
+            param_hint=("--uv", "--pdm", "--pip", "--poetry"),
+        )
     if use_uv:
         tool = "uv"
     elif use_pdm:

{fast_dev_cli-0.22.0 → fast_dev_cli-0.23.1}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
 ]
-version = "0.22.0"
+version = "0.23.1"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -52,9 +52,7 @@ fast = "fast_dev_cli.cli:main"
 
 [dependency-groups]
 dev = [
-    "twine>=6.1.0",
     "asynctor>=0.10.0",
-    "mypy>=1.19.1",
 ]
 
 [build-system]
@@ -67,9 +65,18 @@ build-backend = "pdm.backend"
 distribution = true
 
 [tool.pdm.version]
-source = "file"
 path = "fast_dev_cli/__init__.py"
 
+[tool.pdm.build]
+excludes = [
+    "./**/.git",
+    "./**/.*_cache",
+    "examples",
+    "scripts",
+    "tests",
+    "fastdevcli-slim",
+]
+
 [tool.pdm.scripts]
 up = "just up {args}"
 tree = "pdm list --tree {args}"

fast_dev_cli-0.22.0/fast_dev_cli/__init__.py

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