fast-dev-cli 0.24.3__tar.gz → 0.25.1__tar.gz

{fast_dev_cli-0.24.3 → fast_dev_cli-0.25.1}/PKG-INFO

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

fast_dev_cli-0.25.1/fast_dev_cli/__init__.py

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

{fast_dev_cli-0.24.3 → fast_dev_cli-0.25.1}/fast_dev_cli/cli.py

@@ -114,13 +114,19 @@ def yellow_warn(msg: str) -> None:
 def load_bool(name: str, default: bool = False, *, verbose: bool = True) -> bool:
     if not (v := os.getenv(name)):
         return default
+    if (b := _convert_bool(v)) is not None:
+        return b
+    if verbose:
+        secho(f"WARNING: can not convert value({v!r}) of {name} to bool!")
+    return default
+
+
+def _convert_bool(v: str) -> bool | None:
     if (lower := v.lower()) in ("0", "false", "f", "off", "no", "n"):
         return False
     elif lower in ("1", "true", "t", "on", "yes", "y"):
         return True
-    if verbose:
-        secho(f"WARNING: can not convert value({v!r}) of {name} to bool!")
-    return default
+    return None
 
 
 def is_venv() -> bool:
@@ -141,7 +147,8 @@ class Shell:
     ) -> subprocess.CompletedProcess[str]:
         if isinstance(cmd, str):
             kw.setdefault("shell", True)
-        return subprocess.run(cmd, **kw)  # nosec:B603
+        check = kw.pop("check", False)
+        return subprocess.run(cmd, check=check, **kw)  # nosec:B603
 
     @property
     def command(self) -> list[str] | str:
@@ -260,13 +267,12 @@ def read_version_from_file(
     for line in all_lines:
         if pattern.match(line):
             return _parse_version(line, pattern)
-    else:
-        pattern = re.compile(r"VERSION\s*=")
-        for line in all_lines:
-            if pattern.match(line):
-                return _parse_version(line, pattern)
-        secho(f"WARNING: can not find version pattern in {version_file}!")
-        return "0.0.0"
+    pattern = re.compile(r"VERSION\s*=")
+    for line in all_lines:
+        if pattern.match(line):
+            return _parse_version(line, pattern)
+    secho(f"WARNING: can not find version pattern in {version_file}!")
+    return "0.0.0"
 
 
 def _get_frontend_version() -> tuple[Path, str] | None:
@@ -325,9 +331,9 @@ def get_current_version(
     if package_name is None:
         try:
             work_dir = Project.get_work_dir()
-        except EnvError as e:
+        except EnvError:
             if (res := _get_frontend_version()) is None:
-                raise e
+                raise
             current_version = res[1]
             if check_version:
                 return False, current_version
@@ -468,7 +474,7 @@ class BumpUp(DryRun):
         toml_text: str | None = None,
         work_dir: Path | None = None,
         package_name: str | None = None,
-        context: dict | None = None,
+        context: dict[str, Any] | None = None,
     ) -> str:
         if context is None:
             if toml_text is None:
@@ -528,11 +534,11 @@ class BumpUp(DryRun):
         ds: list[Path] = []
         if package_name is not None:
             packages.insert(0, (package_name, ""))
-        for package_name, source_dir in packages:
-            ds.append(cwd / package_name)
-            ds.append(cwd / "src" / package_name)
+        for pack_name, source_dir in packages:
+            ds.append(cwd / pack_name)
+            ds.append(cwd / "src" / pack_name)
             if source_dir and source_dir != "src":
-                ds.append(cwd / source_dir / package_name)
+                ds.append(cwd / source_dir / pack_name)
         module_name = poetry_module_name(cwd.name)
         ds.extend([cwd / module_name, cwd / "src" / module_name, cwd])
         for d in ds:
@@ -756,7 +762,7 @@ class Project:
         if skip_uv:
             for name in ("pdm", "poetry"):
                 if f"[tool.{name}]" in text:
-                    cls._tool = cast(ToolName, name)
+                    cls._tool = name
                     return cls._tool
             work_dir = cls.get_work_dir(allow_cwd=True)
             for name in ("pdm", "poetry"):
@@ -791,11 +797,11 @@ class Project:
                 if backend:
                     for t in ("pdm", "poetry"):
                         if t in backend:
-                            cls._tool = cast(ToolName, t)
+                            cls._tool = t
                             return cls._tool
                 for name in ("pdm", "poetry"):
                     if f"[tool.{name}]" in text:
-                        cls._tool = cast(ToolName, name)
+                        cls._tool = name
                         return cls._tool
                 if x == 2:
                     cls._tool = (
@@ -919,7 +925,7 @@ class UpgradeDependencies(Project, DryRun):
         elif v == "[":
             echo(f"Skip complex dependence: {line}")
             return True
-        elif v.startswith(">") or v.startswith("<") or v[0].isdigit():
+        elif v.startswith((">", "<")) or v[0].isdigit():
             echo(f"Ignore bigger/smaller/equal: {line}")
             return True
         return False
@@ -1230,50 +1236,54 @@ class LintCode(DryRun):
         should_run_by_tool = with_prefix
         requires_mypy = any(tool.startswith("mypy") for tool in tools)
         global_mypy = False
-        if requires_mypy and Path.home().joinpath(".local/bin/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 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
-                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"
+        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 lint tools:\n\n  {command}\n"
+                            f" to install ruff:\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
+                    elif global_mypy:
                         should_run_by_tool = True
-            else:
-                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
         if should_run_by_tool and tool:
             if tool == ToolOption.default:
                 tool = Project.get_manage_tool() or ""
@@ -1419,6 +1429,14 @@ def check(
     ).run()
 
 
+def _should_bandit() -> bool:
+    if v := os.getenv("FASTDEVCLI_BANDIT"):
+        return _convert_bool(v) or True
+    toml_text = Project.load_toml_text()
+    lines = toml_text.splitlines()
+    return any(i.startswith("[tool.bandit") for i in lines)
+
+
 @cli.command(name="lint")
 def make_style(
     files: list[str] | None = typer.Argument(default=None),  # noqa:B008
@@ -1440,6 +1458,9 @@ 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"),
+    auto_bandit: bool | None = Option(
+        None, help="Whether to run bandit if `[tool.bandit]` in pyproject.toml"
+    ),
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
     if getattr(files, "default", files) is None:
@@ -1448,7 +1469,9 @@ def make_style(
         files = [files]
     skip = _ensure_bool(skip_mypy)
     dmypy = _ensure_bool(use_dmypy)
-    bandit = _ensure_bool(bandit)
+    bandit = _ensure_bool(bandit) or (
+        auto_bandit is not None and _ensure_bool(auto_bandit) and _should_bandit()
+    )
     tool = _ensure_str(tool) or ""
     up = _ensure_bool(up)
     sim = _ensure_bool(sim)
@@ -1581,18 +1604,34 @@ class Publish:
         twine = "python -m build && twine upload"
 
     @classmethod
-    def gen(cls) -> str:
-        if tool := Project.get_manage_tool():
+    def gen(cls, tool: str | None, verbose: bool) -> str:
+        if tool == "auto":
+            tool = Project.get_manage_tool() or ""
+        if tool:
+            if tool == "uv":
+                envs = ["UV_PUBLISH_INDEX", "UV_PUBLISH_URL", "UV_PUBLISH_TOKEN"]
+                if not any(os.getenv(i) for i in envs):
+                    if verbose:
+                        yellow_warn(f"Skip uv publish as envs ({envs}) not set")
+                    return "uv build"
+            elif tool == "pdm":
+                env = "PDM_PUBLISH_REPO"
+                if not os.getenv(env):
+                    if verbose:
+                        yellow_warn(f"Skip pdm publish as env ({env}) not set")
+                    return "pdm build"
             return cls.CommandEnum[tool]
         return cls.CommandEnum.twine
 
 
 @cli.command()
 def upload(
+    verbose: bool = False,
+    tool: str = ToolOption,
     dry: bool = DryOption,
 ) -> None:
     """Shortcut for package publish"""
-    cmd = Publish.gen()
+    cmd = Publish.gen(_ensure_str(tool), verbose)
     exit_if_run_failed(cmd, dry=dry)
 
 
@@ -1630,7 +1669,9 @@ def _prefer_just_dev(f: Path) -> bool:
     return False
 
 
-def _parse_serve_file(uvicorn, filename: str, cmd: str, args: list) -> str:
+def _parse_serve_file(
+    uvicorn: bool | None, filename: str, cmd: str, args: list[str]
+) -> str:
     if m := re.search(r"(.*):(\d+)$", filename):
         h, p = m.group(1), m.group(2)
         if h and "--host" not in str(args):
@@ -1657,7 +1698,12 @@ def _parse_serve_file(uvicorn, filename: str, cmd: str, args: list) -> str:
     return cmd
 
 
-def _runserver(uvicorn, host, port, file) -> tuple[str, list[str]]:
+def _runserver(
+    uvicorn: bool | None,
+    host: OptionInfo | str | None,
+    port: OptionInfo | int | None,
+    file: ArgumentInfo | str | None,
+) -> tuple[str, list[str]]:
     cmd = "uvicorn" if uvicorn else "fastapi dev"
     args = []
     if (host := getattr(host, "default", host)) and host not in (
@@ -1690,10 +1736,11 @@ def dev(
     uvicorn: bool | None = None,
     prod: bool | None = None,
     reload: bool | None = None,
+    just: bool | None = None,
     file: str | None | ArgumentInfo = None,
     dry: bool = False,
 ) -> None:
-    if should_use_just():
+    if just is not False and should_use_just():
         args = [i for i in sys.argv[2:] if i != "--dry"]
         cmd = "just dev"
     else:
@@ -1712,10 +1759,13 @@ def runserver(
     uvicorn: bool | None = None,
     prod: bool | None = None,
     reload: bool | None = None,
+    just: bool | None = None,
     dry: bool = DryOption,
 ) -> None:
     """Start a fastapi server(only for fastapi>=0.111.0)"""
-    f = functools.partial(dev, port, host, fastapi, uvicorn, prod, reload, dry=dry)
+    f = functools.partial(
+        dev, port, host, fastapi, uvicorn, prod, reload, just, dry=dry
+    )
     if getattr(file_or_port, "default", file_or_port):
         f(file=file_or_port)
     else:
@@ -1734,7 +1784,7 @@ def run_by_subprocess(cmd: str, dry: bool = DryOption) -> None:
         ):
             echo(f"Command not found: {command}")
             raise Exit(1) from None
-        raise e
+        raise
     else:
         if rc:
             raise Exit(rc)
@@ -1804,15 +1854,17 @@ class MakeDeps(DryRun):
             tool_section = doc["tool"]
             uv_package = tool_section.get("uv", {}).get("package")
             if uv_package is not None:
-                return doc["project"]["name"] if uv_package else ""
-            match doc["build-system"]["build-backend"]:
-                case "pdm.backend":
-                    if not tool_section.get("pdm", {}).get("distribution", True):
-                        return ""
-                case x if x.startswith("poetry"):
-                    if not tool_section.get("poetry", {}).get("package-mode", True):
-                        return ""
-            return doc["project"]["name"]
+                if not uv_package:
+                    return ""
+            else:
+                match doc["build-system"]["build-backend"]:
+                    case "pdm.backend":
+                        if not tool_section.get("pdm", {}).get("distribution", True):
+                            return ""
+                    case x if x.startswith("poetry"):
+                        if not tool_section.get("poetry", {}).get("package-mode", True):
+                            return ""
+            return cast(str, doc["project"]["name"])
         return ""
 
     def _gen(self) -> str:
@@ -1928,7 +1980,7 @@ class UvPypi(DryRun):
 
     @staticmethod
     def get_target_content(
-        text: str, verbose: bool, target_registry, target_host: str
+        text: str, verbose: bool, target_registry: str, target_host: str
     ) -> str | None:
         registry_pattern = r'(registry = ")(.*?)"'
         registry_urls = {i[1] for i in re.findall(registry_pattern, text)}

{fast_dev_cli-0.24.3 → fast_dev_cli-0.25.1}/pyproject.toml

@@ -29,7 +29,7 @@ dependencies = [
     "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
 ]
-version = "0.24.3"
+version = "0.25.1"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -184,10 +184,13 @@ extend-select = [
 [tool.ruff.lint.per-file-ignores]
 "test_*.py" = [
     "E501",
+    "BLE001",
+    "PLW1510",
 ]
 "scripts/*.py" = [
     "UP009",
     "UP032",
+    "PLW1510",
 ]
 "fast_dev_cli/cli.py" = [
     "UP007",

fast_dev_cli-0.24.3/fast_dev_cli/__init__.py

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