Skip to content
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.

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

feat/estimate-polygonzone-occupation #1648

Closed
wants to merge 122 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
a05882a
Make BaseTrack._count instance variable
grzegorz-roboflow Sep 19, 2024
db2aa72
Let upper layer to handle track_id generation
grzegorz-roboflow Sep 19, 2024
3da10ed
Remove unused variable
grzegorz-roboflow Sep 19, 2024
1e43de0
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Sep 19, 2024
a0655ae
fix test
grzegorz-roboflow Sep 19, 2024
df9257b
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Sep 19, 2024
266bf3f
Reset _count
grzegorz-roboflow Sep 19, 2024
58a6fd0
Merge pull request #1575 from roboflow/main
LinasKo Oct 4, 2024
124c7d9
Added class-agnostic
AHuzail Oct 5, 2024
6d30eef
Added _match_detection_batch_class_agnostic
AHuzail Oct 5, 2024
e0db07a
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 5, 2024
c709881
:arrow_up: Bump ruff from 0.6.8 to 0.6.9
dependabot[bot] Oct 7, 2024
1523ee2
:arrow_up: Bump build from 1.2.2 to 1.2.2.post1
dependabot[bot] Oct 7, 2024
c3e46b0
Merge pull request #1578 from roboflow/dependabot/pip/ruff-0.6.9
onuralpszr Oct 7, 2024
044d503
Merge pull request #1579 from roboflow/dependabot/pip/build-1.2.2.post1
onuralpszr Oct 7, 2024
7862f9c
chore(pre_commit): ⬆ pre_commit autoupdate
pre-commit-ci[bot] Oct 7, 2024
22d7358
Merge pull request #1580 from roboflow/pre-commit-ci-update-config
onuralpszr Oct 7, 2024
3231f7f
Minor fix: mAP can be 1.01
LinasKo Oct 9, 2024
70869c7
Merge pull request #1581 from roboflow/fix/mAP-calculation-division-fix
LinasKo Oct 9, 2024
ebbc79a
Merge branch 'develop' into fix/class-agnostic
LinasKo Oct 9, 2024
921e8f3
ci: 👷 python3.13 ci tests and tox ver added
onuralpszr Oct 9, 2024
a4f79b5
feat: adding type hinting to package
DemyCode Oct 9, 2024
baffd98
removed comments
AHuzail Oct 9, 2024
12c6b87
modified: supervision/metrics/mean_average_precision.py
AHuzail Oct 9, 2024
e433527
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 9, 2024
16a4491
modified class MeanAveragePrecisionResult for class_agnostic
AHuzail Oct 9, 2024
ef85b32
Merge branch 'fix/class-agnostic' of https://github.com/AHuzail/super…
AHuzail Oct 9, 2024
62a3cfe
modified: supervision/metrics/mean_average_precision.py
AHuzail Oct 9, 2024
0f42a87
modified: supervision/metrics/mean_average_precision.py
AHuzail Oct 9, 2024
201a186
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 9, 2024
53b26d0
modified: supervision/metrics/mean_average_precision.py
AHuzail Oct 9, 2024
426e36d
Merge branch 'fix/class-agnostic' of https://github.com/AHuzail/super…
AHuzail Oct 9, 2024
75b6384
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 9, 2024
f1e32e7
Added deepcopy
AHuzail Oct 9, 2024
5fc7c3a
only using _match_detection_batch
AHuzail Oct 9, 2024
9659f7b
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 9, 2024
05b17c4
Deleted _match_detection_batch_class_agnostic
AHuzail Oct 9, 2024
2530c41
docs: fix datatype of class_agnostic in MeanAveragePrecisionResult
LinasKo Oct 10, 2024
c5dfb47
Remove old unused code: CLASS_ID_NONE
LinasKo Oct 10, 2024
70bc4b9
Merge pull request #1577 from AHuzail/fix/class-agnostic
LinasKo Oct 10, 2024
dcdeea8
replaces github hosted to roboflow cdn images links
joaomarcoscrs Oct 10, 2024
bfe4f0f
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 10, 2024
892185e
:arrow_up: Bump mkdocs-material from 9.5.39 to 9.5.40
dependabot[bot] Oct 11, 2024
337b0e4
Merge pull request #1590 from roboflow/dependabot/pip/mkdocs-material…
onuralpszr Oct 11, 2024
ef1f968
Merge pull request #1588 from roboflow/joao/fix/sahi-cookbook-images-…
onuralpszr Oct 11, 2024
b86b660
feat-Added Default color
DivyaVijay1234 Oct 11, 2024
5242614
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 11, 2024
d333d67
Merge pull request #1586 from DemyCode/feat/adding-py-typed-for-type-…
LinasKo Oct 11, 2024
a6897d4
feat: add default color
DivyaVijay1234 Oct 11, 2024
b6ae599
feat: add default color
DivyaVijay1234 Oct 11, 2024
7e7eb8b
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 11, 2024
8edf7bb
Merge pull request #1584 from roboflow/python/version/3.13
LinasKo Oct 11, 2024
c339315
feat: ✨ set default colors for polygon drawing functions and add docu…
onuralpszr Oct 12, 2024
9b35f8c
PR #1591 - feat: 🚀 Add default color to PolygonZoneAnnotator, drawin…
onuralpszr Oct 12, 2024
1d3f61a
Added support by using oriented_box_iou_batch
PrakharJain1509 Oct 13, 2024
9822406
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 13, 2024
302041d
Removed welcome workflow
LinasKo Oct 14, 2024
086091a
Merge pull request #1596 from roboflow/fix/remove-welcome-workflow
onuralpszr Oct 14, 2024
62a4d45
feat: 🚀 python3.13 support for poetry and library
onuralpszr Oct 14, 2024
213d59d
Merge pull request #1595 from roboflow/support/py13
LinasKo Oct 14, 2024
a879c1d
:arrow_up: Bump mypy from 1.11.2 to 1.12.0
dependabot[bot] Oct 15, 2024
e9d5f86
Added support by using oriented_box_iou_batch Final
PrakharJain1509 Oct 15, 2024
865c4e4
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 15, 2024
85f400c
Added support by using oriented_box_iou_batch
PrakharJain1509 Oct 15, 2024
0012052
:arrow_up: Bump tox from 4.21.2 to 4.22.0
dependabot[bot] Oct 16, 2024
5b09368
:arrow_up: Bump mkdocs-material from 9.5.40 to 9.5.41
dependabot[bot] Oct 16, 2024
8d374a6
Merge pull request #1597 from roboflow/dependabot/pip/mypy-1.12.0
onuralpszr Oct 16, 2024
ed6fe98
Merge pull request #1599 from roboflow/dependabot/pip/mkdocs-material…
onuralpszr Oct 16, 2024
3eb5c0b
Merge pull request #1598 from roboflow/dependabot/pip/tox-4.22.0
onuralpszr Oct 16, 2024
d50aa67
:arrow_up: Bump types-requests from 2.32.0.20240914 to 2.32.0.20241016
dependabot[bot] Oct 17, 2024
75a4ff1
Merge pull request #1601 from roboflow/dependabot/pip/types-requests-…
onuralpszr Oct 17, 2024
5ac3999
Validate that polygon has at least 3 vertices in geometry utils.py
ablazejuk Oct 17, 2024
f8ff332
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Oct 17, 2024
1b95d1d
Change get_polygon_center validation to fail on 0 points
LinasKo Oct 17, 2024
f60d89f
Merge pull request #1602 from ablazejuk/patch-1
LinasKo Oct 17, 2024
e5215b9
typos, minor type updates
LinasKo Oct 17, 2024
4a7d9ce
Tracker fix: add & rework mistakenly removed ID system
LinasKo Oct 17, 2024
251b952
Merge pull request #1528 from roboflow/feature/make-BaseTrack-count-i…
LinasKo Oct 17, 2024
b2762da
:arrow_up: Bump tox from 4.22.0 to 4.23.0
dependabot[bot] Oct 18, 2024
70dd0e1
:arrow_up: Bump ruff from 0.6.9 to 0.7.0
dependabot[bot] Oct 18, 2024
2c21e9e
Merge pull request #1604 from roboflow/dependabot/pip/tox-4.23.0
onuralpszr Oct 18, 2024
a9214b2
Merge pull request #1605 from roboflow/dependabot/pip/ruff-0.7.0
onuralpszr Oct 18, 2024
eb3e1e6
Add usage example in Polygon Zone docs
LinasKo Oct 18, 2024
bda4003
Merge pull request #1608 from roboflow/fix/polygon-zone-example
LinasKo Oct 18, 2024
c17de5c
Add precision and recall metrics
LinasKo Oct 18, 2024
fbd96d1
Add new and missing docstrings, examples to metrics, new Common section
LinasKo Oct 18, 2024
3e8a88a
Add Precision and Recall to metrics __init__
LinasKo Oct 18, 2024
ea776b5
Merge pull request #1609 from roboflow/feat/metrics-precision-recall
LinasKo Oct 18, 2024
74ae1ee
:arrow_up: Bump mypy from 1.12.0 to 1.12.1
dependabot[bot] Oct 21, 2024
2efe303
:arrow_up: Bump mkdocs-material from 9.5.41 to 9.5.42
dependabot[bot] Oct 21, 2024
40ef90c
chore(pre_commit): ⬆ pre_commit autoupdate
pre-commit-ci[bot] Oct 21, 2024
5c13d9c
Merge pull request #1611 from roboflow/dependabot/pip/mypy-1.12.1
onuralpszr Oct 22, 2024
145ed41
Merge pull request #1612 from roboflow/dependabot/pip/mkdocs-material…
onuralpszr Oct 22, 2024
7697547
Merge pull request #1614 from roboflow/pre-commit-ci-update-config
onuralpszr Oct 22, 2024
abd149f
:arrow_up: Bump tox from 4.23.0 to 4.23.2
dependabot[bot] Oct 23, 2024
6c7ee37
:arrow_up: Bump mypy from 1.12.1 to 1.13.0
dependabot[bot] Oct 23, 2024
cf3c1e4
:arrow_up: Bump mkdocs-git-revision-date-localized-plugin
dependabot[bot] Oct 23, 2024
f176f46
Merge pull request #1615 from roboflow/dependabot/pip/tox-4.23.2
onuralpszr Oct 23, 2024
d56c566
Merge pull request #1616 from roboflow/dependabot/pip/mypy-1.13.0
onuralpszr Oct 23, 2024
98aedd7
Merge pull request #1617 from roboflow/dependabot/pip/mkdocs-git-revi…
onuralpszr Oct 23, 2024
dbd4aa7
feat(ByteTrack): Allow ByteTrack to track detection without class ids
Kadermiyanyedi Oct 18, 2024
40e1611
:arrow_up: Bump ruff from 0.7.0 to 0.7.1
dependabot[bot] Oct 25, 2024
0e7f3cd
Merge pull request #1620 from roboflow/dependabot/pip/ruff-0.7.1
onuralpszr Oct 25, 2024
b4d93ce
chore(pre_commit): ⬆ pre_commit autoupdate
pre-commit-ci[bot] Oct 28, 2024
b702699
Merge pull request #1627 from roboflow/pre-commit-ci-update-config
onuralpszr Oct 28, 2024
b26e8f5
:arrow_up: Bump tqdm from 4.66.5 to 4.66.6
dependabot[bot] Oct 29, 2024
066099f
Merge pull request #1628 from roboflow/dependabot/pip/tqdm-4.66.6
onuralpszr Oct 29, 2024
b760b96
Merge upstream 'develop' into develop
LinasKo Oct 31, 2024
0273584
Undo style, class agnostic, mAP regressions. Fix empty OBB object shape
LinasKo Oct 31, 2024
37f0ad8
Add OBB support to F1 Score
LinasKo Oct 31, 2024
6f3491f
Fix issue in polygon_to_mask - expects a np.int32 datatype
LinasKo Oct 31, 2024
d1c07bc
Add OBB support to precision and recall
LinasKo Oct 31, 2024
3b4cd42
Merge pull request #1593 from PrakharJain1509/develop
LinasKo Oct 31, 2024
ad4418a
Merge pull request #1618 from Kadermiyanyedi/allow-bytetrack-detectio…
LinasKo Oct 31, 2024
353fa93
Bugfix: Tracker reset fails
LinasKo Oct 31, 2024
7229409
Revert "feat(ByteTrack): Allow ByteTrack to track detection without c…
LinasKo Oct 31, 2024
42b4d43
Merge pull request #1639 from roboflow/revert-1618-allow-bytetrack-de…
LinasKo Oct 31, 2024
37cacec
Merge pull request #1638 from roboflow/fix/tracker-reset-fails
LinasKo Oct 31, 2024
895bcfb
:arrow_up: Bump mkdocs-material from 9.5.42 to 9.5.43
dependabot[bot] Nov 1, 2024
46f7a22
Merge pull request #1640 from roboflow/dependabot/pip/mkdocs-material…
LinasKo Nov 1, 2024
3ea49a0
feat/estimate-polygonzone-occupation
AHB102 Nov 3, 2024
6157d90
fix(pre_commit): 🎨 auto format pre-commit hooks
pre-commit-ci[bot] Nov 3, 2024
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
37 changes: 37 additions & 0 deletions .github/workflows/poetry-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: 🔧 Poetry Check and Installation Test Workflow
on:
push:
paths:
- 'poetry.lock'
- 'pyproject.toml'
pull_request:
paths:
- 'poetry.lock'
- 'pyproject.toml'
workflow_dispatch:

jobs:
poetry-tests:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
runs-on: ${{ matrix.os }}
steps:
- name: 📥 Checkout the repository
uses: actions/checkout@v4

- name: 🐍 Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: 📦 Install the base dependencies
run: python -m pip install --upgrade poetry

- name: 🔍 Check the correctness of the project config
run: poetry check

- name: 🚀 Do Install the package Test
run: poetry install
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
steps:
- name: 🛎️ Checkout
uses: actions/checkout@v4
Expand Down
18 changes: 0 additions & 18 deletions .github/workflows/welcome.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
exclude: test/.*\.py
Expand All @@ -32,7 +32,7 @@ repos:
additional_dependencies: ["bandit[toml]"]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.8
rev: v0.7.1
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down
20 changes: 20 additions & 0 deletions docs/metrics/common_values.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
comments: true
status: new
---

# Common Values

This page contains supplementary values, types and enums that metrics use.

<div class="md-typeset">
<h2><a href="#supervision.metrics.core.MetricTarget">MetricTarget</a></h2>
</div>

:::supervision.metrics.core.MetricTarget

<div class="md-typeset">
<h2><a href="#supervision.metrics.core.AveragingMethod">AveragingMethod</a></h2>
</div>

:::supervision.metrics.core.AveragingMethod
18 changes: 18 additions & 0 deletions docs/metrics/precision.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
comments: true
status: new
---

# Precision

<div class="md-typeset">
<h2><a href="#supervision.metrics.precision.Precision">Precision</a></h2>
</div>

:::supervision.metrics.precision.Precision

<div class="md-typeset">
<h2><a href="#supervision.metrics.precision.PrecisionResult">PrecisionResult</a></h2>
</div>

:::supervision.metrics.precision.PrecisionResult
18 changes: 18 additions & 0 deletions docs/metrics/recall.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
comments: true
status: new
---

# Recall

<div class="md-typeset">
<h2><a href="#supervision.metrics.recall.Recall">Recall</a></h2>
</div>

:::supervision.metrics.recall.Recall

<div class="md-typeset">
<h2><a href="#supervision.metrics.recall.RecallResult">RecallResult</a></h2>
</div>

:::supervision.metrics.recall.RecallResult
10 changes: 5 additions & 5 deletions docs/notebooks/small-object-detection-with-sahi.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"\n",
"This cookbook shows how to use [Slicing Aided Hyper Inference (SAHI) ](https://arxiv.org/abs/2202.06934) for small object detection with `supervision`.\n",
"\n",
"![\"Small Object Detection\"](https://raw.githubusercontent.com/ediardo/notebooks/main/sahi/animation.gif \"Small Object Detection\")\n",
"![\"Small Object Detection\"](https://media.roboflow.com/supervision/cookbooks/sahi/animation.gif \"Small Object Detection\")\n",
"\n",
"Click the Open in Colab button to run the cookbook on Google Colab.\n",
"\n",
Expand Down Expand Up @@ -70,7 +70,7 @@
"\n",
"Detecting people (or their heads) is a common problem that has been addressed by many researchers in the past. In this project, we\u2019ll use an open-source public dataset and a fine-tuned model to perform inference on images.\n",
"\n",
"![Roboflow Universe](https://raw.githubusercontent.com/ediardo/notebooks/main/sahi/roboflow_universe.png \"Open source model for counting people's heads\")\n",
"![Roboflow Universe](https://media.roboflow.com/supervision/cookbooks/sahi/roboflow_universe.png \"Open source model for counting people's heads\")\n",
"\n",
"Some details about the project [\"people_counterv0 Computer Vision Project\"](https://universe.roboflow.com/sit-cx0ng/people_counterv0):\n",
"\n",
Expand Down Expand Up @@ -782,9 +782,9 @@
"\n",
"| Example| Observations |\n",
"|----|----|\n",
"| ![Overlapping](https://github.com/ediardo/notebooks/blob/main/sahi/overlapping_1.png?raw=true \"Overlapping\") | False Negative, Incomplete bbox |\n",
"| ![Overlapping](https://raw.githubusercontent.com/ediardo/notebooks/main/sahi/overlapping_2.png \"Overlapping\")| Double detection, Incomplete bbox|\n",
"| ![Overlapping](https://raw.githubusercontent.com/ediardo/notebooks/main/sahi/overlapping_3.png \"Overlapping\")| Incomplete bounding box|\n",
"| ![Overlapping](https://media.roboflow.com/supervision/cookbooks/sahi/overlapping_1.png \"Overlapping\") | False Negative, Incomplete bbox |\n",
"| ![Overlapping](https://media.roboflow.com/supervision/cookbooks/sahi/overlapping_2.png \"Overlapping\")| Double detection, Incomplete bbox|\n",
"| ![Overlapping](https://media.roboflow.com/supervision/cookbooks/sahi/overlapping_3.png \"Overlapping\")| Incomplete bounding box|\n",
"\n",
"## Improving Object Detection Near Boundaries with Overlapping\n",
"\n",
Expand Down
3 changes: 3 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ nav:
- Utils: datasets/utils.md
- Metrics:
- mAP: metrics/mean_average_precision.md
- Precision: metrics/precision.md
- Recall: metrics/recall.md
- F1 Score: metrics/f1_score.md
- Common Values: metrics/common_values.md
- Legacy Metrics: detection/metrics.md
- Utils:
- Video: utils/video.md
Expand Down
Loading
Loading