PyPI - goosebit - Versions diffs - 0.1.2__py3-none-any.whl → 0.2.1__py3-none-any.whl - Mend

goosebit 0.1.2py3-none-any.whl → 0.2.1py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (105) hide show

goosebit/__init__.py +50 -19
goosebit/__main__.py +7 -0
goosebit/api/responses.py +5 -0
goosebit/api/routes.py +5 -15
goosebit/api/telemetry/__init__.py +1 -0
goosebit/{telemetry/__init__.py → api/telemetry/metrics.py} +9 -3
goosebit/api/telemetry/prometheus/__init__.py +2 -0
goosebit/api/telemetry/prometheus/readers.py +3 -0
goosebit/api/telemetry/prometheus/routes.py +18 -0
goosebit/api/telemetry/routes.py +9 -0
goosebit/api/v1/__init__.py +1 -0
goosebit/api/v1/devices/__init__.py +1 -0
goosebit/api/v1/devices/device/__init__.py +1 -0
goosebit/api/v1/devices/device/responses.py +13 -0
goosebit/api/v1/devices/device/routes.py +27 -0
goosebit/api/v1/devices/requests.py +7 -0
goosebit/api/v1/devices/responses.py +16 -0
goosebit/api/v1/devices/routes.py +35 -0
goosebit/api/v1/download/__init__.py +1 -0
goosebit/api/v1/download/routes.py +22 -0
goosebit/api/v1/rollouts/__init__.py +1 -0
goosebit/api/v1/rollouts/requests.py +16 -0
goosebit/api/v1/rollouts/responses.py +19 -0
goosebit/api/v1/rollouts/routes.py +50 -0
goosebit/api/v1/routes.py +9 -0
goosebit/api/v1/software/__init__.py +1 -0
goosebit/api/v1/software/requests.py +5 -0
goosebit/api/v1/software/responses.py +16 -0
goosebit/api/v1/software/routes.py +77 -0
goosebit/auth/__init__.py +101 -101
goosebit/db/__init__.py +11 -0
goosebit/db/config.py +10 -0
goosebit/db/migrations/models/0_20240830054046_init.py +136 -0
goosebit/{models.py → db/models.py} +17 -10
goosebit/realtime/logs.py +4 -3
goosebit/realtime/routes.py +2 -2
goosebit/schema/__init__.py +0 -0
goosebit/schema/devices.py +73 -0
goosebit/schema/rollouts.py +31 -0
goosebit/schema/software.py +37 -0
goosebit/settings/__init__.py +17 -0
goosebit/settings/const.py +21 -0
goosebit/settings/schema.py +86 -0
goosebit/ui/bff/__init__.py +1 -0
goosebit/ui/bff/devices/__init__.py +1 -0
goosebit/ui/bff/devices/requests.py +12 -0
goosebit/ui/bff/devices/responses.py +39 -0
goosebit/ui/bff/devices/routes.py +72 -0
goosebit/ui/bff/download/__init__.py +1 -0
goosebit/ui/bff/download/routes.py +22 -0
goosebit/ui/bff/rollouts/__init__.py +1 -0
goosebit/ui/bff/rollouts/responses.py +37 -0
goosebit/ui/bff/rollouts/routes.py +52 -0
goosebit/ui/bff/routes.py +11 -0
goosebit/ui/bff/software/__init__.py +1 -0
goosebit/ui/bff/software/responses.py +37 -0
goosebit/ui/bff/software/routes.py +83 -0
goosebit/ui/nav.py +16 -0
goosebit/ui/routes.py +29 -66
goosebit/ui/static/favicon.ico +0 -0
goosebit/ui/static/favicon.svg +1 -1
goosebit/ui/static/js/devices.js +47 -71
goosebit/ui/static/js/index.js +4 -9
goosebit/ui/static/js/login.js +23 -0
goosebit/ui/static/js/logs.js +1 -1
goosebit/ui/static/js/rollouts.js +33 -19
goosebit/ui/static/js/{firmware.js → software.js} +87 -86
goosebit/ui/static/js/util.js +60 -6
goosebit/ui/static/svg/goosebit-logo.svg +1 -1
goosebit/ui/templates/__init__.py +9 -1
goosebit/ui/templates/devices.html.jinja +75 -0
goosebit/ui/templates/index.html.jinja +25 -0
goosebit/ui/templates/login.html.jinja +57 -0
goosebit/ui/templates/logs.html.jinja +31 -0
goosebit/ui/templates/nav.html.jinja +84 -0
goosebit/ui/templates/rollouts.html.jinja +93 -0
goosebit/ui/templates/software.html.jinja +139 -0
goosebit/updater/controller/v1/routes.py +101 -96
goosebit/updater/controller/v1/schema.py +56 -0
goosebit/updater/manager.py +65 -65
goosebit/updater/routes.py +3 -11
goosebit/updates/__init__.py +91 -32
goosebit/updates/swdesc.py +2 -7
goosebit-0.2.1.dist-info/METADATA +173 -0
goosebit-0.2.1.dist-info/RECORD +95 -0
goosebit/api/devices.py +0 -136
goosebit/api/download.py +0 -34
goosebit/api/firmware.py +0 -57
goosebit/api/helper.py +0 -30
goosebit/api/rollouts.py +0 -87
goosebit/db.py +0 -37
goosebit/permissions.py +0 -75
goosebit/settings.py +0 -64
goosebit/telemetry/prometheus.py +0 -10
goosebit/ui/templates/devices.html +0 -115
goosebit/ui/templates/firmware.html +0 -163
goosebit/ui/templates/index.html +0 -23
goosebit/ui/templates/login.html +0 -65
goosebit/ui/templates/logs.html +0 -36
goosebit/ui/templates/nav.html +0 -117
goosebit/ui/templates/rollouts.html +0 -76
goosebit-0.1.2.dist-info/METADATA +0 -123
goosebit-0.1.2.dist-info/RECORD +0 -51
{goosebit-0.1.2.dist-info → goosebit-0.2.1.dist-info}/LICENSE +0 -0
{goosebit-0.1.2.dist-info → goosebit-0.2.1.dist-info}/WHEEL +0 -0

goosebit/ui/templates/nav.html.jinja ADDED Viewed

@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <script>const PERMISSIONS = {{request.user.get_json_permissions() | safe}};</script>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <title>{{ title }}</title>
+        <!--bootstrap-->
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
+              rel="stylesheet"
+              integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
+              crossorigin="anonymous" />
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"
+                integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz"
+                crossorigin="anonymous"></script>
+        <link rel="stylesheet"
+              href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css" />
+        <!--data tables-->
+        <link href="https://cdn.datatables.net/v/bs5/jq-3.7.0/dt-2.0.1/b-3.0.0/r-3.0.0/sl-2.0.0/datatables.min.css"
+              rel="stylesheet" />
+        <script src="https://cdn.datatables.net/v/bs5/jq-3.7.0/dt-2.0.1/b-3.0.0/r-3.0.0/sl-2.0.0/datatables.min.js"></script>
+        <!--favicon-->
+        <link rel="icon" href="{{ url_for('static', path='favicon.svg') }}" />
+        <!-- SweetAlert2 CSS -->
+        <link href="https://cdn.jsdelivr.net/npm/@sweetalert2/theme-bootstrap-4/bootstrap-4.css"
+              rel="stylesheet" />
+        <link href="https://cdn.jsdelivr.net/npm/sweetalert2@11/dist/sweetalert2.min.css"
+              rel="stylesheet" />
+        <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11/dist/sweetalert2.all.min.js"></script>
+        <!--data tables alignment fix-->
+        <style>
+            th.dt-type-numeric {
+                text-align: left !important;
+            }
+            td.dt-type-numeric {
+                text-align: left !important;
+            }
+            .active {
+                color: var(--bs-nav-pills-link-active-color);
+                background-color: transparent;
+            }
+        </style>
+        <script>const TABLE_UPDATE_TIME = 3000;</script>
+        <script src="{{ url_for('static', path='js/util.js') }}"></script>
+    </head>
+    <body data-bs-theme="dark">
+        <nav class="navbar navbar-expand-lg bg-body-tertiary">
+            <div class="container-fluid">
+                <a class="navbar-brand" href="{{ request.url_for('home_ui') }}">
+                    <img src="{{ request.url_for('static', path='svg/goosebit-logo.svg') }}"
+                         class="me-2"
+                         height="30px"
+                         width="30px"
+                         alt="gooseBit logo" />
+                    gooseBit
+                </a>
+                <button class="navbar-toggler"
+                        type="button"
+                        data-bs-toggle="collapse"
+                        data-bs-target="#navbar"
+                        aria-controls="navbar"
+                        aria-expanded="false"
+                        aria-label="Toggle navigation">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+                <div class="collapse navbar-collapse" id="navbar">
+                    <div class="navbar-nav">
+                        {% for nav_item in request.nav %}
+                            {% if compare_permissions(nav_item.permissions, request.user.permissions) %}
+                                <a class="nav-link{% if request.url == request.url_for(nav_item.function) %} active{% endif %}"
+                                   href="{{ request.url_for(nav_item.function) }}">{{ nav_item.text }}</a>
+                            {% endif %}
+                        {% endfor %}
+                    </div>
+                    <div class="navbar-nav d-flex flex-fill justify-content-end">
+                        <a class="nav-link" href="{{ request.url_for('logout') }}">Logout<i class="bi bi-box-arrow-right ps-2"></i></a>
+                    </div>
+                </div>
+            </div>
+        </nav>
+        {% block content %}
+        {% endblock content %}
+    </body>
+</html>

goosebit/ui/templates/rollouts.html.jinja ADDED Viewed

@@ -0,0 +1,93 @@
+{% 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="rollout-table" class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>Id</th>
+                            <th>Created</th>
+                            <th>Name</th>
+                            <th>Feed</th>
+                            <th>Software File</th>
+                            <th>Software Version</th>
+                            <th>Paused</th>
+                            <th>Success Count</th>
+                            <th>Failure Count</th>
+                        </tr>
+                    </thead>
+                    <tbody id="rollouts-list">
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    {% if compare_permissions(["rollout.write"], request.user.permissions) %}
+        <div class="modal" id="rollout-create-modal">
+            <div class="modal-dialog modal-lg">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Create Rollout</h5>
+                        <button type="button"
+                                class="btn-close"
+                                data-bs-dismiss="modal"
+                                aria-label="Close"></button>
+                    </div>
+                    <form id="rollout-form" class="needs-validation" novalidate>
+                        <div class="modal-body">
+                            <div class="form-group mb-3">
+                                <label for="rollout-selected-name">Name</label>
+                                <input id="rollout-selected-name"
+                                       class="form-control"
+                                       placeholder="Release 1" />
+                            </div>
+                            <div class="form-group mb-3">
+                                <label for="rollout-selected-feed">Feed</label>
+                                <input id="rollout-selected-feed"
+                                       class="form-control"
+                                       placeholder="qa"
+                                       required />
+                                <div class="invalid-feedback">
+                                    Feed missing. Use "default" if working with a single
+                                    feed.
+                                </div>
+                            </div>
+                            <div class="form-group mb-3">
+                                <label for="selected-sw">Software</label>
+                                <select class="form-select" id="selected-sw" required>
+                                    <option value="" disabled selected>Select software</option>
+                                </select>
+                                <div class="invalid-feedback">Select software for the rollout.</div>
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                            <button type="submit" class="btn btn-outline-light">Save changes</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    {% else %}
+        <div class="modal modal-lg fade" id="rollout-create-modal">
+            <div class="modal-dialog modal-dialog-centered modal-xl">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        Unavailable
+                        <button type="button"
+                                class="btn-close"
+                                data-bs-dismiss="modal"
+                                aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="alert alert-warning m-0" role="alert">You do not have permission to add rollouts.</div>
+                        <form id="rollout-form">
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+    <script src="{{ url_for('static', path='js/rollouts.js') }}"></script>
+{% endblock content %}

goosebit/ui/templates/software.html.jinja ADDED Viewed

@@ -0,0 +1,139 @@
+{% extends "nav.html.jinja" %}
+{% block content %}
+    <div class="container-fluid">
+        <div class="row p-2 pt-4 g-4 d-flex justify-content-center">
+            <div class="col">
+                <table id="software-table" class="table table-hover">
+                    <thead>
+                        <tr>
+                            <th>ID</th>
+                            <th>Name</th>
+                            <th>Version</th>
+                            <th>Compatibility</th>
+                            <th>Size</th>
+                        </tr>
+                    </thead>
+                    <tbody id="software-list">
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    {% if compare_permissions(["software.write"], request.user.permissions) %}
+        <div class="modal modal-lg fade" id="upload-modal">
+            <div class="modal-dialog modal-dialog-centered modal-xl">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <ul class="nav nav-underline nav-justified w-100" role="tablist">
+                            <li class="nav-item">
+                                <button class="nav-link active"
+                                        aria-current="page"
+                                        id="upload-tab"
+                                        data-bs-toggle="tab"
+                                        data-bs-target="#upload-tab-content"
+                                        type="button"
+                                        role="tab">Upload File</button>
+                            </li>
+                            <li class="nav-item">
+                                <button class="nav-link"
+                                        id="url-tab"
+                                        data-bs-toggle="tab"
+                                        data-bs-target="#url-tab-content"
+                                        type="button"
+                                        role="tab">Remote URL</button>
+                            </li>
+                        </ul>
+                    </div>
+                    <div class="tab-content">
+                        <div class="tab-pane active" id="upload-tab-content">
+                            <div class="modal-body">
+                                <form id="upload-form">
+                                    <div class="row g-3 row-cols-1">
+                                        <div id="upload-alerts"></div>
+                                        <div class="col">
+                                            <input class="form-control"
+                                                   type="file"
+                                                   accept=".swu"
+                                                   id="file-upload"
+                                                   name="file" />
+                                        </div>
+                                        <div class="col">
+                                            <input class="btn btn-outline-light w-100"
+                                                   id="file-upload-submit"
+                                                   type="submit"
+                                                   value="Upload" />
+                                            <div class="progress border border-light bg-dark d-none"
+                                                 style="height: 36px"
+                                                 role="progressbar"
+                                                 aria-valuenow="0"
+                                                 aria-valuemin="0"
+                                                 aria-valuemax="100">
+                                                <div class="progress-bar progress-bar-striped bg-success progress-bar-animated"
+                                                     id="upload-progress"
+                                                     style="width: 0%">0%</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                        <div class="tab-pane" id="url-tab-content">
+                            <div class="modal-body">
+                                <form id="url-form">
+                                    <div class="row g-3 row-cols-1">
+                                        <div id="url-alerts"></div>
+                                        <div class="col">
+                                            <div class="input-group">
+                                                <span class="input-group-text">File URL</span>
+                                                <input class="form-control" type="url" id="file-url" />
+                                            </div>
+                                        </div>
+                                        <div class="col">
+                                            <input class="btn btn-outline-light w-100"
+                                                   id="url-submit"
+                                                   type="submit"
+                                                   value="Upload" />
+                                            <div class="progress border border-light bg-dark d-none"
+                                                 style="height: 36px"
+                                                 role="progressbar"
+                                                 aria-valuenow="0"
+                                                 aria-valuemin="0"
+                                                 aria-valuemax="100">
+                                                <div class="progress-bar progress-bar-striped bg-success progress-bar-animated"
+                                                     id="url-progress"
+                                                     style="width: 0%">0%</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </form>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% else %}
+        <div class="modal modal-lg fade" id="upload-modal">
+            <div class="modal-dialog modal-dialog-centered modal-xl">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        Unavailable
+                        <button type="button"
+                                class="btn-close"
+                                data-bs-dismiss="modal"
+                                aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="alert alert-warning m-0" role="alert">You do not have permission to add software files.</div>
+                        <form id="upload-form">
+                        </form>
+                        <form id="url-form">
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+    <script src="{{ url_for('static', path='js/util.js') }}"></script>
+    <script src="{{ url_for('static', path='js/software.js') }}"></script>
+{% endblock content %}

goosebit/updater/controller/v1/routes.py CHANGED Viewed

@@ -1,26 +1,28 @@
-import json
 import logging
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, HTTPException
 from fastapi.requests import Request
+from fastapi.responses import FileResponse, RedirectResponse, Response
-from goosebit.models import Firmware, UpdateStateEnum
-from goosebit.settings import POLL_TIME_REGISTRATION
+from goosebit.db.models import Software, UpdateStateEnum
+from goosebit.settings import config
 from goosebit.updater.manager import HandlingType, UpdateManager, get_update_manager
 from goosebit.updates import generate_chunk
+from .schema import (
+    ConfigDataSchema,
+    FeedbackSchema,
+    FeedbackStatusExecutionState,
+    FeedbackStatusResultFinished,
+)
 logger = logging.getLogger("DDI API")
 router = APIRouter(prefix="/v1")
 @router.get("/{dev_id}")
-async def polling(
-    request: Request,
-    tenant: str,
-    dev_id: str,
-    updater: UpdateManager = Depends(get_update_manager),
-):
+async def polling(request: Request, dev_id: str, updater: UpdateManager = Depends(get_update_manager)):
     links = {}
     sleep = updater.poll_time
@@ -28,12 +30,11 @@ async def polling(
     if device.last_state == UpdateStateEnum.UNKNOWN:
         # device registration
-        sleep = POLL_TIME_REGISTRATION
+        sleep = config.poll_time_registration
         links["configData"] = {
             "href": str(
                 request.url_for(
                     "config_data",
-                    tenant=tenant,
                     dev_id=dev_id,
                 )
             )
@@ -47,15 +48,14 @@ async def polling(
     else:
         # provide update if available. Note: this is also required while in state "running", otherwise swupdate
         # won't confirm a successful testing (might be a bug/problem in swupdate)
-        handling_type, firmware = await updater.get_update()
+        handling_type, software = await updater.get_update()
         if handling_type != HandlingType.SKIP:
             links["deploymentBase"] = {
                 "href": str(
                     request.url_for(
                         "deployment_base",
-                        tenant=tenant,
                         dev_id=dev_id,
-                        action_id=firmware.id,
+                        action_id=software.id,
                     )
                 )
             }
@@ -68,15 +68,8 @@ async def polling(
 @router.put("/{dev_id}/configData")
-async def config_data(
-    request: Request,
-    dev_id: str,
-    tenant: str,
-    updater: UpdateManager = Depends(get_update_manager),
-):
-    data = await request.json()
-    # TODO: make standard schema to deal with this
-    await updater.update_config_data(**data["data"])
+async def config_data(_: Request, cfg: ConfigDataSchema, updater: UpdateManager = Depends(get_update_manager)):
+    await updater.update_config_data(**cfg.data)
     logger.info(f"Updating config data, device={updater.dev_id}")
     return {"success": True, "message": "Updated swupdate data."}
@@ -84,97 +77,109 @@ async def config_data(
 @router.get("/{dev_id}/deploymentBase/{action_id}")
 async def deployment_base(
     request: Request,
-    tenant: str,
-    dev_id: str,
     action_id: int,
     updater: UpdateManager = Depends(get_update_manager),
 ):
-    handling_type, firmware = await updater.get_update()
+    handling_type, software = await updater.get_update()
     logger.info(f"Request deployment base, device={updater.dev_id}")
     return {
-        "id": f"{action_id}",
+        "id": str(action_id),
         "deployment": {
             "download": str(handling_type),
             "update": str(handling_type),
-            "chunks": generate_chunk(request, firmware),
+            "chunks": await generate_chunk(request, updater),
         },
     }
 @router.post("/{dev_id}/deploymentBase/{action_id}/feedback")
 async def deployment_feedback(
-    request: Request,
-    tenant: str,
-    action_id: int,
-    updater: UpdateManager = Depends(get_update_manager),
+    _: Request, data: FeedbackSchema, action_id: int, updater: UpdateManager = Depends(get_update_manager)
 ):
-    try:
-        data = await request.json()
-    except json.JSONDecodeError as e:
-        logging.warning(f"Parsing deployment feedback failed, error={e}, device={updater.dev_id}")
-        return
-    try:
-        execution = data["status"]["execution"]
-        if execution == "proceeding":
-            await updater.update_device_state(UpdateStateEnum.RUNNING)
-            logger.debug(f"Installation in progress, device={updater.dev_id}")
-        elif execution == "closed":
-            state = data["status"]["result"]["finished"]
-            await updater.update_force_update(False)
-            await updater.update_log_complete(True)
-            reported_firmware = await Firmware.get_or_none(id=data["id"])
-            # From hawkBit docu: DDI defines also a status NONE which will not be interpreted by the update server
-            # and handled like SUCCESS.
-            if state == "success" or state == "none":
-                await updater.update_device_state(UpdateStateEnum.FINISHED)
-                # not guaranteed to be the correct rollout - see next comment.
-                rollout = await updater.get_rollout()
-                if rollout:
-                    if rollout.firmware == reported_firmware:
-                        rollout.success_count += 1
-                        await rollout.save()
-                    else:
-                        logging.warning(
-                            f"Updating rollout success stats failed, firmware={reported_firmware.id}, device={updater.dev_id}"  # noqa: E501
-                        )
-                # setting the currently installed version based on the current assigned firmware / existing rollouts
-                # is problematic. Better to assign custom action_id for each update (rollout id? firmware id? new id?).
-                # Alternatively - but requires customization on the gateway side - use version reported by the gateway.
-                await updater.update_fw_version(reported_firmware.version)
-                logger.debug(f"Installation successful, firmware={reported_firmware.version}, device={updater.dev_id}")
-            elif state == "failure":
-                await updater.update_device_state(UpdateStateEnum.ERROR)
-                # not guaranteed to be the correct rollout - see comment above.
-                rollout = await updater.get_rollout()
-                if rollout:
-                    if rollout.firmware == reported_firmware:
-                        rollout.failure_count += 1
-                        await rollout.save()
-                    else:
-                        logging.warning(
-                            f"Updating rollout failure stats failed, firmware={reported_firmware.id}, device={updater.dev_id}"  # noqa: E501
-                        )
-                logger.debug(f"Installation failed, firmware={reported_firmware.version}, device={updater.dev_id}")
-    except KeyError as e:
-        logging.warning(f"Processing deployment feedback failed, error={e}, device={updater.dev_id}")
+    if data.status.execution == FeedbackStatusExecutionState.PROCEEDING:
+        await updater.update_device_state(UpdateStateEnum.RUNNING)
+        logger.debug(f"Installation in progress, device={updater.dev_id}")
+    elif data.status.execution == FeedbackStatusExecutionState.CLOSED:
+        await updater.update_force_update(False)
+        await updater.update_log_complete(True)
+        reported_software = await Software.get_or_none(id=action_id)
+        # From hawkBit docu: DDI defines also a status NONE which will not be interpreted by the update server
+        # and handled like SUCCESS.
+        if data.status.result.finished in [FeedbackStatusResultFinished.SUCCESS, FeedbackStatusResultFinished.NONE]:
+            await updater.update_device_state(UpdateStateEnum.FINISHED)
+            # not guaranteed to be the correct rollout - see next comment.
+            rollout = await updater.get_rollout()
+            if rollout:
+                if rollout.software == reported_software:
+                    rollout.success_count += 1
+                    await rollout.save()
+                else:
+                    logging.warning(
+                        f"Updating rollout success stats failed, software={reported_software.id}, device={updater.dev_id}"  # noqa: E501
+                    )
+            # setting the currently installed version based on the current assigned software / existing rollouts
+            # is problematic. Better to assign custom action_id for each update (rollout id? software id? new id?).
+            # Alternatively - but requires customization on the gateway side - use version reported by the gateway.
+            await updater.update_sw_version(reported_software.version)
+            logger.debug(f"Installation successful, software={reported_software.version}, device={updater.dev_id}")
+        elif data.status.result.finished == FeedbackStatusResultFinished.FAILURE:
+            await updater.update_device_state(UpdateStateEnum.ERROR)
+            # not guaranteed to be the correct rollout - see comment above.
+            rollout = await updater.get_rollout()
+            if rollout:
+                if rollout.software == reported_software:
+                    rollout.failure_count += 1
+                    await rollout.save()
+                else:
+                    logging.warning(
+                        f"Updating rollout failure stats failed, software={reported_software.id}, device={updater.dev_id}"  # noqa: E501
+                    )
+            logger.debug(f"Installation failed, software={reported_software.version}, device={updater.dev_id}")
+    else:
+        logging.warning(
+            f"Device reported unhandled execution state, state={data.status.execution}, device={updater.dev_id}"
+        )
     try:
-        log = data["status"]["details"]
+        log = data.status.details
         await updater.update_log("\n".join(log))
-    except KeyError:
-        logging.warning(f"No details to update update log, device={updater.dev_id}")
+    except AttributeError:
+        logging.warning(f"No details to update device update log, device={updater.dev_id}")
     return {"id": str(action_id)}
+@router.head("/{dev_id}/download")
+async def download_artifact_head(_: Request, updater: UpdateManager = Depends(get_update_manager)):
+    _, software = await updater.get_update()
+    if software is None:
+        raise HTTPException(404)
+    response = Response()
+    response.headers["Content-Length"] = str(software.size)
+    return response
+@router.get("/{dev_id}/download")
+async def download_artifact(_: Request, updater: UpdateManager = Depends(get_update_manager)):
+    _, software = await updater.get_update()
+    if software is None:
+        raise HTTPException(404)
+    if software.local:
+        return FileResponse(
+            software.path,
+            media_type="application/octet-stream",
+            filename=software.path.name,
+        )
+    else:
+        return RedirectResponse(url=software.uri)

goosebit/updater/controller/v1/schema.py ADDED Viewed

@@ -0,0 +1,56 @@
+from __future__ import annotations
+from enum import StrEnum
+from typing import Any
+from pydantic import BaseModel
+class ConfigDataUpdateMode(StrEnum):
+    MERGE = "merge"
+    REPLACE = "replace"
+    REMOVE = "remove"
+class ConfigDataSchema(BaseModel):
+    data: dict[str, Any]
+    mode: ConfigDataUpdateMode = ConfigDataUpdateMode.MERGE
+class FeedbackStatusExecutionState(StrEnum):
+    CLOSED = "closed"
+    PROCEEDING = "proceeding"
+    CANCELED = "canceled"
+    SCHEDULED = "scheduled"
+    REJECTED = "rejected"
+    RESUMED = "resumed"
+    DOWNLOADED = "downloaded"
+    DOWNLOAD = "download"
+class FeedbackStatusProgressSchema(BaseModel):
+    cnt: int
+    of: int | None
+class FeedbackStatusResultFinished(StrEnum):
+    SUCCESS = "success"
+    FAILURE = "failure"
+    NONE = "none"
+class FeedbackStatusResultSchema(BaseModel):
+    finished: FeedbackStatusResultFinished
+    progress: FeedbackStatusProgressSchema = None
+class FeedbackStatusSchema(BaseModel):
+    execution: FeedbackStatusExecutionState
+    result: FeedbackStatusResultSchema
+    code: int = None
+    details: list[str] = None
+class FeedbackSchema(BaseModel):
+    time: str = None
+    status: FeedbackStatusSchema

goosebit 0.1.2__py3-none-any.whl → 0.2.1__py3-none-any.whl

goosebit 0.1.2py3-none-any.whl → 0.2.1py3-none-any.whl