Skip to content

Camera detection falure bug, the ability to disable object detection … #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeremiah-huston merged 1 commit into from
Aug 25, 2026
Merged

Camera detection falure bug, the ability to disable object detection … #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions App/serval_app/lib/data/camera_record.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ class DetectionMaskSettings {
/// and a hallway where they never do.
class DetectionTuningSettings {
const DetectionTuningSettings({
this.enabled,
this.classes,
this.describeClasses,
this.scoreThreshold,
Expand All @@ -258,6 +259,7 @@ class DetectionTuningSettings {

factory DetectionTuningSettings.fromJson(Map<String, dynamic> json) =>
DetectionTuningSettings(
enabled: json['enabled'] as bool?,
classes: _strings(json['classes']),
describeClasses: _strings(json['describeClasses']),
scoreThreshold: (json['scoreThreshold'] as num?)?.toDouble(),
Expand All @@ -278,6 +280,10 @@ class DetectionTuningSettings {
noveltySeconds: (json['noveltySeconds'] as num?)?.toDouble(),
);

/// Whether the detector looks at this camera at all. Null follows the Server, which is what makes
/// its switch mean "every camera that does not say otherwise".
final bool? enabled;

/// Which of the model's classes this camera records at all.
final List<String>? classes;

Expand Down Expand Up @@ -320,7 +326,12 @@ class DetectionTuningSettings {
/// Regions of the view to ignore. Carried but not edited — see [DetectionMaskSettings].
final List<DetectionMaskSettings>? masks;

// The switch counts. A bag holding only `enabled: false` is a real instruction, and collapsing it
// to null on the way out — which is what every caller does with an empty one — would send the
// camera back to following the Server and make the toggle spring on again on the next load. The
// Server's own collapse rule counts it for the same reason.
bool get isEmpty =>
enabled == null &&
classes == null &&
describeClasses == null &&
scoreThreshold == null &&
Expand All @@ -336,6 +347,7 @@ class DetectionTuningSettings {
noveltySeconds == null;

Map<String, dynamic> toJson() => {
if (enabled != null) 'enabled': enabled,
if (classes != null) 'classes': classes,
if (describeClasses != null) 'describeClasses': describeClasses,
if (scoreThreshold != null) 'scoreThreshold': scoreThreshold,
Expand All @@ -353,6 +365,7 @@ class DetectionTuningSettings {

/// Omit an argument to keep it; pass null to fall back to the Server's default. See [_keep].
DetectionTuningSettings copyWith({
Object? enabled = _keep,
Object? classes = _keep,
Object? describeClasses = _keep,
Object? scoreThreshold = _keep,
Expand All @@ -367,6 +380,7 @@ class DetectionTuningSettings {
Object? absenceSeconds = _keep,
Object? noveltySeconds = _keep,
}) => DetectionTuningSettings(
enabled: _pick(enabled, this.enabled),
classes: _pick(classes, this.classes),
describeClasses: _pick(describeClasses, this.describeClasses),
scoreThreshold: _pick(scoreThreshold, this.scoreThreshold),
Expand All @@ -385,6 +399,7 @@ class DetectionTuningSettings {
@override
bool operator ==(Object other) =>
other is DetectionTuningSettings &&
other.enabled == enabled &&
_sameStrings(other.classes, classes) &&
_sameStrings(other.describeClasses, describeClasses) &&
_sameStrings(other.alertClasses, alertClasses) &&
Expand All @@ -401,6 +416,7 @@ class DetectionTuningSettings {

@override
int get hashCode => Object.hash(
enabled,
classes == null ? null : Object.hashAll(classes!),
describeClasses == null ? null : Object.hashAll(describeClasses!),
alertClasses == null ? null : Object.hashAll(alertClasses!),
Expand Down
10 changes: 9 additions & 1 deletion App/serval_app/lib/models/server_camera_defaults.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ import 'server_settings.dart';
/// wins whenever it is there. A range here that disagrees with the Server's is a bug in this table,
/// not a second opinion.
enum CameraSetting {
// What it looks for — `CameraDetectionTuning`.
// Whether it looks at all, then what it looks for — `CameraDetectionTuning`.
detectionEnabled(
'Serval:Ai:Detection:Enabled',
label: 'Look for objects',
help:
'Runs the detector on this camera, so it can say what is there rather than only that '
'something moved. Left alone it follows the Server.',
kind: SettingKind.boolean,
),
detectionClasses(
'Serval:Ai:Detection:Classes',
label: 'Record these objects',
Expand Down
125 changes: 108 additions & 17 deletions App/serval_app/lib/widgets/camera_settings_form.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import '../data/camera_record.dart';
import '../models/ptz.dart';
import '../playback/playback_volume.dart';
import '../models/server_camera_defaults.dart';
import '../models/server_settings.dart' show SettingSource;
import '../models/system_stats.dart';
import '../screens/cameras_screen.dart' show SaveFailureNote;
import '../theme/nocturne.dart';
Expand Down Expand Up @@ -70,7 +71,7 @@ enum CameraSection {
),
analysis(
'Analysis',
'Which of the Server’s two analysers run on this camera. Each one’s own settings are in the '
'Which of the Server’s three analysers run on this camera. Each one’s own settings are in the '
'section named after it.',
),
objects(
Expand All @@ -80,7 +81,7 @@ enum CameraSection {
),
motion(
'Motion detection',
'Used when this Server is not looking for objects — it compares each frame to the last '
'Used when this camera is not looking for objects — it compares each frame to the last '
'instead. A camera facing a tree needs a higher setting than one facing a hallway.',
),
speech(
Expand Down Expand Up @@ -256,10 +257,12 @@ class CameraSettingsForm extends StatefulWidget {
CameraSection.analysis: [
if (before.aiVision != after.aiVision) 'scene descriptions',
if (before.aiAudio != after.aiAudio) 'audio analysis',
if (before.detectionTuning?.enabled != after.detectionTuning?.enabled)
'looking for objects',
],
CameraSection.objects: [
if (_withoutMasks(before.detectionTuning) !=
_withoutMasks(after.detectionTuning))
if (_tuningOnly(before.detectionTuning) !=
_tuningOnly(after.detectionTuning))
'what it looks for',
],
CameraSection.motion: [
Expand Down Expand Up @@ -292,11 +295,13 @@ class CameraSettingsForm extends StatefulWidget {
static List<String> changesBetween(CameraRecord before, CameraRecord after) =>
[for (final named in changesBySection(before, after).values) ...named];

/// The tuning with its masks taken out, collapsed to null when nothing else is set — so a camera
/// whose only override is a mask compares equal to one with no overrides at all.
static DetectionTuningSettings? _withoutMasks(DetectionTuningSettings? it) {
/// The tuning with the two fields that are edited elsewhere taken out — the masks, on their own
/// screen, and the switch, in *Analysis* — collapsed to null when nothing else is set. So a camera
/// whose only override is one of those compares equal to one with no overrides at all, and neither
/// drawing a polygon nor flipping the switch lights up *Objects & alerts*.
static DetectionTuningSettings? _tuningOnly(DetectionTuningSettings? it) {
if (it == null) return null;
final stripped = it.copyWith(masks: null);
final stripped = it.copyWith(masks: null, enabled: null);
return stripped.isEmpty ? null : stripped;
}

Expand Down Expand Up @@ -695,7 +700,11 @@ class _CameraSettingsFormState extends State<CameraSettingsForm> {
'Control profile',
],
CameraSection.masks => const ['Masks'],
CameraSection.analysis => const ['Scene descriptions', 'Audio analysis'],
CameraSection.analysis => [
'Scene descriptions',
widget.defaults[CameraSetting.detectionEnabled].label,
'Audio analysis',
],
CameraSection.objects => _labelsFor(_objectFields),
CameraSection.motion => _labelsFor(_motionFields),
CameraSection.speech => _labelsFor(_speechFields),
Expand Down Expand Up @@ -768,7 +777,21 @@ class _CameraSettingsFormState extends State<CameraSettingsForm> {
CameraSection.recording => _keepingFootage,
CameraSection.cameraControl => _reachingTheCamera,
CameraSection.masks => _masksSection,
CameraSection.analysis => _senses,
// The one note in this section is about the Server rather than the camera, and it is drawn
// whatever this camera says: *Look for objects* on a camera is a choice within a Server that
// loaded a detector, and it cannot conjure one that was never opened. Without this, "off
// globally, on for the drive" looks like it works and silently does nothing.
CameraSection.analysis => Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_senses,
if (widget.defaults.valueOf(CameraSetting.detectionEnabled) ==
false) ...[
const SizedBox(height: 12),
const TuningNote(_detectionOffOnServer, warning: true),
],
],
),
CameraSection.objects => _cards(
cameraDetectionCards(
tuning: _edited.detectionTuning,
Expand All @@ -778,8 +801,13 @@ class _CameraSettingsFormState extends State<CameraSettingsForm> {
_update((r) => r.copyWith(detectionTuning: _keepMasks(tuning))),
),
paired: paired,
// Two notes, not one, because the cards in this section answer to two different switches:
// all of them wait on *Look for objects*, and *Describe these objects* additionally waits
// on *Scene descriptions*. One note naming a single switch was wrong for whichever half of
// the section the reader was actually looking at.
notes: [
if (!_edited.aiVision) const TuningNote(_needsSceneDescriptions),
if (!_detectionOn) const TuningNote(_needsObjectDetection),
if (!_edited.aiVision) const TuningNote(_describeNeedsDescriptions),
],
),
CameraSection.motion => _cards(
Expand All @@ -795,6 +823,7 @@ class _CameraSettingsFormState extends State<CameraSettingsForm> {
if (_edited.motionTuning?.problem case final problem?)
TuningNote(problem, warning: true),
if (!_edited.aiVision) const TuningNote(_needsSceneDescriptions),
if (_detectionOn) const TuningNote(_replacedByObjects),
],
),
CameraSection.speech => _speech,
Expand Down Expand Up @@ -848,6 +877,31 @@ class _CameraSettingsFormState extends State<CameraSettingsForm> {
static const _needsSceneDescriptions =
'Nothing reads these until “Scene descriptions” is on in Analysis. They are kept either way.';

/// The object equivalent. Almost every card in *Objects & alerts* answers to this switch rather
/// than to *Scene descriptions*, which is what the two used to share and no longer do.
static const _needsObjectDetection =
'Nothing reads these until “Look for objects” is on in Analysis. They are kept either way.';

/// The one card in that section that is still about descriptions. Said apart from the note above
/// because the two can be true separately: a camera can look for objects and describe none of
/// them, which is now a configuration rather than a contradiction.
static const _describeNeedsDescriptions =
'“Describe these objects” does nothing until “Scene descriptions” is on in Analysis. '
'Everything else here still applies.';

/// Said under *Movement* while the object gate is the one running. The two are alternatives, not
/// a chain — see the vision pipeline — so these are stored and unread rather than half-applied.
static const _replacedByObjects =
'This camera looks for objects, which replaces watching for movement rather than sitting '
'behind it. These are kept, and read again if it is turned off.';

/// The Server half of the same story, and the one warning in *Analysis*. Switching a camera on
/// cannot load a model the Server never opened, which is the one thing about these two settings
/// that does not read the way it works.
static const _detectionOffOnServer =
'“Look for objects” is off on the Server, so no detector is loaded and no camera looks for '
'objects whatever it is set to here. Turn it on in Server settings first.';

/// The audio equivalent — and it names *Audio analysis* rather than speech, because that one
/// switch gates the sound recogniser too. It was called “Write down speech” while doing both,
/// which made turning it off look like it only stopped transcripts.
Expand Down Expand Up @@ -1423,16 +1477,39 @@ class _CameraSettingsFormState extends State<CameraSettingsForm> {
);
}

/// The two switches the tuning sections are a refinement of, each named after the Server group it
/// turns on for this camera.
/// What this camera is actually looking for, which is its own answer or the Server's behind it.
bool get _detectionOn =>
_edited.detectionTuning?.enabled ??
widget.defaults.valueOf(CameraSetting.detectionEnabled) == true;

/// Writes the switch without disturbing the rest of the bag — the thresholds and the masks are
/// carried through `copyWith`, so turning detection off never throws away the tuning that would
/// be wanted again the moment it came back on.
void _setDetection(bool? enabled) => _update((r) {
final tuning = (r.detectionTuning ?? const DetectionTuningSettings())
.copyWith(enabled: enabled);
return r.copyWith(detectionTuning: tuning.isEmpty ? null : tuning);
});

/// The three switches the tuning sections are a refinement of, each named after the Server group
/// it turns on for this camera.
///
/// **The second one was called *Write down speech*, and that was a lie by omission.** `aiAudio`
/// **The audio one was called *Write down speech*, and that was a lie by omission.** `aiAudio`
/// gates the sound recogniser as well as the transcriber — they run on the same audio — so
/// turning off what read as a transcript setting also stopped glass-break and smoke-alarm
/// detection, with nothing on screen saying so. *Audio analysis* is what it actually is, and the
/// description now names both halves.
///
/// **The third one is the odd one, and deliberately so.** *Look for objects* overrides a
/// Server-wide switch rather than being a fact the camera holds alone, so it draws the chip and
/// the reset link every other overridable camera setting draws — its switch is *what this camera
/// runs on*, and the chip below says whether the camera chose that or is only following.
Widget get _senses => LayoutBuilder(
builder: (context, constraints) {
final overridden = _edited.detectionTuning?.enabled != null;
final serverDetects =
widget.defaults.valueOf(CameraSetting.detectionEnabled) == true;

final tiles = [
CapabilityCard(
icon: PhosphorIconsFill.sparkle,
Expand All @@ -1441,6 +1518,18 @@ class _CameraSettingsFormState extends State<CameraSettingsForm> {
value: _edited.aiVision,
onChanged: (value) => _update((r) => r.copyWith(aiVision: value)),
),
CapabilityCard(
icon: PhosphorIconsFill.boundingBox,
title: widget.defaults[CameraSetting.detectionEnabled].label,
description: 'Records what is there, not only that something moved.',
value: _detectionOn,
onChanged: _setDetection,
source: overridden ? SettingSource.user : SettingSource.builtIn,
resetLabel: overridden
? 'Use the default · ${serverDetects ? 'on' : 'off'}'
: null,
onReset: overridden ? () => _setDetection(null) : null,
),
CapabilityCard(
icon: PhosphorIconsFill.waveform,
title: 'Audio analysis',
Expand All @@ -1450,9 +1539,11 @@ class _CameraSettingsFormState extends State<CameraSettingsForm> {
),
];

// A card narrower than about 140 reads one word to a line, which is worse than a stack —
// so the cards only share a row when there is that much for each of them.
if (constraints.maxWidth < 280) {
// A card narrower than about 135 reads one word to a line, which is worse than a stack — so
// the cards only share a row when there is that much for each of them. Per card rather than
// a flat number, because the third one arrived and a flat 280 would have squeezed three into
// the width that was measured for two.
if (constraints.maxWidth < tiles.length * 135 + (tiles.length - 1) * 10) {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expand Down
16 changes: 16 additions & 0 deletions App/serval_app/lib/widgets/camera_tuning_sections.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import '../theme/app_theme.dart';
import '../theme/nocturne.dart';
import '../theme/serval_tokens.dart';
import 'label_chips.dart';
import 'nocturne_toggle.dart';
import 'paired_rows.dart';
import 'settings_cards.dart';

Expand Down Expand Up @@ -91,6 +92,9 @@ class CameraSettingCard extends StatelessWidget {
if (fallback case final num number) {
return 'Use the default · ${settingFigure(number)}';
}
if (fallback case final bool on) {
return 'Use the default · ${on ? 'on' : 'off'}';
}
return 'Use the default';
}

Expand Down Expand Up @@ -131,6 +135,18 @@ class CameraSettingCard extends StatelessWidget {
}

Widget get _control {
// Drawn exactly as the Server page draws a bool, for the reason the class comment gives about
// the rest of this card: a camera setting and a Server setting are the same kind of thing.
if (_descriptor.kind == SettingKind.boolean) {
return Align(
alignment: Alignment.centerLeft,
child: NocturneToggle(
value: _effective == true,
onChanged: (picked) => onChanged(picked),
),
);
}

if (_isList) {
// A list is the one control that must not show the Server's value as its own. Real chips
// read as "this camera names these", so a camera following the Server draws no chips and
Expand Down
Loading
Loading