dbt-common 1.8.0__py3-none-any.whl → 1.9.0__py3-none-any.whl

dbt_common/__about__.py

@@ -1 +1 @@
-version = "1.8.0"
+version = "1.9.0"

dbt_common/behavior_flags.py

@@ -9,8 +9,8 @@ except ImportError:
     from typing import Optional as NotRequired
 
 from dbt_common.events.functions import fire_event
-from dbt_common.events.types import BehaviorDeprecationEvent
-from dbt_common.exceptions import CompilationError
+from dbt_common.events.types import BehaviorChangeEvent
+from dbt_common.exceptions import CompilationError, DbtInternalError
 
 
 class BehaviorFlag(TypedDict):
@@ -20,16 +20,20 @@ class BehaviorFlag(TypedDict):
     Args:
         name: the name of the behavior flag
         default: default setting, starts as False, becomes True after a bake-in period
-        deprecation_version: the version when the default will change to True
-        deprecation_message: an additional message to send when the flag evaluates to False
+        description: an additional message to send when the flag evaluates to False
         docs_url: the url to the relevant docs on docs.getdbt.com
+
+    *Note*:
+        While `description` and `docs_url` are both listed as `NotRequired`, at least one of them is required.
+        This is validated when the flag is rendered in `BehaviorFlagRendered` below.
+        The goal of this restriction is to provide the end user with context so they can make an informed decision
+        about if, and when, to enable the behavior flag.
     """
 
     name: str
     default: bool
     source: NotRequired[str]
-    deprecation_version: NotRequired[str]
-    deprecation_message: NotRequired[str]
+    description: NotRequired[str]
     docs_url: NotRequired[str]
 
 
@@ -43,14 +47,33 @@ class BehaviorFlagRendered:
     """
 
     def __init__(self, flag: BehaviorFlag, user_overrides: Dict[str, Any]) -> None:
+        self._validate(flag)
+
         self.name = flag["name"]
         self.setting = user_overrides.get(flag["name"], flag["default"])
-        self.deprecation_event = self._deprecation_event(flag)
+
+        default_description = (
+            f"""The behavior controlled by `{flag["name"]}` is currently turned off.\n"""
+        )
+        default_docs_url = "https://docs.getdbt.com/reference/global-configs/behavior-changes"
+        self._behavior_change_event = BehaviorChangeEvent(
+            flag_name=flag["name"],
+            flag_source=flag.get("source", self._default_source()),
+            description=flag.get("description", default_description),
+            docs_url=flag.get("docs_url", default_docs_url),
+        )
+
+    @staticmethod
+    def _validate(flag: BehaviorFlag) -> None:
+        if flag.get("description") is None and flag.get("docs_url") is None:
+            raise DbtInternalError(
+                "Behavior change flags require at least one of `description` and `docs_url`."
+            )
 
     @property
     def setting(self) -> bool:
         if self._setting is False:
-            fire_event(self.deprecation_event)
+            fire_event(self._behavior_change_event)
         return self._setting
 
     @setting.setter
@@ -61,15 +84,6 @@ class BehaviorFlagRendered:
     def no_warn(self) -> bool:
         return self._setting
 
-    def _deprecation_event(self, flag: BehaviorFlag) -> BehaviorDeprecationEvent:
-        return BehaviorDeprecationEvent(
-            flag_name=flag["name"],
-            flag_source=flag.get("source", self._default_source()),
-            deprecation_version=flag.get("deprecation_version"),
-            deprecation_message=flag.get("deprecation_message"),
-            docs_url=flag.get("docs_url"),
-        )
-
     @staticmethod
     def _default_source() -> str:
         """
@@ -95,7 +109,7 @@ class Behavior:
         if adapter.behavior.my_flag:
             ...
 
-        if adapter.behavior.my_flag.no_warn:  # this will not fire the deprecation event
+        if adapter.behavior.my_flag.no_warn:  # this will not fire the behavior change event
             ...
         ```
         ```jinja
@@ -103,7 +117,7 @@ class Behavior:
             ...
         {% endif %}
 
-        {% if adapter.behavior.my_flag.no_warn %}  {# this will not fire the deprecation event #}
+        {% if adapter.behavior.my_flag.no_warn %}  {# this will not fire the behavior change event #}
             ...
         {% endif %}
         ```

dbt_common/clients/jinja.py

@@ -6,7 +6,21 @@ from ast import literal_eval
 from collections import ChainMap
 from contextlib import contextmanager
 from itertools import chain, islice
-from typing import Any, Callable, Dict, Iterator, List, Mapping, Optional, Union, Set, Type
+from types import CodeType
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Iterator,
+    List,
+    Mapping,
+    Optional,
+    Union,
+    Set,
+    Type,
+    NoReturn,
+)
+
 from typing_extensions import Protocol
 
 import jinja2
@@ -39,10 +53,17 @@ from dbt_common.exceptions.macros import MacroReturn, UndefinedMacroError, Caugh
 SUPPORTED_LANG_ARG = jinja2.nodes.Name("supported_languages", "param")
 
 # Global which can be set by dependents of dbt-common (e.g. core via flag parsing)
-MACRO_DEBUGGING = False
+MACRO_DEBUGGING: Union[str, bool] = False
+
+_ParseReturn = Union[jinja2.nodes.Node, List[jinja2.nodes.Node]]
+
+
+# Temporary type capturing the concept the functions in this file expect for a "node"
+class _NodeProtocol(Protocol):
+    pass
 
 
-def _linecache_inject(source, write):
+def _linecache_inject(source: str, write: bool) -> str:
     if write:
         # this is the only reliable way to accomplish this. Obviously, it's
         # really darn noisy and will fill your temporary directory
@@ -58,18 +79,18 @@ def _linecache_inject(source, write):
     else:
         # `codecs.encode` actually takes a `bytes` as the first argument if
         # the second argument is 'hex' - mypy does not know this.
-        rnd = codecs.encode(os.urandom(12), "hex")  # type: ignore
+        rnd = codecs.encode(os.urandom(12), "hex")
         filename = rnd.decode("ascii")
 
     # put ourselves in the cache
     cache_entry = (len(source), None, [line + "\n" for line in source.splitlines()], filename)
     # linecache does in fact have an attribute `cache`, thanks
-    linecache.cache[filename] = cache_entry  # type: ignore
+    linecache.cache[filename] = cache_entry
     return filename
 
 
 class MacroFuzzParser(jinja2.parser.Parser):
-    def parse_macro(self):
+    def parse_macro(self) -> jinja2.nodes.Macro:
         node = jinja2.nodes.Macro(lineno=next(self.stream).lineno)
 
         # modified to fuzz macros defined in the same file. this way
@@ -83,16 +104,13 @@ class MacroFuzzParser(jinja2.parser.Parser):
 
 
 class MacroFuzzEnvironment(jinja2.sandbox.SandboxedEnvironment):
-    def _parse(self, source, name, filename):
+    def _parse(
+        self, source: str, name: Optional[str], filename: Optional[str]
+    ) -> jinja2.nodes.Template:
         return MacroFuzzParser(self, source, name, filename).parse()
 
-    def _compile(self, source, filename):
+    def _compile(self, source: str, filename: str) -> CodeType:
         """
-
-
-
-
-
         Override jinja's compilation. Use to stash the rendered source inside
         the python linecache for debugging when the appropriate environment
         variable is set.
@@ -108,7 +126,7 @@ class MacroFuzzEnvironment(jinja2.sandbox.SandboxedEnvironment):
 
 
 class MacroFuzzTemplate(jinja2.nativetypes.NativeTemplate):
-    environment_class = MacroFuzzEnvironment
+    environment_class = MacroFuzzEnvironment  # type: ignore
 
     def new_context(
         self,
@@ -171,11 +189,11 @@ class NumberMarker(NativeMarker):
     pass
 
 
-def _is_number(value) -> bool:
+def _is_number(value: Any) -> bool:
     return isinstance(value, (int, float)) and not isinstance(value, bool)
 
 
-def quoted_native_concat(nodes):
+def quoted_native_concat(nodes: Iterator[str]) -> Any:
     """Handle special case for native_concat from the NativeTemplate.
 
     This is almost native_concat from the NativeTemplate, except in the
@@ -213,7 +231,7 @@ def quoted_native_concat(nodes):
 class NativeSandboxTemplate(jinja2.nativetypes.NativeTemplate):  # mypy: ignore
     environment_class = NativeSandboxEnvironment  # type: ignore
 
-    def render(self, *args, **kwargs):
+    def render(self, *args: Any, **kwargs: Any) -> Any:
         """Render the template to produce a native Python type.
 
         If the result is a single node, its value is returned. Otherwise,
@@ -229,6 +247,11 @@ class NativeSandboxTemplate(jinja2.nativetypes.NativeTemplate):  # mypy: ignore
             return self.environment.handle_exception()
 
 
+class MacroProtocol(Protocol):
+    name: str
+    macro_sql: str
+
+
 NativeSandboxEnvironment.template_class = NativeSandboxTemplate  # type: ignore
 
 
@@ -236,7 +259,7 @@ class TemplateCache:
     def __init__(self) -> None:
         self.file_cache: Dict[str, jinja2.Template] = {}
 
-    def get_node_template(self, node) -> jinja2.Template:
+    def get_node_template(self, node: MacroProtocol) -> jinja2.Template:
         key = node.macro_sql
 
         if key in self.file_cache:
@@ -251,7 +274,7 @@ class TemplateCache:
         self.file_cache[key] = template
         return template
 
-    def clear(self):
+    def clear(self) -> None:
         self.file_cache.clear()
 
 
@@ -262,13 +285,13 @@ class BaseMacroGenerator:
     def __init__(self, context: Optional[Dict[str, Any]] = None) -> None:
         self.context: Optional[Dict[str, Any]] = context
 
-    def get_template(self):
+    def get_template(self) -> jinja2.Template:
         raise NotImplementedError("get_template not implemented!")
 
     def get_name(self) -> str:
         raise NotImplementedError("get_name not implemented!")
 
-    def get_macro(self):
+    def get_macro(self) -> Callable:
         name = self.get_name()
         template = self.get_template()
         # make the module. previously we set both vars and local, but that's
@@ -286,7 +309,7 @@ class BaseMacroGenerator:
         except (TypeError, jinja2.exceptions.TemplateRuntimeError) as e:
             raise CaughtMacroError(e)
 
-    def call_macro(self, *args, **kwargs):
+    def call_macro(self, *args: Any, **kwargs: Any) -> Any:
         # called from __call__ methods
         if self.context is None:
             raise DbtInternalError("Context is still None in call_macro!")
@@ -301,11 +324,6 @@ class BaseMacroGenerator:
                 return e.value
 
 
-class MacroProtocol(Protocol):
-    name: str
-    macro_sql: str
-
-
 class CallableMacroGenerator(BaseMacroGenerator):
     def __init__(
         self,
@@ -315,7 +333,7 @@ class CallableMacroGenerator(BaseMacroGenerator):
         super().__init__(context)
         self.macro = macro
 
-    def get_template(self):
+    def get_template(self) -> jinja2.Template:
         return template_cache.get_node_template(self.macro)
 
     def get_name(self) -> str:
@@ -332,14 +350,14 @@ class CallableMacroGenerator(BaseMacroGenerator):
             raise e
 
     # this makes MacroGenerator objects callable like functions
-    def __call__(self, *args, **kwargs):
+    def __call__(self, *args: Any, **kwargs: Any) -> Any:
         return self.call_macro(*args, **kwargs)
 
 
 class MaterializationExtension(jinja2.ext.Extension):
     tags = ["materialization"]
 
-    def parse(self, parser):
+    def parse(self, parser: jinja2.parser.Parser) -> _ParseReturn:
         node = jinja2.nodes.Macro(lineno=next(parser.stream).lineno)
         materialization_name = parser.parse_assign_target(name_only=True).name
 
@@ -382,7 +400,7 @@ class MaterializationExtension(jinja2.ext.Extension):
 class DocumentationExtension(jinja2.ext.Extension):
     tags = ["docs"]
 
-    def parse(self, parser):
+    def parse(self, parser: jinja2.parser.Parser) -> _ParseReturn:
         node = jinja2.nodes.Macro(lineno=next(parser.stream).lineno)
         docs_name = parser.parse_assign_target(name_only=True).name
 
@@ -396,7 +414,7 @@ class DocumentationExtension(jinja2.ext.Extension):
 class TestExtension(jinja2.ext.Extension):
     tags = ["test"]
 
-    def parse(self, parser):
+    def parse(self, parser: jinja2.parser.Parser) -> _ParseReturn:
         node = jinja2.nodes.Macro(lineno=next(parser.stream).lineno)
         test_name = parser.parse_assign_target(name_only=True).name
 
@@ -406,13 +424,19 @@ class TestExtension(jinja2.ext.Extension):
         return node
 
 
-def _is_dunder_name(name):
+def _is_dunder_name(name: str) -> bool:
     return name.startswith("__") and name.endswith("__")
 
 
-def create_undefined(node=None):
+def create_undefined(node: Optional[_NodeProtocol] = None) -> Type[jinja2.Undefined]:
     class Undefined(jinja2.Undefined):
-        def __init__(self, hint=None, obj=None, name=None, exc=None):
+        def __init__(
+            self,
+            hint: Optional[str] = None,
+            obj: Any = None,
+            name: Optional[str] = None,
+            exc: Any = None,
+        ) -> None:
             super().__init__(hint=hint, name=name)
             self.node = node
             self.name = name
@@ -422,12 +446,12 @@ def create_undefined(node=None):
             self.unsafe_callable = False
             self.alters_data = False
 
-        def __getitem__(self, name):
+        def __getitem__(self, name: Any) -> "Undefined":
             # Propagate the undefined value if a caller accesses this as if it
             # were a dictionary
             return self
 
-        def __getattr__(self, name):
+        def __getattr__(self, name: str) -> "Undefined":
             if name == "name" or _is_dunder_name(name):
                 raise AttributeError(
                     "'{}' object has no attribute '{}'".format(type(self).__name__, name)
@@ -437,11 +461,11 @@ def create_undefined(node=None):
 
             return self.__class__(hint=self.hint, name=self.name)
 
-        def __call__(self, *args, **kwargs):
+        def __call__(self, *args: Any, **kwargs: Any) -> "Undefined":
             return self
 
-        def __reduce__(self):
-            raise UndefinedCompilationError(name=self.name, node=node)
+        def __reduce__(self) -> NoReturn:
+            raise UndefinedCompilationError(name=self.name or "unknown", node=node)
 
     return Undefined
 
@@ -463,7 +487,7 @@ TEXT_FILTERS: Dict[str, Callable[[Any], Any]] = {
 
 
 def get_environment(
-    node=None,
+    node: Optional[_NodeProtocol] = None,
     capture_macros: bool = False,
     native: bool = False,
 ) -> jinja2.Environment:
@@ -472,7 +496,7 @@ def get_environment(
     }
 
     if capture_macros:
-        args["undefined"] = create_undefined(node)
+        args["undefined"] = create_undefined(node)  # type: ignore
 
     args["extensions"].append(MaterializationExtension)
     args["extensions"].append(DocumentationExtension)
@@ -493,7 +517,7 @@ def get_environment(
 
 
 @contextmanager
-def catch_jinja(node=None) -> Iterator[None]:
+def catch_jinja(node: Optional[_NodeProtocol] = None) -> Iterator[None]:
     try:
         yield
     except jinja2.exceptions.TemplateSyntaxError as e:
@@ -506,16 +530,16 @@ def catch_jinja(node=None) -> Iterator[None]:
         raise
 
 
-_TESTING_PARSE_CACHE: Dict[str, jinja2.Template] = {}
+_TESTING_PARSE_CACHE: Dict[str, jinja2.nodes.Template] = {}
 
 
-def parse(string):
+def parse(string: Any) -> jinja2.nodes.Template:
     str_string = str(string)
     if test_caching_enabled() and str_string in _TESTING_PARSE_CACHE:
         return _TESTING_PARSE_CACHE[str_string]
 
     with catch_jinja():
-        parsed = get_environment().parse(str(string))
+        parsed: jinja2.nodes.Template = get_environment().parse(str(string))
         if test_caching_enabled():
             _TESTING_PARSE_CACHE[str_string] = parsed
         return parsed
@@ -524,10 +548,10 @@ def parse(string):
 def get_template(
     string: str,
     ctx: Dict[str, Any],
-    node=None,
+    node: Optional[_NodeProtocol] = None,
     capture_macros: bool = False,
     native: bool = False,
-):
+) -> jinja2.Template:
     with catch_jinja(node):
         env = get_environment(node, capture_macros, native=native)
 
@@ -535,7 +559,9 @@ def get_template(
         return env.from_string(template_source, globals=ctx)
 
 
-def render_template(template, ctx: Dict[str, Any], node=None) -> str:
+def render_template(
+    template: jinja2.Template, ctx: Dict[str, Any], node: Optional[_NodeProtocol] = None
+) -> str:
     with catch_jinja(node):
         return template.render(ctx)
 

dbt_common/contracts/config/base.py

@@ -96,10 +96,14 @@ class BaseConfig(AdditionalPropertiesAllowed, Replaceable):
                     return False
         return True
 
-    # This is used in 'add_config_call' to create the combined config_call_dict.
-    # 'meta' moved here from node
+    # This is used in 'merge_config_dicts' to create the combined orig_dict.
+    # Note: "clobber" fields aren't defined, because that's the default.
+    #    "access" is currently the only Clobber field.
+    # This shouldn't really be defined  here. It would be better to have it
+    # associated with the config definitions, but at the point we use it, we
+    # don't know which config we're dealing with.
     mergebehavior = {
-        "append": ["pre-hook", "pre_hook", "post-hook", "post_hook", "tags"],
+        "append": ["pre-hook", "pre_hook", "post-hook", "post_hook", "tags", "packages"],
         "update": [
             "quoting",
             "column_types",
@@ -108,6 +112,7 @@ class BaseConfig(AdditionalPropertiesAllowed, Replaceable):
             "contract",
         ],
         "dict_key_append": ["grants"],
+        "object": ["snapshot_meta_column_names"],
     }
 
     @classmethod
@@ -180,6 +185,7 @@ class MergeBehavior(Metadata):
     Update = 2
     Clobber = 3
     DictKeyAppend = 4
+    Object = 5
 
     @classmethod
     def default_field(cls) -> "MergeBehavior":
@@ -215,8 +221,10 @@ def _listify(value: Any) -> List[Any]:
 
 
 # There are two versions of this code. The one here is for config
-# objects, the one in _add_config_call in core context_config.py is for
-# config_call_dict dictionaries.
+# objects which can get the "MergeBehavior" from the field in the class,
+# the one below in 'merge_config_dicts' (formerly in
+# _add_config_call in core context_config.py) is for config_call dictionaries
+# where we need to get the MergeBehavior from someplace else.
 def _merge_field_value(
     merge_behavior: MergeBehavior,
     self_value: Any,
@@ -225,7 +233,8 @@ def _merge_field_value(
     if merge_behavior == MergeBehavior.Clobber:
         return other_value
     elif merge_behavior == MergeBehavior.Append:
-        return _listify(self_value) + _listify(other_value)
+        new_value = _listify(self_value) + _listify(other_value)
+        return new_value
     elif merge_behavior == MergeBehavior.Update:
         if not isinstance(self_value, dict):
             raise DbtInternalError(f"expected dict, got {self_value}")
@@ -258,6 +267,73 @@ def _merge_field_value(
                 # clobber the list
                 new_dict[new_key] = _listify(other_value[key])
         return new_dict
-
+    elif merge_behavior == MergeBehavior.Object:
+        # All fields in classes with MergeBehavior.Object should have a default of None
+        if not type(self_value).__name__ == type(other_value).__name__:
+            raise DbtInternalError(
+                f"got conflicting types: {type(self_value).__name__} and {type(other_value).__name__}"
+            )
+        new_value = self_value.copy()
+        new_value.update(other_value)
+        return new_value
     else:
         raise DbtInternalError(f"Got an invalid merge_behavior: {merge_behavior}")
+
+
+# This is used in ContextConfig._add_config_call. It updates the orig_dict in place.
+def merge_config_dicts(orig_dict: Dict[str, Any], new_dict: Dict[str, Any]) -> None:
+    # orig_dict is already encountered configs, new_dict is new
+    # This mirrors code in _merge_field_value in model_config.py which is similar but
+    # operates on config objects.
+    if orig_dict == {}:
+        orig_dict.update(new_dict)
+        return
+    for k, v in new_dict.items():
+        # MergeBehavior for post-hook and pre-hook is to collect all
+        # values, instead of overwriting
+        if k in BaseConfig.mergebehavior["append"]:
+            if k in orig_dict:  # should always be a list here
+                orig_dict[k] = _listify(orig_dict[k]) + _listify(v)
+            else:
+                orig_dict[k] = _listify(v)
+        elif k in BaseConfig.mergebehavior["update"]:
+            if not isinstance(v, dict):
+                raise DbtInternalError(f"expected dict, got {v}")
+            if k in orig_dict and isinstance(orig_dict[k], dict):
+                orig_dict[k].update(v)
+            else:
+                orig_dict[k] = v
+        elif k in BaseConfig.mergebehavior["dict_key_append"]:
+            if not isinstance(v, dict):
+                raise DbtInternalError(f"expected dict, got {v}")
+            if k in orig_dict:  # should always be a dict
+                for key in orig_dict[k].keys():
+                    orig_dict[k][key] = _listify(orig_dict[k][key])
+                for key, value in v.items():
+                    extend = False
+                    # This might start with a +, to indicate we should extend the list
+                    # instead of just clobbering it. We don't want to remove the + here
+                    # (like in the other method) because we want it preserved
+                    if key.startswith("+"):
+                        extend = True
+                    if key in orig_dict[k] and extend:
+                        # extend the list
+                        orig_dict[k][key].extend(_listify(value))
+                    else:
+                        # clobber the list
+                        orig_dict[k][key] = _listify(value)
+            else:
+                # This is always a dictionary
+                orig_dict[k] = v
+                # listify everything
+                for key, value in orig_dict[k].items():
+                    orig_dict[k][key] = _listify(value)
+        elif k in BaseConfig.mergebehavior["object"]:
+            if not isinstance(v, dict):
+                raise DbtInternalError(f"expected dict, got {v}")
+            if k not in orig_dict:
+                orig_dict[k] = {}
+            for obj_k, obj_v in v.items():
+                orig_dict[k][obj_k] = obj_v
+        else:  # Clobber
+            orig_dict[k] = v

dbt_common/events/types.proto

@@ -26,17 +26,16 @@ message GenericMessage {
 // D - Deprecations
 
 // D018
-message BehaviorDeprecationEvent {
+message BehaviorChangeEvent {
     string flag_name = 1;
     string flag_source = 2;
-    string deprecation_version = 3;
-    string deprecation_message = 4;
-    string docs_url = 5;
+    string description = 3;
+    string docs_url = 4;
 }
 
-message BehaviorDeprecationEventMsg {
+message BehaviorChangeEventMsg {
     EventInfo info = 1;
-    BehaviorDeprecationEvent data = 2;
+    BehaviorChangeEvent data = 2;
 }
 
 // M - Deps generation

dbt_common/events/types.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from dbt_common.events.base_types import (
     DebugLevel,
     InfoLevel,
@@ -38,33 +36,16 @@ from dbt_common.ui import warning_tag
 # =======================================================
 
 
-class BehaviorDeprecationEvent(WarnLevel):
-    flag_name: str
-    flag_source: str
-    deprecation_version: Optional[str]
-    deprecation_message: Optional[str]
-    docs_url: Optional[str]
-
+class BehaviorChangeEvent(WarnLevel):
     def code(self) -> str:
         return "D018"
 
     def message(self) -> str:
-        msg = f"The legacy behavior controlled by `{self.flag_name}` is deprecated.\n"
-
-        if self.deprecation_version:
-            msg = (
-                f"The legacy behavior is expected to be retired in `{self.deprecation_version}`.\n"
-            )
-
-        msg += f"The new behavior can be turned on by setting `flags.{self.flag_name}` to `True` in `dbt_project.yml`.\n"
-
-        if self.deprecation_message:
-            msg += f"{self.deprecation_message}.\n"
-
-        docs_url = self.docs_url or f"https://docs.getdbt.com/search?q={self.flag_name}"
-        msg += f"Visit {docs_url} for more information."
-
-        return warning_tag(msg)
+        return warning_tag(
+            f"{self.description}\n"
+            f"You may opt into the new behavior sooner by setting `flags.{self.flag_name}` to `True` in `dbt_project.yml`.\n"
+            f"Visit {self.docs_url} for more information."
+        )
 
 
 # =======================================================

dbt_common/events/types_pb2.py

@@ -15,7 +15,7 @@ _sym_db = _symbol_database.Default()
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0btypes.proto\x12\x0bproto_types\x1a\x1fgoogle/protobuf/timestamp.proto\"\x91\x02\n\tEventInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04\x63ode\x18\x02 \x01(\t\x12\x0b\n\x03msg\x18\x03 \x01(\t\x12\r\n\x05level\x18\x04 \x01(\t\x12\x15\n\rinvocation_id\x18\x05 \x01(\t\x12\x0b\n\x03pid\x18\x06 \x01(\x05\x12\x0e\n\x06thread\x18\x07 \x01(\t\x12&\n\x02ts\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x30\n\x05\x65xtra\x18\t \x03(\x0b\x32!.proto_types.EventInfo.ExtraEntry\x12\x10\n\x08\x63\x61tegory\x18\n \x01(\t\x1a,\n\nExtraEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"6\n\x0eGenericMessage\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\"\x8e\x01\n\x18\x42\x65haviorDeprecationEvent\x12\x11\n\tflag_name\x18\x01 \x01(\t\x12\x13\n\x0b\x66lag_source\x18\x02 \x01(\t\x12\x1b\n\x13\x64\x65precation_version\x18\x03 \x01(\t\x12\x1b\n\x13\x64\x65precation_message\x18\x04 \x01(\t\x12\x10\n\x08\x64ocs_url\x18\x05 \x01(\t\"x\n\x1b\x42\x65haviorDeprecationEventMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12\x33\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32%.proto_types.BehaviorDeprecationEvent\"1\n\x11RetryExternalCall\x12\x0f\n\x07\x61ttempt\x18\x01 \x01(\x05\x12\x0b\n\x03max\x18\x02 \x01(\x05\"j\n\x14RetryExternalCallMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12,\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1e.proto_types.RetryExternalCall\"#\n\x14RecordRetryException\x12\x0b\n\x03\x65xc\x18\x01 \x01(\t\"p\n\x17RecordRetryExceptionMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12/\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32!.proto_types.RecordRetryException\"@\n\x13SystemCouldNotWrite\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x0e\n\x06reason\x18\x02 \x01(\t\x12\x0b\n\x03\x65xc\x18\x03 \x01(\t\"n\n\x16SystemCouldNotWriteMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12.\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32 .proto_types.SystemCouldNotWrite\"!\n\x12SystemExecutingCmd\x12\x0b\n\x03\x63md\x18\x01 \x03(\t\"l\n\x15SystemExecutingCmdMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12-\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1f.proto_types.SystemExecutingCmd\"\x1c\n\x0cSystemStdOut\x12\x0c\n\x04\x62msg\x18\x01 \x01(\t\"`\n\x0fSystemStdOutMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12\'\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x19.proto_types.SystemStdOut\"\x1c\n\x0cSystemStdErr\x12\x0c\n\x04\x62msg\x18\x01 \x01(\t\"`\n\x0fSystemStdErrMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12\'\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x19.proto_types.SystemStdErr\",\n\x16SystemReportReturnCode\x12\x12\n\nreturncode\x18\x01 \x01(\x05\"t\n\x19SystemReportReturnCodeMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12\x31\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32#.proto_types.SystemReportReturnCode\"\x19\n\nFormatting\x12\x0b\n\x03msg\x18\x01 \x01(\t\"\\\n\rFormattingMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12%\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x17.proto_types.Formatting\"\x13\n\x04Note\x12\x0b\n\x03msg\x18\x01 \x01(\t\"P\n\x07NoteMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12\x1f\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x11.proto_types.Note\"\x19\n\nPrintEvent\x12\x0b\n\x03msg\x18\x01 \x01(\t\"\\\n\rPrintEventMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12%\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x17.proto_types.PrintEventb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0btypes.proto\x12\x0bproto_types\x1a\x1fgoogle/protobuf/timestamp.proto\"\x91\x02\n\tEventInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x0c\n\x04\x63ode\x18\x02 \x01(\t\x12\x0b\n\x03msg\x18\x03 \x01(\t\x12\r\n\x05level\x18\x04 \x01(\t\x12\x15\n\rinvocation_id\x18\x05 \x01(\t\x12\x0b\n\x03pid\x18\x06 \x01(\x05\x12\x0e\n\x06thread\x18\x07 \x01(\t\x12&\n\x02ts\x18\x08 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x30\n\x05\x65xtra\x18\t \x03(\x0b\x32!.proto_types.EventInfo.ExtraEntry\x12\x10\n\x08\x63\x61tegory\x18\n \x01(\t\x1a,\n\nExtraEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"6\n\x0eGenericMessage\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\"d\n\x13\x42\x65haviorChangeEvent\x12\x11\n\tflag_name\x18\x01 \x01(\t\x12\x13\n\x0b\x66lag_source\x18\x02 \x01(\t\x12\x13\n\x0b\x64\x65scription\x18\x03 \x01(\t\x12\x10\n\x08\x64ocs_url\x18\x04 \x01(\t\"n\n\x16\x42\x65haviorChangeEventMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12.\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32 .proto_types.BehaviorChangeEvent\"1\n\x11RetryExternalCall\x12\x0f\n\x07\x61ttempt\x18\x01 \x01(\x05\x12\x0b\n\x03max\x18\x02 \x01(\x05\"j\n\x14RetryExternalCallMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12,\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1e.proto_types.RetryExternalCall\"#\n\x14RecordRetryException\x12\x0b\n\x03\x65xc\x18\x01 \x01(\t\"p\n\x17RecordRetryExceptionMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12/\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32!.proto_types.RecordRetryException\"@\n\x13SystemCouldNotWrite\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x0e\n\x06reason\x18\x02 \x01(\t\x12\x0b\n\x03\x65xc\x18\x03 \x01(\t\"n\n\x16SystemCouldNotWriteMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12.\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32 .proto_types.SystemCouldNotWrite\"!\n\x12SystemExecutingCmd\x12\x0b\n\x03\x63md\x18\x01 \x03(\t\"l\n\x15SystemExecutingCmdMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12-\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x1f.proto_types.SystemExecutingCmd\"\x1c\n\x0cSystemStdOut\x12\x0c\n\x04\x62msg\x18\x01 \x01(\t\"`\n\x0fSystemStdOutMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12\'\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x19.proto_types.SystemStdOut\"\x1c\n\x0cSystemStdErr\x12\x0c\n\x04\x62msg\x18\x01 \x01(\t\"`\n\x0fSystemStdErrMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12\'\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x19.proto_types.SystemStdErr\",\n\x16SystemReportReturnCode\x12\x12\n\nreturncode\x18\x01 \x01(\x05\"t\n\x19SystemReportReturnCodeMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12\x31\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32#.proto_types.SystemReportReturnCode\"\x19\n\nFormatting\x12\x0b\n\x03msg\x18\x01 \x01(\t\"\\\n\rFormattingMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12%\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x17.proto_types.Formatting\"\x13\n\x04Note\x12\x0b\n\x03msg\x18\x01 \x01(\t\"P\n\x07NoteMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12\x1f\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x11.proto_types.Note\"\x19\n\nPrintEvent\x12\x0b\n\x03msg\x18\x01 \x01(\t\"\\\n\rPrintEventMsg\x12$\n\x04info\x18\x01 \x01(\x0b\x32\x16.proto_types.EventInfo\x12%\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32\x17.proto_types.PrintEventb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -30,48 +30,48 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_EVENTINFO_EXTRAENTRY']._serialized_end=335
   _globals['_GENERICMESSAGE']._serialized_start=337
   _globals['_GENERICMESSAGE']._serialized_end=391
-  _globals['_BEHAVIORDEPRECATIONEVENT']._serialized_start=394
-  _globals['_BEHAVIORDEPRECATIONEVENT']._serialized_end=536
-  _globals['_BEHAVIORDEPRECATIONEVENTMSG']._serialized_start=538
-  _globals['_BEHAVIORDEPRECATIONEVENTMSG']._serialized_end=658
-  _globals['_RETRYEXTERNALCALL']._serialized_start=660
-  _globals['_RETRYEXTERNALCALL']._serialized_end=709
-  _globals['_RETRYEXTERNALCALLMSG']._serialized_start=711
-  _globals['_RETRYEXTERNALCALLMSG']._serialized_end=817
-  _globals['_RECORDRETRYEXCEPTION']._serialized_start=819
-  _globals['_RECORDRETRYEXCEPTION']._serialized_end=854
-  _globals['_RECORDRETRYEXCEPTIONMSG']._serialized_start=856
-  _globals['_RECORDRETRYEXCEPTIONMSG']._serialized_end=968
-  _globals['_SYSTEMCOULDNOTWRITE']._serialized_start=970
-  _globals['_SYSTEMCOULDNOTWRITE']._serialized_end=1034
-  _globals['_SYSTEMCOULDNOTWRITEMSG']._serialized_start=1036
-  _globals['_SYSTEMCOULDNOTWRITEMSG']._serialized_end=1146
-  _globals['_SYSTEMEXECUTINGCMD']._serialized_start=1148
-  _globals['_SYSTEMEXECUTINGCMD']._serialized_end=1181
-  _globals['_SYSTEMEXECUTINGCMDMSG']._serialized_start=1183
-  _globals['_SYSTEMEXECUTINGCMDMSG']._serialized_end=1291
-  _globals['_SYSTEMSTDOUT']._serialized_start=1293
-  _globals['_SYSTEMSTDOUT']._serialized_end=1321
-  _globals['_SYSTEMSTDOUTMSG']._serialized_start=1323
-  _globals['_SYSTEMSTDOUTMSG']._serialized_end=1419
-  _globals['_SYSTEMSTDERR']._serialized_start=1421
-  _globals['_SYSTEMSTDERR']._serialized_end=1449
-  _globals['_SYSTEMSTDERRMSG']._serialized_start=1451
-  _globals['_SYSTEMSTDERRMSG']._serialized_end=1547
-  _globals['_SYSTEMREPORTRETURNCODE']._serialized_start=1549
-  _globals['_SYSTEMREPORTRETURNCODE']._serialized_end=1593
-  _globals['_SYSTEMREPORTRETURNCODEMSG']._serialized_start=1595
-  _globals['_SYSTEMREPORTRETURNCODEMSG']._serialized_end=1711
-  _globals['_FORMATTING']._serialized_start=1713
-  _globals['_FORMATTING']._serialized_end=1738
-  _globals['_FORMATTINGMSG']._serialized_start=1740
-  _globals['_FORMATTINGMSG']._serialized_end=1832
-  _globals['_NOTE']._serialized_start=1834
-  _globals['_NOTE']._serialized_end=1853
-  _globals['_NOTEMSG']._serialized_start=1855
-  _globals['_NOTEMSG']._serialized_end=1935
-  _globals['_PRINTEVENT']._serialized_start=1937
-  _globals['_PRINTEVENT']._serialized_end=1962
-  _globals['_PRINTEVENTMSG']._serialized_start=1964
-  _globals['_PRINTEVENTMSG']._serialized_end=2056
+  _globals['_BEHAVIORCHANGEEVENT']._serialized_start=393
+  _globals['_BEHAVIORCHANGEEVENT']._serialized_end=493
+  _globals['_BEHAVIORCHANGEEVENTMSG']._serialized_start=495
+  _globals['_BEHAVIORCHANGEEVENTMSG']._serialized_end=605
+  _globals['_RETRYEXTERNALCALL']._serialized_start=607
+  _globals['_RETRYEXTERNALCALL']._serialized_end=656
+  _globals['_RETRYEXTERNALCALLMSG']._serialized_start=658
+  _globals['_RETRYEXTERNALCALLMSG']._serialized_end=764
+  _globals['_RECORDRETRYEXCEPTION']._serialized_start=766
+  _globals['_RECORDRETRYEXCEPTION']._serialized_end=801
+  _globals['_RECORDRETRYEXCEPTIONMSG']._serialized_start=803
+  _globals['_RECORDRETRYEXCEPTIONMSG']._serialized_end=915
+  _globals['_SYSTEMCOULDNOTWRITE']._serialized_start=917
+  _globals['_SYSTEMCOULDNOTWRITE']._serialized_end=981
+  _globals['_SYSTEMCOULDNOTWRITEMSG']._serialized_start=983
+  _globals['_SYSTEMCOULDNOTWRITEMSG']._serialized_end=1093
+  _globals['_SYSTEMEXECUTINGCMD']._serialized_start=1095
+  _globals['_SYSTEMEXECUTINGCMD']._serialized_end=1128
+  _globals['_SYSTEMEXECUTINGCMDMSG']._serialized_start=1130
+  _globals['_SYSTEMEXECUTINGCMDMSG']._serialized_end=1238
+  _globals['_SYSTEMSTDOUT']._serialized_start=1240
+  _globals['_SYSTEMSTDOUT']._serialized_end=1268
+  _globals['_SYSTEMSTDOUTMSG']._serialized_start=1270
+  _globals['_SYSTEMSTDOUTMSG']._serialized_end=1366
+  _globals['_SYSTEMSTDERR']._serialized_start=1368
+  _globals['_SYSTEMSTDERR']._serialized_end=1396
+  _globals['_SYSTEMSTDERRMSG']._serialized_start=1398
+  _globals['_SYSTEMSTDERRMSG']._serialized_end=1494
+  _globals['_SYSTEMREPORTRETURNCODE']._serialized_start=1496
+  _globals['_SYSTEMREPORTRETURNCODE']._serialized_end=1540
+  _globals['_SYSTEMREPORTRETURNCODEMSG']._serialized_start=1542
+  _globals['_SYSTEMREPORTRETURNCODEMSG']._serialized_end=1658
+  _globals['_FORMATTING']._serialized_start=1660
+  _globals['_FORMATTING']._serialized_end=1685
+  _globals['_FORMATTINGMSG']._serialized_start=1687
+  _globals['_FORMATTINGMSG']._serialized_end=1779
+  _globals['_NOTE']._serialized_start=1781
+  _globals['_NOTE']._serialized_end=1800
+  _globals['_NOTEMSG']._serialized_start=1802
+  _globals['_NOTEMSG']._serialized_end=1882
+  _globals['_PRINTEVENT']._serialized_start=1884
+  _globals['_PRINTEVENT']._serialized_end=1909
+  _globals['_PRINTEVENTMSG']._serialized_start=1911
+  _globals['_PRINTEVENTMSG']._serialized_end=2003
 # @@protoc_insertion_point(module_scope)

dbt_common/exceptions/jinja.py

@@ -1,8 +1,13 @@
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from dbt_common.clients._jinja_blocks import Tag, TagIterator
+
 from dbt_common.exceptions import CompilationError
 
 
 class BlockDefinitionNotAtTopError(CompilationError):
-    def __init__(self, tag_parser, tag_start) -> None:
+    def __init__(self, tag_parser: "TagIterator", tag_start: int) -> None:
         self.tag_parser = tag_parser
         self.tag_start = tag_start
         super().__init__(msg=self.get_message())
@@ -31,7 +36,7 @@ class MissingCloseTagError(CompilationError):
 
 
 class MissingControlFlowStartTagError(CompilationError):
-    def __init__(self, tag, expected_tag: str, tag_parser) -> None:
+    def __init__(self, tag: "Tag", expected_tag: str, tag_parser: "TagIterator") -> None:
         self.tag = tag
         self.expected_tag = expected_tag
         self.tag_parser = tag_parser
@@ -47,7 +52,7 @@ class MissingControlFlowStartTagError(CompilationError):
 
 
 class NestedTagsError(CompilationError):
-    def __init__(self, outer, inner) -> None:
+    def __init__(self, outer: "Tag", inner: "Tag") -> None:
         self.outer = outer
         self.inner = inner
         super().__init__(msg=self.get_message())
@@ -62,7 +67,7 @@ class NestedTagsError(CompilationError):
 
 
 class UnexpectedControlFlowEndTagError(CompilationError):
-    def __init__(self, tag, expected_tag: str, tag_parser) -> None:
+    def __init__(self, tag: "Tag", expected_tag: str, tag_parser: "TagIterator") -> None:
         self.tag = tag
         self.expected_tag = expected_tag
         self.tag_parser = tag_parser

dbt_common/record.py

@@ -29,8 +29,14 @@ class Record:
 
     def to_dict(self) -> Dict[str, Any]:
         return {
-            "params": self.params._to_dict() if hasattr(self.params, "_to_dict") else dataclasses.asdict(self.params),  # type: ignore
-            "result": self.result._to_dict() if hasattr(self.result, "_to_dict") else dataclasses.asdict(self.result) if self.result is not None else None,  # type: ignore
+            "params": self.params._to_dict()
+            if hasattr(self.params, "_to_dict")
+            else dataclasses.asdict(self.params),
+            "result": self.result._to_dict()
+            if hasattr(self.result, "_to_dict")
+            else dataclasses.asdict(self.result)
+            if self.result is not None
+            else None,
         }
 
     @classmethod

dbt_common/semver.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 import re
-from typing import Iterable, List, Union
+from typing import Any, Iterable, List, Union
 
 import dbt_common.exceptions.base
 from dbt_common.exceptions import VersionsNotCompatibleError
@@ -67,9 +67,9 @@ $
 _VERSION_REGEX = re.compile(_VERSION_REGEX_PAT_STR, re.VERBOSE)
 
 
-def _cmp(a, b) -> int:
+def _cmp(a: Any, b: Any) -> int:
     """Return negative if a<b, zero if a==b, positive if a>b."""
-    return (a > b) - (a < b)
+    return int((a > b) - (a < b))
 
 
 @dataclass
@@ -102,7 +102,9 @@ class VersionSpecifier(VersionSpecification):
 
         matched = {k: v for k, v in match.groupdict().items() if v is not None}
 
-        return cls.from_dict(matched)
+        spec = cls.from_dict(matched)
+        assert isinstance(spec, VersionSpecifier)
+        return spec
 
     def __str__(self) -> str:
         return self.to_version_string()
@@ -198,10 +200,11 @@ class VersionSpecifier(VersionSpecification):
     def __gt__(self, other: "VersionSpecifier") -> bool:
         return self.compare(other) == 1
 
-    def __eq___(self, other: "VersionSpecifier") -> bool:
+    def __eq__(self, other: object) -> bool:
+        assert isinstance(other, VersionSpecifier)
         return self.compare(other) == 0
 
-    def __cmp___(self, other: "VersionSpecifier") -> int:
+    def __cmp__(self, other: "VersionSpecifier") -> int:
         return self.compare(other)
 
     @property
@@ -221,8 +224,8 @@ class VersionSpecifier(VersionSpecification):
         return self.matcher == Matchers.EXACT
 
     @classmethod
-    def _nat_cmp(cls, a, b) -> int:
-        def cmp_prerelease_tag(a, b):
+    def _nat_cmp(cls, a: str, b: str) -> int:
+        def cmp_prerelease_tag(a: Union[str, int], b: Union[str, int]) -> int:
             if isinstance(a, int) and isinstance(b, int):
                 return _cmp(a, b)
             elif isinstance(a, int):
@@ -234,10 +237,10 @@ class VersionSpecifier(VersionSpecification):
 
         a, b = a or "", b or ""
         a_parts, b_parts = a.split("."), b.split(".")
-        a_parts = [int(x) if re.match(r"^\d+$", x) else x for x in a_parts]
-        b_parts = [int(x) if re.match(r"^\d+$", x) else x for x in b_parts]
-        for sub_a, sub_b in zip(a_parts, b_parts):
-            cmp_result = cmp_prerelease_tag(sub_a, sub_b)
+        a_parts_2 = [int(x) if re.match(r"^\d+$", x) else x for x in a_parts]
+        b_parts_2 = [int(x) if re.match(r"^\d+$", x) else x for x in b_parts]
+        for sub_a, sub_b in zip(a_parts_2, b_parts_2):
+            cmp_result = cmp_prerelease_tag(sub_a, sub_b)  # type: ignore
             if cmp_result != 0:
                 return cmp_result
         else:
@@ -249,13 +252,15 @@ class VersionRange:
     start: VersionSpecifier
     end: VersionSpecifier
 
-    def _try_combine_exact(self, a, b):
+    def _try_combine_exact(self, a: VersionSpecifier, b: VersionSpecifier) -> VersionSpecifier:
         if a.compare(b) == 0:
             return a
         else:
             raise VersionsNotCompatibleError()
 
-    def _try_combine_lower_bound_with_exact(self, lower, exact):
+    def _try_combine_lower_bound_with_exact(
+        self, lower: VersionSpecifier, exact: VersionSpecifier
+    ) -> VersionSpecifier:
         comparison = lower.compare(exact)
 
         if comparison < 0 or (comparison == 0 and lower.matcher == Matchers.GREATER_THAN_OR_EQUAL):
@@ -263,7 +268,9 @@ class VersionRange:
 
         raise VersionsNotCompatibleError()
 
-    def _try_combine_lower_bound(self, a, b):
+    def _try_combine_lower_bound(
+        self, a: VersionSpecifier, b: VersionSpecifier
+    ) -> VersionSpecifier:
         if b.is_unbounded:
             return a
         elif a.is_unbounded:
@@ -280,10 +287,12 @@ class VersionRange:
         elif a.is_exact:
             return self._try_combine_lower_bound_with_exact(b, a)
 
-        elif b.is_exact:
+        else:
             return self._try_combine_lower_bound_with_exact(a, b)
 
-    def _try_combine_upper_bound_with_exact(self, upper, exact):
+    def _try_combine_upper_bound_with_exact(
+        self, upper: VersionSpecifier, exact: VersionSpecifier
+    ) -> VersionSpecifier:
         comparison = upper.compare(exact)
 
         if comparison > 0 or (comparison == 0 and upper.matcher == Matchers.LESS_THAN_OR_EQUAL):
@@ -291,7 +300,9 @@ class VersionRange:
 
         raise VersionsNotCompatibleError()
 
-    def _try_combine_upper_bound(self, a, b):
+    def _try_combine_upper_bound(
+        self, a: VersionSpecifier, b: VersionSpecifier
+    ) -> VersionSpecifier:
         if b.is_unbounded:
             return a
         elif a.is_unbounded:
@@ -308,15 +319,14 @@ class VersionRange:
         elif a.is_exact:
             return self._try_combine_upper_bound_with_exact(b, a)
 
-        elif b.is_exact:
+        else:
             return self._try_combine_upper_bound_with_exact(a, b)
 
-    def reduce(self, other):
+    def reduce(self, other: "VersionRange") -> "VersionRange":
         start = None
 
         if self.start.is_exact and other.start.is_exact:
             start = end = self._try_combine_exact(self.start, other.start)
-
         else:
             start = self._try_combine_lower_bound(self.start, other.start)
             end = self._try_combine_upper_bound(self.end, other.end)
@@ -326,7 +336,7 @@ class VersionRange:
 
         return VersionRange(start=start, end=end)
 
-    def __str__(self):
+    def __str__(self) -> str:
         result = []
 
         if self.start.is_unbounded and self.end.is_unbounded:
@@ -340,7 +350,7 @@ class VersionRange:
 
         return ", ".join(result)
 
-    def to_version_string_pair(self):
+    def to_version_string_pair(self) -> List[str]:
         to_return = []
 
         if not self.start.is_unbounded:
@@ -353,7 +363,7 @@ class VersionRange:
 
 
 class UnboundedVersionSpecifier(VersionSpecifier):
-    def __init__(self, *args, **kwargs) -> None:
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         super().__init__(
             matcher=Matchers.EXACT, major=None, minor=None, patch=None, prerelease=None, build=None
         )
@@ -418,7 +428,7 @@ def reduce_versions(*args: Union[VersionSpecifier, VersionRange, str]) -> Versio
     return to_return
 
 
-def versions_compatible(*args) -> bool:
+def versions_compatible(*args: Union[VersionSpecifier, VersionRange, str]) -> bool:
     if len(args) == 1:
         return True
 
@@ -429,7 +439,9 @@ def versions_compatible(*args) -> bool:
         return False
 
 
-def find_possible_versions(requested_range, available_versions: Iterable[str]):
+def find_possible_versions(
+    requested_range: VersionRange, available_versions: Iterable[str]
+) -> List[str]:
     possible_versions = []
 
     for version_string in available_versions:
@@ -443,7 +455,7 @@ def find_possible_versions(requested_range, available_versions: Iterable[str]):
 
 
 def resolve_to_specific_version(
-    requested_range, available_versions: Iterable[str]
+    requested_range: VersionRange, available_versions: Iterable[str]
 ) -> Optional[str]:
     max_version = None
     max_version_string = None

{dbt_common-1.8.0.dist-info → dbt_common-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dbt-common
-Version: 1.8.0
+Version: 1.9.0
 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

{dbt_common-1.8.0.dist-info → dbt_common-1.9.0.dist-info}/RECORD

@@ -1,27 +1,27 @@
-dbt_common/__about__.py,sha256=J9Md0egz2m3v0DHzraSTc3Ep1dKM1wRt2RZSVicTmqM,18
+dbt_common/__about__.py,sha256=cXjavBUobbggOyp9SOIeDA3iCRdu2Hzw1qBttGe-RYs,18
 dbt_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbt_common/behavior_flags.py,sha256=fkk9snLsKH4mM4PklQSjjk9heuP7NvB4zFndgQNWM6E,4163
+dbt_common/behavior_flags.py,sha256=GkrXvJ-Q7P73O0XcsIxyYeyiUAOe5E5DdNKIh6x3unE,4809
 dbt_common/constants.py,sha256=-Y5DIL1SDPQWtlCNizXRYxFgbx1D7LaLs1ysamvGMRk,278
 dbt_common/context.py,sha256=rk4EYBU4SpDXRhqbSvDTJwojilxPSoaiEdOxkXow_BU,2549
 dbt_common/dataclass_schema.py,sha256=u2S0dxwxIghv8RMqC91HlWZJVxmsC_844yZQaGyOwdY,5563
 dbt_common/helper_types.py,sha256=FWJGPmp7Qp2iToHyI4uvhkBbu_d1tl2_oF-obi98_N4,3917
 dbt_common/invocation.py,sha256=2ZchIr4Wq7NwtAjjB-mxHP9ITD6-r45jEq4Zooso0gc,210
 dbt_common/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbt_common/record.py,sha256=og-9SZhRINqW6jnqLdf3CTVKvUPdKldi52oFaa2-QRE,12658
-dbt_common/semver.py,sha256=NNG0CVJosfwSVQ8WKKGtK_qzinbEy-OEn_jih36Y0Co,14364
+dbt_common/record.py,sha256=vItvHEF2yl_NbvuaIXYHo-q6v0LUpCxR2twcTMVCeQ0,12698
+dbt_common/semver.py,sha256=Znewz6tc_NBpXr4mZf20bK_RayPL4ODrnxDbkUZrrRo,15034
 dbt_common/tests.py,sha256=6lC_JuRtoYO6cbAF8-R5aTM4HtQiM_EH8X5m_97duGY,315
 dbt_common/ui.py,sha256=rc2TEM29raBFc_LXcg901pMDD07C2ohwp9qzkE-7pBY,2567
 dbt_common/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt_common/clients/_jinja_blocks.py,sha256=xoJK9Y0F93U2PKfT_3SJbBopCGYCtl7LiwKuylXnrEE,12947
 dbt_common/clients/agate_helper.py,sha256=anKKgKV5PSnFRuFeBwRMdHK3JCaQoUqB2ZXHD0su0Wo,9123
-dbt_common/clients/jinja.py,sha256=yB7fv_Y5LKnj-3BKl3KCFDQYSFEEvn5YCyyu0vBsFR8,18495
+dbt_common/clients/jinja.py,sha256=-eDrUnhH3nxOD0xu81jlweJ_iJqIWdJpYSHZBB27xXo,19682
 dbt_common/clients/system.py,sha256=aoUBtOuXVmkOyj6IhhJ3Y4a7JFzPO2F_zKyOtz3xy44,23932
 dbt_common/contracts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt_common/contracts/constraints.py,sha256=_f1q3Rkcg2UwA7zI5XBbUMXnPUg6pw17UC7l1HyhyQM,1352
 dbt_common/contracts/metadata.py,sha256=K_M06Rue0wmrQhFP_mq3uvQszq10CIt93oGiAVgbRfE,1293
 dbt_common/contracts/util.py,sha256=_-vtcI6ZGmYVgrlxOw4M3YuH34Ncx-oKdKg7TV0pV78,916
 dbt_common/contracts/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dbt_common/contracts/config/base.py,sha256=JR9a7FdboXugexqXmab82TabKyRoRW8OPGn2_vVlS6g,8492
+dbt_common/contracts/config/base.py,sha256=vLkmnwWUGazIpUuUYqdnTrpBmFLJQ9hantsIv7T0GoU,12315
 dbt_common/contracts/config/materialization.py,sha256=rahC72qZ0-jB8oPwxyPooZXc5NJ-smg74g2HnGOMj34,256
 dbt_common/contracts/config/metadata.py,sha256=X47-tEA8q2ZfSMcYv0godUwTSVjt8NI77tD4NqdgM0c,1877
 dbt_common/contracts/config/properties.py,sha256=gWt6xsP4rVOqRKhmagiUhWnDynzD9mykfMYMTviwpEU,2281
@@ -37,16 +37,16 @@ dbt_common/events/functions.py,sha256=K-R-FBTeO03U51gtMBu1EUcNsIAsgw_e5spWxLJ44V
 dbt_common/events/helpers.py,sha256=CfsWwNDjsLJkPIgOtAfuLEnZ3rGUKeYsH8aDtCW12OA,410
 dbt_common/events/interfaces.py,sha256=hEDeDoB0FW2RYHVZBG7gebEt_mUVBzkn1yPubpaxs-s,147
 dbt_common/events/logger.py,sha256=mAUNLZlIIOl3T2u7KOe8FF_deTNNe1CRJqmkPw4YH1U,6728
-dbt_common/events/types.proto,sha256=VflTmP9HUsatIi7xC3GXk2eJHsrS5041m5qpA7idU6c,2335
-dbt_common/events/types.py,sha256=aQ9TSsOyVBq2LMdMQQVktGww0qzH4PpR4AHArMQWtT8,5049
-dbt_common/events/types_pb2.py,sha256=0kIhc1xWqhF3DtJhaAdN_8AjxzxkFcVzE53Dd5mdS5Q,7277
+dbt_common/events/types.proto,sha256=Ujl0O-X-pat8vlo2C0TMH1LZqa8EP_9f8k2TjbFuCV8,2276
+dbt_common/events/types.py,sha256=MXCmG7qaj7hLbDZjjazjWftPTfoLjhNPATPMirO0DvU,4475
+dbt_common/events/types_pb2.py,sha256=oFjR6pFqz3_Nk8wWIrVB9y6inNTxnj-CSGr2g8dnFz4,7167
 dbt_common/exceptions/__init__.py,sha256=X_Uw7BxOzXev_9JMYfs5Cm-_i_Qf2PJim8_-dDJI7Y8,361
 dbt_common/exceptions/base.py,sha256=d6lsA8sLqR6_BERowm91Mrs1ZwrEOeT8WQKWg4nPSPA,7750
 dbt_common/exceptions/cache.py,sha256=0z4fBcdNZMAR41YbPRo2GN0__xAMaYs8Uc-t3hjmVio,2532
 dbt_common/exceptions/connection.py,sha256=rXLJXUdLhyXP3CUUyiqWN2DDO5-0Pn1ChX3OIR7pxKk,176
 dbt_common/exceptions/contracts.py,sha256=i2PKRqda1Pq_Sro9FA22W7FTGklhBAGl6__nimR5_qI,527
 dbt_common/exceptions/events.py,sha256=j83szhbqmK3ITZR_xwA2dYTNaPcGF_lN_kQar6dQgjQ,317
-dbt_common/exceptions/jinja.py,sha256=PzVUB1MFf8x81bQHTwFIGw3PyrGZzWYw04eotI4CqtI,3124
+dbt_common/exceptions/jinja.py,sha256=EfqWKLePqPIfzFjn1-Sn_lEp3fttzhzwogo0I-McAdc,3321
 dbt_common/exceptions/macros.py,sha256=2nujJrtpWHnhBwcyhcOmeVaEzILh3W9gtyP6vVpkA0o,3301
 dbt_common/exceptions/system.py,sha256=scoKnSx2frTFCrfk2cH0g-z3MuzE-SEBXFC9P-jzB2s,1603
 dbt_common/utils/__init__.py,sha256=8PNb_A9zm2YfYMa0GsM-pAyJy3Iu0FUtWKvCs8kFhD0,549
@@ -57,7 +57,7 @@ dbt_common/utils/encoding.py,sha256=6_kSY2FvGNYMg7oX7PrbvVioieydih3Kl7Ii802LaHI,
 dbt_common/utils/executor.py,sha256=pNY0UbPlwQmTE69Vt_Rj91YGCIOEaqeYU3CjAds0T70,2454
 dbt_common/utils/formatting.py,sha256=JUn5rzJ-uajs9wPCN0-f2iRFY1pOJF5YjTD9dERuLoc,165
 dbt_common/utils/jinja.py,sha256=JXgNmJArGGy0h7qkbNLA3zaEQmoF1CxsNBYTlIwFXDw,1101
-dbt_common-1.8.0.dist-info/METADATA,sha256=9YS6_dZQSWe_FuiBUu-lYqVdhptGjdU-na84EExK72g,5298
-dbt_common-1.8.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-dbt_common-1.8.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dbt_common-1.8.0.dist-info/RECORD,,
+dbt_common-1.9.0.dist-info/METADATA,sha256=gJ4sX5mtKWkJP66WbImh-5UrFsb5Mo3KQkoGkzbbsAQ,5298
+dbt_common-1.9.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+dbt_common-1.9.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dbt_common-1.9.0.dist-info/RECORD,,