dbt-common 1.18__py3-none-any.whl → 1.20__py3-none-any.whl

dbt_common/__about__.py

@@ -1 +1 @@
-version = "1.18"
+version = "1.20"

dbt_common/clients/_jinja_blocks.py

@@ -1,7 +1,7 @@
 import dataclasses
 import re
 from collections import namedtuple
-from typing import Dict, Iterator, List, Optional, Set, Union
+from typing import Callable, Dict, Iterator, List, Optional, Set, Union
 
 from dbt_common.exceptions import (
     BlockDefinitionNotAtTopError,
@@ -115,6 +115,12 @@ class PositionedMatch:
     match: Optional[re.Match]
 
 
+@dataclasses.dataclass
+class ExtractWarning:
+    warning_type: str
+    msg: str
+
+
 class TagIterator:
     def __init__(self, text: str) -> None:
         self.text: str = text
@@ -326,8 +332,13 @@ _CONTROL_FLOW_END_TAGS = {v: k for k, v in _CONTROL_FLOW_TAGS.items()}
 
 
 class BlockIterator:
-    def __init__(self, tag_iterator: TagIterator) -> None:
+    def __init__(
+        self,
+        tag_iterator: TagIterator,
+        warning_callback: Optional[Callable[[ExtractWarning], None]] = None,
+    ) -> None:
         self.tag_parser = tag_iterator
+        self.warning_callback = warning_callback
         self.current: Optional[Tag] = None
         self.stack: List[str] = []
         self.last_position: int = 0
@@ -393,6 +404,13 @@ class BlockIterator:
                     full_block=self.data[self.current.start : tag.end],
                 )
                 self.current = None
+            elif self.current is None and self.warning_callback:
+                # Warn on unexpected top-level tags
+                self.warning_callback(
+                    ExtractWarning(
+                        "unexpected_block", f"Found unexpected '{tag.block_type_name}' block tag."
+                    )
+                )
 
         if self.current:
             linecount = self.data[: self.current.end].count("\n") + 1

dbt_common/clients/jinja.py

@@ -38,7 +38,13 @@ from dbt_common.utils.jinja import (
     get_materialization_macro_name,
     get_test_macro_name,
 )
-from dbt_common.clients._jinja_blocks import BlockIterator, BlockData, BlockTag, TagIterator
+from dbt_common.clients._jinja_blocks import (
+    BlockIterator,
+    BlockData,
+    BlockTag,
+    TagIterator,
+    ExtractWarning,
+)
 
 from dbt_common.exceptions import (
     CompilationError,
@@ -659,6 +665,7 @@ def extract_toplevel_blocks(
     text: str,
     allowed_blocks: Optional[Set[str]] = None,
     collect_raw_data: bool = True,
+    warning_callback: Optional[Callable[[ExtractWarning], None]] = None,
 ) -> List[Union[BlockData, BlockTag]]:
     """Extract the top-level blocks with matching block types from a jinja file.
 
@@ -672,6 +679,8 @@ def extract_toplevel_blocks(
         be part of the results, as `BlockData` objects. They have a
         `block_type_name` field of `'__dbt_data'` and will never have a
         `block_name`.
+    :param warning_callback: An optional callback that will be called if there
+        are recoverable issues detected in the template.
     :return: A list of `BlockTag`s matching the allowed block types and (if
         `collect_raw_data` is `True`) `BlockData` objects.
     """
@@ -682,7 +691,7 @@ def extract_toplevel_blocks(
             return _TESTING_BLOCKS_CACHE[hash]
 
     tag_iterator = TagIterator(text)
-    blocks = BlockIterator(tag_iterator).lex_for_blocks(
+    blocks = BlockIterator(tag_iterator, warning_callback).lex_for_blocks(
         allowed_blocks=allowed_blocks, collect_raw_data=collect_raw_data
     )
 

{dbt_common-1.18.dist-info → dbt_common-1.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-common
-Version: 1.18
+Version: 1.20
 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.18.dist-info → dbt_common-1.20.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dbt_common/__about__.py,sha256=ERrGU780ALGuoRiYc9GL9A5N222lJo4nym34aldvEjY,17
+dbt_common/__about__.py,sha256=SGYUg2wlOx0343f4ShHFemOkildSkKho2Xg2m7qLlg8,17
 dbt_common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt_common/behavior_flags.py,sha256=hQzxCqQSweJbRp_xoQqNnlUF77PBuOdCdLOSdcBlkxk,4885
 dbt_common/constants.py,sha256=-Y5DIL1SDPQWtlCNizXRYxFgbx1D7LaLs1ysamvGMRk,278
@@ -12,9 +12,9 @@ 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=5I_VEWkkW_54uK09ErP_8ey7wj-OOXvt1OHqr73HLOk,14879
+dbt_common/clients/_jinja_blocks.py,sha256=eUjZLBtLCASJRRj1G8b9u15A3PQMDCKvytIdWkTLSP4,15451
 dbt_common/clients/agate_helper.py,sha256=anKKgKV5PSnFRuFeBwRMdHK3JCaQoUqB2ZXHD0su0Wo,9123
-dbt_common/clients/jinja.py,sha256=VpCYe_0seh6K4667-4TmQ2PP-T48UIcvDRT3miRyn4o,22488
+dbt_common/clients/jinja.py,sha256=wKwBCtIGKXOwU-KWWF2sz77nST-JUP26U_Zo_a6mNe8,22756
 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
@@ -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.18.dist-info/METADATA,sha256=gd7IHI2wW8J1_OUnmv8GtW2rybVmr9_FiOKIrAZ8QHM,4944
-dbt_common-1.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dbt_common-1.18.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dbt_common-1.18.dist-info/RECORD,,
+dbt_common-1.20.dist-info/METADATA,sha256=SM8vtxD3Hor76Ze62sZ2WjQlRpR-4smcG720v_a74XM,4944
+dbt_common-1.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dbt_common-1.20.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dbt_common-1.20.dist-info/RECORD,,