dreamteamprod · Tim020 · Dec 1, 2025 · Dec 1, 2025
diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml
@@ -3,8 +3,8 @@ name: Python Linting and Formatting
 on: [push]
 
 jobs:
-  pylint:
-    name: Pylint
+  ruff:
+    name: Ruff (Linting & Formatting)
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -22,52 +22,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt -r test_requirements.txt
-      - name: Analysing the code with pylint
+      - name: Run ruff linter
         run: |
-          pylint $(git ls-files '*.py') --output-format github
-
-  black:
-    name: Black
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./server
-    strategy:
-      matrix:
-        python-version: ["3.13"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt -r test_requirements.txt
-      - name: Check code formatting with black
-        run: |
-          black --check $(git ls-files '*.py')
-
-  isort:
-    name: isort
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./server
-    strategy:
-      matrix:
-        python-version: ["3.13"]
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt -r test_requirements.txt
-      - name: Check import sorting with isort
+          ruff check $(git ls-files '*.py') --output-format github
+      - name: Run ruff formatter
         run: |
-          isort --check $(git ls-files '*.py') --profile=black
+          ruff format --check $(git ls-files '*.py')
diff --git a/server/controllers/api/auth.py b/server/controllers/api/auth.py
@@ -21,7 +21,6 @@
 
 @ApiRoute("auth/create", ApiVersion.V1)
 class UserCreateController(BaseAPIController):
-
     async def post(self):
         data = escape.json_decode(self.request.body)
 

diff --git a/server/controllers/api/rbac.py b/server/controllers/api/rbac.py
@@ -94,7 +94,6 @@ async def get(self):
 
 @ApiRoute("rbac/user/roles", ApiVersion.V1)
 class RBACUserRolesHandler(BaseAPIController):
-
     @api_authenticated
     async def get(self):
         with self.make_session() as session:
@@ -117,7 +116,6 @@ async def get(self):
 
 @ApiRoute("rbac/user/roles/grant", ApiVersion.V1)
 class RBACRolesGrantHandler(BaseAPIController):
-
     @api_authenticated
     @require_admin
     async def post(self):
@@ -175,7 +173,6 @@ async def post(self):
 
 @ApiRoute("rbac/user/roles/revoke", ApiVersion.V1)
 class RBACRolesRevokeHandler(BaseAPIController):
-
     @api_authenticated
     @require_admin
     async def post(self):

diff --git a/server/controllers/api/show/acts.py b/server/controllers/api/show/acts.py
@@ -12,7 +12,6 @@
 
 @ApiRoute("show/act", ApiVersion.V1)
 class ActController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()
@@ -212,7 +211,6 @@ async def delete(self):
 
 @ApiRoute("show/act/first_scene", ApiVersion.V1)
 class FirstSceneController(BaseAPIController):
-
     @requires_show
     @no_live_session
     async def post(self):

diff --git a/server/controllers/api/show/cast.py b/server/controllers/api/show/cast.py
@@ -13,7 +13,6 @@
 
 @ApiRoute("show/cast", ApiVersion.V1)
 class CastController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

diff --git a/server/controllers/api/show/characters.py b/server/controllers/api/show/characters.py
@@ -13,7 +13,6 @@
 
 @ApiRoute("show/character", ApiVersion.V1)
 class CharacterController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()
@@ -222,7 +221,6 @@ async def get(self):
 
 @ApiRoute("show/character/group", ApiVersion.V1)
 class CharacterGroupController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

diff --git a/server/controllers/api/show/cues.py b/server/controllers/api/show/cues.py
@@ -15,7 +15,6 @@
 
 @ApiRoute("show/cues/types", ApiVersion.V1)
 class CueTypesController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()
@@ -165,7 +164,6 @@ async def delete(self):
 
 @ApiRoute("show/cues", ApiVersion.V1)
 class CueController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

diff --git a/server/controllers/api/show/microphones.py b/server/controllers/api/show/microphones.py
@@ -13,7 +13,6 @@
 
 @ApiRoute("show/microphones", ApiVersion.V1)
 class MicrophoneController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()
@@ -181,7 +180,6 @@ async def delete(self):
 
 @ApiRoute("show/microphones/allocations", ApiVersion.V1)
 class MicrophoneAllocationsController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

diff --git a/server/controllers/api/show/scenes.py b/server/controllers/api/show/scenes.py
@@ -12,7 +12,6 @@
 
 @ApiRoute("show/scene", ApiVersion.V1)
 class SceneController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

diff --git a/server/controllers/api/show/script/revisions.py b/server/controllers/api/show/script/revisions.py
@@ -23,7 +23,6 @@
 
 @ApiRoute("show/script/revisions", ApiVersion.V1)
 class ScriptRevisionsController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()
@@ -244,7 +243,6 @@ async def delete(self):
 
 @ApiRoute("show/script/revisions/current", ApiVersion.V1)
 class ScriptCurrentRevisionController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

diff --git a/server/controllers/api/show/script/script.py b/server/controllers/api/show/script/script.py
@@ -25,7 +25,6 @@
 
 @ApiRoute("/show/script", ApiVersion.V1)
 class ScriptController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()
@@ -177,7 +176,6 @@ async def post(self):
 
                 previous_line: Optional[ScriptLineRevisionAssociation] = None
                 for index, line in enumerate(lines):
-
                     # Validate each line before we do anything with it
                     valid_status, valid_reason = self._validate_line(line)
                     if not valid_status:
@@ -508,13 +506,13 @@ async def patch(self):
                         session.flush()
 
                         if previous_line.next_line:
-                            next_association: (
-                                ScriptLineRevisionAssociation
-                            ) = session.query(ScriptLineRevisionAssociation).get(
-                                {
-                                    "revision_id": revision.id,
-                                    "line_id": previous_line.next_line.id,
-                                }
+                            next_association: ScriptLineRevisionAssociation = (
+                                session.query(ScriptLineRevisionAssociation).get(
+                                    {
+                                        "revision_id": revision.id,
+                                        "line_id": previous_line.next_line.id,
+                                    }
+                                )
                             )
                             next_association.previous_line = line_object
                             line_association.next_line = next_association.line
@@ -535,50 +533,50 @@ async def patch(self):
                             and curr_association.previous_line
                         ):
                             # Next line and previous line, so need to update both
-                            next_association: (
-                                ScriptLineRevisionAssociation
-                            ) = session.query(ScriptLineRevisionAssociation).get(
-                                {
-                                    "revision_id": revision.id,
-                                    "line_id": curr_association.next_line.id,
-                                }
+                            next_association: ScriptLineRevisionAssociation = (
+                                session.query(ScriptLineRevisionAssociation).get(
+                                    {
+                                        "revision_id": revision.id,
+                                        "line_id": curr_association.next_line.id,
+                                    }
+                                )
                             )
                             next_association.previous_line = (
                                 curr_association.previous_line
                             )
                             session.flush()
 
-                            prev_association: (
-                                ScriptLineRevisionAssociation
-                            ) = session.query(ScriptLineRevisionAssociation).get(
-                                {
-                                    "revision_id": revision.id,
-                                    "line_id": curr_association.previous_line.id,
-                                }
+                            prev_association: ScriptLineRevisionAssociation = (
+                                session.query(ScriptLineRevisionAssociation).get(
+                                    {
+                                        "revision_id": revision.id,
+                                        "line_id": curr_association.previous_line.id,
+                                    }
+                                )
                             )
                             prev_association.next_line = next_association.line
                             session.flush()
                         elif curr_association.next_line:
                             # No previous line, so need to update next line only
-                            next_association: (
-                                ScriptLineRevisionAssociation
-                            ) = session.query(ScriptLineRevisionAssociation).get(
-                                {
-                                    "revision_id": revision.id,
-                                    "line_id": curr_association.next_line.id,
-                                }
+                            next_association: ScriptLineRevisionAssociation = (
+                                session.query(ScriptLineRevisionAssociation).get(
+                                    {
+                                        "revision_id": revision.id,
+                                        "line_id": curr_association.next_line.id,
+                                    }
+                                )
                             )
                             next_association.previous_line = None
                             session.flush()
                         elif curr_association.previous_line:
                             # No next line, so need to update previous line only
-                            prev_association: (
-                                ScriptLineRevisionAssociation
-                            ) = session.query(ScriptLineRevisionAssociation).get(
-                                {
-                                    "revision_id": revision.id,
-                                    "line_id": curr_association.previous_line.id,
-                                }
+                            prev_association: ScriptLineRevisionAssociation = (
+                                session.query(ScriptLineRevisionAssociation).get(
+                                    {
+                                        "revision_id": revision.id,
+                                        "line_id": curr_association.previous_line.id,
+                                    }
+                                )
                             )
                             prev_association.next_line = None
                             session.flush()
@@ -616,13 +614,13 @@ async def patch(self):
                             curr_association.previous_line = previous_line.line
 
                         if curr_association.next_line:
-                            next_association: (
-                                ScriptLineRevisionAssociation
-                            ) = session.query(ScriptLineRevisionAssociation).get(
-                                {
-                                    "revision_id": revision.id,
-                                    "line_id": curr_association.next_line.id,
-                                }
+                            next_association: ScriptLineRevisionAssociation = (
+                                session.query(ScriptLineRevisionAssociation).get(
+                                    {
+                                        "revision_id": revision.id,
+                                        "line_id": curr_association.next_line.id,
+                                    }
+                                )
                             )
                             next_association.previous_line = line_object
                         session.flush()
@@ -687,7 +685,6 @@ def get(self):
 
 @ApiRoute("/show/script/cuts", ApiVersion.V1)
 class ScriptCutsController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()
@@ -787,7 +784,6 @@ def put(self):
 
 @ApiRoute("/show/script/max_page", ApiVersion.V1)
 class ScriptMaxPageController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

diff --git a/server/controllers/api/show/sessions.py b/server/controllers/api/show/sessions.py
@@ -13,7 +13,6 @@
 
 @ApiRoute("show/sessions", ApiVersion.V1)
 class SessionsController(BaseAPIController):
-
     @requires_show
     def get(self):
         current_show = self.get_current_show()

diff --git a/server/controllers/api/show/shows.py b/server/controllers/api/show/shows.py
@@ -15,7 +15,6 @@
 
 @ApiRoute("show", ApiVersion.V1)
 class ShowController(BaseAPIController):
-
     @api_authenticated
     @require_admin
     async def post(self):
@@ -207,7 +206,6 @@ async def patch(self):
 
 @ApiRoute("shows", ApiVersion.V1)
 class ShowsController(BaseAPIController):
-
     def get(self):
         shows = []
         show_schema = ShowSchema()

diff --git a/server/controllers/api/websocket.py b/server/controllers/api/websocket.py
@@ -6,7 +6,6 @@
 
 @ApiRoute("ws/sessions", ApiVersion.V1)
 class WebsocketSessionsController(BaseAPIController):
-
     def get(self):
         session_scheme = SessionSchema()
         with self.make_session() as session:

diff --git a/server/controllers/controllers.py b/server/controllers/controllers.py
@@ -9,6 +9,7 @@
 from utils.web.base_controller import BaseAPIController, BaseController
 from utils.web.route import ApiRoute, ApiVersion, Route
 
+
 IMPORTED_CONTROLLERS = {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@
		from utils.web.base_controller import BaseAPIController, BaseController
		from utils.web.route import ApiRoute, ApiVersion, Route


		IMPORTED_CONTROLLERS = {}


Expand Down