Use prepped request

Author: Val Brodsky

libs/labelbox/src/labelbox/client.py

@@ -128,8 +128,6 @@ def _init_connection(self) -> requests.Session:
 
     def _default_headers(self):
         return {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
             'Authorization': 'Bearer %s' % self.api_key,
             'X-User-Agent': f"python-sdk {SDK_VERSION}",
             'X-Python-Version': f"{python_version_info()}",
@@ -202,13 +200,21 @@ def convert_value(value):
             "/graphql", "/_gql")
 
         try:
-            request = {'url': endpoint, 'data': data, 'timeout': timeout}
-            if files:
-                request.update({'files': files})
-                request['headers'] = {
-                    'Authorization': self._connection.headers['Authorization']
-                }
-            response = self._connection.post(**request)
+            request = requests.Request('POST',
+                                       endpoint,
+                                       headers=self._connection.headers,
+                                       data=data,
+                                       files=files if files else None)
+
+            prepped: requests.PreparedRequest = request.prepare()
+
+            if not files:
+                prepped.headers.update({
+                    'Accept': 'application/json',
+                    'Content-Type': 'application/json',
+                })
+
+            response = self._connection.send(prepped, timeout=timeout)
             logger.debug("Response: %s", response.text)
         except requests.exceptions.Timeout as e:
             raise labelbox.exceptions.TimeoutError(str(e))
@@ -415,7 +421,6 @@ def upload_data(self,
 
         response = self._connection.post(
             self.endpoint,
-            headers={"authorization": "Bearer %s" % self.api_key},
             data=request_data,
             files={
                 "1": (filename, content, content_type) if

libs/labelbox/tests/integration/test_project.py

@@ -144,7 +144,6 @@ def test_attach_instructions(client, project):
     assert str(
         execinfo.value
     ) == "Cannot attach instructions to a project that has not been set up."
-
     editor = list(
         client.get_labeling_frontends(
             where=LabelingFrontend.name == "editor"))[0]
@@ -218,7 +217,7 @@ def test_create_batch_with_global_keys_sync(project: Project, data_rows):
     global_keys = [dr.global_key for dr in data_rows]
     batch_name = f'batch {uuid.uuid4()}'
     batch = project.create_batch(batch_name, global_keys=global_keys)
-    
+
     assert batch.size == len(set(data_rows))
 
 
@@ -227,7 +226,7 @@ def test_create_batch_with_global_keys_async(project: Project, data_rows):
     global_keys = [dr.global_key for dr in data_rows]
     batch_name = f'batch {uuid.uuid4()}'
     batch = project._create_batch_async(batch_name, global_keys=global_keys)
-    
+
     assert batch.size == len(set(data_rows))
 
 
@@ -245,8 +244,7 @@ def test_media_type(client, project: Project, rand_gen):
         # Exclude LLM media types for now, as they are not supported
         if MediaType[media_type] in [
                 MediaType.LLMPromptCreation,
-                MediaType.LLMPromptResponseCreation,
-                MediaType.LLM
+                MediaType.LLMPromptResponseCreation, MediaType.LLM
         ]:
             continue
 
@@ -284,7 +282,8 @@ def test_label_count(client, configured_batch_project_with_label):
 
 def test_clone(client, project, rand_gen):
     # cannot clone unknown project media type
-    project = client.create_project(name=rand_gen(str), media_type=MediaType.Image)
+    project = client.create_project(name=rand_gen(str),
+                                    media_type=MediaType.Image)
     cloned_project = project.clone()
 
     assert cloned_project.description == project.description
@@ -295,4 +294,4 @@ def test_clone(client, project, rand_gen):
     assert cloned_project.get_label_count() == 0
 
     project.delete()
-    cloned_project.delete()
+    cloned_project.delete()