|
4 | 4 | from io import BytesIO
|
5 | 5 | from typing import List, Optional
|
6 | 6 |
|
7 |
| -import requests |
8 | 7 | from lbox.exceptions import (
|
9 |
| - InternalServerError, |
10 | 8 | LabelboxError,
|
11 | 9 | ResourceNotFoundError,
|
12 | 10 | )
|
@@ -151,42 +149,10 @@ def upload_members(
|
151 | 149 | ), # Remove the unnecessary (None, ...) tuple
|
152 | 150 | }
|
153 | 151 |
|
154 |
| - client = self.client |
155 |
| - headers = dict(client.connection.headers) |
156 |
| - headers.pop("Content-Type", None) |
157 |
| - request = requests.Request( |
158 |
| - "POST", |
159 |
| - client.endpoint, |
160 |
| - headers=headers, |
161 |
| - data=request_data, |
162 |
| - files=files, |
163 |
| - ) |
164 |
| - |
165 |
| - prepped: requests.PreparedRequest = request.prepare() |
166 |
| - |
167 |
| - response = client.connection.send(prepped) |
168 |
| - |
169 |
| - if response.status_code == 502: |
170 |
| - error_502 = "502 Bad Gateway" |
171 |
| - raise InternalServerError(error_502) |
172 |
| - elif response.status_code == 503: |
173 |
| - raise InternalServerError(response.text) |
174 |
| - elif response.status_code == 520: |
175 |
| - raise InternalServerError(response.text) |
176 |
| - |
177 |
| - try: |
178 |
| - file_data = response.json().get("data", None) |
179 |
| - except ValueError as e: # response is not valid JSON |
180 |
| - raise LabelboxError("Failed to upload, unknown cause", e) |
| 152 | + file_data = self.client.execute(data=request_data, files=files) |
181 | 153 |
|
182 | 154 | if not file_data or not file_data.get("importUsersAsCsvToGroup", None):
|
183 |
| - try: |
184 |
| - errors = response.json().get("errors", []) |
185 |
| - error_msg = "Unknown error" |
186 |
| - if errors: |
187 |
| - error_msg = errors[0].get("message", "Unknown error") |
188 |
| - except Exception: |
189 |
| - error_msg = "Unknown error" |
| 155 | + error_msg = "Unknown error" |
190 | 156 | raise LabelboxError("Failed to upload, message: %s" % error_msg)
|
191 | 157 |
|
192 | 158 | csv_report = file_data["importUsersAsCsvToGroup"]["csvReport"]
|
|
0 commit comments