Ruff formatting

Author: gfrn

.github/workflows/_integration.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       integration-db:
-        image: ghcr.io/diamondlightsource/pato-backend-db:master
+        image: ghcr.io/diamondlightsource/scaup-backend-db:master
         ports:
           - 3306:3306
     strategy:
@@ -29,7 +29,7 @@ jobs:
           pip install .[dev]
       - name: Test with pytest
         env:
-          CONFIG_PATH: /home/runner/work/pato-backend/pato-backend/config.json
+          CONFIG_PATH: /home/runner/work/scaup-backend/scaup-backend/config.json
         run: |
           tox -e pytest
       - name: Upload coverage to Codecov

database/Dockerfile

@@ -2,6 +2,7 @@ FROM bitnami/postgresql:17-debian-12
 
 WORKDIR /docker-entrypoint-initdb.d
 
+# Dummy data
 ADD data.sql /docker-entrypoint-initdb.d/data.sql
 
 ENV POSTGRESQL_PASSWORD sample_root

src/scaup/crud/pdf.py

@@ -153,7 +153,7 @@ def add_dewar(self, dewar: Row):
         table = (
             (
                 "Proposal",
-                f"{dewar.proposalCode}{dewar.proposalNumber}-{dewar.visitNumber or "?"}",
+                f"{dewar.proposalCode}{dewar.proposalNumber}-{dewar.visitNumber or '?'}",
             ),
             ("Sample Collection", dewar.name),
             ("Code", dewar.code),
@@ -346,7 +346,7 @@ def header(self):
 
     def footer(self):
         self.set_xy(5, -8)
-        self.cell(text=f"Printed on {datetime.now().strftime("%d/%m/%Y %H:%M")}")
+        self.cell(text=f"Printed on {datetime.now().strftime('%d/%m/%Y %H:%M')}")
 
     def add_table(
         self,

src/scaup/crud/samples.py

@@ -73,7 +73,7 @@ def create_sample(shipmentId: int, params: SampleIn, token: str):
             {
                 "shipmentId": shipmentId,
                 **params.model_dump(exclude_unset=True, exclude={"copies"}),
-                "name": f"{params.name}_{i+sample_count}",
+                "name": f"{params.name}_{i + sample_count}",
             }
             for i in range(params.copies)
         ],

src/scaup/models/containers.py

@@ -25,8 +25,7 @@ class BaseContainer(BaseModel):
     name: Optional[str] = Field(
         default=None,
         description=(
-            "Base container name. If name is not provided, the container's type followed"
-            "by the container index is used"
+            "Base container name. If name is not provided, the container's type followedby the container index is used"
         ),
     )
     comments: Optional[str] = None

src/scaup/utils/session.py

@@ -70,7 +70,7 @@ def wrap(*args, **kwargs):
                 case ForeignKeyViolation():
                     columns = _get_columns_and_values(e.__cause__.diag.message_detail)
                     raise HTTPException(
-                        status_code=status.HTTP_404_NOT_FOUND, detail=f"Invalid {", ".join(columns.keys())} provided"
+                        status_code=status.HTTP_404_NOT_FOUND, detail=f"Invalid {', '.join(columns.keys())} provided"
                     )
                 case _:
                     app_logger.warning("Integrity error whilst performing request", exc_info=e)