Merge pull request #122 from nebulabroadcast/remove-nxtools-dependency

Remove nxtools dependency

Author: martastain

backend/api/browse.py

@@ -1,13 +1,13 @@
 from typing import Literal
 
-from nxtools import slugify
 from pydantic import Field
 
 import nebula
 from nebula.common import SerializableValue, sql_list
 from nebula.enum import MetaClass
 from nebula.exceptions import NebulaException
 from nebula.metadata.normalize import normalize_meta
+from nx.utils import slugify
 from server.dependencies import CurrentUser
 from server.models import RequestModel, ResponseModel
 from server.request import APIRequest

backend/api/jobs/actions_request.py

@@ -1,8 +1,8 @@
-from nxtools import xml
 from pydantic import Field
 
 import nebula
 from nebula.enum import *  # noqa
+from nx.utils import xml
 from server.dependencies import CurrentUser
 from server.models import RequestModel, ResponseModel
 from server.request import APIRequest
@@ -55,6 +55,8 @@ async def handle(
                 continue
 
             action_settings = xml(row["settings"])
+            if action_settings is None:
+                continue
 
             if allow_if_elm := action_settings.findall("allow_if"):
                 allow_if_cond = allow_if_elm[0].text

backend/api/jobs/jobs_request.py

@@ -1,11 +1,11 @@
 import time
 from typing import Literal
 
-from nxtools import slugify
 from pydantic import Field
 
 import nebula
 from nebula.enum import JobState
+from nx.utils import slugify
 from server.dependencies import CurrentUser
 from server.models import RequestModel, ResponseModel
 from server.request import APIRequest

backend/api/scheduler/utils.py

@@ -1,7 +1,7 @@
 import asyncpg
-from nxtools import format_time
 
 import nebula
+from nx.utils import format_time
 
 
 async def get_event_at_time(id_channel: int, timestamp: int) -> nebula.Event | None:

backend/nebula/db.py

@@ -12,7 +12,7 @@
 
 
 class DB:
-    _pool: asyncpg.pool.Pool | None = None  # type: ignore
+    _pool: asyncpg.pool.Pool | None = None
 
     async def init_connection(self, conn) -> None:  # type: ignore
         await conn.set_type_codec(
@@ -30,7 +30,7 @@ async def connect(self) -> None:
         )
         assert self._pool is not None
 
-    async def pool(self) -> asyncpg.pool.Pool:  # type: ignore
+    async def pool(self) -> asyncpg.pool.Pool:
         """Return the Postgres connection pool. If it doesn't exist, create it."""
         if self._pool is None:
             await self.connect()
@@ -67,6 +67,6 @@ async def iterate(self, query: str, *args: Any) -> AsyncGenerator[asyncpg.Record
                 yield record
 
 
-DatabaseConnection = asyncpg.pool.PoolConnectionProxy | DB  # type: ignore
+DatabaseConnection = asyncpg.pool.PoolConnectionProxy | DB
 
 db = DB()

backend/nebula/helpers/scheduling.py

@@ -1,9 +1,8 @@
 import datetime
 from typing import TYPE_CHECKING, Any
 
-from nxtools import datestr2ts, s2time
-
 import nebula
+from nx.utils import datestr2ts, s2time
 
 if TYPE_CHECKING:
     from nebula.settings.models import AcceptModel, PlayoutChannelSettings

backend/nebula/metadata/format.py

@@ -1,10 +1,9 @@
 from typing import TYPE_CHECKING, Any
 
-from nxtools import format_filesize, format_time, s2tc
-
 from nebula.enum import ContentType, MediaType, MetaClass, ObjectStatus, QCState
 from nebula.metadata.utils import get_cs_titles
 from nebula.settings import settings
+from nx.utils import format_filesize, format_time, s2tc
 
 if TYPE_CHECKING:
     from nebula.objects.base import BaseObject

backend/nebula/metadata/utils.py

@@ -3,10 +3,9 @@
 from functools import lru_cache
 from typing import Any
 
-from nxtools import unaccent
-
 from nebula.settings import settings
 from nebula.settings.common import LanguageCode
+from nx.utils import unaccent
 
 
 @lru_cache(maxsize=512)

backend/nebula/objects/asset.py

@@ -1,11 +1,10 @@
 import os
 
-from nxtools import get_base_name, slugify
-
 from nebula.enum import ContentType, MediaType, ObjectStatus
 from nebula.objects.base import BaseObject
 from nebula.settings import settings
 from nebula.storages import storages
+from nx.utils import get_base_name, slugify
 
 
 class Asset(BaseObject):

backend/nebula/objects/base.py

@@ -2,7 +2,6 @@
 from typing import Any, TypeVar
 
 import asyncpg
-from nxtools import slugify
 
 from nebula.db import DB, DatabaseConnection, db
 from nebula.enum import ObjectTypeId
@@ -16,6 +15,7 @@
 from nebula.metadata.format import format_meta
 from nebula.metadata.normalize import normalize_meta
 from nebula.settings import settings
+from nx.utils import slugify
 
 T = TypeVar("T", bound="BaseObject")