Add configs to detect target pipeline #242
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maxlou05
reviewed
Jan 22, 2025
config.yaml
Outdated
| device: 0 | ||
| model_path: "tests/model_example/yolov8s_ultralytics_pretrained_default.pt" # See autonomy OneDrive for latest model | ||
| save_prefix: "log_comp" | ||
|
|
||
| detect_brightspot: |
There was a problem hiding this comment.
Sorry just noticed this now, can we move this section under detect_target and call it config, like it is for video_input? In this case, you will comment out this whole section because we are using the ultralytics config
config.yaml
Outdated
| option: 0 # 0 is for Ultralytics and 1 is for brightspot (from detect_target_factory.py) | ||
| save_prefix: "log_comp" | ||
|
|
||
| detect_ultralytics: |
There was a problem hiding this comment.
Can we move this under detect_target and call it config, like it is for video_input?
main_2024.py
Outdated
Comment on lines
119
to
151
| DETECT_TARGET_ULTRALYTICS_DEVICE = ( | ||
| "cpu" if args.cpu else config["detect_ultralytics"]["device"] | ||
| ) | ||
| DETECT_TARGET_ULTRALYTICS_MODEL_PATH = config["detect_ultralytics"]["model_path"] | ||
| DETECT_TARGET_ULTRALYTICS_OVERRIDE_FULL_PRECISION = args.full | ||
|
|
||
| DETECT_TARGET_BRIGHTSPOT_PERCENTILE_THRESHOLD = config["detect_brightspot"][ | ||
| "brightspot_percentile_threshold" | ||
| ] | ||
| DETECT_TARGET_BRIGHTSPOT_FILTER_BY_COLOR = config["detect_brightspot"]["filter_by_color"] | ||
| DETECT_TARGET_BRIGHTSPOT_BLOB_COLOR = config["detect_brightspot"]["blob_color"] | ||
| DETECT_TARGET_BRIGHTSPOT_FILTER_BY_CIRCULARITY = config["detect_brightspot"][ | ||
| "filter_by_circularity" | ||
| ] | ||
| DETECT_TARGET_BRIGHTSPOT_MIN_CIRCULARITY = config["detect_brightspot"]["min_circularity"] | ||
| DETECT_TARGET_BRIGHTSPOT_MAX_CIRCULARITY = config["detect_brightspot"]["max_circularity"] | ||
| DETECT_TARGET_BRIGHTSPOT_FILTER_BY_INERTIA = config["detect_brightspot"][ | ||
| "filter_by_inertia" | ||
| ] | ||
| DETECT_TARGET_BRIGHTSPOT_MIN_INERTIA_RATIO = config["detect_brightspot"][ | ||
| "min_inertia_ratio" | ||
| ] | ||
| DETECT_TARGET_BRIGHTSPOT_MAX_INERTIA_RATIO = config["detect_brightspot"][ | ||
| "max_inertia_ratio" | ||
| ] | ||
| DETECT_TARGET_BRIGHTSPOT_FILTER_BY_CONVEXITY = config["detect_brightspot"][ | ||
| "filter_by_convexity" | ||
| ] | ||
| DETECT_TARGET_BRIGHTSPOT_MIN_CONVEXITY = config["detect_brightspot"]["min_convexity"] | ||
| DETECT_TARGET_BRIGHTSPOT_MAX_CONVEXITY = config["detect_brightspot"]["max_convexity"] | ||
| DETECT_TARGET_BRIGHTSPOT_FILTER_BY_AREA = config["detect_brightspot"]["filter_by_area"] | ||
| DETECT_TARGET_BRIGHTSPOT_MIN_AREA_PIXELS = config["detect_brightspot"]["min_area_pixels"] | ||
| DETECT_TARGET_BRIGHTSPOT_MAX_AREA_PIXELS = config["detect_brightspot"]["max_area_pixels"] |
There was a problem hiding this comment.
Instead of having this many variables, just have one DETECT_TARGET_CONFIG and use match case here (see VIDEO_INPUT_CAMERA_CONFIG above
Comment on lines
24
to
30
| config: ( | ||
| detect_target_brightspot.DetectTargetBrightspotConfig | ||
| | detect_target_ultralytics.DetectTargetUltralyticsConfig | ||
| ), | ||
| local_logger: logger.Logger, | ||
| show_annotations: bool, | ||
| save_name: str, |
There was a problem hiding this comment.
Can we re-order these so that it goes save_name, show_annotations, config, local_logger?
maxlou05
approved these changes
Jan 24, 2025
HermanG05
pushed a commit
that referenced
this pull request
Jan 26, 2025
* Create ultralytics config class * Add configs to target detection pipeline * Organize YAML and improve parsing * Reorder args * Update integration test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.