goosebit 0.2.9__tar.gz → 0.2.10__tar.gz

{goosebit-0.2.9 → goosebit-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: goosebit
-Version: 0.2.9
+Version: 0.2.10
 Summary: A simplistic, opinionated remote update server implementing hawkBit™'s DDI API
 Author: Brett Rowan
 Author-email: 121075405+b-rowan@users.noreply.github.com
@@ -98,8 +98,8 @@ The software packages managed by gooseBit are either stored on the local filesys
 
 ## Assumptions
 
-- Devices use [SWUpdate](https://swupdate.org) or [RAUC](https://github.com/rauc/rauc) + [RAUC hawkBit Updater](https://github.com/rauc/rauc-hawkbit-updater) for managing software updates.
-- Devices send certain attributes (`sw_version`, `hw_model`, `hw_revision`).
+- Devices use [SWUpdate](https://swupdate.org) or [RAUC](https://rauc.io) + [RAUC hawkBit Updater](https://rauc-hawkbit-updater.readthedocs.io) for managing software updates.
+- Devices send certain attributes (`sw_version`, `hw_boardname`, `hw_revision`).
 - Semantic versions are used.
 - With RAUC and multiple hardware revisions, `compatible` in `manifest.raucm` is set to something like `my-board-rev4.2` or `Some Board 2b`.
 
@@ -109,7 +109,7 @@ The software packages managed by gooseBit are either stored on the local filesys
 
 When a device connects to gooseBit for the first time, it is automatically added to the device registry. The server will then request the device's configuration data, including:
 
-- `hw_model` and `hw_revision`: Used to match compatible software.
+- `hw_boardname` and `hw_revision`: Used to match compatible software.
 - `sw_version`: Indicates the currently installed software version.
 
 The registry tracks each device's status, including the last online timestamp, installed software version, update state, and more.

{goosebit-0.2.9 → goosebit-0.2.10}/README.md

@@ -63,8 +63,8 @@ The software packages managed by gooseBit are either stored on the local filesys
 
 ## Assumptions
 
-- Devices use [SWUpdate](https://swupdate.org) or [RAUC](https://github.com/rauc/rauc) + [RAUC hawkBit Updater](https://github.com/rauc/rauc-hawkbit-updater) for managing software updates.
-- Devices send certain attributes (`sw_version`, `hw_model`, `hw_revision`).
+- Devices use [SWUpdate](https://swupdate.org) or [RAUC](https://rauc.io) + [RAUC hawkBit Updater](https://rauc-hawkbit-updater.readthedocs.io) for managing software updates.
+- Devices send certain attributes (`sw_version`, `hw_boardname`, `hw_revision`).
 - Semantic versions are used.
 - With RAUC and multiple hardware revisions, `compatible` in `manifest.raucm` is set to something like `my-board-rev4.2` or `Some Board 2b`.
 
@@ -74,7 +74,7 @@ The software packages managed by gooseBit are either stored on the local filesys
 
 When a device connects to gooseBit for the first time, it is automatically added to the device registry. The server will then request the device's configuration data, including:
 
-- `hw_model` and `hw_revision`: Used to match compatible software.
+- `hw_boardname` and `hw_revision`: Used to match compatible software.
 - `sw_version`: Indicates the currently installed software version.
 
 The registry tracks each device's status, including the last online timestamp, installed software version, update state, and more.

{goosebit-0.2.9 → goosebit-0.2.10}/goosebit/schema/devices.py

@@ -5,7 +5,7 @@ from datetime import datetime
 from enum import Enum, IntEnum, StrEnum
 from typing import Annotated
 
-from pydantic import BaseModel, BeforeValidator, ConfigDict, Field, computed_field
+from pydantic import BaseModel, BeforeValidator, ConfigDict, computed_field
 
 from goosebit.db.models import UpdateModeEnum, UpdateStateEnum
 from goosebit.schema.software import HardwareSchema, SoftwareSchema
@@ -34,8 +34,8 @@ class DeviceSchema(BaseModel):
     name: str | None
     sw_version: str | None
 
-    assigned_software: SoftwareSchema | None = Field(exclude=True)
-    hardware: HardwareSchema | None = Field(exclude=True)
+    assigned_software: SoftwareSchema | None
+    hardware: HardwareSchema | None
 
     feed: str | None
     progress: int | None
@@ -53,26 +53,6 @@ class DeviceSchema(BaseModel):
     def polling(self) -> bool | None:
         return self.last_seen < (self.poll_seconds + 10) if self.last_seen is not None else None
 
-    @computed_field  # type: ignore[misc]
-    @property
-    def sw_target_version(self) -> str | None:
-        return self.assigned_software.version if self.assigned_software is not None else None
-
-    @computed_field  # type: ignore[misc]
-    @property
-    def sw_assigned(self) -> int | None:
-        return self.assigned_software.id if self.assigned_software is not None else None
-
-    @computed_field  # type: ignore[misc]
-    @property
-    def hw_model(self) -> str | None:
-        return self.hardware.model if self.hardware is not None else None
-
-    @computed_field  # type: ignore[misc]
-    @property
-    def hw_revision(self) -> str | None:
-        return self.hardware.revision if self.hardware is not None else None
-
     @computed_field  # type: ignore[misc]
     @property
     def poll_seconds(self) -> int:

{goosebit-0.2.9 → goosebit-0.2.10}/goosebit/schema/rollouts.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from datetime import datetime
 
-from pydantic import BaseModel, ConfigDict, Field, computed_field, field_serializer
+from pydantic import BaseModel, ConfigDict, field_serializer
 
 from goosebit.schema.software import SoftwareSchema
 
@@ -14,21 +14,11 @@ class RolloutSchema(BaseModel):
     created_at: datetime
     name: str | None
     feed: str
-    software: SoftwareSchema = Field(exclude=True)
+    software: SoftwareSchema
     paused: bool
     success_count: int
     failure_count: int
 
-    @computed_field  # type: ignore[misc]
-    @property
-    def sw_version(self) -> str:
-        return self.software.version
-
-    @computed_field  # type: ignore[misc]
-    @property
-    def sw_file(self) -> str:
-        return self.software.path.name
-
     @field_serializer("created_at")
     def serialize_created_at(self, created_at: datetime, _info):
         return int(created_at.timestamp() * 1000)

goosebit-0.2.10/goosebit/ui/bff/common/columns.py

@@ -0,0 +1,207 @@
+from .responses import DTColumnDescription
+
+
+class DeviceColumns:
+    id = DTColumnDescription(
+        title="ID",
+        data="id",
+        name="id",
+        searchable=True,
+        orderable=True,
+    )
+    name = DTColumnDescription(
+        title="Name",
+        data="name",
+        name="name",
+        searchable=True,
+        orderable=True,
+    )
+    hw_model = DTColumnDescription(
+        title="Model",
+        data="hardware.model",
+        name="hardware__model",
+        searchable=True,
+        orderable=True,
+    )
+    hw_revision = DTColumnDescription(
+        title="Revision",
+        data="hardware.revision",
+        name="hardware__revision",
+        searchable=True,
+        orderable=True,
+    )
+    feed = DTColumnDescription(
+        title="Feed",
+        data="feed",
+        name="feed",
+        searchable=True,
+        orderable=True,
+    )
+    sw_version = DTColumnDescription(
+        title="Installed Software",
+        data="sw_version",
+        name="sw_version",
+        searchable=True,
+        orderable=True,
+    )
+    sw_target_version = DTColumnDescription(
+        title="Target Software",
+        data="assigned_software.version",
+        name="assigned_software__version",
+        searchable=True,
+        orderable=True,
+    )
+    update_mode = DTColumnDescription(
+        title="Update Mode",
+        data="update_mode",
+        name="update_mode",
+        searchable=True,
+        orderable=True,
+    )
+    last_state = DTColumnDescription(
+        title="State",
+        data="last_state",
+        name="last_state",
+        searchable=True,
+        orderable=True,
+    )
+    force_update = DTColumnDescription(
+        title="Force Update",
+        data="force_update",
+        name="force_update",
+        orderable=True,
+    )
+    progress = DTColumnDescription(
+        title="Progress",
+        data="progress",
+        name="progress",
+        orderable=True,
+    )
+    last_ip = DTColumnDescription(
+        title="Last IP",
+        data="last_ip",
+        name="last_ip",
+        searchable=True,
+        orderable=True,
+    )
+    polling = DTColumnDescription(
+        title="Polling",
+        data="polling",
+    )
+    last_seen = DTColumnDescription(
+        title="Last Seen",
+        data="last_seen",
+        name="last_seen",
+        orderable=True,
+    )
+
+
+class RolloutColumns:
+    id = DTColumnDescription(
+        title="ID",
+        data="id",
+        visible=False,
+    )
+    created_at = DTColumnDescription(
+        title="Created",
+        data="created_at",
+        name="created_at",
+        orderable=True,
+    )
+    name = DTColumnDescription(
+        title="Name",
+        data="name",
+        name="name",
+        searchable=True,
+        orderable=True,
+    )
+    feed = DTColumnDescription(
+        title="Feed",
+        data="feed",
+        name="feed",
+        searchable=True,
+        orderable=True,
+    )
+    sw_file = DTColumnDescription(
+        title="Software File",
+        data="software.name",
+        name="software__uri",  # May cause strange orderings sorting by uri instead of the end of the path
+        searchable=True,
+        orderable=True,
+    )
+    sw_version = DTColumnDescription(
+        title="Software Version",
+        data="software.version",
+        name="software__version",
+        searchable=True,
+        orderable=True,
+    )
+    paused = DTColumnDescription(
+        title="Paused",
+        name="paused",
+        data="paused",
+        orderable=True,
+    )
+    success_count = DTColumnDescription(
+        title="Success Count",
+        data="success_count",
+        name="success_count",
+        orderable=True,
+    )
+    failure_count = DTColumnDescription(
+        title="Failure Count",
+        data="failure_count",
+        name="failure_count",
+        orderable=True,
+    )
+
+
+class SoftwareColumns:
+    id = DTColumnDescription(
+        title="ID",
+        data="id",
+        visible=False,
+    )
+    name = DTColumnDescription(
+        title="Name",
+        data="name",
+        name="uri",  # May cause strange orderings sorting by uri instead of the end of the path
+        searchable=True,
+        orderable=True,
+    )
+    version = DTColumnDescription(
+        title="Version",
+        data="version",
+        name="version",
+        searchable=True,
+        orderable=True,
+    )
+    compatibility = DTColumnDescription(
+        title="Compatibility",
+        name="compatibility",
+        data="compatibility",
+    )
+    size = DTColumnDescription(
+        title="Size",
+        name="size",
+        data="size",
+        orderable=True,
+    )
+
+
+class SettingsUsersColumns:
+    username = DTColumnDescription(
+        title="Username",
+        data="username",
+        searchable=True,
+        orderable=True,
+    )
+    enabled = DTColumnDescription(
+        title="Enabled",
+        data="enabled",
+        orderable=True,
+    )
+    permissions = DTColumnDescription(
+        title="Permissions",
+        data="permissions",
+    )

{goosebit-0.2.9 → goosebit-0.2.10}/goosebit/ui/bff/devices/routes.py

@@ -37,10 +37,14 @@ async def devices_get(dt_query: Annotated[DataTableRequest, Depends(parse_datata
         return (
             Q(id__icontains=search_value)
             | Q(name__icontains=search_value)
+            | Q(hardware__model__icontains=search_value)
+            | Q(hardware__revision__icontains=search_value)
             | Q(feed__icontains=search_value)
             | Q(sw_version__icontains=search_value)
+            | Q(assigned_software__version__icontains=search_value)
             | Q(update_mode=int(UpdateModeEnum.from_str(search_value)))
             | Q(last_state=int(UpdateStateEnum.from_str(search_value)))
+            | Q(last_ip__icontains=search_value)
         )
 
     query = Device.all().prefetch_related("assigned_software", "hardware", "assigned_software__compatibility")

{goosebit-0.2.9 → goosebit-0.2.10}/goosebit/ui/bff/rollouts/routes.py

@@ -23,7 +23,12 @@ router = APIRouter(prefix="/rollouts")
 )
 async def rollouts_get(dt_query: Annotated[DataTableRequest, Depends(parse_datatables_query)]) -> BFFRolloutsResponse:
     def search_filter(search_value):
-        return Q(name__icontains=search_value) | Q(feed__icontains=search_value)
+        return (
+            Q(name__icontains=search_value)
+            | Q(feed__icontains=search_value)
+            | Q(software__uri__icontains=search_value)
+            | Q(software__version__icontains=search_value)
+        )
 
     query = Rollout.all().prefetch_related("software", "software__compatibility")
 

{goosebit-0.2.9 → goosebit-0.2.10}/goosebit/ui/bff/software/responses.py

@@ -5,7 +5,8 @@ from tortoise.expressions import Q
 from tortoise.queryset import QuerySet
 
 from goosebit.schema.software import SoftwareSchema
-from goosebit.ui.bff.common.requests import DataTableOrderDirection, DataTableRequest
+
+from ..common.requests import DataTableOrderDirection, DataTableRequest
 
 
 class BFFSoftwareResponse(BaseModel):
@@ -41,7 +42,6 @@ class BFFSoftwareResponse(BaseModel):
                 query = query.limit(dt_query.length)
 
             software = await query.offset(dt_query.start).all()
-
         data = [SoftwareSchema.model_validate(s) for s in software]
 
         return cls(data=data, draw=dt_query.draw, records_total=total_records, records_filtered=filtered_records)

{goosebit-0.2.9 → goosebit-0.2.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "goosebit"
-version = "0.2.9"
+version = "0.2.10"
 description = "A simplistic, opinionated remote update server implementing hawkBit™'s DDI API"
 authors = [
     {name = "Brett Rowan", email = "121075405+b-rowan@users.noreply.github.com"}

goosebit-0.2.9/goosebit/ui/bff/common/columns.py

@@ -1,50 +0,0 @@
-from .responses import DTColumnDescription
-
-
-class DeviceColumns:
-    id = DTColumnDescription(title="ID", data="id", name="id", searchable=True, orderable=True)
-    name = DTColumnDescription(title="Name", data="name", name="name", searchable=True, orderable=True)
-    hw_model = DTColumnDescription(title="Model", data="hw_model")
-    hw_revision = DTColumnDescription(title="Revision", data="hw_revision")
-    feed = DTColumnDescription(title="Feed", data="feed", name="feed", searchable=True, orderable=True)
-    sw_version = DTColumnDescription(
-        title="Installed Software", data="sw_version", name="sw_version", searchable=True, orderable=True
-    )
-    sw_target_version = DTColumnDescription(title="Target Software", data="sw_target_version")
-    update_mode = DTColumnDescription(
-        title="Update Mode", data="update_mode", name="update_mode", searchable=True, orderable=True
-    )
-    last_state = DTColumnDescription(
-        title="State", data="last_state", name="last_state", searchable=True, orderable=True
-    )
-    force_update = DTColumnDescription(title="Force Update", data="force_update")
-    progress = DTColumnDescription(title="Progress", data="progress")
-    last_ip = DTColumnDescription(title="Last IP", data="last_ip")
-    polling = DTColumnDescription(title="Polling", data="polling")
-    last_seen = DTColumnDescription(title="Last Seen", data="last_seen")
-
-
-class RolloutColumns:
-    id = DTColumnDescription(title="ID", data="id", visible=False)
-    created_at = DTColumnDescription(title="Created", data="created_at", name="created_at", orderable=True)
-    name = DTColumnDescription(title="Name", data="name", name="name", searchable=True, orderable=True)
-    feed = DTColumnDescription(title="Feed", data="feed", name="feed", searchable=True, orderable=True)
-    sw_file = DTColumnDescription(title="Software File", data="sw_file", name="sw_file")
-    sw_version = DTColumnDescription(title="Software Version", data="sw_version", name="sw_version")
-    paused = DTColumnDescription(title="Paused", name="paused", data="paused")
-    success_count = DTColumnDescription(title="Success Count", data="success_count", name="success_count")
-    failure_count = DTColumnDescription(title="Failure Count", data="failure_count", name="failure_count")
-
-
-class SoftwareColumns:
-    id = DTColumnDescription(title="ID", data="id", visible=False)
-    name = DTColumnDescription(title="Name", data="name", name="name")
-    version = DTColumnDescription(title="Version", data="version", name="version", searchable=True, orderable=True)
-    compatibility = DTColumnDescription(title="Compatibility", name="compatibility", data="compatibility")
-    size = DTColumnDescription(title="Size", name="size", data="size")
-
-
-class SettingsUsersColumns:
-    username = DTColumnDescription(title="Username", data="username", searchable=True, orderable=True)
-    enabled = DTColumnDescription(title="Enabled", data="enabled")
-    permissions = DTColumnDescription(title="Permissions", data="permissions")