-
- | Video Predictions |
-  |
-  |
-
| HTML Predictions |
|
|
- | Geospatial Predictions |
- |
- |
+ Text Predictions |
+ |
+ |
+
+
+ | Video Predictions |
+ |
+ |
| Conversational Predictions |
@@ -306,14 +306,9 @@
|
- | Text Predictions |
- |
- |
-
-
- | Conversational LLM Predictions |
- |
- |
+ Geospatial Predictions |
+ |
+ |
| PDF Predictions |
@@ -325,6 +320,11 @@
|
|
+
+ | Conversational LLM Predictions |
+ |
+ |
+
diff --git a/examples/pyproject.toml b/examples/pyproject.toml
index 969454ecc..b620680e0 100644
--- a/examples/pyproject.toml
+++ b/examples/pyproject.toml
@@ -5,7 +5,7 @@ description = "Labelbox Python Example Notebooks"
authors = [{ name = "Labelbox", email = "docs@labelbox.com" }]
readme = "README.md"
# Python version matches labelbox SDK
-requires-python = ">=3.8"
+requires-python = ">=3.9"
dependencies = []
[project.urls]
@@ -22,8 +22,8 @@ dev-dependencies = [
"yapf>=0.40.2",
"black[jupyter]>=24.4.2",
"databooks>=1.3.10",
- # higher versions dont support python 3.8
- "pandas>=2.0.3",
+ # higher versions dont support python 3.9
+ "pandas>=2.2.3",
]
[tool.rye.scripts]
diff --git a/libs/labelbox/Dockerfile b/libs/labelbox/Dockerfile
index ddf451b14..386bdbc63 100644
--- a/libs/labelbox/Dockerfile
+++ b/libs/labelbox/Dockerfile
@@ -1,5 +1,5 @@
# https://github.com/ucyo/python-package-template/blob/master/Dockerfile
-FROM python:3.8-slim as rye
+FROM python:3.9-slim as rye
ENV LANG="C.UTF-8" \
LC_ALL="C.UTF-8" \
@@ -38,7 +38,7 @@ WORKDIR /home/python/labelbox-python
RUN rye config --set-bool behavior.global-python=true && \
rye config --set-bool behavior.use-uv=true && \
- rye pin 3.8 && \
+ rye pin 3.9 && \
rye sync
CMD cd libs/labelbox && rye run integration && rye sync -f --features labelbox/data && rye run unit && rye run data
diff --git a/libs/labelbox/mypy.ini b/libs/labelbox/mypy.ini
index 48135600e..5129fbe0f 100644
--- a/libs/labelbox/mypy.ini
+++ b/libs/labelbox/mypy.ini
@@ -7,4 +7,7 @@ ignore_missing_imports = True
ignore_errors = True
[mypy-labelbox]
-ignore_errors = True
\ No newline at end of file
+ignore_errors = True
+
+[mypy-lbox.exceptions]
+ignore_missing_imports = True
diff --git a/libs/labelbox/pyproject.toml b/libs/labelbox/pyproject.toml
index ee2f9b859..f58dba890 100644
--- a/libs/labelbox/pyproject.toml
+++ b/libs/labelbox/pyproject.toml
@@ -12,9 +12,10 @@ dependencies = [
"tqdm>=4.66.2",
"geojson>=3.1.0",
"mypy==1.10.1",
+ "lbox-clients==1.1.0",
]
readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9,<3.13"
classifiers = [
# How mature is this project?
"Development Status :: 5 - Production/Stable",
@@ -28,7 +29,6 @@ classifiers = [
"License :: OSI Approved :: Apache Software License",
# Specify the Python versions you support here.
"Programming Language :: Python :: 3",
- "Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
@@ -46,8 +46,7 @@ Changelog = "https://github.com/Labelbox/labelbox-python/blob/develop/libs/label
[project.optional-dependencies]
data = [
"shapely>=2.0.3",
- # numpy v2 breaks package since it only supports python >3.9
- "numpy>=1.24.4, <2.0.0",
+ "numpy>=1.25.0",
"pillow>=10.2.0",
"typeguard>=4.1.5",
"imagesize>=1.4.1",
@@ -74,6 +73,10 @@ dev-dependencies = [
[tool.ruff]
line-length = 80
+[tool.ruff.lint]
+ignore = ["F", "E722"]
+exclude = ["**/__init__.py"]
+
[tool.rye.scripts]
unit = "pytest tests/unit"
# https://github.com/Labelbox/labelbox-python/blob/7c84fdffbc14fd1f69d2a6abdcc0087dc557fa4e/Makefile
@@ -89,9 +92,11 @@ unit = "pytest tests/unit"
# LABELBOX_TEST_BASE_URL="http://host.docker.internal:8080" \
integration = { cmd = "pytest tests/integration" }
data = { cmd = "pytest tests/data" }
+rye-lint = "rye lint"
rye-fmt-check = "rye fmt --check"
+MYPYPATH = "../lbox-clients/src/"
mypy-lint = "mypy src --pretty --show-error-codes --non-interactive --install-types"
-lint = { chain = ["mypy-lint", "rye-fmt-check"] }
+lint = { chain = ["rye-fmt-check", "mypy-lint", "rye-lint"] }
test = { chain = ["lint", "unit", "integration"] }
[tool.hatch.metadata]
diff --git a/libs/labelbox/src/labelbox/__init__.py b/libs/labelbox/src/labelbox/__init__.py
index b0f4ebe11..9b5d6f715 100644
--- a/libs/labelbox/src/labelbox/__init__.py
+++ b/libs/labelbox/src/labelbox/__init__.py
@@ -12,7 +12,6 @@
from labelbox.schema.asset_attachment import AssetAttachment
from labelbox.schema.batch import Batch
from labelbox.schema.benchmark import Benchmark
-from labelbox.schema.bulk_import_request import BulkImportRequest
from labelbox.schema.catalog import Catalog
from labelbox.schema.data_row import DataRow
from labelbox.schema.data_row_metadata import (
@@ -26,10 +25,7 @@
from labelbox.schema.export_task import (
BufferedJsonConverterOutput,
ExportTask,
- FileConverter,
- FileConverterOutput,
- JsonConverter,
- JsonConverterOutput,
+ BufferedJsonConverterOutput,
StreamType,
)
from labelbox.schema.iam_integration import IAMIntegration
@@ -59,6 +55,28 @@
ResponseOption,
Tool,
)
+from labelbox.schema.ontology import PromptResponseClassification
+from labelbox.schema.ontology import ResponseOption
+from labelbox.schema.role import Role, ProjectRole
+from labelbox.schema.invite import Invite, InviteLimit
+from labelbox.schema.data_row_metadata import (
+ DataRowMetadataOntology,
+ DataRowMetadataField,
+ DataRowMetadata,
+ DeleteDataRowMetadata,
+)
+from labelbox.schema.model_run import ModelRun, DataSplit
+from labelbox.schema.benchmark import Benchmark
+from labelbox.schema.iam_integration import IAMIntegration
+from labelbox.schema.resource_tag import ResourceTag
+from labelbox.schema.project_model_config import ProjectModelConfig
+from labelbox.schema.project_resource_tag import ProjectResourceTag
+from labelbox.schema.media_type import MediaType
+from labelbox.schema.slice import Slice, CatalogSlice, ModelSlice
+from labelbox.schema.task_queue import TaskQueue
+from labelbox.schema.label_score import LabelScore
+from labelbox.schema.identifiables import UniqueIds, GlobalKeys, DataRowIds
+from labelbox.schema.identifiable import UniqueId, GlobalKey
from labelbox.schema.ontology_kind import OntologyKind
from labelbox.schema.organization import Organization
from labelbox.schema.project import Project
@@ -68,7 +86,6 @@
ProjectOverviewDetailed,
)
from labelbox.schema.project_resource_tag import ProjectResourceTag
-from labelbox.schema.queue_mode import QueueMode
from labelbox.schema.resource_tag import ResourceTag
from labelbox.schema.review import Review
from labelbox.schema.role import ProjectRole, Role
diff --git a/libs/labelbox/src/labelbox/adv_client.py b/libs/labelbox/src/labelbox/adv_client.py
index 626ac0279..20766a9a4 100644
--- a/libs/labelbox/src/labelbox/adv_client.py
+++ b/libs/labelbox/src/labelbox/adv_client.py
@@ -1,12 +1,12 @@
import io
import json
import logging
-from typing import Dict, Any, Optional, List, Callable
+from typing import Any, Callable, Dict, List, Optional
from urllib.parse import urlparse
-from labelbox.exceptions import LabelboxError
import requests
-from requests import Session, Response
+from lbox.exceptions import LabelboxError
+from requests import Response, Session
logger = logging.getLogger(__name__)
diff --git a/libs/labelbox/src/labelbox/annotated_types.py b/libs/labelbox/src/labelbox/annotated_types.py
index d0fe93ef8..de2e1e01f 100644
--- a/libs/labelbox/src/labelbox/annotated_types.py
+++ b/libs/labelbox/src/labelbox/annotated_types.py
@@ -1,6 +1,5 @@
-from typing_extensions import Annotated
+from typing import Annotated
from pydantic import Field
-
Cuid = Annotated[str, Field(min_length=25, max_length=25)]
diff --git a/libs/labelbox/src/labelbox/client.py b/libs/labelbox/src/labelbox/client.py
index 671f8b8cc..bcf29665e 100644
--- a/libs/labelbox/src/labelbox/client.py
+++ b/libs/labelbox/src/labelbox/client.py
@@ -4,20 +4,25 @@
import mimetypes
import os
import random
-import sys
import time
import urllib.parse
import warnings
from collections import defaultdict
from datetime import datetime, timezone
from types import MappingProxyType
-from typing import Any, Dict, List, Optional, Union, overload
+from typing import Any, Callable, Dict, List, Optional, Set, Union, overload
import requests
import requests.exceptions
from google.api_core import retry
+from lbox.exceptions import (
+ InternalServerError,
+ LabelboxError,
+ ResourceNotFoundError,
+ TimeoutError,
+)
+from lbox.request_client import RequestClient
-import labelbox.exceptions
from labelbox import __version__ as SDK_VERSION
from labelbox import utils
from labelbox.adv_client import AdvClient
@@ -25,6 +30,7 @@
from labelbox.orm.db_object import DbObject
from labelbox.orm.model import Entity, Field
from labelbox.pagination import PaginatedCollection
+from labelbox.project_validation import _CoreProjectInput
from labelbox.schema import role
from labelbox.schema.catalog import Catalog
from labelbox.schema.data_row import DataRow
@@ -67,7 +73,6 @@
CONSENSUS_AUTO_AUDIT_PERCENTAGE,
QualityMode,
)
-from labelbox.schema.queue_mode import QueueMode
from labelbox.schema.role import Role
from labelbox.schema.search_filters import SearchFilter
from labelbox.schema.send_to_annotate_params import (
@@ -82,20 +87,11 @@
logger = logging.getLogger(__name__)
-_LABELBOX_API_KEY = "LABELBOX_API_KEY"
-
-
-def python_version_info():
- version_info = sys.version_info
-
- return f"{version_info.major}.{version_info.minor}.{version_info.micro}-{version_info.releaselevel}"
-
class Client:
"""A Labelbox client.
- Contains info necessary for connecting to a Labelbox server (URL,
- authentication key). Provides functions for querying and creating
+ Provides functions for querying and creating
top-level data objects (Projects, Datasets).
"""
@@ -121,57 +117,45 @@ def __init__(
enable_experimental (bool): Indicates whether or not to use experimental features
app_url (str) : host url for all links to the web app
Raises:
- labelbox.exceptions.AuthenticationError: If no `api_key`
+ AuthenticationError: If no `api_key`
is provided as an argument or via the environment
variable.
"""
- if api_key is None:
- if _LABELBOX_API_KEY not in os.environ:
- raise labelbox.exceptions.AuthenticationError(
- "Labelbox API key not provided"
- )
- api_key = os.environ[_LABELBOX_API_KEY]
- self.api_key = api_key
-
- self.enable_experimental = enable_experimental
- if enable_experimental:
- logger.info("Experimental features have been enabled")
-
- logger.info("Initializing Labelbox client at '%s'", endpoint)
- self.app_url = app_url
- self.endpoint = endpoint
- self.rest_endpoint = rest_endpoint
self._data_row_metadata_ontology = None
+ self._request_client = RequestClient(
+ sdk_version=SDK_VERSION,
+ api_key=api_key,
+ endpoint=endpoint,
+ enable_experimental=enable_experimental,
+ app_url=app_url,
+ rest_endpoint=rest_endpoint,
+ )
self._adv_client = AdvClient.factory(rest_endpoint, api_key)
- self._connection: requests.Session = self._init_connection()
- def _init_connection(self) -> requests.Session:
- connection = (
- requests.Session()
- ) # using default connection pool size of 10
- connection.headers.update(self._default_headers())
+ @property
+ def headers(self) -> MappingProxyType:
+ return self._request_client.headers
- return connection
+ @property
+ def connection(self) -> requests.Session:
+ return self._request_client._connection
@property
- def headers(self) -> MappingProxyType:
- return self._connection.headers
-
- def _default_headers(self):
- return {
- "Authorization": "Bearer %s" % self.api_key,
- "Accept": "application/json",
- "Content-Type": "application/json",
- "X-User-Agent": f"python-sdk {SDK_VERSION}",
- "X-Python-Version": f"{python_version_info()}",
- }
+ def endpoint(self) -> str:
+ return self._request_client.endpoint
+
+ @property
+ def rest_endpoint(self) -> str:
+ return self._request_client.rest_endpoint
+
+ @property
+ def enable_experimental(self) -> bool:
+ return self._request_client.enable_experimental
+
+ @property
+ def app_url(self) -> str:
+ return self._request_client.app_url
- @retry.Retry(
- predicate=retry.if_exception_type(
- labelbox.exceptions.InternalServerError,
- labelbox.exceptions.TimeoutError,
- )
- )
def execute(
self,
query=None,
@@ -182,264 +166,34 @@ def execute(
experimental=False,
error_log_key="message",
raise_return_resource_not_found=False,
- ):
- """Sends a request to the server for the execution of the
- given query.
-
- Checks the response for errors and wraps errors
- in appropriate `labelbox.exceptions.LabelboxError` subtypes.
+ error_handlers: Optional[
+ Dict[str, Callable[[requests.models.Response], None]]
+ ] = None,
+ ) -> Dict[str, Any]:
+ """Executes a GraphQL query.
Args:
query (str): The query to execute.
- params (dict): Query parameters referenced within the query.
- data (str): json string containing the query to execute
- files (dict): file arguments for request
- timeout (float): Max allowed time for query execution,
- in seconds.
- Returns:
- dict, parsed JSON response.
- Raises:
- labelbox.exceptions.AuthenticationError: If authentication
- failed.
- labelbox.exceptions.InvalidQueryError: If `query` is not
- syntactically or semantically valid (checked server-side).
- labelbox.exceptions.ApiLimitError: If the server API limit was
- exceeded. See "How to import data" in the online documentation
- to see API limits.
- labelbox.exceptions.TimeoutError: If response was not received
- in `timeout` seconds.
- labelbox.exceptions.NetworkError: If an unknown error occurred
- most likely due to connection issues.
- labelbox.exceptions.LabelboxError: If an unknown error of any
- kind occurred.
- ValueError: If query and data are both None.
- """
- logger.debug("Query: %s, params: %r, data %r", query, params, data)
-
- # Convert datetimes to UTC strings.
- def convert_value(value):
- if isinstance(value, datetime):
- value = value.astimezone(timezone.utc)
- value = value.strftime("%Y-%m-%dT%H:%M:%SZ")
- return value
-
- if query is not None:
- if params is not None:
- params = {
- key: convert_value(value) for key, value in params.items()
- }
- data = json.dumps({"query": query, "variables": params}).encode(
- "utf-8"
- )
- elif data is None:
- raise ValueError("query and data cannot both be none")
-
- endpoint = (
- self.endpoint
- if not experimental
- else self.endpoint.replace("/graphql", "/_gql")
- )
-
- try:
- headers = self._connection.headers.copy()
- if files:
- del headers["Content-Type"]
- del headers["Accept"]
- request = requests.Request(
- "POST",
- endpoint,
- headers=headers,
- data=data,
- files=files if files else None,
- )
-
- prepped: requests.PreparedRequest = request.prepare()
-
- settings = self._connection.merge_environment_settings(
- prepped.url, {}, None, None, None
- )
-
- response = self._connection.send(
- prepped, timeout=timeout, **settings
- )
- logger.debug("Response: %s", response.text)
- except requests.exceptions.Timeout as e:
- raise labelbox.exceptions.TimeoutError(str(e))
- except requests.exceptions.RequestException as e:
- logger.error("Unknown error: %s", str(e))
- raise labelbox.exceptions.NetworkError(e)
- except Exception as e:
- raise labelbox.exceptions.LabelboxError(
- "Unknown error during Client.query(): " + str(e), e
- )
-
- if (
- 200 <= response.status_code < 300
- or response.status_code < 500
- or response.status_code >= 600
- ):
- try:
- r_json = response.json()
- except Exception:
- raise labelbox.exceptions.LabelboxError(
- "Failed to parse response as JSON: %s" % response.text
- )
- else:
- if (
- "upstream connect error or disconnect/reset before headers"
- in response.text
- ):
- raise labelbox.exceptions.InternalServerError(
- "Connection reset"
- )
- elif response.status_code == 502:
- error_502 = "502 Bad Gateway"
- raise labelbox.exceptions.InternalServerError(error_502)
- elif 500 <= response.status_code < 600:
- error_500 = f"Internal server http error {response.status_code}"
- raise labelbox.exceptions.InternalServerError(error_500)
-
- errors = r_json.get("errors", [])
-
- def check_errors(keywords, *path):
- """Helper that looks for any of the given `keywords` in any of
- current errors on paths (like error[path][component][to][keyword]).
- """
- for error in errors:
- obj = error
- for path_elem in path:
- obj = obj.get(path_elem, {})
- if obj in keywords:
- return error
- return None
-
- def get_error_status_code(error: dict) -> int:
- try:
- return int(error["extensions"].get("exception").get("status"))
- except:
- return 500
-
- if (
- check_errors(["AUTHENTICATION_ERROR"], "extensions", "code")
- is not None
- ):
- raise labelbox.exceptions.AuthenticationError("Invalid API key")
-
- authorization_error = check_errors(
- ["AUTHORIZATION_ERROR"], "extensions", "code"
- )
- if authorization_error is not None:
- raise labelbox.exceptions.AuthorizationError(
- authorization_error["message"]
- )
-
- validation_error = check_errors(
- ["GRAPHQL_VALIDATION_FAILED"], "extensions", "code"
- )
-
- if validation_error is not None:
- message = validation_error["message"]
- if message == "Query complexity limit exceeded":
- raise labelbox.exceptions.ValidationFailedError(message)
- else:
- raise labelbox.exceptions.InvalidQueryError(message)
-
- graphql_error = check_errors(
- ["GRAPHQL_PARSE_FAILED"], "extensions", "code"
- )
- if graphql_error is not None:
- raise labelbox.exceptions.InvalidQueryError(
- graphql_error["message"]
- )
-
- # Check if API limit was exceeded
- response_msg = r_json.get("message", "")
-
- if response_msg.startswith("You have exceeded"):
- raise labelbox.exceptions.ApiLimitError(response_msg)
-
- resource_not_found_error = check_errors(
- ["RESOURCE_NOT_FOUND"], "extensions", "code"
- )
- if resource_not_found_error is not None:
- if raise_return_resource_not_found:
- raise labelbox.exceptions.ResourceNotFoundError(
- message=resource_not_found_error["message"]
- )
- else:
- # Return None and let the caller methods raise an exception
- # as they already know which resource type and ID was requested
- return None
-
- resource_conflict_error = check_errors(
- ["RESOURCE_CONFLICT"], "extensions", "code"
- )
- if resource_conflict_error is not None:
- raise labelbox.exceptions.ResourceConflict(
- resource_conflict_error["message"]
- )
+ variables (dict): Variables to pass to the query.
+ raise_return_resource_not_found (bool): If True, raise a
+ ResourceNotFoundError if the query returns None.
+ error_handlers (dict): A dictionary mapping graphql error code to handler functions.
+ Allows a caller to handle specific errors reporting in a custom way or produce more user-friendly readable messages
- malformed_request_error = check_errors(
- ["MALFORMED_REQUEST"], "extensions", "code"
- )
- if malformed_request_error is not None:
- raise labelbox.exceptions.MalformedQueryException(
- malformed_request_error[error_log_key]
- )
-
- # A lot of different error situations are now labeled serverside
- # as INTERNAL_SERVER_ERROR, when they are actually client errors.
- # TODO: fix this in the server API
- internal_server_error = check_errors(
- ["INTERNAL_SERVER_ERROR"], "extensions", "code"
- )
- if internal_server_error is not None:
- message = internal_server_error.get("message")
- error_status_code = get_error_status_code(internal_server_error)
- if error_status_code == 400:
- raise labelbox.exceptions.InvalidQueryError(message)
- elif error_status_code == 422:
- raise labelbox.exceptions.UnprocessableEntityError(message)
- elif error_status_code == 426:
- raise labelbox.exceptions.OperationNotAllowedException(message)
- elif error_status_code == 500:
- raise labelbox.exceptions.LabelboxError(message)
- else:
- raise labelbox.exceptions.InternalServerError(message)
-
- not_allowed_error = check_errors(
- ["OPERATION_NOT_ALLOWED"], "extensions", "code"
+ Returns:
+ dict: The response from the server.
+ """
+ return self._request_client.execute(
+ query,
+ params,
+ data=data,
+ files=files,
+ timeout=timeout,
+ experimental=experimental,
+ error_log_key=error_log_key,
+ raise_return_resource_not_found=raise_return_resource_not_found,
+ error_handlers=error_handlers,
)
- if not_allowed_error is not None:
- message = not_allowed_error.get("message")
- raise labelbox.exceptions.OperationNotAllowedException(message)
-
- if len(errors) > 0:
- logger.warning("Unparsed errors on query execution: %r", errors)
- messages = list(
- map(
- lambda x: {
- "message": x["message"],
- "code": x["extensions"]["code"],
- },
- errors,
- )
- )
- raise labelbox.exceptions.LabelboxError(
- "Unknown error: %s" % str(messages)
- )
-
- # if we do return a proper error code, and didn't catch this above
- # reraise
- # this mainly catches a 401 for API access disabled for free tier
- # TODO: need to unify API errors to handle things more uniformly
- # in the SDK
- if response.status_code != requests.codes.ok:
- message = f"{response.status_code} {response.reason}"
- cause = r_json.get("message")
- raise labelbox.exceptions.LabelboxError(message, cause)
-
- return r_json["data"]
def upload_file(self, path: str) -> str:
"""Uploads given path to local file.
@@ -451,7 +205,7 @@ def upload_file(self, path: str) -> str:
Returns:
str, the URL of uploaded data.
Raises:
- labelbox.exceptions.LabelboxError: If upload failed.
+ LabelboxError: If upload failed.
"""
content_type, _ = mimetypes.guess_type(path)
filename = os.path.basename(path)
@@ -460,11 +214,7 @@ def upload_file(self, path: str) -> str:
content=f.read(), filename=filename, content_type=content_type
)
- @retry.Retry(
- predicate=retry.if_exception_type(
- labelbox.exceptions.InternalServerError
- )
- )
+ @retry.Retry(predicate=retry.if_exception_type(InternalServerError))
def upload_data(
self,
content: bytes,
@@ -484,7 +234,7 @@ def upload_data(
str, the URL of uploaded data.
Raises:
- labelbox.exceptions.LabelboxError: If upload failed.
+ LabelboxError: If upload failed.
"""
request_data = {
@@ -509,7 +259,7 @@ def upload_data(
if (filename and content_type)
else content
}
- headers = self._connection.headers.copy()
+ headers = self.connection.headers.copy()
headers.pop("Content-Type", None)
request = requests.Request(
"POST",
@@ -521,22 +271,20 @@ def upload_data(
prepped: requests.PreparedRequest = request.prepare()
- response = self._connection.send(prepped)
+ response = self.connection.send(prepped)
if response.status_code == 502:
error_502 = "502 Bad Gateway"
- raise labelbox.exceptions.InternalServerError(error_502)
+ raise InternalServerError(error_502)
elif response.status_code == 503:
- raise labelbox.exceptions.InternalServerError(response.text)
+ raise InternalServerError(response.text)
elif response.status_code == 520:
- raise labelbox.exceptions.InternalServerError(response.text)
+ raise InternalServerError(response.text)
try:
file_data = response.json().get("data", None)
except ValueError as e: # response is not valid JSON
- raise labelbox.exceptions.LabelboxError(
- "Failed to upload, unknown cause", e
- )
+ raise LabelboxError("Failed to upload, unknown cause", e)
if not file_data or not file_data.get("uploadFile", None):
try:
@@ -546,9 +294,7 @@ def upload_data(
)
except Exception:
error_msg = "Unknown error"
- raise labelbox.exceptions.LabelboxError(
- "Failed to upload, message: %s" % error_msg
- )
+ raise LabelboxError("Failed to upload, message: %s" % error_msg)
return file_data["uploadFile"]["url"]
@@ -561,7 +307,7 @@ def _get_single(self, db_object_type, uid):
Returns:
Object of `db_object_type`.
Raises:
- labelbox.exceptions.ResourceNotFoundError: If there is no object
+ ResourceNotFoundError: If there is no object
of the given type for the given ID.
"""
query_str, params = query.get_single(db_object_type, uid)
@@ -569,9 +315,7 @@ def _get_single(self, db_object_type, uid):
res = self.execute(query_str, params)
res = res and res.get(utils.camel_case(db_object_type.type_name()))
if res is None:
- raise labelbox.exceptions.ResourceNotFoundError(
- db_object_type, params
- )
+ raise ResourceNotFoundError(db_object_type, params)
else:
return db_object_type(self, res)
@@ -585,7 +329,7 @@ def get_project(self, project_id) -> Project:
Returns:
The sought Project.
Raises:
- labelbox.exceptions.ResourceNotFoundError: If there is no
+ ResourceNotFoundError: If there is no
Project with the given ID.
"""
return self._get_single(Entity.Project, project_id)
@@ -600,7 +344,7 @@ def get_dataset(self, dataset_id) -> Dataset:
Returns:
The sought Dataset.
Raises:
- labelbox.exceptions.ResourceNotFoundError: If there is no
+ ResourceNotFoundError: If there is no
Dataset with the given ID.
"""
return self._get_single(Entity.Dataset, dataset_id)
@@ -630,7 +374,7 @@ def _get_all(self, db_object_type, where, filter_deleted=True):
An iterable of `db_object_type` instances.
"""
if filter_deleted:
- not_deleted = db_object_type.deleted == False
+ not_deleted = db_object_type.deleted == False # noqa: E712