Merge pull request #108 from nebulabroadcast/migrate-to-uv

martastain · web-flow · commit 3ba90aa584db · 2025-02-12T18:59:48.000+01:00
Switch to UV
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -1,4 +1,4 @@
-name: Publish a new version
+name: Publish a dev version
 
 on:
   push:
@@ -22,7 +22,7 @@ jobs:
         uses: SebRollen/toml-action@v1.0.1
         with:
           file: 'backend/pyproject.toml'
-          field: 'tool.poetry.version'
+          field: 'project.version'
 
       - name: Build docker image
         uses: docker/build-push-action@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,7 +22,7 @@ jobs:
         uses: SebRollen/toml-action@v1.0.1
         with:
           file: 'backend/pyproject.toml'
-          field: 'tool.poetry.version'
+          field: 'project.version'
 
       - name: Build docker image
         uses: docker/build-push-action@v4
diff --git a/Dockerfile b/Dockerfile
@@ -11,26 +11,22 @@ COPY ./frontend/public /frontend/public
 WORKDIR /frontend
 RUN yarn install && yarn build
 
-FROM python:3.12-bullseye
+FROM python:3.12-slim
 ENV PYTHONBUFFERED=1
 
 RUN \
   apt-get update \
-  && apt-get -yqq upgrade \
   && apt-get -yqq install \
-  cifs-utils
+  cifs-utils \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir /backend
 WORKDIR /backend
-COPY ./backend/pyproject.toml /backend/pyproject.toml
+COPY ./backend/pyproject.toml /backend/uv.lock .
+RUN --mount=from=ghcr.io/astral-sh/uv,source=/uv,target=/bin/uv \
+    uv pip install -r pyproject.toml --system
 
-RUN \
-  pip install -U pip && \
-  pip install poetry && \
-  poetry config virtualenvs.create false && \
-  poetry install --no-interaction --no-ansi --only main
-
-COPY ./backend /backend
+COPY ./backend .
 COPY --from=build /frontend/dist/ /frontend
 
 CMD ["/bin/bash", "manage", "start"]
diff --git a/Makefile b/Makefile
@@ -1,15 +1,15 @@
 IMAGE_NAME=nebulabroadcast/nebula-server:dev
-VERSION=$(shell cd backend && poetry run python -c 'import nebula' --version)
+VERSION=$(shell cd backend && uv run python -c 'import nebula' --version)
 
 check:
 	cd frontend && \
 		yarn format
 
 	cd backend && \
-		poetry version $(VERSION) && \
-		poetry run ruff format . && \
-		poetry run ruff check --fix . && \
-		poetry run mypy .
+		sed -i "s/^version = \".*\"/version = \"$(VERSION)\"/" pyproject.toml && \
+		uv run ruff format . && \
+		uv run ruff check --fix . && \
+		uv run mypy .
 
 build: check
 	docker build -t $(IMAGE_NAME) .
diff --git a/backend/api/browse.py b/backend/api/browse.py
@@ -115,9 +115,9 @@ def sanitize_value(value: SerializableValue) -> str:
 def build_conditions(conditions: list[ConditionModel]) -> list[str]:
     cond_list: list[str] = []
     for condition in conditions:
-        assert (
-            condition.key in nebula.settings.metatypes
-        ), f"Invalid meta key {condition.key}"
+        assert condition.key in nebula.settings.metatypes, (
+            f"Invalid meta key {condition.key}"
+        )
         condition.value = normalize_meta(condition.key, condition.value)
         if condition.operator in ["IN", "NOT IN"]:
             assert isinstance(condition.value, list), "Value must be a list"
diff --git a/backend/api/jobs/jobs_request.py b/backend/api/jobs/jobs_request.py
@@ -261,7 +261,7 @@ async def handle(
         LEFT JOIN services as s ON s.id = j.id_service
         LEFT JOIN users as u ON u.id = j.id_user
         LEFT JOIN actions as ac ON ac.id = j.id_action
-        {('WHERE ' + (' AND '.join(conds))) if conds else ''}
+        {("WHERE " + (" AND ".join(conds))) if conds else ""}
         ORDER BY
             j.progress DESC NULLS LAST,
             j.end_time DESC,
diff --git a/backend/api/order/set_rundown_order.py b/backend/api/order/set_rundown_order.py
@@ -64,25 +64,24 @@ async def set_rundown_order(
                     affected_bins.append(item["id_bin"])
 
             elif obj.type == "asset":
-                assert (
-                    obj.id is not None
-                ), "Asset ID must not be None when inserting asset to rundown"
+                assert obj.id is not None, (
+                    "Asset ID must not be None when inserting asset to rundown"
+                )
                 asset = await nebula.Asset.load(
                     obj.id,
                     connection=conn,
                     username=user.name,
                 )
                 if not asset:
                     nebula.log.error(
-                        f"Unable to append {obj.type} ID {obj.id}. " f"Asset not found",
+                        f"Unable to append {obj.type} ID {obj.id}. Asset not found",
                         user=user.name,
                     )
                     continue
 
                 if not can_append(asset, channel.rundown_accepts):
                     nebula.log.error(
-                        f"Unable to append {obj.type} ID {obj.id}. "
-                        f"Asset not allowed",
+                        f"Unable to append {obj.type} ID {obj.id}. Asset not allowed",
                         user=user.name,
                     )
                     continue
diff --git a/backend/api/scheduler/scheduler.py b/backend/api/scheduler/scheduler.py
@@ -48,9 +48,9 @@ async def scheduler(
         if (event_at_position is not None) and event_at_position.id != event_data.id:
             # Replace event at position
 
-            assert (
-                event_at_position.id is not None
-            ), "Event at position returned event without ID. This should not happen."
+            assert event_at_position.id is not None, (
+                "Event at position returned event without ID. This should not happen."
+            )
             affected_events.append(event_at_position.id)
 
             if event_data.id_asset:
@@ -88,9 +88,9 @@ async def scheduler(
                     new_item["mark_out"] = asset["mark_out"]
                     await new_item.save()
                     ex_bin.items.append(new_item)
-                    assert (
-                        ex_bin.id is not None
-                    ), "Bin ID should not be None at this point"
+                    assert ex_bin.id is not None, (
+                        "Bin ID should not be None at this point"
+                    )
                     affected_bins.append(ex_bin.id)
 
                 # update the event
diff --git a/backend/nebula/common.py b/backend/nebula/common.py
@@ -32,7 +32,7 @@ def hash_data(data: SerializableValue) -> str:
 
 def create_hash() -> str:
     """Create a pseudo-random hash (used as and access token)."""
-    return hash_data([time.time(), random.random()])
+    return hash_data([time.time(), random.random()])  # noqa: S311
 
 
 def sql_list(lst: list[Any], t: Literal["int", "str"] = "int") -> str:
diff --git a/backend/nebula/db.py b/backend/nebula/db.py
@@ -1,6 +1,7 @@
 __all__ = ["db", "DB", "DatabaseConnection"]
 
-from typing import Any, AsyncGenerator
+from collections.abc import AsyncGenerator
+from typing import Any
 
 import asyncpg
 import asyncpg.pool
diff --git a/backend/nebula/helpers/email.py b/backend/nebula/helpers/email.py
@@ -29,7 +29,8 @@ def markdown2email(text: str) -> MIMEMultipart | MIMEText:
         msg = MIMEMultipart("alternative")
         html = mistune.html(text)
         part1 = MIMEText(text, "plain")
-        part2 = MIMEText(html, "html")
+        if isinstance(html, str):  # mistune hack
+            part2 = MIMEText(html, "html")
         msg.attach(part1)
         msg.attach(part2)
         return msg
diff --git a/backend/nebula/helpers/scheduling.py b/backend/nebula/helpers/scheduling.py
@@ -136,7 +136,7 @@ def can_append(asset: nebula.Asset, conditions: "AcceptModel") -> bool:
         asset["content_type"] not in conditions.content_types
     ):
         nebula.log.warn(
-            f"Content type {asset['content_type']}" " not in {conditions.content_types}"
+            f"Content type {asset['content_type']} not in {{conditions.content_types}}"
         )
         return False
     return True
diff --git a/backend/nebula/log.py b/backend/nebula/log.py
@@ -6,7 +6,7 @@
 
 
 def indent(text: str, level: int = 4) -> str:
-    return text.replace("\n", f"\n{' '*level}")
+    return text.replace("\n", f"\n{' ' * level}")
 
 
 class LogLevel(enum.IntEnum):
diff --git a/backend/nebula/metadata/normalize.py b/backend/nebula/metadata/normalize.py
@@ -23,7 +23,7 @@ def is_serializable(value: Any) -> bool:
 
     This is used to check if a value can be stored in the database.
     """
-    return bool(isinstance(value, (str, int, float, bool, dict, list, tuple)))
+    return bool(isinstance(value, str | int | float | bool | dict | list | tuple))
 
 
 def normalize_meta(key: str, value: Any) -> Any:
@@ -38,9 +38,9 @@ def normalize_meta(key: str, value: Any) -> Any:
 
     # If there's no matching metatype, just return the value
     if key not in settings.metatypes:
-        assert is_serializable(
-            value
-        ), f"Value {value} set to unknown key {key} is not supported."
+        assert is_serializable(value), (
+            f"Value {value} set to unknown key {key} is not supported."
+        )
         return value
 
     meta_type = settings.metatypes[key]
@@ -76,9 +76,9 @@ def normalize_meta(key: str, value: Any) -> Any:
             return float(value)
 
         case MetaClass.OBJECT:
-            assert is_serializable(
-                value
-            ), f"Value {value} of key {key} is not supported."
+            assert is_serializable(value), (
+                f"Value {value} of key {key} is not supported."
+            )
             return value
 
         case MetaClass.FRACTION:
diff --git a/backend/nebula/metadata/utils.py b/backend/nebula/metadata/utils.py
@@ -1,7 +1,7 @@
 import re
 from collections import defaultdict
 from functools import lru_cache
-from typing import Any, DefaultDict
+from typing import Any
 
 from nxtools import unaccent
 
@@ -89,7 +89,7 @@ def make_cs_tree(
     elif order in ["title", "alias"]:
         items.sort(key=lambda x: unaccent(x["title"]))
 
-    parents: DefaultDict[str, list[Any]] = defaultdict(list[Any])
+    parents: defaultdict[str, list[Any]] = defaultdict(list[Any])
 
     for item in items:
         path = item["value"].split(".")
diff --git a/backend/nebula/objects/base.py b/backend/nebula/objects/base.py
@@ -1,5 +1,5 @@
 import time
-from typing import Any, Type, TypeVar
+from typing import Any, TypeVar
 
 import asyncpg
 from nxtools import slugify
@@ -65,7 +65,7 @@ def __init__(
         username: str | None = None,
     ) -> None:
         if connection is not None:
-            assert isinstance(connection, (asyncpg.pool.PoolConnectionProxy, DB))
+            assert isinstance(connection, asyncpg.pool.PoolConnectionProxy | DB)
             self.connection = connection
         else:
             self.connection = db
@@ -154,7 +154,7 @@ def update(self, meta: dict[str, Any]) -> None:
 
     @classmethod
     async def load(
-        cls: Type[T],
+        cls: type[T],
         id: int,
         connection: DatabaseConnection | None = None,
         username: str | None = None,
@@ -168,7 +168,7 @@ async def load(
 
     @classmethod
     def from_row(
-        cls: Type[T],
+        cls: type[T],
         row: asyncpg.Record,
         connection: DatabaseConnection | None = None,
         username: str | None = None,
@@ -183,7 +183,7 @@ def from_row(
 
     @classmethod
     def from_meta(
-        cls: Type[T],
+        cls: type[T],
         meta: dict[str, Any],
         connection: DatabaseConnection | None = None,
         username: str | None = None,
@@ -197,7 +197,7 @@ def from_meta(
 
     @classmethod
     def from_untrusted(
-        cls: Type[T],
+        cls: type[T],
         meta: dict[str, Any],
         connection: DatabaseConnection | None = None,
         username: str | None = None,
@@ -307,7 +307,7 @@ async def _insert(self) -> None:
             ["$" + str(i) for i in range(1, len(self.db_columns) + 2)]
         )
         query = f"""
-            INSERT INTO {self.object_type}s ({','.join(self.db_columns)}, meta)
+            INSERT INTO {self.object_type}s ({",".join(self.db_columns)}, meta)
             VALUES ({placeholders}) RETURNING id
             """
         qargs = [self.meta[col] for col in self.db_columns] + [self.meta]
diff --git a/backend/nebula/objects/item.py b/backend/nebula/objects/item.py
@@ -49,9 +49,9 @@ def asset(self, asset: Asset) -> None:
         assert isinstance(asset, Asset), "Asset must be an instance of Asset"
         if self["id_asset"] is None:
             self["id_asset"] = asset.id
-        assert (
-            asset.id == self["id_asset"]
-        ), f"Asset id must match item id_asset: {asset.id} != {self['id_asset']}"
+        assert asset.id == self["id_asset"], (
+            f"Asset id must match item id_asset: {asset.id} != {self['id_asset']}"
+        )
         self._asset = asset
 
         # BIG NO-NO - if needed, do that manually!!!
diff --git a/backend/nebula/objects/user.py b/backend/nebula/objects/user.py
@@ -18,7 +18,7 @@
 
 
 def hash_password(password: str) -> str:
-    if config.password_hashing == "legacy":
+    if config.password_hashing == "legacy":  # noqa: S105
         return hashlib.sha256(password.encode("ascii")).hexdigest()
     raise NotImplementedException("Hashing method not available")
 
diff --git a/backend/nebula/objects/utils.py b/backend/nebula/objects/utils.py
@@ -1,5 +1,3 @@
-from typing import Type
-
 from nebula.enum import ObjectType
 from nebula.objects.asset import Asset
 from nebula.objects.base import BaseObject
@@ -17,7 +15,7 @@
 }
 
 
-def get_object_class_by_name(name: ObjectType) -> Type[BaseObject]:
+def get_object_class_by_name(name: ObjectType) -> type[BaseObject]:
     if name not in object_types:
         raise KeyError(f"Unknown object type: {name}")
     return object_types[name]
diff --git a/backend/nebula/plugins/library.py b/backend/nebula/plugins/library.py
@@ -1,7 +1,6 @@
 import os
-from typing import Any
-
 import tomllib
+from typing import Any
 
 from nebula.common import classes_from_module, import_module
 from nebula.config import config
diff --git a/backend/nebula/redis.py b/backend/nebula/redis.py
@@ -1,5 +1,6 @@
 import json
-from typing import Any, AsyncGenerator
+from collections.abc import AsyncGenerator
+from typing import Any
 
 from pydantic import BaseModel
 from redis import asyncio as aioredis
@@ -88,7 +89,7 @@ async def incr(cls, namespace: str, key: str) -> int:
         """Increment a value in Redis"""
         if not cls.connected:
             await cls.connect()
-        res = await cls.redis_pool.incr(f"{namespace}-{key}")
+        res: int = await cls.redis_pool.incr(f"{namespace}-{key}")
         return res
 
     @classmethod
diff --git a/backend/pyproject.toml b/backend/pyproject.toml
diff --git a/backend/server/request.py b/backend/server/request.py
diff --git a/backend/server/session.py b/backend/server/session.py
diff --git a/backend/server/storage_monitor.py b/backend/server/storage_monitor.py
diff --git a/backend/uv.lock b/backend/uv.lock
