From cc8d20d45eec9aecf58ab2accd498bcab72a4a01 Mon Sep 17 00:00:00 2001 From: Santiago Martinez Date: Mon, 27 Nov 2023 19:59:51 +0000 Subject: [PATCH] Fixed typing and formatting errors --- docs/user_guide/1_saving_and_loading.py | 4 +++- docs/user_guide/example_dataset.json | 2 +- docs/user_guide/nips4b_plus_sample.json | 2 +- pyproject.toml | 2 +- src/soundevent/io/aoef/clip_annotations.py | 8 ++++---- src/soundevent/io/aoef/clip_predictions.py | 8 ++++---- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/docs/user_guide/1_saving_and_loading.py b/docs/user_guide/1_saving_and_loading.py index 6c30bcd..0a78ddb 100644 --- a/docs/user_guide/1_saving_and_loading.py +++ b/docs/user_guide/1_saving_and_loading.py @@ -105,7 +105,9 @@ f"* Recording {recording.path} [from " f"{clip.start_time:.3f}s to {clip.end_time:.3f}s]" ) - print(f"\t{len(clip_annotation.sound_events)} sound event annotations found") + print( + f"\t{len(clip_annotation.sound_events)} sound event annotations found" + ) for annotation in clip_annotation.sound_events: sound_event = annotation.sound_event start_time, end_time = sound_event.geometry.coordinates diff --git a/docs/user_guide/example_dataset.json b/docs/user_guide/example_dataset.json index 9638459..a3459c1 100644 --- a/docs/user_guide/example_dataset.json +++ b/docs/user_guide/example_dataset.json @@ -1 +1 @@ -{"version":"1.1.0","created_on":"2023-11-27T19:45:58.447521","data":{"uuid":"b1096756-eea2-4489-9e6a-b98b559647bb","collection_type":"dataset","created_on":"2023-11-21T13:43:14.742002","recordings":[{"uuid":"89957d47-f67d-4bfe-8352-bf0fe5a8ce3e","path":"recording1.wav","duration":10.0,"channels":1,"samplerate":44100,"time_expansion":10.0,"hash":"1234567890abcdef","date":"2021-01-01","time":"21:34:56","latitude":12.345,"longitude":34.567,"tags":[0,1,2],"features":{"SNR":10.0,"ACI":0.5},"notes":[{"uuid":"2931b864-43e4-4fb1-aae1-a214dccca6e3","message":"This is a note.","created_by":"04ef3927-3a3d-40df-9d6e-2cc5e21482a0","is_issue":false,"created_on":"2023-11-21T13:43:14.742073"}],"owners":["d6eb0862-a619-4919-992c-eb3625692c13"]},{"uuid":"bd30f886-3abb-475b-aacb-c7148a4d4420","path":"recording2.wav","duration":8.0,"channels":1,"samplerate":441000,"time_expansion":10.0,"hash":"234567890abcdef1","date":"2021-01-02","time":"19:34:56","latitude":13.345,"longitude":32.567,"tags":[3,4,5],"features":{"SNR":7.0,"ACI":0.3},"notes":[{"uuid":"713b6c15-0e3d-4cc5-acc6-3f1093209a40","message":"Unsure about the species.","created_by":"04ef3927-3a3d-40df-9d6e-2cc5e21482a0","is_issue":false,"created_on":"2023-11-21T13:43:14.742147"}],"owners":["d6eb0862-a619-4919-992c-eb3625692c13"]}],"tags":[{"id":0,"key":"species","value":"Myotis myotis"},{"id":1,"key":"sex","value":"female"},{"id":2,"key":"behaviour","value":"foraging"},{"id":3,"key":"species","value":"Eptesicus serotinus"},{"id":4,"key":"sex","value":"male"},{"id":5,"key":"behaviour","value":"social calls"}],"users":[{"uuid":"04ef3927-3a3d-40df-9d6e-2cc5e21482a0","name":"John Doe"},{"uuid":"d6eb0862-a619-4919-992c-eb3625692c13","email":"data.collector@soundevent.org","name":"Data Collector"}],"name":"test_dataset","description":"A test dataset"}} \ No newline at end of file +{"version":"1.1.0","created_on":"2023-11-27T19:53:00.688910","data":{"uuid":"b1096756-eea2-4489-9e6a-b98b559647bb","collection_type":"dataset","created_on":"2023-11-21T13:43:14.742002","recordings":[{"uuid":"89957d47-f67d-4bfe-8352-bf0fe5a8ce3e","path":"recording1.wav","duration":10.0,"channels":1,"samplerate":44100,"time_expansion":10.0,"hash":"1234567890abcdef","date":"2021-01-01","time":"21:34:56","latitude":12.345,"longitude":34.567,"tags":[0,1,2],"features":{"SNR":10.0,"ACI":0.5},"notes":[{"uuid":"2931b864-43e4-4fb1-aae1-a214dccca6e3","message":"This is a note.","created_by":"04ef3927-3a3d-40df-9d6e-2cc5e21482a0","is_issue":false,"created_on":"2023-11-21T13:43:14.742073"}],"owners":["d6eb0862-a619-4919-992c-eb3625692c13"]},{"uuid":"bd30f886-3abb-475b-aacb-c7148a4d4420","path":"recording2.wav","duration":8.0,"channels":1,"samplerate":441000,"time_expansion":10.0,"hash":"234567890abcdef1","date":"2021-01-02","time":"19:34:56","latitude":13.345,"longitude":32.567,"tags":[3,4,5],"features":{"SNR":7.0,"ACI":0.3},"notes":[{"uuid":"713b6c15-0e3d-4cc5-acc6-3f1093209a40","message":"Unsure about the species.","created_by":"04ef3927-3a3d-40df-9d6e-2cc5e21482a0","is_issue":false,"created_on":"2023-11-21T13:43:14.742147"}],"owners":["d6eb0862-a619-4919-992c-eb3625692c13"]}],"tags":[{"id":0,"key":"species","value":"Myotis myotis"},{"id":1,"key":"sex","value":"female"},{"id":2,"key":"behaviour","value":"foraging"},{"id":3,"key":"species","value":"Eptesicus serotinus"},{"id":4,"key":"sex","value":"male"},{"id":5,"key":"behaviour","value":"social calls"}],"users":[{"uuid":"04ef3927-3a3d-40df-9d6e-2cc5e21482a0","name":"John Doe"},{"uuid":"d6eb0862-a619-4919-992c-eb3625692c13","email":"data.collector@soundevent.org","name":"Data Collector"}],"name":"test_dataset","description":"A test dataset"}} \ No newline at end of file diff --git a/docs/user_guide/nips4b_plus_sample.json b/docs/user_guide/nips4b_plus_sample.json index 84b7a28..35f97d3 100644 --- a/docs/user_guide/nips4b_plus_sample.json +++ b/docs/user_guide/nips4b_plus_sample.json @@ -1 +1 @@ -{"version":"1.1.0","created_on":"2023-11-27T19:45:58.841511","data":{"uuid":"c18624a1-8145-4657-a3f1-b3512134ecf6","collection_type":"annotation_set","recordings":[{"uuid":"8392b0ff-293f-4d5b-bc1b-d40d2a0eb0dc","path":"train/nips4b_birds_trainfile079.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"35e120d0-1633-4864-88c9-063aca992747","path":"train/nips4b_birds_trainfile237.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"7ee23c44-1bc6-4833-8d66-14aa4a8e8634","path":"train/nips4b_birds_trainfile587.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"24eceb91-535e-42f0-80e4-8c670465bac8","path":"train/nips4b_birds_trainfile106.wav","duration":4.069297052154195,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"24dd23da-ca07-40eb-80e6-af8b6b2a75ee","path":"train/nips4b_birds_trainfile430.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"8954beed-21d0-4f20-98bd-58c14264d853","path":"train/nips4b_birds_trainfile661.wav","duration":1.3873922902494331,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"69f7bf42-087a-4d88-b312-f26688597974","path":"train/nips4b_birds_trainfile429.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"b98b5a59-3518-45e5-9306-67c522540ae1","path":"train/nips4b_birds_trainfile633.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"52e329a3-afbb-475e-938c-f70c88580723","path":"train/nips4b_birds_trainfile200.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"6eeca672-f3ec-41ca-a551-54ddec0dd1a7","path":"train/nips4b_birds_trainfile545.wav","duration":2.7921995464852607,"channels":1,"samplerate":44100,"owners":[]}],"clips":[{"uuid":"b283a71f-4aa8-4ee2-ac83-7c7d5d0af2bc","recording":"8392b0ff-293f-4d5b-bc1b-d40d2a0eb0dc","start_time":0.0,"end_time":5.00390022675737},{"uuid":"e2ec7571-bfe1-4682-8d4d-15e3e34edfc9","recording":"35e120d0-1633-4864-88c9-063aca992747","start_time":0.0,"end_time":5.00390022675737},{"uuid":"ab5bcc8f-078e-4194-97a4-763998d289fa","recording":"7ee23c44-1bc6-4833-8d66-14aa4a8e8634","start_time":0.0,"end_time":5.00390022675737},{"uuid":"dd9ad126-8b15-4121-84f5-f59dc3f85802","recording":"24eceb91-535e-42f0-80e4-8c670465bac8","start_time":0.0,"end_time":4.069297052154195},{"uuid":"0a53e14f-f51c-4ade-9567-87c2b02bd197","recording":"24dd23da-ca07-40eb-80e6-af8b6b2a75ee","start_time":0.0,"end_time":5.00390022675737},{"uuid":"ae455d97-d1fa-43a1-b179-907bee8471e6","recording":"8954beed-21d0-4f20-98bd-58c14264d853","start_time":0.0,"end_time":1.3873922902494331},{"uuid":"0b42c9e1-0289-4f03-b3cb-10859a80103e","recording":"69f7bf42-087a-4d88-b312-f26688597974","start_time":0.0,"end_time":5.00390022675737},{"uuid":"56329c3c-5beb-48ed-8a79-be4e9bd2d9ed","recording":"b98b5a59-3518-45e5-9306-67c522540ae1","start_time":0.0,"end_time":5.00390022675737},{"uuid":"57e0b23a-8663-49f3-8455-997e0f4d2b49","recording":"52e329a3-afbb-475e-938c-f70c88580723","start_time":0.0,"end_time":5.00390022675737},{"uuid":"c7b6f927-fd3b-40ac-9b25-d682eec2d3ac","recording":"6eeca672-f3ec-41ca-a551-54ddec0dd1a7","start_time":0.0,"end_time":2.7921995464852607}],"clip_annotations":[{"uuid":"0e7a786e-48e4-4424-a8da-bf080bdefd9e","clip":"b283a71f-4aa8-4ee2-ac83-7c7d5d0af2bc","created_on":"2023-11-23T20:44:32.913233"},{"uuid":"af9713a7-2bf4-45df-bdff-63d47de34d71","clip":"e2ec7571-bfe1-4682-8d4d-15e3e34edfc9","created_on":"2023-11-23T20:44:32.913255"},{"uuid":"70738dff-3c98-4838-979c-0ed073edd0ea","clip":"ab5bcc8f-078e-4194-97a4-763998d289fa","created_on":"2023-11-23T20:44:32.913264"},{"uuid":"fa0fc36e-0c1a-450f-900b-5a32df17a159","clip":"dd9ad126-8b15-4121-84f5-f59dc3f85802","created_on":"2023-11-23T20:44:32.913377"},{"uuid":"178bf156-2bab-4970-8a76-4abfdc4b31b7","clip":"0a53e14f-f51c-4ade-9567-87c2b02bd197","created_on":"2023-11-23T20:44:32.913386"},{"uuid":"dc71d06a-54d6-4fad-ac6a-205bbee7ec96","clip":"ae455d97-d1fa-43a1-b179-907bee8471e6","created_on":"2023-11-23T20:44:32.913392"},{"uuid":"b418abd6-52cc-4ef4-9725-33d3d38b7878","clip":"0b42c9e1-0289-4f03-b3cb-10859a80103e","created_on":"2023-11-23T20:44:32.913400"},{"uuid":"d18ca56f-2f13-44dd-be43-f995e4d2edb6","clip":"56329c3c-5beb-48ed-8a79-be4e9bd2d9ed","created_on":"2023-11-23T20:44:32.913415"},{"uuid":"8dfa7d26-5f8b-4f37-bf0a-c031373b22f7","clip":"57e0b23a-8663-49f3-8455-997e0f4d2b49","created_on":"2023-11-23T20:44:32.913430"},{"uuid":"ebc5e8d0-bd3e-4d01-95e0-d9a0ce337ac9","clip":"c7b6f927-fd3b-40ac-9b25-d682eec2d3ac","created_on":"2023-11-23T20:44:32.913437"}],"created_on":"2023-11-23T20:44:32.913488"}} \ No newline at end of file +{"version":"1.1.0","created_on":"2023-11-27T19:53:01.364978","data":{"uuid":"c18624a1-8145-4657-a3f1-b3512134ecf6","collection_type":"annotation_set","recordings":[{"uuid":"8392b0ff-293f-4d5b-bc1b-d40d2a0eb0dc","path":"train/nips4b_birds_trainfile079.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"35e120d0-1633-4864-88c9-063aca992747","path":"train/nips4b_birds_trainfile237.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"7ee23c44-1bc6-4833-8d66-14aa4a8e8634","path":"train/nips4b_birds_trainfile587.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"24eceb91-535e-42f0-80e4-8c670465bac8","path":"train/nips4b_birds_trainfile106.wav","duration":4.069297052154195,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"24dd23da-ca07-40eb-80e6-af8b6b2a75ee","path":"train/nips4b_birds_trainfile430.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"8954beed-21d0-4f20-98bd-58c14264d853","path":"train/nips4b_birds_trainfile661.wav","duration":1.3873922902494331,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"69f7bf42-087a-4d88-b312-f26688597974","path":"train/nips4b_birds_trainfile429.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"b98b5a59-3518-45e5-9306-67c522540ae1","path":"train/nips4b_birds_trainfile633.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"52e329a3-afbb-475e-938c-f70c88580723","path":"train/nips4b_birds_trainfile200.wav","duration":5.00390022675737,"channels":1,"samplerate":44100,"owners":[]},{"uuid":"6eeca672-f3ec-41ca-a551-54ddec0dd1a7","path":"train/nips4b_birds_trainfile545.wav","duration":2.7921995464852607,"channels":1,"samplerate":44100,"owners":[]}],"clips":[{"uuid":"b283a71f-4aa8-4ee2-ac83-7c7d5d0af2bc","recording":"8392b0ff-293f-4d5b-bc1b-d40d2a0eb0dc","start_time":0.0,"end_time":5.00390022675737},{"uuid":"e2ec7571-bfe1-4682-8d4d-15e3e34edfc9","recording":"35e120d0-1633-4864-88c9-063aca992747","start_time":0.0,"end_time":5.00390022675737},{"uuid":"ab5bcc8f-078e-4194-97a4-763998d289fa","recording":"7ee23c44-1bc6-4833-8d66-14aa4a8e8634","start_time":0.0,"end_time":5.00390022675737},{"uuid":"dd9ad126-8b15-4121-84f5-f59dc3f85802","recording":"24eceb91-535e-42f0-80e4-8c670465bac8","start_time":0.0,"end_time":4.069297052154195},{"uuid":"0a53e14f-f51c-4ade-9567-87c2b02bd197","recording":"24dd23da-ca07-40eb-80e6-af8b6b2a75ee","start_time":0.0,"end_time":5.00390022675737},{"uuid":"ae455d97-d1fa-43a1-b179-907bee8471e6","recording":"8954beed-21d0-4f20-98bd-58c14264d853","start_time":0.0,"end_time":1.3873922902494331},{"uuid":"0b42c9e1-0289-4f03-b3cb-10859a80103e","recording":"69f7bf42-087a-4d88-b312-f26688597974","start_time":0.0,"end_time":5.00390022675737},{"uuid":"56329c3c-5beb-48ed-8a79-be4e9bd2d9ed","recording":"b98b5a59-3518-45e5-9306-67c522540ae1","start_time":0.0,"end_time":5.00390022675737},{"uuid":"57e0b23a-8663-49f3-8455-997e0f4d2b49","recording":"52e329a3-afbb-475e-938c-f70c88580723","start_time":0.0,"end_time":5.00390022675737},{"uuid":"c7b6f927-fd3b-40ac-9b25-d682eec2d3ac","recording":"6eeca672-f3ec-41ca-a551-54ddec0dd1a7","start_time":0.0,"end_time":2.7921995464852607}],"clip_annotations":[{"uuid":"0e7a786e-48e4-4424-a8da-bf080bdefd9e","clip":"b283a71f-4aa8-4ee2-ac83-7c7d5d0af2bc","created_on":"2023-11-23T20:44:32.913233"},{"uuid":"af9713a7-2bf4-45df-bdff-63d47de34d71","clip":"e2ec7571-bfe1-4682-8d4d-15e3e34edfc9","created_on":"2023-11-23T20:44:32.913255"},{"uuid":"70738dff-3c98-4838-979c-0ed073edd0ea","clip":"ab5bcc8f-078e-4194-97a4-763998d289fa","created_on":"2023-11-23T20:44:32.913264"},{"uuid":"fa0fc36e-0c1a-450f-900b-5a32df17a159","clip":"dd9ad126-8b15-4121-84f5-f59dc3f85802","created_on":"2023-11-23T20:44:32.913377"},{"uuid":"178bf156-2bab-4970-8a76-4abfdc4b31b7","clip":"0a53e14f-f51c-4ade-9567-87c2b02bd197","created_on":"2023-11-23T20:44:32.913386"},{"uuid":"dc71d06a-54d6-4fad-ac6a-205bbee7ec96","clip":"ae455d97-d1fa-43a1-b179-907bee8471e6","created_on":"2023-11-23T20:44:32.913392"},{"uuid":"b418abd6-52cc-4ef4-9725-33d3d38b7878","clip":"0b42c9e1-0289-4f03-b3cb-10859a80103e","created_on":"2023-11-23T20:44:32.913400"},{"uuid":"d18ca56f-2f13-44dd-be43-f995e4d2edb6","clip":"56329c3c-5beb-48ed-8a79-be4e9bd2d9ed","created_on":"2023-11-23T20:44:32.913415"},{"uuid":"8dfa7d26-5f8b-4f37-bf0a-c031373b22f7","clip":"57e0b23a-8663-49f3-8455-997e0f4d2b49","created_on":"2023-11-23T20:44:32.913430"},{"uuid":"ebc5e8d0-bd3e-4d01-95e0-d9a0ce337ac9","clip":"c7b6f927-fd3b-40ac-9b25-d682eec2d3ac","created_on":"2023-11-23T20:44:32.913437"}],"created_on":"2023-11-23T20:44:32.913488"}} \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 11d5ffe..4ab4eeb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -86,7 +86,7 @@ profile = "black" ignore_missing_imports = true show_error_codes = true show_error_code_links = true -disable_error_code = ["call-overload", "misc"] +disable_error_code = ["call-overload", "misc", "override"] [tool.coverage.run] branch = true diff --git a/src/soundevent/io/aoef/clip_annotations.py b/src/soundevent/io/aoef/clip_annotations.py index b13379d..da005b0 100644 --- a/src/soundevent/io/aoef/clip_annotations.py +++ b/src/soundevent/io/aoef/clip_annotations.py @@ -90,20 +90,20 @@ def assemble_soundevent( if (tag := self.tag_adapter.from_id(tag_id)) is not None ], sound_events=[ - annotation + se_ann for annotation_id in obj.sound_events or [] if ( - annotation := self.sound_event_annotation_adapter.from_id( + se_ann := self.sound_event_annotation_adapter.from_id( annotation_id ) ) is not None ], sequences=[ - annotation + seq_ann for annotation_id in obj.sequences or [] if ( - annotation := self.sequence_annotation_adapter.from_id( + seq_ann := self.sequence_annotation_adapter.from_id( annotation_id ) ) diff --git a/src/soundevent/io/aoef/clip_predictions.py b/src/soundevent/io/aoef/clip_predictions.py index 90e0e34..7ddc108 100644 --- a/src/soundevent/io/aoef/clip_predictions.py +++ b/src/soundevent/io/aoef/clip_predictions.py @@ -83,20 +83,20 @@ def assemble_soundevent( uuid=obj.uuid, clip=clip, sound_events=[ - prediction + se_pred for sound_event in obj.sound_events or [] if ( - prediction := self.sound_event_prediction_adapter.from_id( + se_pred := self.sound_event_prediction_adapter.from_id( sound_event ) ) is not None ], sequences=[ - prediction + seq_pred for sequence in obj.sequences or [] if ( - prediction := self.sequence_prediction_adapter.from_id( + seq_pred := self.sequence_prediction_adapter.from_id( sequence ) )