Fix default header handling

Author: Val Brodsky

libs/labelbox/src/labelbox/client.py

@@ -129,6 +129,8 @@ def _init_connection(self) -> requests.Session:
     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()}",
         }
@@ -200,20 +202,18 @@ def convert_value(value):
             "/graphql", "/_gql")
 
         try:
+            headers = self._connection.headers.copy()
+            if files:
+                del headers['Content-Type']
+                del headers['Accept']
             request = requests.Request('POST',
                                        endpoint,
-                                       headers=self._connection.headers,
+                                       headers=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:
@@ -419,13 +419,21 @@ def upload_data(self,
             "map": (None, json.dumps({"1": ["variables.file"]})),
         }
 
-        response = self._connection.post(
-            self.endpoint,
-            data=request_data,
-            files={
-                "1": (filename, content, content_type) if
-                     (filename and content_type) else content
-            })
+        files = {
+            "1": (filename, content, content_type) if
+                 (filename and content_type) else content
+        }
+        headers = self._connection.headers.copy()
+        headers.pop("Content-Type", None)
+        request = requests.Request('POST',
+                                   self.endpoint,
+                                   headers=headers,
+                                   data=request_data,
+                                   files=files)
+
+        prepped: requests.PreparedRequest = request.prepare()
+
+        response = self._connection.send(prepped)
 
         if response.status_code == 502:
             error_502 = '502 Bad Gateway'
@@ -1094,6 +1102,7 @@ def get_feature_schema(self, feature_schema_id):
         query_str = """query rootSchemaNodePyApi($rootSchemaNodeWhere: RootSchemaNodeWhere!){
               rootSchemaNode(where: $rootSchemaNodeWhere){%s}
         }""" % query.results_query_part(Entity.FeatureSchema)
+
         res = self.execute(
             query_str,
             {'rootSchemaNodeWhere': {
@@ -1204,10 +1213,7 @@ def delete_unused_feature_schema(self, feature_schema_id: str) -> None:
 
         endpoint = self.rest_endpoint + "/feature-schemas/" + urllib.parse.quote(
             feature_schema_id)
-        response = self._connection.delete(
-            endpoint,
-            headers=self.headers,
-        )
+        response = self._connection.delete(endpoint,)
 
         if response.status_code != requests.codes.no_content:
             raise labelbox.exceptions.LabelboxError(
@@ -1224,10 +1230,7 @@ def delete_unused_ontology(self, ontology_id: str) -> None:
         """
         endpoint = self.rest_endpoint + "/ontologies/" + urllib.parse.quote(
             ontology_id)
-        response = self._connection.delete(
-            endpoint,
-            headers=self.headers,
-        )
+        response = self._connection.delete(endpoint,)
 
         if response.status_code != requests.codes.no_content:
             raise labelbox.exceptions.LabelboxError(
@@ -1251,7 +1254,6 @@ def update_feature_schema_title(self, feature_schema_id: str,
             feature_schema_id) + '/definition'
         response = self._connection.patch(
             endpoint,
-            headers=self.headers,
             json={"title": title},
         )
 
@@ -1284,7 +1286,6 @@ def upsert_feature_schema(self, feature_schema: Dict) -> FeatureSchema:
             feature_schema_id)
         response = self._connection.put(
             endpoint,
-            headers=self.headers,
             json={"normalized": json.dumps(feature_schema)},
         )
 
@@ -1314,7 +1315,6 @@ def insert_feature_schema_into_ontology(self, feature_schema_id: str,
                 feature_schema_id)
         response = self._connection.post(
             endpoint,
-            headers=self.headers,
             json={"position": position},
         )
         if response.status_code != requests.codes.created:
@@ -1339,7 +1339,6 @@ def get_unused_ontologies(self, after: str = None) -> List[str]:
         endpoint = self.rest_endpoint + "/ontologies/unused"
         response = self._connection.get(
             endpoint,
-            headers=self.headers,
             json={"after": after},
         )
 
@@ -1367,7 +1366,6 @@ def get_unused_feature_schemas(self, after: str = None) -> List[str]:
         endpoint = self.rest_endpoint + "/feature-schemas/unused"
         response = self._connection.get(
             endpoint,
-            headers=self.headers,
             json={"after": after},
         )
 
@@ -1890,10 +1888,7 @@ def is_feature_schema_archived(self, ontology_id: str,
 
         ontology_endpoint = self.rest_endpoint + "/ontologies/" + urllib.parse.quote(
             ontology_id)
-        response = self._connection.get(
-            ontology_endpoint,
-            headers=self.headers,
-        )
+        response = self._connection.get(ontology_endpoint,)
 
         if response.status_code == requests.codes.ok:
             feature_schema_nodes = response.json()['featureSchemaNodes']
@@ -1969,10 +1964,7 @@ def delete_feature_schema_from_ontology(
         ontology_endpoint = self.rest_endpoint + "/ontologies/" + urllib.parse.quote(
             ontology_id) + "/feature-schemas/" + urllib.parse.quote(
                 feature_schema_id)
-        response = self._connection.delete(
-            ontology_endpoint,
-            headers=self.headers,
-        )
+        response = self._connection.delete(ontology_endpoint,)
 
         if response.status_code == requests.codes.ok:
             response_json = response.json()
@@ -2006,10 +1998,7 @@ def unarchive_feature_schema_node(self, ontology_id: str,
         ontology_endpoint = self.rest_endpoint + "/ontologies/" + urllib.parse.quote(
             ontology_id) + '/feature-schemas/' + urllib.parse.quote(
                 root_feature_schema_id) + '/unarchive'
-        response = self._connection.patch(
-            ontology_endpoint,
-            headers=self.headers,
-        )
+        response = self._connection.patch(ontology_endpoint,)
         if response.status_code == requests.codes.ok:
             if not bool(response.json()['unarchived']):
                 raise labelbox.exceptions.LabelboxError(