feat(ci): add isort and black (#975)

* ci: enable isort to run on every PR

* fix imports

* run isort

---------

Co-authored-by: Sanskar Jethi <[email protected]>

.github/workflows/lint-pr.yml

@@ -1,20 +1,23 @@
-name: "Lint PR"
+name: Lint PR
 
 on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-
-permissions:
-  pull-requests: read
+  pull_request:
+    branches: [main]
 
 jobs:
-  main:
-    name: Validate PR title
+  lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: amannn/action-semantic-pull-request@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install ruff isort black
+    - name: Run linters
+      run: |
+        ruff check .
+        isort --check-only --diff .

.pre-commit-config.yaml

@@ -6,5 +6,6 @@ repos:
         args:
           - --fix
       - id: ruff-format
+
 ci:
   autoupdate_schedule: weekly

integration_tests/base_routes.py

@@ -3,19 +3,9 @@
 from collections import defaultdict
 from typing import Optional, TypedDict
 
-from integration_tests.subroutes import sub_router, di_subrouter
-from integration_tests.views import SyncView, AsyncView
-from robyn import Headers
-from robyn import (
-    Request,
-    Response,
-    Robyn,
-    WebSocket,
-    jsonify,
-    serve_file,
-    serve_html,
-    WebSocketConnector,
-)
+from integration_tests.subroutes import di_subrouter, sub_router
+from integration_tests.views import AsyncView, SyncView
+from robyn import Headers, Request, Response, Robyn, WebSocket, WebSocketConnector, jsonify, serve_file, serve_html
 from robyn.authentication import AuthenticationHandler, BearerGetter, Identity
 from robyn.templating import JinjaTemplate
 

integration_tests/conftest.py

@@ -1,13 +1,14 @@
 import os
 import pathlib
+import platform
 import signal
 import socket
 import subprocess
 import time
 from typing import List
-import platform
 
 import pytest
+
 from integration_tests.helpers.network_helpers import get_network_host
 
 

integration_tests/helpers/network_helpers.py

@@ -1,5 +1,5 @@
-import socket
 import platform
+import socket
 
 
 def get_network_host():

integration_tests/subroutes/__init__.py

@@ -1,4 +1,4 @@
-from robyn import SubRouter, jsonify, WebSocket
+from robyn import SubRouter, WebSocket, jsonify
 
 from .di_subrouter import di_subrouter
 

integration_tests/subroutes/di_subrouter.py

@@ -1,4 +1,4 @@
-from robyn import SubRouter, Request
+from robyn import Request, SubRouter
 
 di_subrouter = SubRouter(__file__, "/di_subrouter")
 GLOBAL_DEPENDENCY = "GLOBAL DEPENDENCY OVERRIDE"

integration_tests/test_add_route_without_decorator.py

@@ -1,5 +1,7 @@
 from collections.abc import Callable
+
 import pytest
+
 from integration_tests.helpers.http_methods_helpers import get, post, put
 
 

integration_tests/test_app.py

@@ -1,9 +1,9 @@
-from robyn import Robyn, ALLOW_CORS
+import pytest
+
+from robyn import ALLOW_CORS, Robyn
 from robyn.events import Events
 from robyn.robyn import Headers
 
-import pytest
-
 
 @pytest.mark.benchmark
 def test_add_request_header():

integration_tests/test_base_url.py

@@ -1,6 +1,6 @@
 import os
-import pytest
 
+import pytest
 import requests
 
 from integration_tests.helpers.network_helpers import get_network_host

integration_tests/test_delete_requests.py

@@ -1,4 +1,5 @@
 import pytest
+
 from integration_tests.helpers.http_methods_helpers import delete
 
 

integration_tests/test_env_populator.py

@@ -1,5 +1,6 @@
 import os
 import pathlib
+
 import pytest
 
 from robyn.env_populator import load_vars, parser

integration_tests/test_exception_handling.py

@@ -1,5 +1,7 @@
 from collections.abc import Callable
+
 import pytest
+
 from integration_tests.helpers.http_methods_helpers import get, post, put
 
 

integration_tests/test_file_download.py

@@ -1,4 +1,5 @@
 import pytest
+
 from integration_tests.helpers.http_methods_helpers import get
 
 

integration_tests/test_multipart_data.py

@@ -1,4 +1,5 @@
 import pytest
+
 from integration_tests.helpers.http_methods_helpers import multipart_post
 
 

integration_tests/test_patch_requests.py

@@ -1,4 +1,5 @@
 import pytest
+
 from integration_tests.helpers.http_methods_helpers import patch
 
 

integration_tests/test_post_requests.py

@@ -1,4 +1,5 @@
 import pytest
+
 from integration_tests.helpers.http_methods_helpers import post
 
 

integration_tests/test_put_requests.py

@@ -1,4 +1,5 @@
 import pytest
+
 from integration_tests.helpers.http_methods_helpers import put
 
 

integration_tests/test_status_code.py

@@ -1,4 +1,5 @@
 import pytest
+
 from integration_tests.helpers.http_methods_helpers import get
 
 

integration_tests/test_subrouter.py

@@ -1,5 +1,5 @@
-from websocket import create_connection
 import pytest
+from websocket import create_connection
 
 from integration_tests.helpers.http_methods_helpers import generic_http_helper, head
 

integration_tests/test_views.py

@@ -1,6 +1,7 @@
-from integration_tests.helpers.http_methods_helpers import get, post
 import pytest
 
+from integration_tests.helpers.http_methods_helpers import get, post
+
 
 @pytest.mark.benchmark
 def test_get_sync_view(session):

integration_tests/test_web_sockets.py

@@ -1,7 +1,7 @@
 import json
 
-from websocket import create_connection
 import pytest
+from websocket import create_connection
 
 BASE_URL = "ws://127.0.0.1:8080"
 

integration_tests/views/__init__.py

@@ -1,4 +1,4 @@
-from .sync_view import SyncView
 from .async_view import AsyncView
+from .sync_view import SyncView
 
 __all__ = ["SyncView", "AsyncView"]

noxfile.py

@@ -1,4 +1,5 @@
 import sys
+
 import nox
 
 

pyproject.toml

@@ -98,5 +98,27 @@ exclude = ["src/*", ".git", "docs"]
 [tool.ruff.mccabe]
 max-complexity = 10
 
+[tool.isort]
+profile = "black"
+line_length = 160
+
+[tool.black]
+line-length = 160
+target-version = ['py38']
+include = '\.pyi?$'
+extend-exclude = '''
+/(
+  # directories
+  \.eggs
+  | \.git
+  | \.hg
+  | \.mypy_cache
+  | \.tox
+  | \.venv
+  | build
+  | dist
+)/
+'''
+
 [tool.maturin]
 module-name = "robyn"

robyn/__init__.py

@@ -6,7 +6,6 @@
 
 import multiprocess as mp
 from nestd import get_all_nested
-from robyn.robyn import FunctionInfo, Headers, HttpMethod, Request, Response, WebSocketConnector, get_version
 
 from robyn import status_codes
 from robyn.argument_parser import Config
@@ -20,6 +19,7 @@
 from robyn.processpool import run_processes
 from robyn.reloader import compile_rust_files
 from robyn.responses import html, serve_file, serve_html
+from robyn.robyn import FunctionInfo, Headers, HttpMethod, Request, Response, WebSocketConnector, get_version
 from robyn.router import MiddlewareRouter, MiddlewareType, Router, WebSocketRouter
 from robyn.types import Directory
 from robyn.ws import WebSocket

robyn/cli.py

@@ -1,17 +1,19 @@
 import os
+import shutil
+import subprocess
 import sys
-from typing import Optional
 import webbrowser
-from InquirerPy.resolver import prompt
+from pathlib import Path
+from typing import Optional
+
 from InquirerPy.base.control import Choice
-from .argument_parser import Config
-from .reloader import create_rust_file, setup_reloader
+from InquirerPy.resolver import prompt
+
 from robyn.env_populator import load_vars
 from robyn.robyn import get_version
-from pathlib import Path
-import shutil
-import subprocess
 
+from .argument_parser import Config
+from .reloader import create_rust_file, setup_reloader
 
 SCAFFOLD_DIR = Path(__file__).parent / "scaffold"
 CURRENT_WORKING_DIR = Path.cwd()

robyn/logger.py

@@ -1,5 +1,5 @@
-from enum import Enum
 import logging
+from enum import Enum
 from typing import Optional
 
 

robyn/openapi.py

@@ -2,10 +2,10 @@
 from dataclasses import asdict, dataclass, field
 from importlib import resources
 from inspect import Signature
-from typing import Callable, Dict, List, Optional, TypedDict, Any
+from typing import Any, Callable, Dict, List, Optional, TypedDict
 
-from robyn import Response
 from robyn.responses import FileResponse, html
+from robyn.robyn import Response
 
 
 @dataclass

robyn/processpool.py

@@ -1,14 +1,15 @@
 import asyncio
-import webbrowser
-from multiprocess import Process
 import signal
 import sys
+import webbrowser
 from typing import Dict, List
-from robyn.logger import logger
+
+from multiprocess import Process
 
 from robyn.events import Events
+from robyn.logger import logger
 from robyn.robyn import FunctionInfo, Headers, Server, SocketHeld
-from robyn.router import GlobalMiddleware, RouteMiddleware, Route
+from robyn.router import GlobalMiddleware, Route, RouteMiddleware
 from robyn.types import Directory
 from robyn.ws import WebSocket
 

robyn/reloader.py

@@ -1,5 +1,5 @@
-import os
 import glob
+import os
 import signal
 import subprocess
 import sys

robyn/responses.py

@@ -1,8 +1,8 @@
-from typing import Optional
-import os
 import mimetypes
+import os
+from typing import Optional
 
-from robyn.robyn import Response, Headers
+from robyn.robyn import Headers, Response
 
 
 class FileResponse:

robyn/router.py

@@ -1,29 +1,20 @@
 import inspect
+import logging
 from abc import ABC, abstractmethod
 from asyncio import iscoroutinefunction
 from functools import wraps
 from inspect import signature
 from types import CoroutineType
-from typing import Callable, Dict, List, NamedTuple, Union, Optional
-from robyn.authentication import AuthenticationHandler, AuthenticationNotConfiguredError
-from robyn.dependency_injection import DependencyMap
-from robyn.responses import FileResponse
+from typing import Callable, Dict, List, NamedTuple, Optional, Union
 
-from robyn.robyn import (
-    FunctionInfo,
-    Headers,
-    HttpMethod,
-    MiddlewareType,
-    Request,
-    Response,
-)
 from robyn import status_codes
+from robyn.authentication import AuthenticationHandler, AuthenticationNotConfiguredError
+from robyn.dependency_injection import DependencyMap
 from robyn.jsonify import jsonify
-
+from robyn.responses import FileResponse
+from robyn.robyn import FunctionInfo, Headers, HttpMethod, MiddlewareType, Request, Response
 from robyn.ws import WebSocket
 
-import logging
-
 _logger = logging.getLogger(__name__)
 
 

robyn/scaffold/mongo/app.py

@@ -1,4 +1,5 @@
 from pymongo import MongoClient
+
 from robyn import Robyn
 
 app = Robyn(__file__)