Merge pull request #208 from Jakub3628800/ruff

replace black + flake8 with ruff

.pre-commit-config.yaml

@@ -1,20 +1,12 @@
 default_language_version:
     python: python3.10
 repos:
--   repo: https://github.com/psf/black
-    rev: 23.12.1
-    hooks:
-    - id: black
-      args:
-          - --line-length=120
-
--   repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
-    hooks:
-    - id: flake8
-      args:
-        - --ignore=D100, D103, D101
-        - --max-line-length=120
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.4.1
+  hooks:
+    - id: ruff
+      args: [ --fix ]
+    - id: ruff-format
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.8.0
@@ -23,11 +15,6 @@ repos:
         args: [--explicit-package-bases, --namespace-packages]
         exclude: "upload_test_coverage.py"
 
--   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
-    hooks:
-    -   id: reorder-python-imports
-
 -   repo: https://github.com/jazzband/pip-tools
     rev: 7.3.0
     hooks:

shortener/actions.py

@@ -20,7 +20,9 @@ async def check_db_up(connection: asyncpg.Connection) -> bool:
 
 async def get_url_target(short_url: str, connection: asyncpg.Connection) -> str:
     try:
-        return await connection.fetchval("SELECT target from short_urls where url_key=$1;", short_url)
+        return await connection.fetchval(
+            "SELECT target from short_urls where url_key=$1;", short_url
+        )
     except Exception:
         raise UrlNotFoundException()
 
@@ -29,17 +31,31 @@ async def get_all_short_urls(connection: asyncpg.Connection):
     await connection.fetchval(query="SELECT * from short_urls;")
 
 
-async def create_url_target(short_url: str, target_url: str, connection: asyncpg.Connection):
+async def create_url_target(
+    short_url: str, target_url: str, connection: asyncpg.Connection
+):
     try:
-        await connection.execute("INSERT INTO short_urls (url_key, target) VALUES ($1,$2);", short_url, target_url)
+        await connection.execute(
+            "INSERT INTO short_urls (url_key, target) VALUES ($1,$2);",
+            short_url,
+            target_url,
+        )
     except asyncpg.exceptions.UniqueViolationError:
         pass
     return
 
 
-async def update_url_target(short_url: str, new_target_url: str, connection: asyncpg.Connection):
-    return await connection.fetchval("UPDATE short_urls SET target = $1 WHERE url_key = $2;", new_target_url, short_url)
+async def update_url_target(
+    short_url: str, new_target_url: str, connection: asyncpg.Connection
+):
+    return await connection.fetchval(
+        "UPDATE short_urls SET target = $1 WHERE url_key = $2;",
+        new_target_url,
+        short_url,
+    )
 
 
 async def delete_url_target(short_url: str, connection: asyncpg.Connection):
-    return await connection.fetchval("delete from short_urls where url_key=$1;", short_url)
+    return await connection.fetchval(
+        "delete from short_urls where url_key=$1;", short_url
+    )

shortener/settings.py

@@ -4,7 +4,11 @@
 class PostgresSettings(BaseSettings):
     """Settings for postgres connection."""
 
-    model_config = {"env_prefix": "DB_", "env_file": ".env", "env_file_encoding": "utf-8"}
+    model_config = {
+        "env_prefix": "DB_",
+        "env_file": ".env",
+        "env_file_encoding": "utf-8",
+    }
 
     host: str = "localhost"
     port: int = 5432

shortener/views/swagger.py

@@ -8,7 +8,9 @@
 
 
 def openapi_schema(request: Request):
-    schemas = SchemaGenerator({"openapi": "3.0.0", "info": {"title": APP_NAME, "version": "1.0"}})
+    schemas = SchemaGenerator(
+        {"openapi": "3.0.0", "info": {"title": APP_NAME, "version": "1.0"}}
+    )
     return schemas.OpenAPIResponse(request=request)
 
 

shortener/views/urls.py

@@ -1,4 +1,5 @@
 """Endpoints for editing short_url: target mappings."""
+
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 from starlette.routing import Route
@@ -28,7 +29,9 @@ async def get_url(request: Request):
     async with request.app.pool.acquire() as connection:
         target_url = await get_url_target(short_url, connection)
 
-    return JSONResponse(content={"short_url": short_url, "target_url": target_url}, status_code=200)
+    return JSONResponse(
+        content={"short_url": short_url, "target_url": target_url}, status_code=200
+    )
 
 
 async def create_url(request: Request):
@@ -61,9 +64,13 @@ async def create_url(request: Request):
     short_url = body.get("short_url")
     target_url = body.get("target_url")
     async with request.app.pool.acquire() as connection:
-        await create_url_target(short_url=short_url, target_url=target_url, connection=connection)
+        await create_url_target(
+            short_url=short_url, target_url=target_url, connection=connection
+        )
 
-    return JSONResponse(content={"short_url": short_url, "target_url": target_url}, status_code=201)
+    return JSONResponse(
+        content={"short_url": short_url, "target_url": target_url}, status_code=201
+    )
 
 
 async def update_url(request: Request):
@@ -92,9 +99,13 @@ async def update_url(request: Request):
     target_url = body.get("target_url")
 
     async with request.app.pool.acquire() as connection:
-        await update_url_target(short_url=short_url, new_target_url=target_url, connection=connection)
+        await update_url_target(
+            short_url=short_url, new_target_url=target_url, connection=connection
+        )
 
-    return JSONResponse(content={"short_url": short_url, "target_url": target_url}, status_code=200)
+    return JSONResponse(
+        content={"short_url": short_url, "target_url": target_url}, status_code=200
+    )
 
 
 async def delete_url(request: Request):

tests/conftest.py

@@ -11,7 +11,9 @@
 
 @pytest.fixture(scope="function")
 async def test_client():
-    async_pool = asyncpg.create_pool(min_size=5, max_size=25, **dict(PostgresSettings(_env_file=None)))
+    async_pool = asyncpg.create_pool(
+        min_size=5, max_size=25, **dict(PostgresSettings(_env_file=None))
+    )
     async with async_pool as pool:
         app.pool = pool
         with TestClient(app=app) as client:
@@ -45,7 +47,9 @@ def psycopg2_cursor():
     db_name = os.getenv("DB_NAME", "postgres")
     db_user = os.getenv("DB_USER", "localuser")
     db_password = os.getenv("DB_PASSWORD", "password123")
-    connection = psycopg2.connect(dbname=db_name, user=db_user, password=db_password, host=db_host, port=db_port)
+    connection = psycopg2.connect(
+        dbname=db_name, user=db_user, password=db_password, host=db_host, port=db_port
+    )
 
     cur = connection.cursor()
     cur.execute("SELECT 1")