Skip to content

Commit bb7cf4e

Browse files
committed
Merge develop
2 parents 13c3f6a + 7746479 commit bb7cf4e

Some content is hidden

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

61 files changed

+2042
-613
lines changed

.github/workflows/python-package-shared.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
integration:
3737
runs-on: ubuntu-latest
3838
concurrency:
39-
group: labelbox-python-${{ inputs.test-env }}-${{ inputs.python-version }}
39+
group: labelbox-python-${{ inputs.test-env }}-${{ inputs.python-version }}-integration
4040
cancel-in-progress: false
4141
steps:
4242
- uses: actions/checkout@v4
@@ -48,14 +48,16 @@ jobs:
4848
python-version: ${{ inputs.python-version }}
4949
- name: Integration Testing
5050
env:
51-
PYTEST_XDIST_AUTO_NUM_WORKERS: 20
5251
LABELBOX_TEST_API_KEY: ${{ secrets[inputs.api-key] }}
5352
DA_GCP_LABELBOX_API_KEY: ${{ secrets[inputs.da-test-key] }}
5453
LABELBOX_TEST_ENVIRON: ${{ inputs.test-env }}
5554
working-directory: libs/labelbox
56-
run: rye run integration
55+
run: rye run integration -n 32
5756
unit-data:
5857
runs-on: ubuntu-latest
58+
concurrency:
59+
group: labelbox-python-${{ inputs.test-env }}-${{ inputs.python-version }}-unit-data
60+
cancel-in-progress: false
5961
steps:
6062
- uses: actions/checkout@v4
6163
with:
@@ -66,12 +68,11 @@ jobs:
6668
python-version: ${{ inputs.python-version }}
6769
- name: Unit && Data Testing
6870
env:
69-
PYTEST_XDIST_AUTO_NUM_WORKERS: 20
7071
LABELBOX_TEST_API_KEY: ${{ secrets[inputs.api-key] }}
7172
DA_GCP_LABELBOX_API_KEY: ${{ secrets[inputs.da-test-key] }}
7273
LABELBOX_TEST_ENVIRON: ${{ inputs.test-env }}
7374
working-directory: libs/labelbox
7475
run: |
7576
rye sync -f --features labelbox/data
76-
rye run unit
77-
rye run data
77+
rye run unit -n 32
78+
rye run data -n 32

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
project = 'Python SDK reference'
1717
copyright = '2024, Labelbox'
1818
author = 'Labelbox'
19-
release = '3.72.2'
19+
release = '3.74.0'
2020

2121
# -- General configuration ---------------------------------------------------
2222

docs/labelbox/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Labelbox Python SDK Documentation
2525
identifiable
2626
identifiables
2727
label
28+
label-score
2829
labeling-frontend
2930
labeling-frontend-options
3031
labeling-parameter-override

docs/labelbox/label-score.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Label Score
2+
===============================================================================================
3+
4+
.. automodule:: labelbox.schema.label_score
5+
:members:
6+
:show-inheritance:

docs/labelbox/user-group.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
User Group
2+
===============================================================================================
3+
4+
.. automodule:: labelbox.schema.user_group
5+
:members:
6+
:show-inheritance:

libs/labelbox/CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# Changelog
2+
# Version 3.74.0 (2024-06-24)
3+
## Added
4+
* Include predictions in export (#1689)
5+
* Upsert label feedback method Client upsert_label_feedback() (#1684)
6+
7+
## Removed
8+
* Removed deprecated class LabelList (#1691)
9+
10+
# Version 3.73.0 (2024-06-20)
11+
## Added
12+
* Conversational data row checks (#1678)
13+
* UI ontology mode support (#1676)
14+
* Empty data row validation (#1667)
15+
16+
## Fixed
17+
* Numpy semver locked to < 2.0.0 (#1681)
18+
119
# Changelog
220
# Version 3.72.2 (2024-06-10)
321
## Added

libs/labelbox/pyproject.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
[project]
22
name = "labelbox"
3-
version = "3.72.2"
3+
version = "3.74.0"
44
description = "Labelbox Python API"
5-
authors = [
6-
{ name = "Labelbox", email = "engineering@labelbox.com" }
7-
]
5+
authors = [{ name = "Labelbox", email = "engineering@labelbox.com" }]
86
dependencies = [
97
"google-api-core>=1.22.1",
108
"pydantic>=1.8",
@@ -16,7 +14,7 @@ dependencies = [
1614
]
1715
readme = "README.md"
1816
requires-python = ">=3.8"
19-
classifiers=[
17+
classifiers = [
2018
# How mature is this project?
2119
"Development Status :: 5 - Production/Stable",
2220
# Indicate who your project is intended for
@@ -27,7 +25,7 @@ classifiers=[
2725
"Intended Audience :: Education",
2826
# Pick your license as you wish
2927
"License :: OSI Approved :: Apache Software License",
30-
# Specify the Python versions you support here.
28+
# Specify the Python versions you support here.
3129
"Programming Language :: Python :: 3",
3230
"Programming Language :: Python :: 3.8",
3331
"Programming Language :: Python :: 3.9",
@@ -47,7 +45,8 @@ Changelog = "https://github.com/Labelbox/labelbox-python/blob/develop/libs/label
4745
[project.optional-dependencies]
4846
data = [
4947
"shapely>=2.0.3",
50-
"numpy>=1.24.4",
48+
# numpy v2 breaks package since it only supports python >3.9
49+
"numpy>=1.24.4, <2.0.0",
5150
"pillow>=10.2.0",
5251
"typeguard>=4.1.5",
5352
"imagesize>=1.4.1",
@@ -85,12 +84,12 @@ unit = "pytest tests/unit"
8584
# LABELBOX_TEST_ENVIRON="ephemeral" \
8685
# SERVICE_API_KEY=${SERVICE_API_KEY} \
8786
# LABELBOX_TEST_BASE_URL="http://host.docker.internal:8080" \
88-
integration = { cmd = "pytest tests/integration" }
87+
integration = { cmd = "pytest tests/integration" }
8988
data = { cmd = "pytest tests/data" }
9089
yapf-lint = "yapf tests src -i --verbose --recursive --parallel --style \"google\""
9190
mypy-lint = "mypy src --pretty --show-error-codes --non-interactive --install-types"
9291
lint = { chain = ["yapf-lint", "mypy-lint"] }
93-
test = { chain = ["lint", "unit", "integration" ] }
92+
test = { chain = ["lint", "unit", "integration"] }
9493

9594
[tool.hatch.metadata]
9695
allow-direct-references = true

libs/labelbox/src/labelbox/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "labelbox"
22

3-
__version__ = "3.72.2"
3+
__version__ = "3.74.0"
44

55
from labelbox.client import Client
66
from labelbox.schema.project import Project
@@ -36,6 +36,7 @@
3636
from labelbox.schema.slice import Slice, CatalogSlice, ModelSlice
3737
from labelbox.schema.queue_mode import QueueMode
3838
from labelbox.schema.task_queue import TaskQueue
39+
from labelbox.schema.label_score import LabelScore
3940
from labelbox.schema.identifiables import UniqueIds, GlobalKeys, DataRowIds
4041
from labelbox.schema.identifiable import UniqueId, GlobalKey
4142
from labelbox.schema.ontology_kind import OntologyKind

0 commit comments

Comments
 (0)