goosebit 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

goosebit/updater/routes.py

@@ -3,14 +3,18 @@ import time
 from fastapi import APIRouter, Depends
 from fastapi.requests import Request
 
+from goosebit.settings import config
+
 from . import controller
 from .manager import get_update_manager
 
 
 async def log_last_connection(request: Request, dev_id: str):
-    host = request.client.host
     updater = await get_update_manager(dev_id)
-    await updater.update_last_connection(round(time.time()), host)
+    if config.track_device_ip:
+        await updater.update_last_connection(round(time.time()), request.client.host)
+    else:
+        await updater.update_last_connection(round(time.time()))
 
 
 router = APIRouter(

goosebit/updates/__init__.py

@@ -1,8 +1,9 @@
-import shutil
-from pathlib import Path
+from __future__ import annotations
+
 from urllib.parse import unquote, urlparse
 from urllib.request import url2pathname
 
+from anyio import Path
 from fastapi import HTTPException
 from fastapi.requests import Request
 from tortoise.expressions import Q
@@ -10,6 +11,7 @@ from tortoise.expressions import Q
 from goosebit.db.models import Hardware, Software
 from goosebit.updater.manager import UpdateManager
 
+from ..settings import config
 from . import swdesc
 
 
@@ -18,6 +20,8 @@ async def create_software_update(uri: str, temp_file: Path | None) -> Software:
 
     # parse swu header into update_info
     if parsed_uri.scheme == "file":
+        if temp_file is None:
+            raise HTTPException(500, "Temporary file missing, cannot parse file information")
         try:
             update_info = await swdesc.parse_file(temp_file)
         except Exception:
@@ -28,7 +32,6 @@ async def create_software_update(uri: str, temp_file: Path | None) -> Software:
             update_info = await swdesc.parse_remote(uri)
         except Exception:
             raise HTTPException(422, "Software swu header cannot be parsed")
-
     else:
         raise HTTPException(422, "Software URI protocol unknown")
 
@@ -42,10 +45,14 @@ async def create_software_update(uri: str, temp_file: Path | None) -> Software:
 
     # for local file: rename temp file to final name
     if parsed_uri.scheme == "file":
-        path = _unique_path(parsed_uri)
-        path.parent.mkdir(parents=True, exist_ok=True)
-        shutil.copy(temp_file, path)
-        uri = path.absolute().as_uri()
+        if temp_file is None:
+            raise HTTPException(500, "Temporary file missing, cannot parse file information")
+        filename = Path(url2pathname(unquote(parsed_uri.path))).name
+        path = Path(config.artifacts_dir).joinpath(update_info["hash"], filename)
+        await path.parent.mkdir(parents=True, exist_ok=True)
+        await temp_file.replace(path)
+        absolute = await path.absolute()
+        uri = absolute.as_uri()
 
     # create software
     software = await Software.create(
@@ -85,20 +92,6 @@ async def _is_software_colliding(update_info):
     return is_colliding
 
 
-def _unique_path(uri):
-    path = Path(url2pathname(unquote(uri.path)))
-    if not path.exists():
-        return path
-
-    counter = 1
-    new_path = path.with_name(f"{path.stem}-{counter}{path.suffix}")
-    while new_path.exists():
-        counter += 1
-        new_path = path.with_name(f"{path.stem}-{counter}{path.suffix}")
-
-    return new_path
-
-
 async def generate_chunk(request: Request, updater: UpdateManager) -> list:
     _, software = await updater.get_update()
     if software is None:

goosebit/updates/swdesc.py

@@ -1,12 +1,15 @@
 import hashlib
 import logging
-from pathlib import Path
+import random
+import string
 from typing import Any
 
-import aiofiles
 import httpx
 import libconf
 import semver
+from anyio import AsyncFile, Path, open_file
+
+from goosebit.settings import config
 
 logger = logging.getLogger(__name__)
 
@@ -20,8 +23,8 @@ def _append_compatibility(boardname, value, compatibility):
 def parse_descriptor(swdesc: libconf.AttrDict[Any, Any | None]):
     swdesc_attrs = {}
     try:
-        swdesc_attrs["version"] = semver.Version.parse(swdesc["software"]["version"])
-        compatibility = []
+        swdesc_attrs["version"] = semver.Version.parse(swdesc["software"]["version"], optional_minor_and_patch=True)
+        compatibility: list[dict[str, str]] = []
         _append_compatibility("default", swdesc["software"], compatibility)
 
         for key in swdesc["software"]:
@@ -41,7 +44,7 @@ def parse_descriptor(swdesc: libconf.AttrDict[Any, Any | None]):
 
 
 async def parse_file(file: Path):
-    async with aiofiles.open(file, "r+b") as f:
+    async with await open_file(file, "r+b") as f:
         # get file size
         size = int((await f.read(110))[54:62], 16)
         filename = b""
@@ -59,20 +62,38 @@ async def parse_file(file: Path):
         swdesc = libconf.loads((await f.read(size)).decode("utf-8"))
 
         swdesc_attrs = parse_descriptor(swdesc)
-        swdesc_attrs["size"] = file.stat().st_size
-        swdesc_attrs["hash"] = _sha1_hash_file(file)
+        stat = await file.stat()
+        swdesc_attrs["size"] = stat.st_size
+        swdesc_attrs["hash"] = await _sha1_hash_file(f)
         return swdesc_attrs
 
 
 async def parse_remote(url: str):
     async with httpx.AsyncClient() as c:
         file = await c.get(url)
-        async with aiofiles.tempfile.NamedTemporaryFile("w+b") as f:
-            await f.write(file.content)
-            return await parse_file(Path(f.name))
-
-
-def _sha1_hash_file(file_path: Path):
-    with file_path.open("rb") as f:
-        sha1_hash = hashlib.file_digest(f, "sha1")
+        artifacts_dir = Path(config.artifacts_dir)
+        tmp_file_path = artifacts_dir.joinpath("tmp", ("".join(random.choices(string.ascii_lowercase, k=12)) + ".tmp"))
+        await tmp_file_path.parent.mkdir(parents=True, exist_ok=True)
+        try:
+            async with await open_file(tmp_file_path, "w+b") as f:
+                await f.write(file.content)
+            file_data = await parse_file(Path(str(f.name)))
+        finally:
+            await tmp_file_path.unlink()
+        return file_data
+
+
+async def _sha1_hash_file(fileobj: AsyncFile):
+    last = await fileobj.tell()
+    await fileobj.seek(0)
+    sha1_hash = hashlib.sha1()
+    buf = bytearray(2**18)
+    view = memoryview(buf)
+    while True:
+        size = await fileobj.readinto(buf)
+        if size == 0:
+            break
+        sha1_hash.update(view[:size])
+
+    await fileobj.seek(last)
     return sha1_hash.hexdigest()

{goosebit-0.2.3.dist-info → goosebit-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goosebit
-Version: 0.2.3
+Version: 0.2.5
 Summary: 
 Author: Upstream Data
 Author-email: brett@upstreamdata.ca
@@ -8,10 +8,10 @@ Requires-Python: >=3.11,<4.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Provides-Extra: postgresql
 Requires-Dist: aerich (>=0.7.2,<0.8.0)
 Requires-Dist: aiocache (>=0.12.2,<0.13.0)
-Requires-Dist: aiofiles (>=24.1.0,<25.0.0)
 Requires-Dist: argon2-cffi (>=23.1.0,<24.0.0)
 Requires-Dist: asyncpg (>=0.29.0,<0.30.0) ; extra == "postgresql"
 Requires-Dist: fastapi[uvicorn] (>=0.111.0,<0.112.0)
@@ -20,9 +20,9 @@ Requires-Dist: itsdangerous (>=2.2.0,<3.0.0)
 Requires-Dist: jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: joserfc (>=1.0.0,<2.0.0)
 Requires-Dist: libconf (>=2.0.1,<3.0.0)
-Requires-Dist: opentelemetry-distro (>=0.47b0,<0.48)
-Requires-Dist: opentelemetry-exporter-prometheus (>=0.47b0,<0.48)
-Requires-Dist: opentelemetry-instrumentation-fastapi (>=0.47b0,<0.48)
+Requires-Dist: opentelemetry-distro (>=0.49b1,<0.50)
+Requires-Dist: opentelemetry-exporter-prometheus (>=0.49b1,<0.50)
+Requires-Dist: opentelemetry-instrumentation-fastapi (>=0.49b1,<0.50)
 Requires-Dist: pydantic-settings (>=2.4.0,<3.0.0)
 Requires-Dist: python-multipart (>=0.0.9,<0.0.10)
 Requires-Dist: semver (>=3.0.2,<4.0.0)
@@ -34,6 +34,8 @@ Description-Content-Type: text/markdown
 
 <img src="docs/img/goosebit-logo.png" style="width: 100px; height: 100px; display: block;">
 
+[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/UpstreamDataInc/goosebit/badge)](https://scorecard.dev/viewer/?uri=github.com/UpstreamDataInc/goosebit)
+
 ---
 
 A simplistic, opinionated remote update server implementing hawkBit™'s [DDI API](https://eclipse.dev/hawkbit/apis/ddi_api/).
@@ -43,10 +45,18 @@ A simplistic, opinionated remote update server implementing hawkBit™'s [DDI AP
 ### Installation
 
 1. Install dependencies using [Poetry](https://python-poetry.org/):
+
     ```bash
     poetry install
     ```
-2. Launch gooseBit:
+
+2. Create the database:
+
+    ```bash
+    poetry run aerich upgrade
+    ```
+
+3. Launch gooseBit:
     ```bash
     python main.py
     ```
@@ -117,6 +127,12 @@ After a model change create the migration
 poetry run aerich migrate
 ```
 
+To seed some sample data (attention: drops all current data) use
+
+```bash
+poetry run generate-sample-data
+```
+
 ### Code formatting and linting
 
 Code is formatted using different tools
@@ -139,7 +155,7 @@ poetry run pre-commit install
 To manually apply the hooks to all files use:
 
 ```bash
-pre-commit run --all-files
+poetry run pre-commit run --all-files
 ```
 
 ### Testing

{goosebit-0.2.3.dist-info → goosebit-0.2.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-goosebit/__init__.py,sha256=vhOcvSYVWRttpjBDeAVftUHZPVaLExvqFEV9LU69vgc,3039
+goosebit/__init__.py,sha256=qHY0WDT5n5PdX6D6tv2bAsBwBfMw-bcjEjKotIQDAzg,4158
 goosebit/__main__.py,sha256=ezSLOobcrbnBspFOSbyjuATEdk8B3aAj9cgEu647ujk,161
 goosebit/api/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
 goosebit/api/responses.py,sha256=HXLpFgL-iv5Ts6LKa3AMt1XGV1GbDE5GzjK66_3Gz5o,84
@@ -13,83 +13,87 @@ goosebit/api/v1/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,4
 goosebit/api/v1/devices/__init__.py,sha256=kzt5TBA-bJmDZFXYPohggbMOW7GhklyflaRKZNC0yDY,42
 goosebit/api/v1/devices/device/__init__.py,sha256=kzt5TBA-bJmDZFXYPohggbMOW7GhklyflaRKZNC0yDY,42
 goosebit/api/v1/devices/device/responses.py,sha256=THIPMzc6mwl7GmIXuqAeLLesFHfssvPrMJeHe8tV4mA,222
-goosebit/api/v1/devices/device/routes.py,sha256=Q9v7NzTFGdwQQmSRjGsFXl9qDwilVB1ieG9isXLaXgs,957
+goosebit/api/v1/devices/device/routes.py,sha256=rxdu7A2_NRcPV1ofXntrqE1elH9H2GuKE5kO07xQtXM,1173
 goosebit/api/v1/devices/requests.py,sha256=zx9eWXQanqBnmy-XboA_lrzInfx9ozOB4vG2jRTwnJA,131
-goosebit/api/v1/devices/responses.py,sha256=m1S0DfseNhlJ0mlw8J5msmXrdftUC0oZbwciy8eNfvY,402
-goosebit/api/v1/devices/routes.py,sha256=D6w6vq0XkRGMaE-QHHLNPPi5kiZ8JufdHFTyar1XH8s,1051
+goosebit/api/v1/devices/responses.py,sha256=NmaxpXKJ_YsQ92mvoTXG8HYB39_HLFmZaHo_uvXFmhg,185
+goosebit/api/v1/devices/routes.py,sha256=pcQx5U-KJXnGjbwheINOtdWtdcJOz3mvnRVcefAph10,1683
 goosebit/api/v1/download/__init__.py,sha256=kzt5TBA-bJmDZFXYPohggbMOW7GhklyflaRKZNC0yDY,42
 goosebit/api/v1/download/routes.py,sha256=wdeXA-dGO4D9FxaUP6OnUSW4_2NZhi_VgIxMcSRL2x4,675
 goosebit/api/v1/rollouts/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
 goosebit/api/v1/rollouts/requests.py,sha256=EF1VUwaK-f-2SSKxl2klKrMGfBkBo72iWKtw3cAzzW0,257
-goosebit/api/v1/rollouts/responses.py,sha256=grPcETWUSJrmVyQZs70jYhFjACsL-I_gPbg806BsauA,482
-goosebit/api/v1/rollouts/routes.py,sha256=wZki0Cz959gXYjQFjByU259TElubfhRs0RupYy8Xpl0,1683
+goosebit/api/v1/rollouts/responses.py,sha256=yKljabI1wQB6MXNXrF4aIi5csKRCo0A96RqTW6OwAjE,311
+goosebit/api/v1/rollouts/routes.py,sha256=afUQTjzrpLbHA68CEpMDMZ93C6-jp8JLrdjUEYUFm7o,1927
 goosebit/api/v1/routes.py,sha256=g9vL0VOuFSdNG3FnK3y_03trwv4X2OLN9ustJeCgc58,272
 goosebit/api/v1/software/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
 goosebit/api/v1/software/requests.py,sha256=visd81BMeWDKJADcC10NBJDs7Z3xQC-5nod9z_WHiPg,101
-goosebit/api/v1/software/responses.py,sha256=pxhhqdjSkKOpF8KfJZuiRer0o4L3ydvb81RarEyAUlI,418
-goosebit/api/v1/software/routes.py,sha256=s89cBMB_IM4XR7CtftK9a6tPoTHoR6B9Et8KtuakfU0,2612
-goosebit/auth/__init__.py,sha256=REU94_KD2YmYYLNZdVhCIkNq8J7DOcVKyi_Grh5V2dc,4558
-goosebit/db/__init__.py,sha256=B8yfzkcjrb-qH-C6O_Uix4Y1ttcyJSxMBKwIFwNNo08,202
+goosebit/api/v1/software/responses.py,sha256=l41-JWqyJmmEslXkx4NEJsGOqMrAB__nBUZS3E_9le0,192
+goosebit/api/v1/software/routes.py,sha256=r8lSPg1eQajPF6990DwnbJpDsuzW53rC5ktLuG3zyjA,3209
+goosebit/auth/__init__.py,sha256=VWrDFMfYfQpGV6Pc4xkb2zbUiQATpcsv5PbTiXQ9FoU,4703
+goosebit/db/__init__.py,sha256=ktnV4302iWzzTr-3oHXv3ud-23qTcAJ4tPLAXyTZZJw,462
 goosebit/db/config.py,sha256=YCtF52lQ5bEVtKsrqkSzQpbKmCbD79O8Tz0RE4thV3c,220
 goosebit/db/migrations/models/0_20240830054046_init.py,sha256=EBig7b0-AOWt_AE10rQf_0ZrserjKTm0r53wYInK5Co,5526
-goosebit/db/models.py,sha256=P-mdryY9wbxGQkU3Dvy90fTgcKsksYJWEab3Vu9U2t4,4389
+goosebit/db/migrations/models/1_20241109151811_update.py,sha256=cPbX-8Ga7HYKHQkESR5FXNlS-s-bsx4bsLrXvcfVIkQ,309
+goosebit/db/models.py,sha256=4gi-FsNJFLiAVNxV61Eb4qU8_Qn3zDNQmc2ngqDt_uU,5150
 goosebit/realtime/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
-goosebit/realtime/logs.py,sha256=JJ6bfVKzux9n3mXaUFoQhH2krGCpW7U1VzaloNmiORY,1223
+goosebit/realtime/logs.py,sha256=sjGg2n7H-4j4i02Kbq_YlECLFp33mmOmaoAZXeE8J9Y,1225
 goosebit/realtime/routes.py,sha256=yLHrA-BHHU5cpUNvxAPVxWC3KcB9aUrV31HT_th24Ls,265
 goosebit/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-goosebit/schema/devices.py,sha256=jaZSP0yA_ef7mbbHvgQSeoO5MWehnNiHuTA_HnoYerc,2469
-goosebit/schema/rollouts.py,sha256=_43CtAMX1j6AhCRQkSBkoukvhRzGeOYQgkVxCx3wt4g,788
-goosebit/schema/software.py,sha256=xxwe6ix-dNa3Nt3FL4_mGSr45yXHzCxesjADREDsrWI,884
+goosebit/schema/devices.py,sha256=mUmPLLEF506eKAxVPuUv5echqeHrkLIEuhNCHxL5y0Y,2659
+goosebit/schema/rollouts.py,sha256=Kp--XRC39SDs1bKf59q8fBHzitoW88ZMN1GVlbCQotQ,882
+goosebit/schema/software.py,sha256=W02rA0guQ7zeeVMTdwxt6EjCnTdf-9JewVJRqdN_GK0,951
 goosebit/settings/__init__.py,sha256=UkJa_G_VJckNf16Em0zz8sXgEi5pzxHFvZ96oa9MC3k,360
 goosebit/settings/const.py,sha256=hOpeA9pGmbU4V4mqcfhpHV7cmEjf2GIenmzCSz2Jpj8,779
-goosebit/settings/schema.py,sha256=T6MntOkM6Pbf98dQHZoEVUADwKpeJqCrFDc40ufCiG4,2543
+goosebit/settings/schema.py,sha256=ffDhMsyW6_TGIReJRiw3hisKUretdf1PnISTJ0yBe0o,2577
 goosebit/ui/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
 goosebit/ui/bff/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
+goosebit/ui/bff/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+goosebit/ui/bff/common/requests.py,sha256=Db8AohkRfsjUbx3pbdKVva7ZkLhAfBiDwAA221OXd5M,1183
+goosebit/ui/bff/common/responses.py,sha256=3LLIrBhsjdELnZ4kFc5-QDDYwdn7OvcD_2CObiJ6NME,303
+goosebit/ui/bff/common/util.py,sha256=_hz89EFLAL1UvbIvJJJSF80PL4T1mz1Vk7354wHBzOE,1144
 goosebit/ui/bff/devices/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
 goosebit/ui/bff/devices/requests.py,sha256=YbTUsyVLQZaUnn3dJ6AQe0mZl_H5aQC6QKCRxhCjGJc,286
-goosebit/ui/bff/devices/responses.py,sha256=ljXPzDX6CzWYguMOVYs1qBrlVyA0TqGn4kmxnkIgcAE,1431
-goosebit/ui/bff/devices/routes.py,sha256=H7ftSFz2d4BFNK7RV6a-m6m5eo6xv86xsDZweBj9k18,2680
+goosebit/ui/bff/devices/responses.py,sha256=4279xeu-soqgyOc4ncKZpai6juBQ3dl096p2LgtIu2s,1208
+goosebit/ui/bff/devices/routes.py,sha256=9WoGBheOkOT5-UDlQ0rtK-MJF4MNPuHxz3mBxdVhbWU,5260
 goosebit/ui/bff/download/__init__.py,sha256=kzt5TBA-bJmDZFXYPohggbMOW7GhklyflaRKZNC0yDY,42
 goosebit/ui/bff/download/routes.py,sha256=wdeXA-dGO4D9FxaUP6OnUSW4_2NZhi_VgIxMcSRL2x4,675
 goosebit/ui/bff/rollouts/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
-goosebit/ui/bff/rollouts/responses.py,sha256=wdQiMdgg6qY5pvu1aB3QsqZ1aQiOmBqFHk_ayoT9ByI,1403
-goosebit/ui/bff/rollouts/routes.py,sha256=Krr7ds_BRgezO-SUUBjXgxKpmWjijArJOLMkQLKLdGo,1408
-goosebit/ui/bff/routes.py,sha256=dq0fHXBiJfERzvUhvR4KVYCK3Ogf0Gb9wMSpzQanDac,323
+goosebit/ui/bff/rollouts/responses.py,sha256=gFEzWkFUBIka98lrA0ivdXBiTqaU5AugfJm2F3p33uk,1180
+goosebit/ui/bff/rollouts/routes.py,sha256=ZO-mkDzTgzssBtIbhOqSxrPgZYMVPsMW4EXw3f8YA1o,1553
+goosebit/ui/bff/routes.py,sha256=wx7so5Kfleop7ZdTEnMFSQ6P_Eck8iX6TnAqyetd3wM,428
 goosebit/ui/bff/software/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
-goosebit/ui/bff/software/responses.py,sha256=B85qsf5SgV4iuMvH5z3kv4IW0UDn4VkyPqg9z79BvNs,1404
-goosebit/ui/bff/software/routes.py,sha256=0BphAUN1wOGyBWnBuJufyje803lCRl10GWJTQWgt4BE,2610
-goosebit/ui/nav.py,sha256=ZdNGTST3bnRRT7P4vsS9LwlzB82H6SRshqSnQC35i_E,371
-goosebit/ui/routes.py,sha256=cc62_rEDjbniw0Fnsu7sZ13CNUuJ3z9z7F46urSUuBk,2151
+goosebit/ui/bff/software/responses.py,sha256=e7zMP8q2uWgKRy1q5Jp0HTNx-lggljOy2BFQRJglDSo,1920
+goosebit/ui/bff/software/routes.py,sha256=xwLsI6wTJzu_-eWAV1f8DlEWw67i22LK72D-uYLRMu0,3220
+goosebit/ui/nav.py,sha256=l-MCY2AN5v6jDCSDZoka3qjQ2_24SjLqUi1dYtxCjIM,378
+goosebit/ui/routes.py,sha256=J6Nkh1yShO810IRU3vjFlZCwYOy_qgwPCiOhHP3szbw,2015
 goosebit/ui/static/__init__.py,sha256=AsZiM3h9chQ_YaBbAD6TVFf0244Q9DetkDMl70q8swQ,135
 goosebit/ui/static/favicon.ico,sha256=MKAqEjW7F1-j2dmW4s08y4U0dFteIlU7rpLKakU0Lxk,4286
 goosebit/ui/static/favicon.svg,sha256=8zvM7o2Ob3YmTEV6Rj7rCTgSajvY6wIaAQAAjWwlDsw,8733
-goosebit/ui/static/js/devices.js,sha256=ZRAS1C_UzgQeB_MI8WjUGGaCPSUMOPPhgL-hns8B24I,11052
-goosebit/ui/static/js/index.js,sha256=ldsPX0PpGB1vkYEfMY05tYEgG6iCif3tx60aaAc3URY,5515
+goosebit/ui/static/js/devices.js,sha256=zseDgA1PnnreNajQRx7F38GuS_BjQugVtQLNPUhI3xg,13635
 goosebit/ui/static/js/login.js,sha256=9qlXki3udm5CmAO8UXUJe94Kc_-SJekdKjfH9TzJhgk,579
 goosebit/ui/static/js/logs.js,sha256=DgOWLKUvK-mM-oYRA0JJTIhtiCiegb5qCJ7pE9H2I3k,863
-goosebit/ui/static/js/rollouts.js,sha256=KQ_BaJn11VkLNBkIK7I_GLGpsPTjGg0ISEMfRszJtKQ,7174
-goosebit/ui/static/js/software.js,sha256=H9P4RjizC2EhL6Otjv4-iLnESdi3IvQYhWFvM4ddjaQ,8907
-goosebit/ui/static/js/util.js,sha256=D1EfZGCXlfmyDCXwae0XbHIsPckEbDNsqkCnrD_5D-o,3706
+goosebit/ui/static/js/rollouts.js,sha256=bswZSdPvDGSctpxyw2qhnuslTPugXDqkIMVBMYiY-Gc,7484
+goosebit/ui/static/js/software.js,sha256=3B9F6mLkvKhl0K1YJn4qkw5Wj4u_V9gabbz3ix84tDI,8728
+goosebit/ui/static/js/util.js,sha256=GlF2eVL6iGUWEbBgxzmLX4r3x5bLYh1YiBN7okX9dVE,4593
 goosebit/ui/static/svg/goosebit-logo.svg,sha256=8zvM7o2Ob3YmTEV6Rj7rCTgSajvY6wIaAQAAjWwlDsw,8733
 goosebit/ui/templates/__init__.py,sha256=xHCio6TnuNnYKLOZ3VhvbxyJPZ2ddzTSle_RmiuLrrA,378
-goosebit/ui/templates/devices.html.jinja,sha256=JROU5CInzjXlaiH2yxvCS1cepLXzU2O7TmiXUXJ2jes,3523
-goosebit/ui/templates/index.html.jinja,sha256=SDROkbhSRX6-pdET-yikfnrcfNKZR5zPhY2ByrSdAy4,907
+goosebit/ui/templates/devices.html.jinja,sha256=G2t3pKIe0e7LDkm9H0YwDddSvyXY4PaSPM11Rl9d1BY,5773
 goosebit/ui/templates/login.html.jinja,sha256=eQX1ypZ5iJ2L4v4lw8VB7GKluUjUYmpoUyUy8jY98Og,3050
 goosebit/ui/templates/logs.html.jinja,sha256=JLHogVHWcP_Y321dd-gHexNqix-PFfGVpEKbNmzsMU8,1310
-goosebit/ui/templates/nav.html.jinja,sha256=cKS8SGxI_zP5oSElQ_dosmuvmf7sC9L0dHY2sZi1H-g,4241
-goosebit/ui/templates/rollouts.html.jinja,sha256=5FKm6EoBS-2Sk5L4cfWRxuoYZ-NT7ehff6Q_NapWp9k,4515
+goosebit/ui/templates/nav.html.jinja,sha256=cdAM-9RZG_taugisf9Sh-UcRT3jLHAqNGbf9r7mk8ow,5725
+goosebit/ui/templates/rollouts.html.jinja,sha256=s9kIxRYO8OypqIQH8tQUwZJDDjsex89piuV4kh1eqwE,4728
 goosebit/ui/templates/software.html.jinja,sha256=CTIeNkPMJMvtDVWbcKl_BjvtAFV3bskpCcNg-lCJIZM,7551
 goosebit/updater/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
 goosebit/updater/controller/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
 goosebit/updater/controller/routes.py,sha256=8CnLb-kDuO-yFeWdu4apIyctCf9OzvJ011Az3QDGemU,123
 goosebit/updater/controller/v1/__init__.py,sha256=4RRIzqC6KbCESIC9Vc6G4iAa28IWQH4KROTGd2S4AoI,41
-goosebit/updater/controller/v1/routes.py,sha256=cuRIS-K_Pf3ufiSq1e5Uur7eR06jbLO4mQ-Tl9UZy-E,7110
-goosebit/updater/controller/v1/schema.py,sha256=VomKoJYRWsbpkChWrq3SrjSVhPtkz6mrUcMrer94Tks,1200
-goosebit/updater/manager.py,sha256=WVqNQwr0ymgBcoBkyuGA_b_rKz6j9rAjn1fee-g1WRQ,11478
-goosebit/updater/routes.py,sha256=GfjbSdFYaw28B8b7hByOPN8BMIbaGvbz4CbG1jQCmP8,515
-goosebit/updates/__init__.py,sha256=MjoFNaMbCYJRNeXtg90AdFy5ott41Og1q01-D0XMgmc,4185
-goosebit/updates/swdesc.py,sha256=APfUMUkP8Tz2H1Ajk9FQeJfjJWARxoMGPSnJQiU0Xzc,2419
-goosebit-0.2.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-goosebit-0.2.3.dist-info/METADATA,sha256=dlawimz01PevrQ4HtDDvaIhkhkIf2PPs348HH1hbHco,5420
-goosebit-0.2.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-goosebit-0.2.3.dist-info/RECORD,,
+goosebit/updater/controller/v1/routes.py,sha256=lJFx3gi01iI7ep_omPg5pI4TSVRa13kqfFSeXKuGIpY,7273
+goosebit/updater/controller/v1/schema.py,sha256=NwSyPx3A38iFabfOfzaVtxPozJQNacikP5WOhxMHqdg,1228
+goosebit/updater/manager.py,sha256=b_OqH5TBHicd1cZNzvkwlgpjXTa5N4BOe6oqiNXgYLI,10692
+goosebit/updater/routes.py,sha256=BYH8qdSUO99MQo09IQOkPNnmNZS74O5IZqIKcuNkNkY,647
+goosebit/updates/__init__.py,sha256=RIq3m7x0-ByWjU21llKZSnj4a0Hg27iSNMfO1G4Kjwc,4284
+goosebit/updates/swdesc.py,sha256=f2GxYwDvxgNsCTV_3RBlQ5oOWfB9cpNZuQBMMuZyZn8,3154
+goosebit-0.2.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+goosebit-0.2.5.dist-info/METADATA,sha256=nHUxHj5Qy3KK8K542dcMbzTxSZ3wtTErq-OCGejBqz8,5801
+goosebit-0.2.5.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+goosebit-0.2.5.dist-info/entry_points.txt,sha256=5p3wNB9_WEljksEBgZmOxO0DrBVhRxP20JD9JJ_lpb4,57
+goosebit-0.2.5.dist-info/RECORD,,

{goosebit-0.2.3.dist-info → goosebit-0.2.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any

goosebit-0.2.5.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+generate-sample-data=sample_data:main
+

goosebit/ui/static/js/index.js

@@ -1,155 +0,0 @@
-let dataTable;
-
-document.addEventListener("DOMContentLoaded", () => {
-    dataTable = new DataTable("#device-table", {
-        responsive: true,
-        paging: true,
-        processing: false,
-        serverSide: true,
-        scrollCollapse: true,
-        scroller: true,
-        scrollY: "65vh",
-        stateSave: true,
-        stateLoadParams: (settings, data) => {
-            // if save state is older than last breaking code change...
-            if (data.time <= 1722434386000) {
-                // ... delete it
-                for (const key of Object.keys(data)) {
-                    delete data[key];
-                }
-            }
-        },
-        ajax: {
-            url: "/ui/bff/devices",
-            contentType: "application/json",
-        },
-        initComplete: () => {
-            updateBtnState();
-        },
-        columnDefs: [
-            {
-                targets: "_all",
-                searchable: false,
-                orderable: false,
-                render: (data) => data || "-",
-            },
-        ],
-        columns: [
-            { data: "name", searchable: true, orderable: true },
-            {
-                data: "online",
-                render: (data, type) => {
-                    if (type === "display" || type === "filter") {
-                        const color = data ? "success" : "danger";
-                        return `
-                        <div class="text-${color}">
-                            ●
-                        </div>
-                        `;
-                    }
-                    return data;
-                },
-            },
-            { data: "uuid", searchable: true, orderable: true },
-            { data: "sw_version", searchable: true, orderable: true },
-            {
-                data: "progress",
-                render: (data, type) => {
-                    if (type === "display" || type === "filter") {
-                        return data ? `${data}%` : "-";
-                    }
-                    return data;
-                },
-            },
-            { data: "last_ip" },
-            {
-                data: "last_seen",
-                render: (data, type) => {
-                    if (type === "display" || type === "filter") {
-                        return secondsToRecentDate(data);
-                    }
-                    return data;
-                },
-            },
-        ],
-        select: true,
-        rowId: "uuid",
-        layout: {
-            top1Start: {
-                buttons: [
-                    {
-                        text: '<i class="bi bi-check-all"></i>',
-                        extend: "selectAll",
-                        titleAttr: "Select All",
-                    },
-                    {
-                        text: '<i class="bi bi-x"></i>',
-                        extend: "selectNone",
-                        titleAttr: "Clear Selection",
-                    },
-                    {
-                        text: '<i class="bi bi-file-earmark-arrow-down"></i>',
-                        action: (e, dt) => {
-                            const selectedDevices = dt.rows({ selected: true }).data().toArray();
-                            downloadLogins(selectedDevices);
-                        },
-                        className: "buttons-export-login",
-                        titleAttr: "Export Login",
-                    },
-                    {
-                        text: '<i class="bi bi-file-text"></i>',
-                        action: (e, dt) => {
-                            const selectedDevice = dt.rows({ selected: true }).data().toArray()[0];
-                            window.location.href = `/ui/logs/${selectedDevice.uuid}`;
-                        },
-                        className: "buttons-logs",
-                        titleAttr: "View Log",
-                    },
-                ],
-            },
-        },
-    });
-
-    dataTable
-        .on("select", () => {
-            updateBtnState();
-        })
-        .on("deselect", () => {
-            updateBtnState();
-        });
-
-    setInterval(() => {
-        dataTable.ajax.reload(null, false);
-    }, TABLE_UPDATE_TIME);
-});
-
-function updateBtnState() {
-    if (dataTable.rows({ selected: true }).any()) {
-        document.querySelector("button.buttons-select-none").classList.remove("disabled");
-        document.querySelector("button.buttons-export-login").classList.remove("disabled");
-    } else {
-        document.querySelector("button.buttons-select-none").classList.add("disabled");
-        document.querySelector("button.buttons-export-login").classList.add("disabled");
-    }
-    if (dataTable.rows({ selected: true }).count() === 1) {
-        document.querySelector("button.buttons-logs").classList.remove("disabled");
-    } else {
-        document.querySelector("button.buttons-logs").classList.add("disabled");
-    }
-}
-
-function downloadLogins(devices) {
-    const deviceLogins = devices.map((dev) => {
-        return [dev.name, `https://${dev.uuid}-access.loadsync.io`, dev.uuid];
-    });
-    deviceLogins.unshift(["Building", "Access Link", "Serial Number/Wifi SSID", "Login/Wifi Password"]);
-
-    const csvContent = `data:text/csv;charset=utf-8,${deviceLogins.map((e) => e.join(",")).join("\n")}`;
-    const encodedUri = encodeURI(csvContent);
-    const link = document.createElement("a");
-    link.setAttribute("href", encodedUri);
-    link.setAttribute("download", "LoadsyncLogins-Export.csv");
-    document.body.appendChild(link);
-
-    link.click();
-}

goosebit/ui/templates/index.html.jinja

@@ -1,25 +0,0 @@
-{% extends "nav.html.jinja" %}
-{% block content %}
-    <div class="container-fluid">
-        <div class="row p-2 d-flex justify-content-center">
-            <div class="col">
-                <table id="device-table" class="table table-hover">
-                    <thead>
-                        <tr>
-                            <th>Name</th>
-                            <th>Up</th>
-                            <th>UUID</th>
-                            <th>Software</th>
-                            <th>Progress</th>
-                            <th>Last IP</th>
-                            <th>Last Seen</th>
-                        </tr>
-                    </thead>
-                    <tbody id="devices-list">
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-    <script src="{{ url_for('static', path='js/index.js') }}"></script>
-{% endblock content %}