Skip to content

Commit d753923

Browse files
author
Matt Sokoloff
committed
merge with dev
2 parents 0e5edd0 + 5c7d22b commit d753923

File tree

145 files changed

+8089
-875
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+8089
-875
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,5 @@ docs/build/
137137
# and source files
138138
docs/source/_static
139139
docs/source/_templates
140+
/.graphqlconfig
141+
/schema.graphql

‎CHANGELOG.md

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,81 @@
11
# Changelog
2+
# Version 3.7.0 (2021-10-11)
3+
## Added
4+
* Search for data row ids from external ids without specifying a dataset
5+
* `client.get_data_row_ids_for_external_ids()`
6+
* Support for numeric metadata type
7+
8+
## Updated
9+
* The following `DataRowMetadataOntology` fields were renamed:
10+
* `all_fields` -> `fields`
11+
* `all_fields_id_index` -> `fields_by_id`
12+
* `reserved_id_index` -> `reserved_by_id`
13+
* `reserved_name_index` -> `reserved_by_name`
14+
* `custom_id_index` -> `custom_by_id`
15+
* `custom_name_index` -> `custom_by_name`
16+
17+
18+
# Version 3.6.1 (2021-10-07)
19+
* Fix import error that appears when exporting labels
20+
21+
# Version 3.6.0 (2021-10-04)
22+
## Added
23+
* Bulk export metadata with `DataRowMetadataOntology.bulk_export()`
24+
* Add docstring examples of annotation types and a few helper methods
25+
26+
## Updated
27+
* Update metadata notebook under examples/basics to include bulk_export.
28+
* Allow color to be a single integer when constructing Mask objects
29+
* Allow users to pass int arrays to RasterData and attempt coercion to uint8
30+
31+
## Removed
32+
* data_row.metadata was removed in favor of bulk exports.
33+
34+
35+
# Version 3.5.0 (2021-09-15)
36+
## Added
37+
* Diagnostics custom metrics
38+
* Metric annotation types
39+
* Update ndjson converter to be compatible with metric types
40+
* Metric library for computing confusion matrix metrics and iou
41+
* Demo notebooks under `examples/diagnostics`
42+
* COCO Converter
43+
* Detectron2 example integration notebooks
44+
45+
# Version 3.4.1 (2021-09-10)
46+
## Fix
47+
* Iam validation exception message
48+
49+
# Version 3.4.0 (2021-09-10)
50+
## Added
51+
* New `IAMIntegration` entity
52+
* `Client.create_dataset()` compatibility with delegated access
53+
* `Organization.get_iam_integrations()` to list all integrations available to an org
54+
* `Organization.get_default_iam_integration()` to only get the defaault iam integration
55+
56+
# Version 3.3.0 (2021-09-02)
57+
## Added
58+
* `Dataset.create_data_rows_sync()` for synchronous bulk uploads of data rows
59+
* `Model.delete()`, `ModelRun.delete()`, and `ModelRun.delete_annotation_groups()` to
60+
Clean up models, model runs, and annotation groups.
61+
62+
## Fix
63+
* Increased timeout for label exports since projects with many segmentation masks weren't finishing quickly enough.
64+
65+
# Version 3.2.1 (2021-08-31)
66+
## Fix
67+
* Resolved issue with `create_data_rows()` was not working on amazon linux
68+
69+
# Version 3.2.0 (2021-08-26)
70+
## Added
71+
* List `BulkImportRequest`s for a project with `Project.bulk_import_requests()`
72+
* Improvemens to `Dataset.create_data_rows()`
73+
* Add attachments when bulk importing data rows
74+
* Provide external ids when creating data rows from local files
75+
* Get more informative error messages when the api rejects an import
76+
77+
## Fix
78+
* Bug causing `project.label_generator()` to fail when projects had benchmarks
279

380
# Version 3.1.0 (2021-08-18)
481
## Added

‎README.md

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@ The Labelbox Python API offers a simple, user-friendly way to interact with the
66

77
## Table of Contents
88

9-
* [Requirements](#requirements)
10-
* [Installation](#installation)
11-
* [Documentation](#documentation)
12-
* [Authentication](#authentication)
13-
* [Contribution](#contribution)
14-
* [Testing](#testing)
9+
- [Labelbox Python SDK](#labelbox-python-sdk)
10+
- [Table of Contents](#table-of-contents)
11+
- [Requirements](#requirements)
12+
- [Installation](#installation)
13+
- [Note for Windows users](#note-for-windows-users)
14+
- [Documentation](#documentation)
15+
- [Authentication](#authentication)
16+
- [Contribution](#contribution)
17+
- [Testing](#testing)
1518

1619
## Requirements
1720

@@ -48,6 +51,37 @@ To install dependencies required for data processing modules use:
4851
```
4952
pip install labelbox[data]
5053
```
54+
### Note for Windows users
55+
The package `rasterio` installed by `labelbox[data]` relies on GDAL which could be difficult to install on Microsoft Windows.
56+
57+
You may see the following error message:
58+
59+
```
60+
INFO:root:Building on Windows requires extra options to setup.py to locate needed GDAL files. More information is available in the README.
61+
62+
ERROR: A GDAL API version must be specified. Provide a path to gdal-config using a GDAL_CONFIG environment variable or use a GDAL_VERSION environment variable.
63+
```
64+
65+
As a workaround:
66+
67+
1. Download the binary files for GDAL and rasterio:
68+
69+
a. From https://www.lfd.uci.edu/~gohlke/pythonlibs/#gdal, download `GDAL‑3.3.2‑cp38‑cp38‑win_amd64.wh`
70+
71+
b. From https://www.lfd.uci.edu/~gohlke/pythonlibs/#rasterio, download `rasterio‑1.2.9‑cp38‑cp38‑win_amd64.whl`
72+
73+
Note: You need to download the right files for your Python version. In the files above `cp38` means CPython 3.8.
74+
75+
2. After downloading the files, please run the following commands, in this particular order.
76+
77+
```
78+
pip install GDAL‑3.3.2‑cp38‑cp38‑win_amd64.wh
79+
pip install rasterio‑1.2.9‑cp38‑cp38‑win_amd64.whl
80+
pip install labelbox[data]
81+
```
82+
83+
This should resolve the error message.
84+
5185

5286
## Documentation
5387

‎docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
copyright = '2021, Labelbox'
2222
author = 'Labelbox'
2323

24-
release = '3.0.0-rc0'
24+
release = '3.7.0'
2525

2626
# -- General configuration ---------------------------------------------------
2727

‎examples/README.md

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,46 +22,62 @@
2222

2323
## [Label Export](label_export)
2424

25+
| Notebook | Github | Google Colab | Learn more |
26+
| --------------------------- | --------------------------------- | ------------ | ---------- |
27+
| Image Annotation Export | [Github](label_export/images.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/label_export/images.ipynb) | [Reference](https://docs.labelbox.com/reference/label-output) |
28+
| Text Annotation Export | [Github](label_export/text.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/label_export/text.ipynb) | [Reference](https://docs.labelbox.com/reference/label-output) |
29+
| Video Annotation Export | [Github](label_export/video.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/label_export/video.ipynb) | [Reference](https://docs.labelbox.com/reference/label-output) |
30+
------
31+
32+
## Model Training
33+
34+
Train a model using data annotated on Labelbox
35+
2536
| Notebook | Github | Google Colab |
2637
| --------------------------- | --------------------------------- | ------------ |
27-
| Image Annotation Export | [Github](label_export/images.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/label_export/images.ipynb) |
28-
| Text Annotation Export | [Github](label_export/text.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/label_export/text.ipynb) |
29-
| Video Annotation Export | [Github](label_export/video.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/label_export/video.ipynb) |
38+
| Object Detection (Detectron2) | [Github](coco_object.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/integrations/detectron2/coco_panoptic.ipynb) |
39+
| Panoptic Detection (Detectron2) | [Github](coco_panoptic.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/integrations/detectron2/coco_panoptic.ipynb)
3040
------
3141

32-
## [Model Assisted Labeling](model_assisted_labeling)
42+
## [Annotation Types](annotation_types)
43+
44+
Learn more about annotation types in the [docs](https://docs.labelbox.com/docs/annotation-types-1)
3345

3446
| Notebook | Github | Google Colab |
3547
| --------------------------- | --------------------------------- | ------------ |
36-
| MAL Basics | [Github](model_assisted_labeling/mal_basics.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_assisted_labeling/mal_basics.ipynb) |
37-
| Image MAL | [Github](model_assisted_labeling/image_mal.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_assisted_labeling/image_mal.ipynb) |
48+
| Annotation Type Basics | [Github](annotation_types/basics.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/basics.ipynb) |
49+
| Converters | [Github](annotation_types/converters.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/converters.ipynb) |
50+
| Label Containers | [Github](annotation_types/label_containers.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/label_containers.ipynb) |
51+
| MAL Using Annotation Types | [Github](annotation_types/mal_using_annotation_types.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/mal_using_annotation_types.ipynb) |
52+
53+
54+
## [Model Assisted Labeling](model_assisted_labeling)
55+
56+
57+
| Notebook | Github | Google Colab | Learn more |
58+
| --------------------------- | --------------------------------- | ------------ | ---------- |
59+
| MAL Basics | [Github](model_assisted_labeling/mal_basics.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_assisted_labeling/mal_basics.ipynb) | [Docs](https://docs.labelbox.com/docs/model-assisted-labeling) |
60+
| Image MAL | [Github](model_assisted_labeling/image_mal.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_assisted_labeling/image_mal.ipynb) |
3861
| Named Entity Recognition MAL | [Github](model_assisted_labeling/ner_mal.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_assisted_labeling/ner_mal.ipynb) |
3962
| Debugging MAL | [Github](model_assisted_labeling/debugging_mal.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_assisted_labeling/debugging_mal.ipynb) |
4063
| MAL with Subclasses | [Github](model_assisted_labeling/mal_with_subclasses.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_assisted_labeling/mal_with_subclasses.ipynb) |
4164
| Tiled Imagery MAL | [Github](model_assisted_labeling/tiled_imagery_mal.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_assisted_labeling/tiled_imagery_mal.ipynb) |
42-
4365
------
4466

4567
## [Project Configuration](project_configuration)
4668

47-
| Notebook | Github | Google Colab |
48-
| --------------------------- | --------------------------------- | ------------ |
49-
| Project Setup | [Github](project_configuration/project_setup.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/project_configuration/project_setup.ipynb) |
50-
| Queue Management | [Github](project_configuration/queue_management.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/project_configuration/queue_management.ipynb) |
51-
| Webhooks | [Github](project_configuration/webhooks.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/project_configuration/webhooks.ipynb) |
69+
| Notebook | Github | Google Colab | Learn more |
70+
| --------------------------- | --------------------------------- | ------------ | ---------- |
71+
| Project Setup | [Github](project_configuration/project_setup.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/project_configuration/project_setup.ipynb) | [Docs](https://docs.labelbox.com/docs/project-setup) |
72+
| Queue Management | [Github](project_configuration/queue_management.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/project_configuration/queue_management.ipynb) | [Docs](https://docs.labelbox.com/docs/queue-customization) |
73+
| Webhooks | [Github](project_configuration/webhooks.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/project_configuration/webhooks.ipynb) | [Docs](https://docs.labelbox.com/docs/webhooks) |
5274

5375

54-
## [Annotation Types](annotation_types)
55-
56-
| Notebook | Github | Google Colab |
57-
| --------------------------- | --------------------------------- | ------------ |
58-
| Annotation Type Basics | [Github](annotation_types/basics.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/basics.ipynb) |
59-
| Converters | [Github](annotation_types/converters.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/converters.ipynb) |
60-
| Label Containers | [Github](annotation_types/label_containers.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/label_containers.ipynb) |
61-
| MAL Using Annotation Types | [Github](annotation_types/mal_using_annotation_types.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/annotation_types/mal_using_annotation_types.ipynb) |
6276

6377
## [Model Diagnostics](model_diagnostics)
64-
| Notebook | Github | Google Colab |
65-
| --------------------------- | --------------------------------- | ------------ |
66-
| Model Diagnostics Guide | [Github](model_diagnostics/model_diagnostics_guide.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_diagnostics/model_diagnostics_guide.ipynb) |
78+
| Notebook | Github | Google Colab | Learn more |
79+
| --------------------------- | --------------------------------- | ------------ | ---------- |
80+
| Model Diagnostics Guide | [Github](model_diagnostics/model_diagnostics_guide.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_diagnostics/model_diagnostics_guide.ipynb) | [Docs](https://docs.labelbox.com/docs/model-diagnostics) |
6781
| Model Diagnostics Demo | [Github](model_diagnostics/model_diagnostics_demo.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_diagnostics/model_diagnostics_demo.ipynb) |
82+
| Custom Metrics Basics | [Github](model_diagnostics/custom_metrics_basics.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_diagnostics/custom_metrics_basics.ipynb) | [Docs](https://docs.labelbox.com/docs/model-diagnostics) |
83+
| Custom Metrics Demo | [Github](model_diagnostics/custom_metrics_demo.ipynb) | [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/Labelbox/labelbox-python/blob/develop/examples/model_diagnostics/custom_metrics_demo.ipynb) |

0 commit comments

Comments
 (0)