From 5784a5995b9def3fb1f7df6ae6ceeaaaf8c2e21c Mon Sep 17 00:00:00 2001 From: mgale456 <55673155+mgale456@users.noreply.github.com> Date: Mon, 21 Nov 2022 03:48:06 -0600 Subject: [PATCH] fix(frigate): clean up small things in questions.yaml (#4661) * change birdseye rendering default to false Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> * make max_frames default not a required question Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> * fix handling of decimal values Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> * add filters questions under camera zones Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> * bump version Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> * indent mask and filters underneath objects Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> * Update charts/incubator/frigate/questions.yaml Signed-off-by: Kjeld Schouten-Lebbing * Apply suggestions from code review Signed-off-by: Kjeld Schouten-Lebbing Signed-off-by: mgale456 <55673155+mgale456@users.noreply.github.com> Signed-off-by: Kjeld Schouten-Lebbing Co-authored-by: Kjeld Schouten-Lebbing --- charts/incubator/frigate/Chart.yaml | 2 +- charts/incubator/frigate/questions.yaml | 196 +++++++++++++++--------- 2 files changed, 122 insertions(+), 76 deletions(-) diff --git a/charts/incubator/frigate/Chart.yaml b/charts/incubator/frigate/Chart.yaml index 0f17acd57fc..427072a5872 100644 --- a/charts/incubator/frigate/Chart.yaml +++ b/charts/incubator/frigate/Chart.yaml @@ -24,7 +24,7 @@ sources: - https://github.com/blakeblackshear/frigate - https://hub.docker.com/r/blakeblackshear/frigate type: application -version: 5.0.3 +version: 5.0.4 annotations: truecharts.org/catagories: | - nvr diff --git a/charts/incubator/frigate/questions.yaml b/charts/incubator/frigate/questions.yaml index 8accda1fae8..f21c1cb294f 100644 --- a/charts/incubator/frigate/questions.yaml +++ b/charts/incubator/frigate/questions.yaml @@ -251,7 +251,7 @@ questions: description: Enable it to add the configuration in the config file schema: type: boolean - default: true + default: false show_subquestions_if: true subquestions: - variable: enabled @@ -447,7 +447,6 @@ questions: schema: type: int "null": true - required: true - variable: objects label: Objects schema: @@ -498,79 +497,83 @@ questions: type: string required: true default: "" - - variable: mask - label: Mask - description: | - Mask to prevent all object types from being detected in certain areas - Checks based on the bottom center of the bounding box of the object. - This mask is COMBINED with the object type specific mask below - schema: - type: string - default: "" - - variable: filters - label: Filters - description: Filters to reduce false positives for specific object types - schema: - type: list - default: [] - items: - - variable: filter_entry - label: Filter Entry + - variable: mask + label: Mask + description: | + Mask to prevent all object types from being detected in certain areas + Checks based on the bottom center of the bounding box of the object. + This mask is COMBINED with the object type specific mask below schema: - additional_attrs: true - type: dict - attrs: - - variable: object - label: Object - description: For example person + type: string + default: "" + - variable: filters + label: Filters + description: Filters to reduce false positives for specific object types + schema: + type: list + default: [] + items: + - variable: filter_entry + label: Filter Entry schema: - type: string - required: true - default: "" - - variable: min_area - label: Min Area - description: Minimum width*height of the bounding box for the detected object - schema: - type: int - "null": true - - variable: max_area - label: Max Area - description: Maximum width*height of the bounding box for the detected object - schema: - type: int - "null": true - - variable: min_ratio - label: Min Ratio - description: Minimum width/height of the bounding box for the detected object - schema: - type: int - "null": true - - variable: max_ratio - label: Max Ratio - description: Maximum width/height of the bounding box for the detected object - schema: - type: int - "null": true - - variable: min_score - label: Min Score - description: Minimum score for the object to initiate tracking - schema: - type: int - "null": true - - variable: threshold - label: Threshold - description: Minimum decimal percentage for tracked object's computed score to be considered a true positive - schema: - type: int - "null": true - - variable: mask - label: Mask - description: | - Mask to prevent this object type from being detected in certain areas - Checks based on the bottom center of the bounding box of the object - schema: - type: string - default: "" + additional_attrs: true + type: dict + attrs: + - variable: object + label: Object + description: For example person + schema: + type: string + required: true + default: "" + - variable: min_area + label: Min Area + description: Minimum width*height of the bounding box for the detected object + schema: + type: int + "null": true + - variable: max_area + label: Max Area + description: Maximum width*height of the bounding box for the detected object + schema: + type: int + "null": true + - variable: min_ratio + label: Min Ratio + description: Minimum width/height of the bounding box for the detected object + schema: + type: string + default: "" + valid_chars: '^[0-9]+(\.[0-9]*)?$' + - variable: max_ratio + label: Max Ratio + description: Maximum width/height of the bounding box for the detected object + schema: + type: string + default: "" + valid_chars: '^[0-9]+(\.[0-9]*)?$' + - variable: min_score + label: Min Score + description: Minimum score for the object to initiate tracking + schema: + type: string + default: "" + valid_chars: '^[0-9]+(\.[0-9]*)?$' + - variable: threshold + label: Threshold + description: Minimum decimal percentage for tracked object's computed score to be considered a true positive + schema: + type: string + default: "" + valid_chars: '^[0-9]+(\.[0-9]*)?$' + - variable: mask + label: Mask + description: | + Mask to prevent this object type from being detected in certain areas + Checks based on the bottom center of the bounding box of the object + schema: + type: string + default: "" - variable: motion label: Motion schema: @@ -616,7 +619,8 @@ questions: Too low and a fast moving person wont be detected as motion. schema: type: string - default: "0.2" + default: "" + valid_chars: '^[0-9]+(\.[0-9]*)?$' - variable: frame_alpha label: Frame Alpha description: | @@ -626,7 +630,8 @@ questions: https://www.geeksforgeeks.org/background-subtraction-in-an-image-using-concept-of-running-average schema: type: string - default: "0.2" + default: "" + valid_chars: '^[0-9]+(\.[0-9]*)?$' - variable: frame_height label: Frame Height description: | @@ -1213,6 +1218,7 @@ questions: default: "" - variable: coordinates label: Coordinates + description: List of x,y coordinates to define the polygon of the zone. schema: type: string required: true @@ -1230,6 +1236,46 @@ questions: type: string required: true default: "" + - variable: filters + label: Filters + description: Zone level object filters + schema: + type: list + default: [] + items: + - variable: filter_entry + label: Filter Entry + description: For example person + schema: + additional_attrs: true + type: dict + attrs: + - variable: object + label: Object + description: For example person + schema: + type: string + required: true + default: "" + - variable: min_area + label: Min Area + description: Minimum width*height of the bounding box for the detected object + schema: + type: int + "null": true + - variable: max_area + label: Max Area + description: Maximum width*height of the bounding box for the detected object + schema: + type: int + "null": true + - variable: threshold + label: Threshold + description: Minimum decimal percentage for tracked object's computed score to be considered a true positive + schema: + type: string + default: "" + valid_chars: '^[0-9]+(\.[0-9]*)?$' - variable: mqtt label: MQTT description: MQTT Configuration for jpg snapshots published for this camera