Skip to content

Commit 9de7a6e

Browse files
author
Matt Sokoloff
committed
Merge branch 'develop' of https://github.com/Labelbox/labelbox-python into ms/prediction-import-update-2
2 parents 708ba5f + 3bf041a commit 9de7a6e

Some content is hidden

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

80 files changed

+4051
-2774
lines changed

‎.github/workflows/publish.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ jobs:
2828
run: |
2929
python setup.py sdist bdist_wheel
3030
31-
- name: Update help docs
32-
run: |
33-
python setup.py install
34-
python ./tools/api_reference_generator.py ${{ secrets.HELPDOCS_API_KEY }}
35-
3631
- name: Publish
3732
env:
3833
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}

‎CHANGELOG.md

Lines changed: 121 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,127 @@
11
# Changelog
22

3-
# Next Release
3+
# Version 3.0.1 (2021-08-12)
4+
## Fix
5+
* Issue with inferring text type from export
6+
7+
# Version 3.0.0 (2021-08-12)
8+
## Added
9+
* Annotation types
10+
- A set of python objects for working with labelbox data
11+
- Creates a standard interface for both exports and imports
12+
- See example notebooks on how to use under examples/annotation_types
13+
- Note that these types are not yet supported for tiled imagery
14+
* MEA Support
15+
- Beta MEA users can now just use the latest SDK release
16+
* Metadata support
17+
- New metadata features are now fully supported by the SDK
18+
* Easier export
19+
- `project.export_labels()` accepts a boolean indicating whether or not to download the result
20+
- Create annotation objects directly from exports with `project.label_generator()` or `project.video_label_generator()`
21+
- `project.video_label_generator()` asynchronously fetches video annotations
22+
* Retry logic on data uploads
23+
- Bulk creation of data rows will be more reliable
24+
* Datasets
25+
- Determine the number of data rows just by calling `dataset.row_count`.
26+
- Updated threading logic in create_data_rows() to make it compatible with aws lambdas
27+
* Ontology
28+
- `OntologyBuilder`, `Classification`, `Option`, and `Tool` can now be imported from `labelbox` instead of `labelbox.schema.ontology`
29+
30+
## Removed
31+
* Deprecated:
32+
- `project.reviews()`
33+
- `project.create_prediction()`
34+
- `project.create_prediction_model()`
35+
- `project.create_label()`
36+
- `Project.predictions()`
37+
- `Project.active_prediction_model`
38+
- `data_row.predictions`
39+
- `PredictionModel`
40+
- `Prediction`
41+
* Replaced:
42+
- `data_row.metadata()` use `data_row.attachments()` instead
43+
- `data_row.create_metadata()` use `data_row.create_attachments()` instead
44+
- `AssetMetadata` use `AssetAttachment` instead
45+
46+
## Fixes
47+
* Support derived classes of ontology objects when using `from_dict`
48+
* Notebooks:
49+
- Video export bug where the code would fail if the exported projects had tools other than bounding boxes
50+
- MAL demos were broken due to an image download failing.
51+
52+
## Misc
53+
* Data processing dependencies are not installed by default to for users that only want client functionality.
54+
* To install all dependencies required for the data modules (annotation types and mea metric calculation) use `pip install labelbox[data]`
55+
* Decrease wait time between updates for `BulkImportRequest.wait_until_done()`.
56+
* Organization is no longer used to create the LFO in `Project.setup()`
57+
58+
59+
# Version 3.0.0-rc3 (2021-08-11)
60+
## Updates
61+
* Geometry.raster now has a consistent interface and improved functionality
62+
* renamed schema_id to feature_schema_id in the `FeatureSchema` class
63+
* `Mask` objects now use `MaskData` to represent segmentation masks instead of `ImageData`
64+
65+
# Version 3.0.0-rc2 (2021-08-09)
66+
## Updates
67+
* Rename `data` property of TextData, ImageData, and VideoData types to `value`.
68+
* Decrease wait time between updates for `BulkImportRequest.wait_until_done()`
69+
* Organization is no longer used to create the LFO in `Project.setup()`
70+
71+
72+
# Version 3.0.0-rc1 (2021-08-05)
73+
## Added
74+
* Model diagnostics notebooks
75+
* Minor annotation type improvements
76+
77+
# Version 3.0.0-rc0 (2021-08-04)
78+
## Added
79+
* Annotation types
80+
- A set of python objects for working with labelbox data
81+
- Creates a standard interface for both exports and imports
82+
- See example notebooks on how to use under examples/annotation_types
83+
- Note that these types are not yet supported for tiled imagery
84+
* MEA Support
85+
- Beta MEA users can now just use the latest SDK release
86+
* Metadata support
87+
- New metadata features are now fully supported by the SDK
88+
* Easier export
89+
- `project.export_labels()` accepts a boolean indicating whether or not to download the result
90+
- Create annotation objects directly from exports with `project.label_generator()` or `project.video_label_generator()`
91+
- `project.video_label_generator()` asynchronously fetches video annotations
92+
* Retry logic on data uploads
93+
- Bulk creation of data rows will be more reliable
94+
* Datasets
95+
- Determine the number of data rows just by calling `dataset.row_count`.
96+
- Updated threading logic in create_data_rows() to make it compatible with aws lambdas
97+
* Ontology
98+
- `OntologyBuilder`, `Classification`, `Option`, and `Tool` can now be imported from `labelbox` instead of `labelbox.schema.ontology`
99+
4100
## Removed
5-
* Deprecated functions
6-
- project.reviews()
7-
- project.create_prediction()
8-
- project.create_prediction_model()
9-
- project.create_label()
101+
* Deprecated:
102+
- `project.reviews()`
103+
- `project.create_prediction()`
104+
- `project.create_prediction_model()`
105+
- `project.create_label()`
106+
- `Project.predictions()`
107+
- `Project.active_prediction_model`
108+
- `data_row.predictions`
109+
- `PredictionModel`
110+
- `Prediction`
111+
* Replaced:
112+
- `data_row.metadata()` use `data_row.attachments()` instead
113+
- `data_row.create_metadata()` use `data_row.create_attachments()` instead
114+
- `AssetMetadata` use `AssetAttachment` instead
115+
116+
## Fixes
117+
* Support derived classes of ontology objects when using `from_dict`
118+
* Notebooks:
119+
- Video export bug where the code would fail if the exported projects had tools other than bounding boxes
120+
- MAL demos were broken due to an image download failing.
121+
122+
## Misc
123+
* Data processing dependencies are not installed by default to for users that only want client functionality.
124+
* To install all dependencies required for the data modules (annotation types and mea metric calculation) use `pip install labelbox[data]`
10125

11126
# Version 2.7b1+mea (2021-06-27)
12127
## Fix

‎CONTRIB.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ following packages/modules:
2727

2828
## Testing
2929

30-
Currently the SDK functionality is tested using integration tests. These tests
30+
Currently, the SDK functionality is tested using integration tests. These tests
3131
communicate with a Labelbox server (by default the staging server) and are in
32-
that sense not self-contained. Besides that they are organized like unit test
32+
that sense not self-contained. Besides, that they are organized like unit test
3333
and are based on the `pytest` library.
3434

3535
To execute tests you will need to provide an API key for the server you're using
3636
for testing (staging by default) in the `LABELBOX_TEST_API_KEY` environment
37-
variable. For more info see [Labelbox API key
38-
docs](https://labelbox.helpdocs.io/docs/api/getting-started).
37+
variable. For more info see [Labelbox API key docs](https://labelbox.helpdocs.io/docs/api/getting-started).
38+
39+
To pass tests, code must be formatted using the following command:
40+
41+
```shell
42+
yapf labelbox -i --verbose --recursive --parallel --style "google"
43+
```
3944

4045
## Release Steps
4146

4247
Each release should follow the following steps:
4348

4449
1. Update the Python SDK package version in `REPO_ROOT/setup.py`
45-
2. Make sure the `CHANGELOG.md` contains appropriate info
50+
2. Make sure the `CHANGELOG.md` contains appropriate info
4651
3. Commit these changes and tag the commit in Git as `vX.Y`
4752
4. Merge `develop` to `master` (fast-forward only).
4853
5. Create a GitHub release.
4954
6. This will kick off a Github Actions workflow that will:
50-
- Build the library in the [standard
51-
way](https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives)
52-
- Upload the distribution archives in the [standard
53-
way](https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives)
55+
- Build the library in the [standard way](https://packaging.python.org/tutorials/packaging-projects/#generating-distribution-archives)
56+
- Upload the distribution archives in the [standard way](https://packaging.python.org/tutorials/packaging-projects/#uploading-the-distribution-archives)
5457
with credentials for the `labelbox` PyPI user.
55-
- Run the `REPO_ROOT/tools/api_reference_generator.py` script to update
56-
[HelpDocs documentation](https://labelbox.helpdocs.io/docs/). You will need
57-
to provide a HelpDocs API key for.

‎README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ Install dependencies
4444
```
4545
pip3 install -r requirements.txt
4646
```
47+
To install dependencies required for data processing modules use:
48+
```
49+
pip install labelbox[data]
50+
```
4751

4852
## Documentation
4953

‎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 = '2.6.0'
24+
release = '3.0.0-rc0'
2525

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

‎docs/source/index.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ AssetAttachment
2121
:members:
2222
:show-inheritance:
2323

24-
AssetMetadata
25-
--------------------------------------
26-
27-
.. automodule:: labelbox.schema.asset_metadata
28-
:members:
29-
:show-inheritance:
3024

3125
Benchmark
3226
--------------------------------

0 commit comments

Comments
 (0)