Skip to content

Commit 9b86233

Browse files
authored
[PLT-2336] Vb/backport export charset plt 2336 (#1943)
1 parent 6b87083 commit 9b86233

File tree

6 files changed

+76
-45
lines changed

6 files changed

+76
-45
lines changed

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.8.19
1+
3.9.18

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.78.1'
19+
release = '3.78.2'
2020

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

libs/labelbox/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# Changelog
2+
# Version 3.78.2 (2025-01-15)
3+
## Fixed
4+
* Exporter encoding
5+
* NOTE: backported from v.5.2.1
6+
27
# Version 3.78.1 (2024-09-10)
38
## Fixed
49
* Labeling dashboard query for tags

libs/labelbox/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "labelbox"
3-
version = "3.78.1"
3+
version = "3.78.2"
44
description = "Labelbox Python API"
55
authors = [{ name = "Labelbox", email = "[email protected]" }]
66
dependencies = [
Lines changed: 60 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,73 @@
11
name = "labelbox"
22

3-
__version__ = "3.78.1"
3+
__version__ = "3.78.2"
44

55
from labelbox.client import Client
6-
from labelbox.schema.project import Project
7-
from labelbox.schema.model import Model
8-
from labelbox.schema.model_config import ModelConfig
6+
from labelbox.schema.annotation_import import (
7+
LabelImport,
8+
MALPredictionImport,
9+
MEAPredictionImport,
10+
MEAToMALPredictionImport,
11+
)
12+
from labelbox.schema.asset_attachment import AssetAttachment
13+
from labelbox.schema.batch import Batch
14+
from labelbox.schema.benchmark import Benchmark
915
from labelbox.schema.bulk_import_request import BulkImportRequest
10-
from labelbox.schema.annotation_import import MALPredictionImport, MEAPredictionImport, LabelImport, MEAToMALPredictionImport
11-
from labelbox.schema.dataset import Dataset
12-
from labelbox.schema.data_row import DataRow
1316
from labelbox.schema.catalog import Catalog
17+
from labelbox.schema.data_row import DataRow
18+
from labelbox.schema.data_row_metadata import (
19+
DataRowMetadata,
20+
DataRowMetadataField,
21+
DataRowMetadataOntology,
22+
DeleteDataRowMetadata,
23+
)
24+
from labelbox.schema.dataset import Dataset
1425
from labelbox.schema.enums import AnnotationImportState
26+
from labelbox.schema.export_task import (
27+
BufferedJsonConverterOutput,
28+
ExportTask,
29+
FileConverter,
30+
FileConverterOutput,
31+
JsonConverter,
32+
JsonConverterOutput,
33+
StreamType,
34+
)
35+
from labelbox.schema.iam_integration import IAMIntegration
36+
from labelbox.schema.identifiable import GlobalKey, UniqueId
37+
from labelbox.schema.identifiables import DataRowIds, GlobalKeys, UniqueIds
38+
from labelbox.schema.invite import Invite, InviteLimit
1539
from labelbox.schema.label import Label
16-
from labelbox.schema.batch import Batch
17-
from labelbox.schema.review import Review
18-
from labelbox.schema.user import User
19-
from labelbox.schema.organization import Organization
20-
from labelbox.schema.task import Task
21-
from labelbox.schema.export_task import StreamType, ExportTask, JsonConverter, JsonConverterOutput, FileConverter, FileConverterOutput, BufferedJsonConverterOutput
40+
from labelbox.schema.label_score import LabelScore
2241
from labelbox.schema.labeling_frontend import LabelingFrontend, LabelingFrontendOptions
23-
from labelbox.schema.asset_attachment import AssetAttachment
24-
from labelbox.schema.webhook import Webhook
25-
from labelbox.schema.ontology import Ontology, OntologyBuilder, Classification, Option, Tool, FeatureSchema
26-
from labelbox.schema.ontology import PromptResponseClassification
27-
from labelbox.schema.ontology import ResponseOption
28-
from labelbox.schema.role import Role, ProjectRole
29-
from labelbox.schema.invite import Invite, InviteLimit
30-
from labelbox.schema.data_row_metadata import DataRowMetadataOntology, DataRowMetadataField, DataRowMetadata, DeleteDataRowMetadata
31-
from labelbox.schema.model_run import ModelRun, DataSplit
32-
from labelbox.schema.benchmark import Benchmark
33-
from labelbox.schema.iam_integration import IAMIntegration
34-
from labelbox.schema.resource_tag import ResourceTag
42+
from labelbox.schema.labeling_service import LabelingService
43+
from labelbox.schema.labeling_service_dashboard import LabelingServiceDashboard
44+
from labelbox.schema.labeling_service_status import LabelingServiceStatus
45+
from labelbox.schema.media_type import MediaType
46+
from labelbox.schema.model import Model
47+
from labelbox.schema.model_config import ModelConfig
48+
from labelbox.schema.model_run import DataSplit, ModelRun
49+
from labelbox.schema.ontology import (
50+
Classification,
51+
FeatureSchema,
52+
Ontology,
53+
OntologyBuilder,
54+
Option,
55+
PromptResponseClassification,
56+
ResponseOption,
57+
Tool,
58+
)
59+
from labelbox.schema.ontology_kind import OntologyKind
60+
from labelbox.schema.organization import Organization
61+
from labelbox.schema.project import Project
3562
from labelbox.schema.project_model_config import ProjectModelConfig
63+
from labelbox.schema.project_overview import ProjectOverview, ProjectOverviewDetailed
3664
from labelbox.schema.project_resource_tag import ProjectResourceTag
37-
from labelbox.schema.media_type import MediaType
38-
from labelbox.schema.slice import Slice, CatalogSlice, ModelSlice
3965
from labelbox.schema.queue_mode import QueueMode
66+
from labelbox.schema.resource_tag import ResourceTag
67+
from labelbox.schema.review import Review
68+
from labelbox.schema.role import ProjectRole, Role
69+
from labelbox.schema.slice import CatalogSlice, ModelSlice, Slice
70+
from labelbox.schema.task import Task
4071
from labelbox.schema.task_queue import TaskQueue
41-
from labelbox.schema.label_score import LabelScore
42-
from labelbox.schema.identifiables import UniqueIds, GlobalKeys, DataRowIds
43-
from labelbox.schema.identifiable import UniqueId, GlobalKey
44-
from labelbox.schema.ontology_kind import OntologyKind
45-
from labelbox.schema.project_overview import ProjectOverview, ProjectOverviewDetailed
46-
from labelbox.schema.labeling_service import LabelingService
47-
from labelbox.schema.labeling_service_dashboard import LabelingServiceDashboard
48-
from labelbox.schema.labeling_service_status import LabelingServiceStatus
72+
from labelbox.schema.user import User
73+
from labelbox.schema.webhook import Webhook

libs/labelbox/src/labelbox/schema/export_task.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1+
import json
2+
import os
3+
import tempfile
4+
import warnings
15
from abc import ABC, abstractmethod
26
from dataclasses import dataclass
37
from enum import Enum
48
from functools import lru_cache
59
from io import TextIOWrapper
6-
import json
710
from pathlib import Path
811
from typing import (
12+
TYPE_CHECKING,
13+
Any,
914
Callable,
1015
Generic,
1116
Iterator,
@@ -14,17 +19,12 @@
1419
Tuple,
1520
TypeVar,
1621
Union,
17-
TYPE_CHECKING,
1822
overload,
19-
Any,
2023
)
2124

2225
import requests
23-
import warnings
24-
import tempfile
25-
import os
26-
from labelbox import pydantic_compat
2726

27+
from labelbox import pydantic_compat
2828
from labelbox.schema.task import Task
2929
from labelbox.utils import _CamelCaseMixin
3030

@@ -236,6 +236,7 @@ def _get_file_content(
236236
f"{self._ctx.stream_type.value} stream")
237237
response = requests.get(file_info.file, timeout=30)
238238
response.raise_for_status()
239+
response.encoding = "utf-8"
239240
assert len(
240241
response.content
241242
) == file_info.offsets.end - file_info.offsets.start + 1, (

0 commit comments

Comments
 (0)