dbt-common 0.1.4__tar.gz → 0.1.6__tar.gz

{dbt_common-0.1.4 → dbt_common-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-common
-Version: 0.1.4
+Version: 0.1.6
 Summary: The shared common utilities that dbt-core and adapter implementations use
 Project-URL: Homepage, https://github.com/dbt-labs/dbt-common
 Project-URL: Repository, https://github.com/dbt-labs/dbt-common.git
@@ -30,7 +30,7 @@ Requires-Dist: jinja2~=3.0
 Requires-Dist: jsonschema~=4.0
 Requires-Dist: mashumaro[msgpack]~=3.9
 Requires-Dist: pathspec<0.12,>=0.9
-Requires-Dist: protobuf>=4.0.0
+Requires-Dist: protobuf<5.0.0,>=4.0.0
 Requires-Dist: python-dateutil~=2.0
 Requires-Dist: requests<3.0.0
 Requires-Dist: typing-extensions~=4.4

dbt_common-0.1.6/dbt_common/__about__.py

@@ -0,0 +1 @@
+version = "0.1.6"

{dbt_common-0.1.4 → dbt_common-0.1.6}/dbt_common/context.py

@@ -26,7 +26,7 @@ class InvocationContext:
 _INVOCATION_CONTEXT_VAR: ContextVar[InvocationContext] = ContextVar("DBT_INVOCATION_CONTEXT_VAR")
 
 
-def _reliably_get_invocation_var() -> ContextVar:
+def reliably_get_invocation_var() -> ContextVar:
     invocation_var: Optional[ContextVar] = next(
         (cv for cv in copy_context() if cv.name == _INVOCATION_CONTEXT_VAR.name), None
     )
@@ -38,11 +38,11 @@ def _reliably_get_invocation_var() -> ContextVar:
 
 
 def set_invocation_context(env: Mapping[str, str]) -> None:
-    invocation_var = _reliably_get_invocation_var()
+    invocation_var = reliably_get_invocation_var()
     invocation_var.set(InvocationContext(env))
 
 
 def get_invocation_context() -> InvocationContext:
-    invocation_var = _reliably_get_invocation_var()
+    invocation_var = reliably_get_invocation_var()
     ctx = invocation_var.get()
     return ctx

{dbt_common-0.1.4 → dbt_common-0.1.6}/dbt_common/events/contextvars.py

@@ -58,12 +58,12 @@ def set_task_contextvars(**kwargs: Any) -> Mapping[str, contextvars.Token]:
 def set_contextvars(prefix: str, **kwargs: Any) -> Mapping[str, contextvars.Token]:
     cvar_tokens = {}
     for k, v in kwargs.items():
-        log_key = f"{prefix}{k}"
+        prefix_key = f"{prefix}{k}"
         try:
-            var = _context_vars[log_key]
+            var = _context_vars[prefix_key]
         except KeyError:
-            var = contextvars.ContextVar(log_key, default=Ellipsis)
-            _context_vars[log_key] = var
+            var = contextvars.ContextVar(prefix_key, default=Ellipsis)
+            _context_vars[prefix_key] = var
 
         cvar_tokens[k] = var.set(v)
 
@@ -73,17 +73,17 @@ def set_contextvars(prefix: str, **kwargs: Any) -> Mapping[str, contextvars.Toke
 # reset by Tokens
 def reset_contextvars(prefix: str, **kwargs: contextvars.Token) -> None:
     for k, v in kwargs.items():
-        log_key = f"{prefix}{k}"
-        var = _context_vars[log_key]
+        prefix_key = f"{prefix}{k}"
+        var = _context_vars[prefix_key]
         var.reset(v)
 
 
 # remove from contextvars
 def unset_contextvars(prefix: str, *keys: str) -> None:
     for k in keys:
-        if k in _context_vars:
-            log_key = f"{prefix}{k}"
-            _context_vars[log_key].set(Ellipsis)
+        prefix_key = f"{prefix}{k}"
+        if prefix_key in _context_vars:
+            _context_vars[prefix_key].set(Ellipsis)
 
 
 # Context manager or decorator to set and unset the context vars

{dbt_common-0.1.4 → dbt_common-0.1.6}/dbt_common/events/functions.py

@@ -132,13 +132,6 @@ def fire_event_if(
         fire_event(lazy_e(), level=level)
 
 
-# a special case of fire_event_if, to only fire events in our unit/functional tests
-def fire_event_if_test(
-    lazy_e: Callable[[], BaseEvent], level: Optional[EventLevel] = None
-) -> None:
-    fire_event_if(conditional=("pytest" in sys.modules), lazy_e=lazy_e, level=level)
-
-
 # top-level method for accessing the new eventing system
 # this is where all the side effects happen branched by event type
 # (i.e. - mutating the event history, printing to stdout, logging

{dbt_common-0.1.4 → dbt_common-0.1.6}/dbt_common/utils/executor.py

@@ -1,7 +1,10 @@
 import concurrent.futures
 from contextlib import contextmanager
+from contextvars import ContextVar
 from typing import Protocol, Optional
 
+from dbt_common.context import get_invocation_context, reliably_get_invocation_var
+
 
 class ConnectingExecutor(concurrent.futures.Executor):
     def submit_connected(self, adapter, conn_name, func, *args, **kwargs):
@@ -60,8 +63,17 @@ class HasThreadingConfig(Protocol):
     threads: Optional[int]
 
 
+def _thread_initializer(invocation_context: ContextVar) -> None:
+    invocation_var = reliably_get_invocation_var()
+    invocation_var.set(invocation_context)
+
+
 def executor(config: HasThreadingConfig) -> ConnectingExecutor:
     if config.args.single_threaded:
         return SingleThreadedExecutor()
     else:
-        return MultiThreadedExecutor(max_workers=config.threads)
+        return MultiThreadedExecutor(
+            max_workers=config.threads,
+            initializer=_thread_initializer,
+            initargs=(get_invocation_context(),),
+        )

{dbt_common-0.1.4 → dbt_common-0.1.6}/pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
   "Jinja2~=3.0",
   "mashumaro[msgpack]~=3.9",
   "pathspec>=0.9,<0.12",
-  "protobuf>=4.0.0",
+  "protobuf>=4.0.0,<5.0.0",
   "python-dateutil~=2.0",
   "requests<3.0.0",
   "typing-extensions~=4.4",

dbt_common-0.1.4/dbt_common/__about__.py

@@ -1 +0,0 @@
-version = "0.1.4"