style: adopt ruff format (#665)

Author: sansyrox

.pre-commit-config.yaml

@@ -1,12 +1,10 @@
 repos:
-  - repo: https://github.com/psf/black
-    rev: 23.10.0
-    hooks:
-      - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.1
+    rev: v0.1.2
     hooks:
       - id: ruff
-
+        args:
+          - --fix
+      - id: ruff-format
 ci:
   autoupdate_schedule: weekly

integration_tests/conftest.py

@@ -14,9 +14,7 @@
 def spawn_process(command: List[str]) -> subprocess.Popen:
     if platform.system() == "Windows":
         command[0] = "python"
-        process = subprocess.Popen(
-            command, shell=True, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
-        )
+        process = subprocess.Popen(command, shell=True, creationflags=subprocess.CREATE_NEW_PROCESS_GROUP)
         return process
     process = subprocess.Popen(command, preexec_fn=os.setsid)
     return process

integration_tests/helpers/http_methods_helpers.py

@@ -174,15 +174,11 @@ def generic_http_helper(
 
     endpoint = endpoint.strip("/")
     if method not in ["get", "post", "put", "patch", "delete", "options", "trace"]:
-        raise ValueError(
-            f"{method} method must be one of get, post, put, patch, delete"
-        )
+        raise ValueError(f"{method} method must be one of get, post, put, patch, delete")
     if method == "get":
         response = requests.get(f"{BASE_URL}/{endpoint}", headers=headers)
     else:
-        response = requests.request(
-            method, f"{BASE_URL}/{endpoint}", data=data, headers=headers
-        )
+        response = requests.request(method, f"{BASE_URL}/{endpoint}", data=data, headers=headers)
     if should_check_response:
         check_response(response, expected_status_code)
     return response

pyproject.toml

@@ -65,7 +65,7 @@ templating = ["jinja2"]
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-ruff = "0.0.240"
+ruff = "0.1.2"
 black = "23.1"
 isort = "5.11.5"
 pre-commit = "2.21.0"

robyn/__init__.py

@@ -118,9 +118,7 @@ def before_request(self, endpoint: Optional[str] = None) -> Callable[..., None]:
         :param endpoint str|None: endpoint to server the route. If None, the middleware will be applied to all the routes.
         """
 
-        return self.middleware_router.add_middleware(
-            MiddlewareType.BEFORE_REQUEST, endpoint
-        )
+        return self.middleware_router.add_middleware(MiddlewareType.BEFORE_REQUEST, endpoint)
 
     def after_request(self, endpoint: Optional[str] = None) -> Callable[..., None]:
         """
@@ -129,9 +127,7 @@ def after_request(self, endpoint: Optional[str] = None) -> Callable[..., None]:
         :param endpoint str|None: endpoint to server the route. If None, the middleware will be applied to all the routes.
         """
 
-        return self.middleware_router.add_middleware(
-            MiddlewareType.AFTER_REQUEST, endpoint
-        )
+        return self.middleware_router.add_middleware(MiddlewareType.AFTER_REQUEST, endpoint)
 
     def add_directory(
         self,
@@ -140,9 +136,7 @@ def add_directory(
         index_file: Optional[str] = None,
         show_files_listing: bool = False,
     ):
-        self.directories.append(
-            Directory(route, directory_path, show_files_listing, index_file)
-        )
+        self.directories.append(Directory(route, directory_path, show_files_listing, index_file))
 
     def add_request_header(self, key: str, value: str) -> None:
         self.request_headers.append(Header(key, value))
@@ -253,9 +247,7 @@ def get(self, endpoint: str, const: bool = False, auth_required: bool = False):
         """
 
         def inner(handler):
-            return self.add_route(
-                HttpMethod.GET, endpoint, handler, const, auth_required
-            )
+            return self.add_route(HttpMethod.GET, endpoint, handler, const, auth_required)
 
         return inner
 
@@ -267,9 +259,7 @@ def post(self, endpoint: str, auth_required: bool = False):
         """
 
         def inner(handler):
-            return self.add_route(
-                HttpMethod.POST, endpoint, handler, auth_required=auth_required
-            )
+            return self.add_route(HttpMethod.POST, endpoint, handler, auth_required=auth_required)
 
         return inner
 
@@ -281,9 +271,7 @@ def put(self, endpoint: str, auth_required: bool = False):
         """
 
         def inner(handler):
-            return self.add_route(
-                HttpMethod.PUT, endpoint, handler, auth_required=auth_required
-            )
+            return self.add_route(HttpMethod.PUT, endpoint, handler, auth_required=auth_required)
 
         return inner
 
@@ -295,9 +283,7 @@ def delete(self, endpoint: str, auth_required: bool = False):
         """
 
         def inner(handler):
-            return self.add_route(
-                HttpMethod.DELETE, endpoint, handler, auth_required=auth_required
-            )
+            return self.add_route(HttpMethod.DELETE, endpoint, handler, auth_required=auth_required)
 
         return inner
 
@@ -309,9 +295,7 @@ def patch(self, endpoint: str, auth_required: bool = False):
         """
 
         def inner(handler):
-            return self.add_route(
-                HttpMethod.PATCH, endpoint, handler, auth_required=auth_required
-            )
+            return self.add_route(HttpMethod.PATCH, endpoint, handler, auth_required=auth_required)
 
         return inner
 
@@ -323,9 +307,7 @@ def head(self, endpoint: str, auth_required: bool = False):
         """
 
         def inner(handler):
-            return self.add_route(
-                HttpMethod.HEAD, endpoint, handler, auth_required=auth_required
-            )
+            return self.add_route(HttpMethod.HEAD, endpoint, handler, auth_required=auth_required)
 
         return inner
 
@@ -337,9 +319,7 @@ def options(self, endpoint: str, auth_required: bool = False):
         """
 
         def inner(handler):
-            return self.add_route(
-                HttpMethod.OPTIONS, endpoint, handler, auth_required=auth_required
-            )
+            return self.add_route(HttpMethod.OPTIONS, endpoint, handler, auth_required=auth_required)
 
         return inner
 
@@ -351,9 +331,7 @@ def connect(self, endpoint: str, auth_required: bool = False):
         """
 
         def inner(handler):
-            return self.add_route(
-                HttpMethod.CONNECT, endpoint, handler, auth_required=auth_required
-            )
+            return self.add_route(HttpMethod.CONNECT, endpoint, handler, auth_required=auth_required)
 
         return inner
 
@@ -365,9 +343,7 @@ def trace(self, endpoint: str, auth_required: bool = False):
         """
 
         def inner(handler):
-            return self.add_route(
-                HttpMethod.TRACE, endpoint, handler, auth_required=auth_required
-            )
+            return self.add_route(HttpMethod.TRACE, endpoint, handler, auth_required=auth_required)
 
         return inner
 
@@ -378,20 +354,14 @@ def include_router(self, router):
         :param router Robyn: the router object to include the routes from
         """
         self.router.routes.extend(router.router.routes)
-        self.middleware_router.global_middlewares.extend(
-            router.middleware_router.global_middlewares
-        )
-        self.middleware_router.route_middlewares.extend(
-            router.middleware_router.route_middlewares
-        )
+        self.middleware_router.global_middlewares.extend(router.middleware_router.global_middlewares)
+        self.middleware_router.route_middlewares.extend(router.middleware_router.route_middlewares)
 
         # extend the websocket routes
         prefix = router.prefix
         for route in router.web_socket_router.routes:
             new_endpoint = f"{prefix}{route}"
-            self.web_socket_router.routes[
-                new_endpoint
-            ] = router.web_socket_router.routes[route]
+            self.web_socket_router.routes[new_endpoint] = router.web_socket_router.routes[route]
 
     def configure_authentication(self, authentication_handler: AuthenticationHandler):
         """
@@ -404,9 +374,7 @@ def configure_authentication(self, authentication_handler: AuthenticationHandler
 
 
 class SubRouter(Robyn):
-    def __init__(
-        self, file_object: str, prefix: str = "", config: Config = Config()
-    ) -> None:
+    def __init__(self, file_object: str, prefix: str = "", config: Config = Config()) -> None:
         super().__init__(file_object, config)
         self.prefix = prefix
 
@@ -446,9 +414,7 @@ def ALLOW_CORS(app: Robyn, origins: List[str]):
             "Access-Control-Allow-Methods",
             "GET, POST, PUT, DELETE, PATCH, HEAD, OPTIONS",
         )
-        app.add_request_header(
-            "Access-Control-Allow-Headers", "Content-Type, Authorization"
-        )
+        app.add_request_header("Access-Control-Allow-Headers", "Content-Type, Authorization")
         app.add_request_header("Access-Control-Allow-Credentials", "true")
 
 

robyn/argument_parser.py

@@ -3,9 +3,7 @@
 
 class Config:
     def __init__(self) -> None:
-        parser = argparse.ArgumentParser(
-            description="Robyn, a fast async web framework with a rust runtime."
-        )
+        parser = argparse.ArgumentParser(description="Robyn, a fast async web framework with a rust runtime.")
         parser.add_argument(
             "--processes",
             type=int,

robyn/reloader.py

@@ -47,23 +47,17 @@ def __init__(self, file_path: str) -> None:
         self.file_path = file_path
         self.process = None  # Keep track of the subprocess
 
-        self.last_reload = (
-            time.time()
-        )  # Keep track of the last reload. EventHandler is initialized with the process.
+        self.last_reload = time.time()  # Keep track of the last reload. EventHandler is initialized with the process.
 
     def stop_server(self):
         if self.process:
-            os.kill(
-                self.process.pid, signal.SIGTERM
-            )  # Stop the subprocess using os.kill()
+            os.kill(self.process.pid, signal.SIGTERM)  # Stop the subprocess using os.kill()
 
     def reload(self):
         self.stop_server()
 
         new_env = os.environ.copy()
-        new_env[
-            "IS_RELOADER_RUNNING"
-        ] = "True"  # This is used to check if a reloader is already running
+        new_env["IS_RELOADER_RUNNING"] = "True"  # This is used to check if a reloader is already running
 
         self.process = subprocess.Popen(
             [sys.executable, *sys.argv],

robyn/robyn.pyi

@@ -133,9 +133,7 @@ class Server:
         is_const: bool,
     ) -> None:
         pass
-    def add_global_middleware(
-        self, middleware_type: MiddlewareType, function: FunctionInfo
-    ) -> None:
+    def add_global_middleware(self, middleware_type: MiddlewareType, function: FunctionInfo) -> None:
         pass
     def add_middleware_route(
         self,

robyn/router.py

@@ -47,11 +47,7 @@ def _format_response(
         res: dict,
         default_response_header: dict,
     ) -> Response:
-        headers = (
-            {"Content-Type": "text/plain"}
-            if not default_response_header
-            else default_response_header
-        )
+        headers = {"Content-Type": "text/plain"} if not default_response_header else default_response_header
         response = {}
         if isinstance(res, dict):
             status_code = res.get("status_code", status_codes.HTTP_200_OK)
@@ -61,9 +57,7 @@ def _format_response(
             if not isinstance(status_code, int):
                 status_code = int(status_code)  # status_code can potentially be string
 
-            response = Response(
-                status_code=status_code, headers=headers, description=description
-            )
+            response = Response(status_code=status_code, headers=headers, description=description)
             file_path = res.get("file_path")
             if file_path is not None:
                 response.file_path = file_path
@@ -150,14 +144,10 @@ def __init__(self) -> None:
     def set_authentication_handler(self, authentication_handler: AuthenticationHandler):
         self.authentication_handler = authentication_handler
 
-    def add_route(
-        self, middleware_type: MiddlewareType, endpoint: str, handler: Callable
-    ) -> Callable:
+    def add_route(self, middleware_type: MiddlewareType, endpoint: str, handler: Callable) -> Callable:
         number_of_params = len(signature(handler).parameters)
         function = FunctionInfo(handler, iscoroutinefunction(handler), number_of_params)
-        self.route_middlewares.append(
-            RouteMiddleware(middleware_type, endpoint, function)
-        )
+        self.route_middlewares.append(RouteMiddleware(middleware_type, endpoint, function))
         return handler
 
     def add_auth_middleware(self, endpoint: str):
@@ -183,9 +173,7 @@ def inner_handler(request: Request, *args):
     # These inner functions are basically a wrapper around the closure(decorator) being returned.
     # They take a handler, convert it into a closure and return the arguments.
     # Arguments are returned as they could be modified by the middlewares.
-    def add_middleware(
-        self, middleware_type: MiddlewareType, endpoint: Optional[str]
-    ) -> Callable[..., None]:
+    def add_middleware(self, middleware_type: MiddlewareType, endpoint: Optional[str]) -> Callable[..., None]:
         def inner(handler):
             @wraps(handler)
             async def async_inner_handler(*args):

robyn/templating.py

@@ -18,11 +18,7 @@ def render_template(self, *args, **kwargs) -> Response:
 
 class JinjaTemplate(TemplateInterface):
     def __init__(self, directory, encoding="utf-8", followlinks=False):
-        self.env = Environment(
-            loader=FileSystemLoader(
-                searchpath=directory, encoding=encoding, followlinks=followlinks
-            )
-        )
+        self.env = Environment(loader=FileSystemLoader(searchpath=directory, encoding=encoding, followlinks=followlinks))
 
     def render_template(self, template_name, **kwargs) -> Response:
         rendered_template = self.env.get_template(template_name).render(**kwargs)

robyn/ws.py

@@ -24,9 +24,7 @@ def inner(handler):
             if type not in ["connect", "close", "message"]:
                 raise Exception(f"Socket method {type} does not exist")
             else:
-                self.methods[type] = FunctionInfo(
-                    handler, self._is_async(handler), self._num_params(handler)
-                )
+                self.methods[type] = FunctionInfo(handler, self._is_async(handler), self._num_params(handler))
                 self.robyn_object.add_web_socket(self.endpoint, self)
 
         return inner

scripts/format.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -x
+
+ruff format robyn integration_tests docs_src