fix ruff rule I and format Q

Author: wu-clan

fastapi_ccli/__init__.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-__version__ = "0.0.2"
+__version__ = '0.0.2'

fastapi_ccli/cloner/__init__.py

@@ -3,14 +3,14 @@
 import typer
 
 # Boolean fonts
-GREEN = typer.style("True", fg="green", bold=True)
-RED = typer.style("False", fg="red", bold=True)
+GREEN = typer.style('True', fg='green', bold=True)
+RED = typer.style('False', fg='red', bold=True)
 
 # GitHub src
-github_fba_src = "https://github.com/wu-clan/fastapi_best_architecture.git"
-github_ftm_src = "https://github.com/wu-clan/fastapi_tortoise_mysql.git"
-github_fsm_src = "https://github.com/fastapi-practices/fastapi_sqlmodel_mysql.git"
+github_fba_src = 'https://github.com/wu-clan/fastapi_best_architecture.git'
+github_ftm_src = 'https://github.com/wu-clan/fastapi_tortoise_mysql.git'
+github_fsm_src = 'https://github.com/fastapi-practices/fastapi_sqlmodel_mysql.git'
 
 # Gitee src
-gitee_fba_src = "https://gitee.com/wu_cl/fastapi_best_architecture.git"
-gitee_ftm_src = "https://gitee.com/wu_cl/fastapi_tortoise_mysql.git"
+gitee_fba_src = 'https://gitee.com/wu_cl/fastapi_best_architecture.git'
+gitee_ftm_src = 'https://gitee.com/wu_cl/fastapi_tortoise_mysql.git'

fastapi_ccli/cloner/cloner_en.py

@@ -3,19 +3,21 @@
 import os
 import re
 import time
+
 from pathlib import Path
 from typing import Optional
 
 import typer
+
 from rich import print
 
 from fastapi_ccli import __version__
-from fastapi_ccli.cloner import GREEN, RED, github_fba_src, github_ftm_src, github_fsm_src, gitee_fba_src, gitee_ftm_src
+from fastapi_ccli.cloner import GREEN, RED, gitee_fba_src, gitee_ftm_src, github_fba_src, github_fsm_src, github_ftm_src
 from fastapi_ccli.utils.get_country import get_current_country
 from fastapi_ccli.utils.get_ip import get_net_ip
 from fastapi_ccli.utils.get_path import get_project_path
 
-app_en = typer.Typer(rich_markup_mode="rich")
+app_en = typer.Typer(rich_markup_mode='rich')
 
 
 def is_china(dns: bool) -> str:
@@ -25,7 +27,7 @@ def is_china(dns: bool) -> str:
     :param dns:
     :return:
     """
-    with typer.progressbar(range(5), label="Analyzing") as progress:
+    with typer.progressbar(range(5), label='Analyzing') as progress:
         for i in progress:
             ip = get_net_ip()
             if ip:
@@ -36,7 +38,7 @@ def is_china(dns: bool) -> str:
                 progress.update(i)
                 continue
         rp = get_current_country(ip)
-        if "CN" in rp:
+        if 'CN' in rp:
             ending = GREEN if dns else RED
         else:
             ending = RED if dns else GREEN
@@ -53,47 +55,47 @@ def exec_clone(orm: str, country: str, project: str, path: str) -> None:
     :param path:
     :return:
     """
-    typer.echo("Project name: " + typer.style(project, fg="blue", bold=True))
-    typer.echo("Select orm: " + orm)
-    if orm == "sqlalchemy":
-        source = github_fba_src if "True" in country else gitee_fba_src
-    elif orm == "tortoise":
-        source = github_ftm_src if "True" in country else gitee_ftm_src
-    elif orm == "sqlmodel":
+    typer.echo('Project name: ' + typer.style(project, fg='blue', bold=True))
+    typer.echo('Select orm: ' + orm)
+    if orm == 'sqlalchemy':
+        source = github_fba_src if 'True' in country else gitee_fba_src
+    elif orm == 'tortoise':
+        source = github_ftm_src if 'True' in country else gitee_ftm_src
+    elif orm == 'sqlmodel':
         source = github_fsm_src
     try:
         print(f"⏳ Start clone {source.split('/')[-1].split('.')[0]} project...")  # noqa
-        out = os.system(f"git clone {source} {path}")
+        out = os.system(f'git clone {source} {path}')
         if out != 0:
             raise RuntimeError(out)
     except Exception as e:
-        print(f"❌ Clone project failed: {e}")
+        print(f'❌ Clone project failed: {e}')
         raise typer.Exit(1)
     else:
-        print("✅ The project was cloned successfully")
+        print('✅ The project was cloned successfully')
         typer.echo(f"Please go to the directory {typer.style(path, fg='green', bold=True)} to view")
 
 
-@app_en.command(epilog="Made by :beating_heart: wu-clan")
+@app_en.command(epilog='Made by :beating_heart: wu-clan')
 def cloner(
     version: Optional[bool] = typer.Option(
         None,
-        "--version",
-        "-V",
-        help="Print version information.",
+        '--version',
+        '-V',
+        help='Print version information.',
     ),
     orm: Optional[str] = typer.Option(
-        "sqlalchemy",
-        "--orm",
-        "-o",
-        metavar="<ORM>",
+        'sqlalchemy',
+        '--orm',
+        '-o',
+        metavar='<ORM>',
         help="Select the orm to use, the default is sqlalchemy, support 'sqlalchemy' / 'tortoise' / 'sqlmodel'.",
     ),
     project_path: Optional[str] = typer.Option(
         None,
-        "--path",
-        "-p",
-        metavar="<PATH>",
+        '--path',
+        '-p',
+        metavar='<PATH>',
         show_default=False,
         help="Project clone path, the default is '../fastapi_project', supports absolute path or relative path.",
     ),
@@ -102,16 +104,16 @@ def cloner(
     FastAPI project cloner
     """
     if version:
-        typer.secho("\n🔥 FastAPI CCLI " + __version__, fg="green", bold=True)
+        typer.secho('\n🔥 FastAPI CCLI ' + __version__, fg='green', bold=True)
     if orm:
-        if orm not in ["sqlalchemy", "tortoise", "sqlmodel"]:
+        if orm not in ['sqlalchemy', 'tortoise', 'sqlmodel']:
             raise typer.BadParameter("Enter unknown parameters, only allowed 'sqlalchemy' / 'tortoise' / 'sqlmodel'")
     if project_path:
         if not Path(project_path).is_dir():
-            raise typer.BadParameter("Wrong parameter input, please enter the correct path")
-        use_project_name = project_path or "../fastapi_project"
+            raise typer.BadParameter('Wrong parameter input, please enter the correct path')
+        use_project_name = project_path or '../fastapi_project'
         path = get_project_path(use_project_name)
-        project_name = re.split(r"/|\'|\\|\\\\", use_project_name)[-1]
-        _country = typer.confirm("Is your region China?", default=False)
+        project_name = re.split(r'/|\'|\\|\\\\', use_project_name)[-1]
+        _country = typer.confirm('Is your region China?', default=False)
         country = is_china(_country)
         exec_clone(orm, country, project_name, path)

fastapi_ccli/cloner/cloner_en_form.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 import re
+
 from pathlib import Path
 from typing import Optional
 
@@ -11,22 +12,22 @@
 from fastapi_ccli.cloner.cloner_en import exec_clone, is_china
 from fastapi_ccli.utils.get_path import get_project_path
 
-app_en_form = typer.Typer(rich_markup_mode="rich")
+app_en_form = typer.Typer(rich_markup_mode='rich')
 
 
-@app_en_form.command(epilog="Made by :beating_heart: wu-clan")
+@app_en_form.command(epilog='Made by :beating_heart: wu-clan')
 def cloner(
     version: Optional[bool] = typer.Option(
         None,
-        "--version",
-        "-V",
-        help="Print version information.",
+        '--version',
+        '-V',
+        help='Print version information.',
     ),
     project_path: Optional[str] = typer.Option(
         None,
-        "--path",
-        "-p",
-        metavar="<PATH>",
+        '--path',
+        '-p',
+        metavar='<PATH>',
         show_default=False,
         help="Project clone path, the default is '../fastapi_project', supports absolute path or relative path.",
     ),
@@ -35,23 +36,23 @@ def cloner(
     FastAPI project cloner
     """
     if version:
-        typer.secho("\n🔥 FastAPI CCLI " + __version__, fg="green", bold=True)
+        typer.secho('\n🔥 FastAPI CCLI ' + __version__, fg='green', bold=True)
     if project_path:
         if not Path(project_path).is_dir():
-            raise typer.BadParameter("Wrong parameter input, please enter the correct path")
-        use_project_name = project_path or "../fastapi_project"
+            raise typer.BadParameter('Wrong parameter input, please enter the correct path')
+        use_project_name = project_path or '../fastapi_project'
         path = get_project_path(use_project_name)
-        project_name = re.split(r"/|\'|\\|\\\\", use_project_name)[-1]
+        project_name = re.split(r'/|\'|\\|\\\\', use_project_name)[-1]
         result_if = questionary.form(
             orm=questionary.select(
-                "Please select the orm you want to use:",
-                choices=["sqlalchemy", "tortoise", "sqlmodel"],
-                default="sqlalchemy",
+                'Please select the orm you want to use:',
+                choices=['sqlalchemy', 'tortoise', 'sqlmodel'],
+                default='sqlalchemy',
             ),
-            country=questionary.select("Is your region China?", choices=["Yes", "No"], default="No"),
+            country=questionary.select('Is your region China?', choices=['Yes', 'No'], default='No'),
         ).ask()
         if len(result_if) == 0:
             raise typer.Exit(1)
-        country = is_china(result_if["country"])
-        orm = result_if["orm"]
+        country = is_china(result_if['country'])
+        orm = result_if['orm']
         exec_clone(orm, country, project_name, path)

fastapi_ccli/main.py

@@ -11,25 +11,25 @@
 
 def run():
     if not len(sys.argv) > 1:
-        typer.secho("\nMissing command line parameters, try '--help' for help.", fg="red")
+        typer.secho("\nMissing command line parameters, try '--help' for help.", fg='red')
     else:
-        if any(sys.argv[1] == _ for _ in ["--version", "-V"]):
+        if any(sys.argv[1] == _ for _ in ['--version', '-V']):
             app_en()
         else:
             select_run_type = questionary.form(
                 interactive=questionary.select(
-                    "Whether to run in interactive mode?",
-                    choices=["yes", "no"],
-                    default="yes",
+                    'Whether to run in interactive mode?',
+                    choices=['yes', 'no'],
+                    default='yes',
                 )
             ).ask()
             if len(select_run_type) == 0:
                 raise typer.Exit(1)
-            if select_run_type.get("interactive") == "yes":
+            if select_run_type.get('interactive') == 'yes':
                 app_en_form()
             else:
                 app_en()
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
     run()

fastapi_ccli/utils/get_country.py

@@ -12,13 +12,13 @@ def get_current_country(ip: Union[str, None]) -> str:
     :param ip:
     :return:
     """
-    proxy = {"http": None, "https": None}  # extra
+    proxy = {'http': None, 'https': None}  # extra
     try:
         if ip:
-            rp = request.get(f"https://ip.useragentinfo.com/json?ip={ip}", proxies=proxy).json()["short_name"]
+            rp = request.get(f'https://ip.useragentinfo.com/json?ip={ip}', proxies=proxy).json()['short_name']
         else:
-            rp = request.get("https://ip.useragentinfo.com/json?ip=", proxies=proxy).json()["short_name"]
+            rp = request.get('https://ip.useragentinfo.com/json?ip=', proxies=proxy).json()['short_name']
     except Exception:  # noqa
-        rp = "Unknown"
+        rp = 'Unknown'
 
     return rp

fastapi_ccli/utils/get_ip.py

@@ -13,13 +13,13 @@ def get_net_ip() -> str:
     """
     timeout = 3
     try:
-        ip = request.get("https://checkip.amazonaws.com/", timeout=timeout).text.strip()
+        ip = request.get('https://checkip.amazonaws.com/', timeout=timeout).text.strip()
         if not ip:
-            ip = request.get("https://jsonip.com/", timeout=timeout).json()["ip"]
+            ip = request.get('https://jsonip.com/', timeout=timeout).json()['ip']
     except JSONDecodeError:
-        ip = request.get("https://api.ipify.org/", timeout=timeout).text.strip()
+        ip = request.get('https://api.ipify.org/', timeout=timeout).text.strip()
         if not ip:
-            ip = request.get("https://ip.42.pl/raw", timeout=timeout).text.strip()
+            ip = request.get('https://ip.42.pl/raw', timeout=timeout).text.strip()
     except Exception:  # noqa
         ip = None
 

fastapi_ccli/utils/get_path.py

@@ -9,7 +9,7 @@ def get_project_path(project_path: str) -> str:
 
     :return:
     """
-    path_resolve = project_path if not project_path.startswith("..") else os.path.abspath(project_path)
-    path = path_resolve if not path_resolve.startswith(".") else os.path.abspath(project_path)
+    path_resolve = project_path if not project_path.startswith('..') else os.path.abspath(project_path)
+    path = path_resolve if not path_resolve.startswith('.') else os.path.abspath(project_path)
 
     return path

pyproject.toml

@@ -41,15 +41,16 @@ lint = [
 ]
 
 [tool.ruff]
+extend-select = ["I"]
 line-length = 120
 cache-dir = "./.ruff_cache"
 
 [tool.ruff.isort]
+lines-between-types = 1
 order-by-type = true
 
-[tool.ruff.flake8-quotes]
-inline-quotes = "single"
-multiline-quotes = "single"
+[tool.ruff.format]
+quote-style = "single"
 
 [build-system]
 requires = ["pdm-backend"]