PyPI - goosebit - Versions diffs - 0.2.5__py3-none-any.whl → 0.2.7__py3-none-any.whl - Mend

goosebit 0.2.5py3-none-any.whl → 0.2.7py3-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 (88) hide show

goosebit/__init__.py +41 -7
goosebit/api/telemetry/metrics.py +1 -5
goosebit/api/v1/devices/device/responses.py +1 -0
goosebit/api/v1/devices/device/routes.py +8 -8
goosebit/api/v1/devices/requests.py +20 -0
goosebit/api/v1/devices/routes.py +68 -8
goosebit/api/v1/download/routes.py +14 -3
goosebit/api/v1/rollouts/routes.py +5 -4
goosebit/api/v1/routes.py +2 -1
goosebit/api/v1/settings/routes.py +14 -0
goosebit/api/v1/settings/users/__init__.py +1 -0
goosebit/api/v1/settings/users/requests.py +16 -0
goosebit/api/v1/settings/users/responses.py +7 -0
goosebit/api/v1/settings/users/routes.py +56 -0
goosebit/api/v1/software/routes.py +18 -14
goosebit/auth/__init__.py +49 -13
goosebit/auth/permissions.py +80 -0
goosebit/db/config.py +57 -1
goosebit/db/migrations/models/2_20241121113728_update.py +11 -0
goosebit/db/migrations/models/3_20241121140210_update.py +11 -0
goosebit/db/migrations/models/4_20250324110331_update.py +16 -0
goosebit/db/migrations/models/4_20250402085235_rename_uuid_to_id.py +11 -0
goosebit/db/migrations/models/5_20250619090242_null_feed.py +83 -0
goosebit/db/models.py +19 -8
goosebit/db/pg_ssl_context.py +51 -0
goosebit/device_manager.py +262 -0
goosebit/plugins/__init__.py +32 -0
goosebit/schema/devices.py +8 -5
goosebit/schema/plugins.py +67 -0
goosebit/schema/updates.py +15 -0
goosebit/schema/users.py +9 -0
goosebit/settings/__init__.py +0 -3
goosebit/settings/schema.py +60 -14
goosebit/storage/__init__.py +62 -0
goosebit/storage/base.py +14 -0
goosebit/storage/filesystem.py +111 -0
goosebit/storage/s3.py +104 -0
goosebit/ui/bff/common/columns.py +50 -0
goosebit/ui/bff/common/responses.py +1 -0
goosebit/ui/bff/devices/device/__init__.py +1 -0
goosebit/ui/bff/devices/device/routes.py +17 -0
goosebit/ui/bff/devices/requests.py +1 -0
goosebit/ui/bff/devices/routes.py +49 -46
goosebit/ui/bff/download/routes.py +14 -3
goosebit/ui/bff/rollouts/routes.py +32 -4
goosebit/ui/bff/routes.py +2 -1
goosebit/ui/bff/settings/__init__.py +1 -0
goosebit/ui/bff/settings/routes.py +20 -0
goosebit/ui/bff/settings/users/__init__.py +1 -0
goosebit/ui/bff/settings/users/responses.py +33 -0
goosebit/ui/bff/settings/users/routes.py +80 -0
goosebit/ui/bff/software/routes.py +40 -12
goosebit/ui/nav.py +12 -2
goosebit/ui/routes.py +66 -13
goosebit/ui/static/js/devices.js +32 -24
goosebit/ui/static/js/login.js +21 -5
goosebit/ui/static/js/logs.js +7 -22
goosebit/ui/static/js/rollouts.js +31 -30
goosebit/ui/static/js/settings.js +322 -0
goosebit/ui/static/js/setup.js +28 -0
goosebit/ui/static/js/software.js +127 -121
goosebit/ui/static/js/util.js +25 -4
goosebit/ui/templates/__init__.py +10 -1
goosebit/ui/templates/login.html.jinja +5 -0
goosebit/ui/templates/nav.html.jinja +13 -5
goosebit/ui/templates/rollouts.html.jinja +4 -22
goosebit/ui/templates/settings.html.jinja +88 -0
goosebit/ui/templates/setup.html.jinja +71 -0
goosebit/ui/templates/software.html.jinja +0 -11
goosebit/updater/controller/v1/routes.py +119 -77
goosebit/updater/routes.py +83 -8
goosebit/updates/__init__.py +24 -31
goosebit/updates/swdesc.py +15 -8
goosebit/users/__init__.py +63 -0
goosebit/util/__init__.py +0 -0
goosebit/util/path.py +42 -0
goosebit/util/version.py +92 -0
goosebit-0.2.7.dist-info/METADATA +280 -0
goosebit-0.2.7.dist-info/RECORD +133 -0
{goosebit-0.2.5.dist-info → goosebit-0.2.7.dist-info}/WHEEL +1 -1
goosebit/realtime/logs.py +0 -42
goosebit/realtime/routes.py +0 -13
goosebit/updater/manager.py +0 -325
goosebit-0.2.5.dist-info/METADATA +0 -189
goosebit-0.2.5.dist-info/RECORD +0 -99
/goosebit/{realtime → api/v1/settings}/__init__.py +0 -0
{goosebit-0.2.5.dist-info → goosebit-0.2.7.dist-info}/LICENSE +0 -0
{goosebit-0.2.5.dist-info → goosebit-0.2.7.dist-info}/entry_points.txt +0 -0

goosebit/ui/templates/login.html.jinja CHANGED Viewed

@@ -31,11 +31,15 @@
                                      alt="gooseBit Logo" />
                             </div>
                         </div>
+                        <div id="login_error" class="alert alert-danger d-none" role="alert">
+                            <!-- Error message will be inserted here -->
+                        </div>
                         <form method="post" id="login_form">
                             <div class="form-outline form-white mb-4">
                                 <input type="email"
                                        id="username"
                                        name="username"
+                                       autocomplete="username"
                                        placeholder="Email"
                                        class="form-control form-control-lg" />
                             </div>
@@ -43,6 +47,7 @@
                                 <input type="password"
                                        id="password"
                                        name="password"
+                                       autocomplete="current-password"
                                        placeholder="Password"
                                        class="form-control form-control-lg" />
                             </div>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <script>const PERMISSIONS = {{request.user.get_json_permissions() | safe}};</script>
+        <script>const PERMISSIONS = {{request.user.permissions | safe}};</script>
         <meta charset="utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <title>{{ title }}</title>
@@ -84,6 +84,7 @@
                          width="30px"
                          alt="gooseBit logo" />
                     gooseBit
+                    <small class="text-muted">v{{ request.app.version }}</small>
                 </a>
                 <button class="navbar-toggler"
                         type="button"
@@ -97,14 +98,21 @@
                 <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>
+                            {% if nav_item.show %}
+                                {% 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 %}
                             {% 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>
+                        {% if compare_permissions("goosebit.settings", request.user.permissions) %}
+                            <a class="nav-link ps-3 me-2 border-start"
+                               href="{{ request.url_for('settings_ui') }}">Settings<i class="bi bi-gear ps-2"></i></a>
+                        {% endif %}
+                        <a class="nav-link ps-3 border-start"
+                           href="{{ request.url_for('logout') }}">Logout<i class="bi bi-box-arrow-right ps-2"></i></a>
                     </div>
                 </div>
             </div>

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

@@ -4,28 +4,13 @@
         <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 modal-lg fade" id="rollout-create-modal">
+            <div class="modal-dialog modal-dialog-centered modal-xl">
                 <div class="modal-content">
                     <div class="modal-header">
                         <h5 class="modal-title">Create Rollout</h5>
@@ -46,7 +31,7 @@
                                 <input class="form-control" id="rollout-selected-feed" required />
                                 <div class="invalid-feedback">Feed missing. Use "default" if working with a single feed.</div>
                             </div>
-                            <div class="form-group mb-3">
+                            <div class="form-group">
                                 <div class="input-group mb-3 has-validation">
                                     <span class="input-group-text">Software</span>
                                     <select class="form-control"
@@ -59,10 +44,7 @@
                                             required></select>
                                     <div class="invalid-feedback">Software missing.</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>
+                                <button type="submit" class="btn btn-outline-light w-100">Save changes</button>
                             </div>
                         </div>
                     </form>

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

@@ -0,0 +1,88 @@
+{% extends "nav.html.jinja" %}
+{% block content %}
+    <style>
+        input[type="checkbox"].ignore-validation:valid,
+        input[type="checkbox"].ignore-validation:invalid {
+            border-color: var(--bs-border-color);
+        }
+    </style>
+    <div class="container-fluid">
+        <ul class="nav nav-underline nav-fill my-2">
+            <li class="nav-item" role="presentation">
+                <button class="nav-link active"
+                        id="settings-users-tab"
+                        data-bs-toggle="tab"
+                        data-bs-target="#settings-users-panel"
+                        type="button"
+                        role="tab">Users</button>
+            </li>
+        </ul>
+        <div class="tab-content mb-2">
+            <div class="tab-pane fade show active"
+                 id="settings-users-panel"
+                 role="tabpanel">
+                <table id="users-table" class="table table-hover">
+                </table>
+            </div>
+        </div>
+    </div>
+    {% if compare_permissions(["settings.write"], request.user.permissions) %}
+        <div class="modal modal-lg fade" id="create-user-modal">
+            <div class="modal-dialog modal-dialog-scrollable modal-dialog-centered modal-xl">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">Create User</h5>
+                        <button type="button"
+                                class="btn-close"
+                                data-bs-dismiss="modal"
+                                aria-label="Close"></button>
+                    </div>
+                    <form id="create-user-form" class="needs-validation" novalidate>
+                        <div class="modal-body">
+                            <div class="input-group mb-3 has-validation">
+                                <span class="input-group-text">Username</span>
+                                <input class="form-control" type="text" id="create-user-username" required />
+                                <div class="invalid-feedback">Username missing.</div>
+                            </div>
+                            <div class="input-group mb-3 has-validation">
+                                <span class="input-group-text">Password</span>
+                                <input class="form-control" type="text" id="create-user-password" required />
+                                <div class="invalid-feedback">Password missing.</div>
+                            </div>
+                            <div class="input-group mb-3 has-validation">
+                                <input type="checkbox"
+                                       id="create-user-permissions-validator"
+                                       required
+                                       style="display:none">
+                                <div class="col" id="create-user-permissions"></div>
+                                <div class="invalid-feedback">Please set at least one permission.</div>
+                            </div>
+                            <input class="btn btn-outline-light w-100"
+                                   id="create-user-submit"
+                                   type="submit"
+                                   value="Create User" />
+                        </div>
+                    </form>
+                </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 users.</div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+    <script src="{{ url_for('static', path='js/settings.js') }}"></script>
+{% endblock content %}

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

@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <title>Login</title>
+        <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" />
+        <link rel="icon" href="{{ url_for('static', path='favicon.svg') }}" />
+    </head>
+    <body data-bs-theme="dark">
+        <div class="container py-2">
+            <div class="row d-flex justify-content-center align-items-center h-100">
+                <div class="col-12 col-md-8 col-lg-6 col-xl-5">
+                    <div class="mb-md-5 mt-md-4 pb-5">
+                        <div class="row mb-2 p-2">
+                            <div class="col d-flex align-items-center">
+                                <h2 class="fw-bold m-0 text-uppercase">gooseBit</h2>
+                            </div>
+                            <div class="col d-flex justify-content-end px-3">
+                                <img src="{{ request.url_for('static', path='svg/goosebit-logo.svg') }}"
+                                     height="35px"
+                                     width="35px"
+                                     alt="gooseBit Logo" />
+                            </div>
+                        </div>
+                        <div class="row mb-2 p-2">
+                            <div class="col d-flex align-items-center">
+                                <p class="m-0">Welcome to gooseBit. Please create an admin user.</p>
+                            </div>
+                        </div>
+                        <form method="post" id="setup_form">
+                            <div class="form-outline form-white mb-4">
+                                <input type="email"
+                                       id="username"
+                                       name="username"
+                                       placeholder="Email"
+                                       class="form-control form-control-lg" />
+                            </div>
+                            <div class="form-outline form-white mb-4">
+                                <input type="password"
+                                       id="password"
+                                       name="password"
+                                       placeholder="Password"
+                                       autocomplete="new-password"
+                                       class="form-control form-control-lg" />
+                            </div>
+                            <div class="form-outline form-white mb-4">
+                                <input type="password"
+                                       id="password_confirm"
+                                       name="password_confirm"
+                                       placeholder="Confirm Password"
+                                       autocomplete="new-password"
+                                       class="form-control form-control-lg" />
+                            </div>
+                            <button class="btn btn-outline-light btn-lg px-5 w-100" type="submit">Setup</button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <script src="{{ url_for('static', path='js/setup.js') }}"></script>
+    </body>
+</html>

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

@@ -4,17 +4,6 @@
         <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>

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

@@ -2,11 +2,17 @@ import logging
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi.requests import Request
-from fastapi.responses import FileResponse, Response
+from fastapi.responses import (
+    FileResponse,
+    RedirectResponse,
+    Response,
+    StreamingResponse,
+)
-from goosebit.db.models import Software, UpdateStateEnum
+from goosebit.db.models import Device, Software, UpdateStateEnum
+from goosebit.device_manager import DeviceManager, HandlingType, get_device
 from goosebit.settings import config
-from goosebit.updater.manager import HandlingType, UpdateManager, get_update_manager
+from goosebit.storage import storage
 from goosebit.updates import generate_chunk
 from .schema import (
@@ -22,53 +28,64 @@ router = APIRouter(prefix="/v1")
 @router.get("/{dev_id}")
-async def polling(request: Request, dev_id: str, updater: UpdateManager = Depends(get_update_manager)):
+async def polling(request: Request, device: Device = Depends(get_device)):
     links: dict[str, dict[str, str]] = {}
-    device = await updater.get_device()
     if device is None:
         raise HTTPException(404)
+    sleep = config.poll_time
     if device.last_state == UpdateStateEnum.UNKNOWN:
-        # device registration
-        sleep = config.poll_time_registration
+        # device registration: force device to poll again in 10s. After registration, an update might be available
+        sleep = "00:00:10"
         links["configData"] = {
             "href": str(
                 request.url_for(
                     "config_data",
-                    dev_id=dev_id,
+                    dev_id=device.id,
                 )
             )
         }
-        logger.info(f"Skip: registration required, device={updater.dev_id}")
+        logger.info(f"Skip: registration required, device={device.id}")
     elif device.last_state == UpdateStateEnum.ERROR and not device.force_update:
-        sleep = config.poll_time_default
-        logger.info(f"Skip: device in error state, device={updater.dev_id}")
+        logger.info(f"Skip: device in error state, device={device.id}")
     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, software = await updater.get_update()
+        handling_type, software = await DeviceManager.get_update(device)
         if handling_type != HandlingType.SKIP and software is not None:
-            sleep = config.poll_time_updating
-            links["deploymentBase"] = {
-                "href": str(
-                    request.url_for(
-                        "deployment_base",
-                        dev_id=dev_id,
-                        action_id=software.id,
+            number_of_running = await Device.filter(last_state=UpdateStateEnum.RUNNING).count()
+            if number_of_running < config.max_concurrent_updates or device.last_state == UpdateStateEnum.RUNNING:
+                links["deploymentBase"] = {
+                    "href": str(
+                        request.url_for(
+                            "deployment_base",
+                            dev_id=device.id,
+                            action_id=software.id,
+                        )
                     )
-                )
-            }
-            logger.info(f"Forced: update available, device={updater.dev_id}")
+                }
+                logger.info(f"Forced: update available, device={device.id}")
         else:
-            sleep = config.poll_time_default
-    # update poll time on manager so that UI can properly display if device is overdue
-    updater.poll_time = sleep
+            number_of_running = await Device.filter(last_state=UpdateStateEnum.RUNNING).count()
+            if number_of_running < config.max_concurrent_updates or device.last_state == UpdateStateEnum.RUNNING:
+                plugin_sources = await DeviceManager.get_alt_src_updates(request, device)
+                for handling_type, _ in plugin_sources:
+                    if handling_type == HandlingType.SKIP:
+                        continue
+                    links["deploymentBase"] = {
+                        "href": str(
+                            request.url_for(
+                                "deployment_base",
+                                dev_id=device.id,
+                                action_id=-1,  # custom plugin
+                            )
+                        )
+                    }
+                    break
     return {
         "config": {"polling": {"sleep": sleep}},
         "_links": links,
@@ -76,9 +93,9 @@ async def polling(request: Request, dev_id: str, updater: UpdateManager = Depend
 @router.put("/{dev_id}/configData")
-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}")
+async def config_data(_: Request, cfg: ConfigDataSchema, device: Device = Depends(get_device)):
+    await DeviceManager.update_config_data(device, **cfg.data)
+    logger.info(f"Updating config data, device={device.id}")
     return {"success": True, "message": "Updated swupdate data."}
@@ -86,46 +103,56 @@ async def config_data(_: Request, cfg: ConfigDataSchema, updater: UpdateManager
 async def deployment_base(
     request: Request,
     action_id: int,
-    updater: UpdateManager = Depends(get_update_manager),
+    device: Device = Depends(get_device),
 ):
-    handling_type, software = await updater.get_update()
-    logger.info(f"Request deployment base, device={updater.dev_id}")
-    return {
-        "id": str(action_id),
-        "deployment": {
-            "download": str(handling_type),
-            "update": str(handling_type),
-            "chunks": await generate_chunk(request, updater),
-        },
-    }
+    handling_type, software = await DeviceManager.get_update(device)
+    logger.info(f"Request deployment base, device={device.id}")
+    if not handling_type == HandlingType.SKIP:
+        return {
+            "id": str(action_id),
+            "deployment": {
+                "download": str(handling_type),
+                "update": str(handling_type),
+                "chunks": [chunk.model_dump(by_alias=True) for chunk in (await generate_chunk(request, device))],
+            },
+        }
+    else:
+        plugin_sources = await DeviceManager.get_alt_src_updates(request, device)
+        for handling_type, chunk in plugin_sources:
+            if handling_type == HandlingType.SKIP or chunk is None:
+                continue
+            return {
+                "id": str(action_id),
+                "deployment": {
+                    "download": str(handling_type),
+                    "update": str(handling_type),
+                    "chunks": [chunk.model_dump(by_alias=True)],
+                },
+            }
 @router.post("/{dev_id}/deploymentBase/{action_id}/feedback")
-async def deployment_feedback(
-    _: Request, data: FeedbackSchema, action_id: int, updater: UpdateManager = Depends(get_update_manager)
-):
+async def deployment_feedback(_: Request, data: FeedbackSchema, action_id: int, device: Device = Depends(get_device)):
     if data.status.execution == FeedbackStatusExecutionState.PROCEEDING:
-        device = await updater.get_device()
         if device and device.last_state != UpdateStateEnum.RUNNING:
-            await updater.clear_log()
-            await updater.update_device_state(UpdateStateEnum.RUNNING)
+            await DeviceManager.deployment_action_start(device)
+            await DeviceManager.update_device_state(device, UpdateStateEnum.RUNNING)
-        logger.debug(f"Installation in progress, device={updater.dev_id}")
+        logger.debug(f"Installation in progress, device={device.id}")
     elif data.status.execution == FeedbackStatusExecutionState.CLOSED:
-        await updater.update_force_update(False)
+        await DeviceManager.update_force_update(device, False)
         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.deployment_action_success()
-            await updater.update_device_state(UpdateStateEnum.FINISHED)
+            await DeviceManager.deployment_action_success(device)
+            await DeviceManager.update_device_state(device, UpdateStateEnum.FINISHED)
-            rollout = await updater.get_rollout()
+            rollout = await DeviceManager.get_rollout(device)
             if rollout:
                 if rollout.software == reported_software:
                     rollout.success_count += 1
@@ -133,16 +160,20 @@ async def deployment_feedback(
                 else:
                     # edge case where device update mode got changed while update was running
                     logging.warning(
-                        f"Updating rollout success stats failed, software={reported_software.id}, device={updater.dev_id}"  # noqa: E501
+                        f"Updating rollout success stats failed, action_id={action_id}, device={device.id}"
+                        # noqa: E501
                     )
-            await updater.update_sw_version(reported_software.version)
-            logger.debug(f"Installation successful, software={reported_software.version}, device={updater.dev_id}")
+            if reported_software:
+                await DeviceManager.update_sw_version(device, reported_software.version)
+            software_version = reported_software.version if reported_software else None
+            logger.debug(f"Installation successful, software={software_version}, device={device.id}")
         elif data.status.result.finished == FeedbackStatusResultFinished.FAILURE:
-            await updater.update_device_state(UpdateStateEnum.ERROR)
+            await DeviceManager.update_device_state(device, UpdateStateEnum.ERROR)
-            rollout = await updater.get_rollout()
+            rollout = await DeviceManager.get_rollout(device)
             if rollout:
                 if rollout.software == reported_software:
                     rollout.failure_count += 1
@@ -150,28 +181,28 @@ async def deployment_feedback(
                 else:
                     # edge case where device update mode got changed while update was running
                     logging.warning(
-                        f"Updating rollout failure stats failed, software={reported_software.id}, device={updater.dev_id}"  # noqa: E501
+                        f"Updating rollout failure stats failed, action_id={action_id}, device={device.id}"
+                        # noqa: E501
                     )
-            logger.debug(f"Installation failed, software={reported_software.version}, device={updater.dev_id}")
+            software_version = reported_software.version if reported_software else None
+            logger.debug(f"Installation failed, software={software_version}, device={device.id}")
     else:
-        logging.error(
-            f"Device reported unhandled execution state, state={data.status.execution}, device={updater.dev_id}"
-        )
+        logging.error(f"Device reported unhandled execution state, state={data.status.execution}, device={device.id}")
     try:
         log = data.status.details
         if log is not None:
-            await updater.update_log("\n".join(log))
+            await DeviceManager.update_log(device, "\n".join(log))
     except AttributeError:
-        logging.warning(f"No details to update device update log, device={updater.dev_id}")
+        logging.warning(f"No details to update device update log, device={device.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()
+async def download_artifact_head(_: Request, device: Device = Depends(get_device)):
+    _, software = await DeviceManager.get_update(device)
     if software is None:
         raise HTTPException(404)
@@ -181,15 +212,26 @@ async def download_artifact_head(_: Request, updater: UpdateManager = Depends(ge
 @router.get("/{dev_id}/download")
-async def download_artifact(_: Request, updater: UpdateManager = Depends(get_update_manager)):
-    _, software = await updater.get_update()
+async def download_artifact(_: Request, device: Device = Depends(get_device)):
+    _, software = await DeviceManager.get_update(device)
     if software is None:
         raise HTTPException(404)
-    assert software.local, "device requests local software to download"
+    if software.local:
+        return FileResponse(
+            software.path,
+            media_type="application/octet-stream",
+            filename=software.path.name,
+        )
-    return FileResponse(
-        software.path,
-        media_type="application/octet-stream",
-        filename=software.path.name,
-    )
+    try:
+        url = await storage.get_download_url(software.uri)
+        return RedirectResponse(url=url)
+    except ValueError:
+        # Fallback to streaming if redirect fails.
+        file_stream = storage.get_file_stream(software.uri)
+        return StreamingResponse(
+            file_stream,
+            media_type="application/octet-stream",
+            headers={"Content-Disposition": f"attachment; filename={software.path.name}"},
+        )

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

goosebit 0.2.5py3-none-any.whl → 0.2.7py3-none-any.whl