mirror of
https://github.com/Screenly/Anthias.git
synced 2026-06-10 17:18:43 -04:00
133ec78ff0
* refactor(packaging): adopt src/ layout with split server/viewer packages
Move all Python source under src/ following modern packaging conventions.
Server, viewer, host-agent, and shared common code now live as four
top-level packages with clear excision boundaries — anthias_viewer can
be removed wholesale when the rewrite-out-of-Python lands without
touching the server.
src/anthias_common/ shared: errors, utils, internal_auth, device_helper
src/anthias_server/ Django app, REST API, Celery tasks, manage.py
lib/ server-only: auth, backup_helper, diagnostics, github, telemetry
src/anthias_viewer/ player runtime (was viewer/)
src/anthias_host_agent/ systemd-driven host shim (was host_agent.py)
tools/raspberry_pi_imager/ moved from repo root
tests/conftest.py moved from repo root
pyproject.toml gets [build-system], setuptools src/ discovery, and an
anthias-manage console script. Django AppConfigs keep label='anthias_app'
and label='api' so existing migration dependency tuples don't move.
BASE_DIR computed from parents[3] to keep templates/static at repo root.
mypy_path set to ["src", "stubs"] with explicit_package_bases.
Dockerfile templates set PYTHONPATH=/usr/src/app/src; bin/start_*.sh
and CI workflows use python -m anthias_server.manage / python -m
anthias_viewer instead of bare ./manage.py and python -m viewer.
Ansible host-agent unit invokes python -m anthias_host_agent.
Verified end-to-end in the docker test container:
- 430 unit tests pass (matches baseline)
- 7 integration tests pass, 5 skipped (matches baseline)
- ruff, mypy clean
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* style: ruff format the new src/ tree
The longer post-rename module paths (anthias_common.internal_auth vs
lib.internal_auth, etc.) pushed several import lines past 79 chars, so
ruff format had to wrap them. Apply that formatting and split the one
multi-import in anthias_viewer/__init__.py into per-symbol lines so the
existing # noqa: E402 sits on the `from` line where ruff expects it,
without needing a re-anchor when format wraps the parens.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore: realign sonar + gitignore comment to src/ layout
sonar-project.properties still pointed at the pre-refactor top-level
packages (anthias_app, anthias_django, api, lib, viewer, ...) and
their old per-file coverage.exclusions paths, which would have
produced empty Sonar runs and stale exclusions. Collapse sources to
`src` and rewrite the exclusions to the new src/anthias_*/ paths.
Also fix the stale path reference in .gitignore's comment for the
test DB (now src/anthias_server/django_project/settings.py).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore: gitignore .claude/ and untrack the lock file I just leaked
Previous commit accidentally pulled in .claude/scheduled_tasks.lock
because .claude was in .dockerignore but not .gitignore. Add the
pattern to .gitignore and drop the file from the index.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(dockerignore): exclude pytest cache, __pycache__ dirs, and the local test DB
Three entries that were missing relative to the new src/ layout:
- .anthias-test.db (and -journal/-wal/-shm siblings) — created at the
repo root by src/anthias_server/django_project/settings.py when a
developer runs the host pytest suite. Without this exclude, the
next docker build COPY . bakes the file into /usr/src/app/.
- **/__pycache__ — *.py[co] only matched the .pyc/.pyo files, leaving
the empty cache directories to ship.
- .pytest_cache — host-side, regenerable.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(urls): preserve 'anthias_app' URL namespace, not just the app label
Copilot caught that the import-rewrite swept up the URL namespace too:
app_name in src/anthias_server/app/urls.py changed from 'anthias_app'
to 'anthias_server.app', which leaves templates/login.html's
{% url 'anthias_app:login' %} pointing at a namespace that no longer
exists — NoReverseMatch at render time when an unauthenticated request
hits the login page.
The namespace is the same kind of stable user-facing identifier as the
AppConfig label (which we already kept as 'anthias_app'). Restore it,
and revert the two reverse() callers in lib/auth.py and app/views.py
that the rewrite changed in lockstep.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix(ci): update --confcutdir to the new tools/raspberry_pi_imager path
Copilot caught that the earlier sweep missed --confcutdir=raspberry_pi_imager
(no trailing slash) — replace_all of "raspberry_pi_imager/" only matched
path-with-slash forms. Without confcutdir, pytest walks back up looking
for conftests and discovers the repo-root tests/conftest.py, which
applies the Anthias-specific Django/Redis stubs to the rpi-imager test
run on the website-deploy workflow.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
72 lines
1.9 KiB
Python
72 lines
1.9 KiB
Python
from unittest import mock
|
|
|
|
import pytest
|
|
|
|
from anthias_common import device_helper
|
|
|
|
|
|
PI4_CPUINFO = """\
|
|
processor : 0
|
|
BogoMIPS : 108.00
|
|
Features : fp asimd evtstrm crc32 cpuid
|
|
CPU implementer : 0x41
|
|
|
|
processor : 1
|
|
BogoMIPS : 108.00
|
|
|
|
processor : 2
|
|
|
|
processor : 3
|
|
|
|
Hardware : BCM2711
|
|
Revision : c03114
|
|
Serial : 100000004a4f5b8c
|
|
Model : Raspberry Pi 4 Model B Rev 1.4
|
|
"""
|
|
|
|
|
|
def test_parse_cpu_info_extracts_fields() -> None:
|
|
m = mock.mock_open(read_data=PI4_CPUINFO)
|
|
with mock.patch('builtins.open', m):
|
|
info = device_helper.parse_cpu_info()
|
|
assert info['cpu_count'] == 4
|
|
assert info['hardware'] == 'BCM2711'
|
|
assert info['revision'] == 'c03114'
|
|
assert info['serial'] == '100000004a4f5b8c'
|
|
assert info['model'] == 'Raspberry Pi 4 Model B Rev 1.4'
|
|
|
|
|
|
def test_parse_cpu_info_minimal() -> None:
|
|
m = mock.mock_open(read_data='processor : 0\n')
|
|
with mock.patch('builtins.open', m):
|
|
info = device_helper.parse_cpu_info()
|
|
assert info['cpu_count'] == 1
|
|
# No Hardware/Model/etc. → only cpu_count populated.
|
|
assert 'hardware' not in info
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
'content,expected',
|
|
[
|
|
('Raspberry Pi 5 Model B Rev 1.0', 'pi5'),
|
|
('Compute Module 5', 'pi5'),
|
|
('Raspberry Pi 4 Model B Rev 1.4', 'pi4'),
|
|
('Compute Module 4', 'pi4'),
|
|
('Raspberry Pi 3 Model B Plus', 'pi3'),
|
|
('Compute Module 3+', 'pi3'),
|
|
('Raspberry Pi 2 Model B', 'pi2'),
|
|
('Raspberry Pi Model B Plus Rev 1.2', 'pi1'),
|
|
],
|
|
)
|
|
def test_get_device_type_from_dt_model(content: str, expected: str) -> None:
|
|
m = mock.mock_open(read_data=content)
|
|
with mock.patch('builtins.open', m):
|
|
assert device_helper.get_device_type() == expected
|
|
|
|
|
|
def test_get_device_type_falls_back_to_x86() -> None:
|
|
with mock.patch(
|
|
'builtins.open', side_effect=FileNotFoundError('no such file')
|
|
):
|
|
assert device_helper.get_device_type() == 'x86'
|