allows to init requests helper without runtime injection, uses re-ent…

…rant locks when injecting context

dlt/common/configuration/container.py

@@ -36,7 +36,7 @@ class Container:
 
     thread_contexts: Dict[int, Dict[Type[ContainerInjectableContext], ContainerInjectableContext]]
     """A thread aware mapping of injection context """
-    _context_container_locks: Dict[str, threading.Lock]
+    _context_container_locks: Dict[str, threading.RLock]
     """Locks for container types on threads."""
 
     main_context: Dict[Type[ContainerInjectableContext], ContainerInjectableContext]
@@ -159,8 +159,9 @@ def injectable_context(
         if lock_context:
             lock_key = f"{id(context)}"
             if (lock := self._context_container_locks.get(lock_key)) is None:
+                # use multi-entrant locks so same thread can acquire this context several times
                 with Container._LOCK:
-                    self._context_container_locks[lock_key] = lock = threading.Lock()
+                    self._context_container_locks[lock_key] = lock = threading.RLock()
         else:
             lock = nullcontext()
 

dlt/common/runtime/init.py

@@ -27,7 +27,7 @@ def initialize_runtime(
     )
 
     # Init or update default requests client config
-    requests.init(runtime_config)
+    # requests.init(runtime_config)
 
 
 def restore_run_context(
@@ -46,6 +46,10 @@ def restore_run_context(
 def init_telemetry(runtime_config: RuntimeConfiguration) -> None:
     """Starts telemetry only once"""
     from dlt.common.runtime.telemetry import start_telemetry
+    from dlt.sources.helpers import requests
+
+    # Init or update default requests client config
+    requests.init(runtime_config)
 
     global _INITIALIZED
     # initialize only once

dlt/sources/helpers/requests/retry.py

@@ -224,7 +224,11 @@ def __init__(
         )
 
     @with_config(spec=RuntimeConfiguration)
-    def update_from_config(self, config: RuntimeConfiguration = ConfigValue) -> None:
+    def configure(self, config: RuntimeConfiguration = ConfigValue) -> None:
+        """Update session/retry settings via injected RunConfiguration"""
+        self.update_from_config(config)
+
+    def update_from_config(self, config: RuntimeConfiguration) -> None:
         """Update session/retry settings from RunConfiguration"""
         self._session_kwargs["timeout"] = config.request_timeout
         self._retry_kwargs["backoff_factor"] = config.request_backoff_factor

tests/sources/helpers/test_requests.py

@@ -230,7 +230,7 @@ def test_client_instance_with_config(existing_session: bool) -> None:
     os.environ.update({key: str(value) for key, value in cfg.items()})
 
     client = default_client if existing_session else Client()
-    client.update_from_config()
+    client.configure()
 
     session = client.session
     assert session.timeout == cfg["RUNTIME__REQUEST_TIMEOUT"]