nb-cli-plugin-docker 0.3.0__tar.gz → 0.4.0__tar.gz

{nb_cli_plugin_docker-0.3.0 → nb_cli_plugin_docker-0.4.0}/PKG-INFO

@@ -1,24 +1,23 @@
 Metadata-Version: 2.1
 Name: nb-cli-plugin-docker
-Version: 0.3.0
+Version: 0.4.0
 Summary: docker support for nb-cli
 Home-page: https://github.com/nonebot/cli-plugin-docker
 License: MIT
 Keywords: nonebot,cli,docker
 Author: yanyongyu
 Author-email: yyy@nonebot.dev
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Robot Framework
 Classifier: Framework :: Robot Framework :: Library
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: nb-cli (>=1.1.0,<2.0.0)
 Requires-Dist: noneprompt (>=0.1.7,<0.2.0)
 Project-URL: Documentation, https://github.com/nonebot/cli-plugin-docker#readme
@@ -40,14 +39,14 @@ _✨ NoneBot2 命令行工具 Docker 插件 ✨_
 
 <p align="center">
   <a href="https://raw.githubusercontent.com/nonebot/nb-cli-plugin-docker/master/LICENSE">
-    <img src="https://img.shields.io/github/license/nonebot/nb-cli-plugin-docker" alt="license">
+    <img src="https://img.shields.io/github/license/nonebot/cli-plugin-docker" alt="license">
   </a>
   <a href="https://pypi.python.org/pypi/nb-cli-plugin-docker">
     <img src="https://img.shields.io/pypi/v/nb-cli-plugin-docker" alt="pypi">
   </a>
   <img src="https://img.shields.io/badge/python-3.8+-blue" alt="python">
   <a href="https://results.pre-commit.ci/latest/github/nonebot/nb-cli-plugin-docker/master">
-    <img src="https://results.pre-commit.ci/badge/github/nonebot/nb-cli-plugin-docker/master.svg" alt="pre-commit" />
+    <img src="https://results.pre-commit.ci/badge/github/nonebot/cli-plugin-docker/master.svg" alt="pre-commit" />
   </a>
   <br />
   <a href="https://jq.qq.com/?_wv=1027&k=5OFifDh">

{nb_cli_plugin_docker-0.3.0 → nb_cli_plugin_docker-0.4.0}/README.md

@@ -13,14 +13,14 @@ _✨ NoneBot2 命令行工具 Docker 插件 ✨_
 
 <p align="center">
   <a href="https://raw.githubusercontent.com/nonebot/nb-cli-plugin-docker/master/LICENSE">
-    <img src="https://img.shields.io/github/license/nonebot/nb-cli-plugin-docker" alt="license">
+    <img src="https://img.shields.io/github/license/nonebot/cli-plugin-docker" alt="license">
   </a>
   <a href="https://pypi.python.org/pypi/nb-cli-plugin-docker">
     <img src="https://img.shields.io/pypi/v/nb-cli-plugin-docker" alt="pypi">
   </a>
   <img src="https://img.shields.io/badge/python-3.8+-blue" alt="python">
   <a href="https://results.pre-commit.ci/latest/github/nonebot/nb-cli-plugin-docker/master">
-    <img src="https://results.pre-commit.ci/badge/github/nonebot/nb-cli-plugin-docker/master.svg" alt="pre-commit" />
+    <img src="https://results.pre-commit.ci/badge/github/nonebot/cli-plugin-docker/master.svg" alt="pre-commit" />
   </a>
   <br />
   <a href="https://jq.qq.com/?_wv=1027&k=5OFifDh">

{nb_cli_plugin_docker-0.3.0 → nb_cli_plugin_docker-0.4.0}/nb_cli_plugin_docker/cli.py

@@ -1,5 +1,5 @@
+from typing import cast
 from pathlib import Path
-from typing import List, cast
 
 import click
 from nb_cli import _
@@ -33,7 +33,7 @@ async def docker(ctx: click.Context):
     command = cast(ClickAliasedGroup, ctx.command)
 
     # auto discover sub commands and scripts
-    choices: List[Choice[click.Command]] = []
+    choices: list[Choice[click.Command]] = []
     for sub_cmd_name in await run_sync(command.list_commands)(ctx):
         if sub_cmd := await run_sync(command.get_command)(ctx, sub_cmd_name):
             choices.append(
@@ -73,7 +73,7 @@ async def generate(ctx: click.Context, force: bool):
     python_version = await get_python_version(python_path=python_path)
     python_version = f"{python_version['major']}.{python_version['minor']}"
 
-    is_reverse = await get_driver_type(python_path=python_path, cwd=cwd)
+    is_asgi = await get_driver_type(python_path=python_path, cwd=cwd)
     build_backend = await get_build_backend(
         config_manager=ConfigManager(working_dir=cwd, python_path=python_path)
     )
@@ -81,19 +81,19 @@ async def generate(ctx: click.Context, force: bool):
     try:
         dockerfile = await generate_dockerfile(
             python_version=python_version,
-            is_reverse=is_reverse,
+            is_asgi=is_asgi,
             build_backend=build_backend,
         )
         await safe_write_file(cwd / "Dockerfile", dockerfile, force=force)
 
-        compose_file = await generate_compose_file(is_reverse=is_reverse)
+        compose_file = await generate_compose_file(is_asgi=is_asgi)
         await safe_write_file(cwd / "docker-compose.yml", compose_file, force=force)
 
         await safe_copy_dir(
             Path(__file__).parent / "static" / "common", cwd, force=force
         )
 
-        if is_reverse:
+        if is_asgi:
             await safe_copy_dir(
                 Path(__file__).parent / "static" / "reverse", cwd, force=force
             )
@@ -112,7 +112,7 @@ async def generate(ctx: click.Context, force: bool):
 @click.argument("compose_args", nargs=-1)
 @click.pass_context
 @run_async
-async def up(ctx: click.Context, force: bool, compose_args: List[str]):
+async def up(ctx: click.Context, force: bool, compose_args: list[str]):
     """Deploy the bot."""
     cwd = get_project_root()
 
@@ -130,7 +130,7 @@ async def up(ctx: click.Context, force: bool, compose_args: List[str]):
 @docker.command(aliases=["stop"], context_settings={"ignore_unknown_options": True})
 @click.argument("compose_args", nargs=-1)
 @run_async
-async def down(compose_args: List[str]):
+async def down(compose_args: list[str]):
     """Undeploy the bot."""
     proc = await compose_down(compose_args)
     await proc.wait()
@@ -139,7 +139,7 @@ async def down(compose_args: List[str]):
 @docker.command(context_settings={"ignore_unknown_options": True})
 @click.argument("compose_args", nargs=-1)
 @run_async
-async def build(compose_args: List[str]):
+async def build(compose_args: list[str]):
     """Build the bot image."""
     proc = await compose_build(compose_args)
     await proc.wait()
@@ -148,7 +148,7 @@ async def build(compose_args: List[str]):
 @docker.command(context_settings={"ignore_unknown_options": True})
 @click.argument("compose_args", nargs=-1)
 @run_async
-async def logs(compose_args: List[str]):
+async def logs(compose_args: list[str]):
     """View the bot logs."""
     proc = await compose_logs(compose_args)
     await proc.wait()
@@ -157,7 +157,7 @@ async def logs(compose_args: List[str]):
 @docker.command(context_settings={"ignore_unknown_options": True})
 @click.argument("compose_args", nargs=-1)
 @run_async
-async def ps(compose_args: List[str]):
+async def ps(compose_args: list[str]):
     """View the bot service status."""
     proc = await compose_ps(compose_args)
     await proc.wait()

{nb_cli_plugin_docker-0.3.0 → nb_cli_plugin_docker-0.4.0}/nb_cli_plugin_docker/handler.py

@@ -2,7 +2,7 @@ import json
 import asyncio
 from pathlib import Path
 from dataclasses import dataclass
-from typing import IO, TYPE_CHECKING, Any, List, Tuple, Union, Literal, Optional, cast
+from typing import IO, TYPE_CHECKING, Any, Union, Literal, Optional, cast
 
 from nb_cli import cache
 from jinja2 import Environment, FileSystemLoader
@@ -36,14 +36,13 @@ templates.filters.update(cli_templates.filters)
 
 @dataclass
 class Compose:
-    command: Tuple[str, ...]
+    command: tuple[str, ...]
     info: str
 
 
 if TYPE_CHECKING:
 
-    async def get_compose_command() -> Compose:
-        ...
+    async def get_compose_command() -> Compose: ...
 
 else:
 
@@ -68,7 +67,7 @@ else:
 
 @ensure_process_terminated
 async def call_compose(
-    compose_args: Optional[List[str]] = None,
+    compose_args: Optional[list[str]] = None,
     cwd: Optional[Path] = None,
     stdin: Optional[Union[IO[Any], int]] = None,
     stdout: Optional[Union[IO[Any], int]] = None,
@@ -89,7 +88,7 @@ async def call_compose(
 
 
 async def compose_up(
-    compose_args: Optional[List[str]] = None,
+    compose_args: Optional[list[str]] = None,
     cwd: Optional[Path] = None,
     stdin: Optional[Union[IO[Any], int]] = None,
     stdout: Optional[Union[IO[Any], int]] = None,
@@ -105,7 +104,7 @@ async def compose_up(
 
 
 async def compose_down(
-    compose_args: Optional[List[str]] = None,
+    compose_args: Optional[list[str]] = None,
     cwd: Optional[Path] = None,
     stdin: Optional[Union[IO[Any], int]] = None,
     stdout: Optional[Union[IO[Any], int]] = None,
@@ -121,7 +120,7 @@ async def compose_down(
 
 
 async def compose_build(
-    compose_args: Optional[List[str]] = None,
+    compose_args: Optional[list[str]] = None,
     cwd: Optional[Path] = None,
     stdin: Optional[Union[IO[Any], int]] = None,
     stdout: Optional[Union[IO[Any], int]] = None,
@@ -137,7 +136,7 @@ async def compose_build(
 
 
 async def compose_logs(
-    compose_args: Optional[List[str]] = None,
+    compose_args: Optional[list[str]] = None,
     cwd: Optional[Path] = None,
     stdin: Optional[Union[IO[Any], int]] = None,
     stdout: Optional[Union[IO[Any], int]] = None,
@@ -153,7 +152,7 @@ async def compose_logs(
 
 
 async def compose_ps(
-    compose_args: Optional[List[str]] = None,
+    compose_args: Optional[list[str]] = None,
     cwd: Optional[Path] = None,
     stdin: Optional[Union[IO[Any], int]] = None,
     stdout: Optional[Union[IO[Any], int]] = None,
@@ -170,8 +169,8 @@ async def compose_ps(
 
 @requires_nonebot
 async def get_driver_type(
-    adapters: Optional[List[SimpleInfo]] = None,
-    builtin_plugins: Optional[List[str]] = None,
+    adapters: Optional[list[SimpleInfo]] = None,
+    builtin_plugins: Optional[list[str]] = None,
     python_path: Optional[str] = None,
     cwd: Optional[Path] = None,
 ) -> bool:
@@ -198,9 +197,12 @@ async def get_driver_type(
     )
     stdout, stderr = await proc.communicate()
     if proc.returncode != 0:
-        raise GetDriverTypeError(stderr)
+        raise GetDriverTypeError(stdout, stderr)
 
-    return json.loads(stdout.strip())
+    try:
+        return json.loads(stdout.strip())
+    except Exception as e:
+        raise GetDriverTypeError(stdout, stderr) from e
 
 
 async def get_build_backend(
@@ -220,11 +222,11 @@ async def get_build_backend(
 
 
 async def generate_dockerfile(
-    python_version: str, is_reverse: bool, build_backend: Optional[str]
+    python_version: str, is_asgi: bool, build_backend: Optional[str]
 ):
     t = templates.get_template(
         "docker/reverse.Dockerfile.jinja"
-        if is_reverse
+        if is_asgi
         else "docker/forward.Dockerfile.jinja"
     )
     return await t.render_async(
@@ -232,6 +234,6 @@ async def generate_dockerfile(
     )
 
 
-async def generate_compose_file(is_reverse: bool):
+async def generate_compose_file(is_asgi: bool):
     t = templates.get_template("docker/docker-compose.yml.jinja")
-    return await t.render_async(is_reverse=is_reverse)
+    return await t.render_async(is_asgi=is_asgi)

{nb_cli_plugin_docker-0.3.0 → nb_cli_plugin_docker-0.4.0}/nb_cli_plugin_docker/static/reverse/docker/_main.py

@@ -1,4 +1,3 @@
-import bot
 import nonebot
 
 app = nonebot.get_asgi()

{nb_cli_plugin_docker-0.3.0 → nb_cli_plugin_docker-0.4.0}/nb_cli_plugin_docker/static/reverse/docker/gunicorn_conf.py

@@ -79,4 +79,4 @@ log_data = {
     "host": host,
     "port": port,
 }
-print(json.dumps(log_data))
+print(json.dumps(log_data))  # noqa: T201

{nb_cli_plugin_docker-0.3.0 → nb_cli_plugin_docker-0.4.0}/nb_cli_plugin_docker/template/docker/docker-compose.yml.jinja

@@ -1,6 +1,6 @@
 version: "3"
 
-{% if is_reverse %}
+{% if is_asgi %}
 x-config-host: &config-host ${HOST:-0.0.0.0}
 x-config-port: &config-port ${PORT:-8080}
 {% endif %}
@@ -8,7 +8,7 @@ x-config-port: &config-port ${PORT:-8080}
 services:
   nonebot:
     build: .
-    {% if is_reverse %}
+    {% if is_asgi %}
     ports:
       - *config-port
     {% endif %}
@@ -16,7 +16,7 @@ services:
       - .env.prod
     environment:
       ENVIRONMENT: prod
-      {% if is_reverse %}
+      {% if is_asgi %}
       HOST: *config-host
       PORT: *config-port
       {% endif %}

{nb_cli_plugin_docker-0.3.0 → nb_cli_plugin_docker-0.4.0}/nb_cli_plugin_docker/template/docker/get_driver_type.py.jinja

@@ -3,11 +3,11 @@
 import json
 import nonebot
 from nonebot.log import logger
-from nonebot.drivers import ReverseDriver
+from nonebot.drivers import ASGIMixin
 
 logger.remove()
 
 {{ prepare_bot(adapters, builtin_plugins) }}
 
 driver = nonebot.get_driver()
-print(json.dumps(isinstance(driver, ReverseDriver)))
+print(json.dumps(isinstance(driver, ASGIMixin)))

{nb_cli_plugin_docker-0.3.0 → nb_cli_plugin_docker-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nb-cli-plugin-docker"
-version = "0.3.0"
+version = "0.4.0"
 description = "docker support for nb-cli"
 authors = ["yanyongyu <yyy@nonebot.dev>"]
 license = "MIT"
@@ -15,19 +15,20 @@ classifiers = [
   "Framework :: Robot Framework :: Library",
   "License :: OSI Approved :: MIT License",
   "Operating System :: OS Independent",
-  "Programming Language :: Python :: 3"
+  "Programming Language :: Python :: 3",
 ]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.9"
 nb-cli = "^1.1.0"
 noneprompt = "^0.1.7"
 
 [tool.poetry.group.dev.dependencies]
+ruff = "^0.5.0"
 isort = "^5.10.1"
-black = "^22.3.0"
+black = "^24.0.0"
 nonemoji = "^0.1.2"
-pre-commit = "^2.16.0"
+pre-commit = "^3.0.0"
 
 [tool.poetry.plugins.nb]
 docker = "nb_cli_plugin_docker.plugin:install"
@@ -46,11 +47,48 @@ skip_gitignore = true
 force_sort_within_sections = true
 extra_standard_library = ["typing_extensions"]
 
+[tool.ruff]
+line-length = 88
+target-version = "py39"
+
+[tool.ruff.lint]
+select = [
+  "F",     # Pyflakes
+  "W",     # pycodestyle warnings
+  "E",     # pycodestyle errors
+  "UP",    # pyupgrade
+  "ASYNC", # flake8-async
+  "C4",    # flake8-comprehensions
+  "T10",   # flake8-debugger
+  "T20",   # flake8-print
+  "PYI",   # flake8-pyi
+  "PT",    # flake8-pytest-style
+  "Q",     # flake8-quotes
+  "RUF",   # Ruff-specific rules
+]
+ignore = [
+  "E402",   # module-import-not-at-top-of-file
+  "UP037",  # quoted-annotation
+  "RUF001", # ambiguous-unicode-character-string
+  "RUF002", # ambiguous-unicode-character-docstring
+  "RUF003", # ambiguous-unicode-character-comment
+]
+
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = false
+mark-parentheses = false
+
 [tool.pyright]
-pythonVersion = "3.8"
+pythonVersion = "3.9"
 pythonPlatform = "All"
+defineConstant = { PYDANTIC_V2 = true }
+
 ignore = ["nb_cli_plugin_docker/static/"]
 
+typeCheckingMode = "standard"
+reportShadowedImports = false
+disableBytesTypePromotions = true
+
 [build-system]
 requires = ["poetry_core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"