updated

Author: Oleksandr Bazarnov

airbyte_cdk/sources/declarative/requesters/http_job_repository.py

@@ -284,12 +284,14 @@ def _get_creation_response_interpolation_context(self, job: AsyncJob) -> Dict[st
             Dict[str, Any]: The interpolation context as a dictionary.
         """
         creation_response_context = dict(self._create_job_response_by_id[job.api_job_id()].json())
-        creation_response_context["headers"] = self._create_job_response_by_id[
-            job.api_job_id()
-        ].headers
-        creation_response_context["request"] = self._create_job_response_by_id[
-            job.api_job_id()
-        ].request
+        if not "headers" in creation_response_context:
+            creation_response_context["headers"] = self._create_job_response_by_id[
+                job.api_job_id()
+            ].headers
+        if not "request" in creation_response_context:
+            creation_response_context["request"] = self._create_job_response_by_id[
+                job.api_job_id()
+            ].request
         return creation_response_context
 
     def _get_polling_response_interpolation_context(self, job: AsyncJob) -> Dict[str, Any]:
@@ -303,12 +305,14 @@ def _get_polling_response_interpolation_context(self, job: AsyncJob) -> Dict[str
             Dict[str, Any]: The interpolation context as a dictionary.
         """
         polling_response_context = dict(self._polling_job_response_by_id[job.api_job_id()].json())
-        polling_response_context["headers"] = self._polling_job_response_by_id[
-            job.api_job_id()
-        ].headers
-        polling_response_context["request"] = self._polling_job_response_by_id[
-            job.api_job_id()
-        ].request
+        if not "headers" in polling_response_context:
+            polling_response_context["headers"] = self._polling_job_response_by_id[
+                job.api_job_id()
+            ].headers
+        if not "request" in polling_response_context:
+            polling_response_context["request"] = self._polling_job_response_by_id[
+                job.api_job_id()
+            ].request
         return polling_response_context
 
     def _get_create_job_stream_slice(self, job: AsyncJob) -> StreamSlice: