From f763786ec6e24d601269cbd374d706ce6614de15 Mon Sep 17 00:00:00 2001 From: Nikita Sokovnin Date: Fri, 1 Nov 2024 12:22:17 +0000 Subject: [PATCH 1/7] fix: add images with no annotations to LuxonisDataset --- datadreamer/utils/luxonis_dataset_converter.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datadreamer/utils/luxonis_dataset_converter.py b/datadreamer/utils/luxonis_dataset_converter.py index 8462ea1..c5ebbcd 100644 --- a/datadreamer/utils/luxonis_dataset_converter.py +++ b/datadreamer/utils/luxonis_dataset_converter.py @@ -80,6 +80,12 @@ def dataset_generator(): image_full_path = os.path.join(dataset_dir, image_path) width, height = Image.open(image_full_path).size labels = data[image_path]["labels"] + + if len(labels) == 0: + yield { + "file": image_full_path, + } + for label in labels: yield { "file": image_full_path, From 65c91e3d6f4f99d160242a308ecabd01af363e09 Mon Sep 17 00:00:00 2001 From: conorsim Date: Tue, 5 Nov 2024 13:36:24 -0700 Subject: [PATCH 2/7] fix(workflow): use branch we run workflow from --- .github/workflows/gar-publish-dev.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/gar-publish-dev.yaml b/.github/workflows/gar-publish-dev.yaml index b5a7408..5e8b8c8 100644 --- a/.github/workflows/gar-publish-dev.yaml +++ b/.github/workflows/gar-publish-dev.yaml @@ -16,8 +16,6 @@ jobs: steps: - name: 'Checkout GitHub Action' uses: actions/checkout@main - with: - ref: dev # Checkout the dev branch - id: 'auth' name: 'Authenticate to Google Cloud' From b033286c000973bac3a51828f7f7722efedf75bc Mon Sep 17 00:00:00 2001 From: conorsim Date: Tue, 5 Nov 2024 14:39:47 -0700 Subject: [PATCH 3/7] test: confirm current branch in workflow --- .github/workflows/gar-publish-dev.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gar-publish-dev.yaml b/.github/workflows/gar-publish-dev.yaml index 5e8b8c8..87970f6 100644 --- a/.github/workflows/gar-publish-dev.yaml +++ b/.github/workflows/gar-publish-dev.yaml @@ -15,7 +15,10 @@ jobs: steps: - name: 'Checkout GitHub Action' - uses: actions/checkout@main + uses: actions/checkout@v4 + + - name: Confirm current branch + run: git rev-parse --abbrev-ref HEAD - id: 'auth' name: 'Authenticate to Google Cloud' From 17b670f38e01cbe9d64f8604a734d3961ba7698d Mon Sep 17 00:00:00 2001 From: conorsim Date: Tue, 5 Nov 2024 14:43:03 -0700 Subject: [PATCH 4/7] fix(workflows): correctly pass branch arg --- .github/workflows/gar-publish-dev.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/gar-publish-dev.yaml b/.github/workflows/gar-publish-dev.yaml index 87970f6..0aa63d3 100644 --- a/.github/workflows/gar-publish-dev.yaml +++ b/.github/workflows/gar-publish-dev.yaml @@ -16,9 +16,6 @@ jobs: steps: - name: 'Checkout GitHub Action' uses: actions/checkout@v4 - - - name: Confirm current branch - run: git rev-parse --abbrev-ref HEAD - id: 'auth' name: 'Authenticate to Google Cloud' @@ -37,5 +34,5 @@ jobs: - name: 'Build Inventory Image' working-directory: . run: | - docker build --build-arg GITHUB_TOKEN=${{secrets.GHCR_PAT}} --build-arg BRANCH=dev . --tag $GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/internal/datadreamer:dev + docker build --build-arg GITHUB_TOKEN=${{secrets.GHCR_PAT}} --build-arg BRANCH=${{ github.ref_name }} . --tag $GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/internal/datadreamer:latest --tag $GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/internal/datadreamer:${{ github.event.release.tag_name }} docker push $GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/internal/datadreamer --all-tags \ No newline at end of file From aaea7d128a8b2f6d80f2b6d3fcfd852a4d7419c4 Mon Sep 17 00:00:00 2001 From: conorsim Date: Tue, 5 Nov 2024 14:46:23 -0700 Subject: [PATCH 5/7] fix(workflows): tags --- .github/workflows/gar-publish-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gar-publish-dev.yaml b/.github/workflows/gar-publish-dev.yaml index 0aa63d3..9b0bb31 100644 --- a/.github/workflows/gar-publish-dev.yaml +++ b/.github/workflows/gar-publish-dev.yaml @@ -34,5 +34,5 @@ jobs: - name: 'Build Inventory Image' working-directory: . run: | - docker build --build-arg GITHUB_TOKEN=${{secrets.GHCR_PAT}} --build-arg BRANCH=${{ github.ref_name }} . --tag $GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/internal/datadreamer:latest --tag $GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/internal/datadreamer:${{ github.event.release.tag_name }} + docker build --build-arg GITHUB_TOKEN=${{secrets.GHCR_PAT}} --build-arg BRANCH=${{ github.ref_name }} . --tag $GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/internal/datadreamer:dev docker push $GAR_LOCATION-docker.pkg.dev/$PROJECT_ID/internal/datadreamer --all-tags \ No newline at end of file From ba4127c5ec8a550446805b1a29705e46f9ea0f95 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 7 Nov 2024 23:04:27 +0000 Subject: [PATCH 6/7] [Automated] Updated coverage badge --- media/coverage_badge.svg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media/coverage_badge.svg b/media/coverage_badge.svg index 6c15cac..179c6a1 100644 --- a/media/coverage_badge.svg +++ b/media/coverage_badge.svg @@ -9,13 +9,13 @@ - + coverage coverage - 75% - 75% + 63% + 63% From 0cae9fafbdc0b1d35a94809c70c78d561a678dec Mon Sep 17 00:00:00 2001 From: Nikita Sokovnin Date: Fri, 8 Nov 2024 16:50:23 +0000 Subject: [PATCH 7/7] chore: change min required luxonis-ml version to 0.5.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2ab6b13..df5cc3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,6 +12,6 @@ accelerate>=0.25.0 scipy>=1.10.0 bitsandbytes>=0.42.0 nltk>=3.8.1 -luxonis-ml[all]>=0.4.1 +luxonis-ml[all]>=0.5.0 python-box>=7.1.1 gcsfs>=2023.1.0 \ No newline at end of file