airflow-dbt-python 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

airflow_dbt_python/__version__.py

@@ -3,4 +3,4 @@
 __author__ = "Tomás Farías Santana"
 __copyright__ = "Copyright 2021 Tomás Farías Santana"
 __title__ = "airflow-dbt-python"
-__version__ = "2.1.0"
+__version__ = "2.2.0"

airflow_dbt_python/hooks/dbt.py

@@ -25,8 +25,6 @@ from airflow.exceptions import AirflowException
 from airflow.hooks.base import BaseHook
 from airflow.models.connection import Connection
 
-from airflow_dbt_python.utils.version import DBT_INSTALLED_GTE_1_8
-
 if sys.version_info >= (3, 11):
     from contextlib import chdir as chdir_ctx
 else:
@@ -400,13 +398,7 @@ class DbtHook(BaseHook):
         default_stdout. As these are initialized by the CLI app, we need to
         initialize them here.
         """
-        if DBT_INSTALLED_GTE_1_8:
-            from dbt.events.logging import setup_event_logger
-        else:
-            from dbt.events.functions import (  # type: ignore[no-redef]
-                setup_event_logger,
-            )
-
+        from dbt.events.logging import setup_event_logger
         from dbt.flags import get_flags
 
         flags = get_flags()

airflow_dbt_python/utils/configs.py

@@ -11,7 +11,7 @@ from typing import Any, Optional, Type, Union
 
 import dbt.flags as flags
 import yaml
-from dbt.adapters.factory import register_adapter
+from dbt.cli.option_types import Package
 from dbt.clients import yaml_helper  # type: ignore
 from dbt.config.profile import Profile, read_profile
 from dbt.config.project import PartialProject, Project
@@ -20,13 +20,14 @@ from dbt.config.runtime import RuntimeConfig
 from dbt.contracts.graph.manifest import Manifest
 from dbt.exceptions import DbtProjectError
 from dbt.graph.graph import Graph
-from dbt.parser.manifest import ManifestLoader, parse_manifest
+from dbt.parser.manifest import parse_manifest
 from dbt.task.base import BaseTask, ConfiguredTask
 from dbt.task.build import BuildTask
 from dbt.task.clean import CleanTask
 from dbt.task.compile import CompileTask
 from dbt.task.debug import DebugTask
 from dbt.task.deps import DepsTask
+from dbt.task.docs.generate import GenerateTask
 from dbt.task.freshness import FreshnessTask
 from dbt.task.list import ListTask
 from dbt.task.run import RunTask
@@ -38,15 +39,7 @@ from dbt.task.test import TestTask
 from dbt.tracking import initialize_from_flags
 
 from airflow_dbt_python.utils.enums import FromStrEnum, LogFormat, Output
-from airflow_dbt_python.utils.version import (
-    DBT_INSTALLED_GTE_1_7,
-    DBT_INSTALLED_GTE_1_8,
-)
-
-if DBT_INSTALLED_GTE_1_8:
-    from dbt.task.docs.generate import GenerateTask
-else:
-    from dbt.task.generate import GenerateTask  # type: ignore[no-redef]
+from airflow_dbt_python.utils.version import DBT_INSTALLED_GTE_1_9
 
 
 def parse_yaml_args(args: Optional[Union[str, dict[str, Any]]]) -> dict[str, Any]:
@@ -139,34 +132,27 @@ class BaseConfig:
         default=None, repr=False
     )
 
-    # dbt >= 1.7
-    if DBT_INSTALLED_GTE_1_7:
-        from dbt.cli.option_types import Package
-
-        include_saved_query: Optional[bool] = None
-        no_include_saved_query: Optional[bool] = dataclasses.field(
-            default=None, repr=False
-        )
+    include_saved_query: Optional[bool] = None
+    no_include_saved_query: Optional[bool] = dataclasses.field(default=None, repr=False)
 
-        clean_project_files_only: Optional[bool] = None
-        no_clean_project_files_only: Optional[bool] = dataclasses.field(
-            default=None, repr=False
-        )
+    clean_project_files_only: Optional[bool] = None
+    no_clean_project_files_only: Optional[bool] = dataclasses.field(
+        default=None, repr=False
+    )
 
-        require_resource_names_without_spaces: bool = False
+    require_resource_names_without_spaces: bool = False
 
-        add_package: Optional[Package] = None
-        dry_run: bool = False
-        lock: bool = False
-        static: bool = False
-        upgrade: bool = False
+    add_package: Optional[Package] = None
+    dry_run: bool = False
+    lock: bool = False
+    static: bool = False
+    upgrade: bool = False
 
-    if DBT_INSTALLED_GTE_1_8:
-        require_model_names_without_spaces: bool = False
-        source_freshness_run_project_hooks: bool = False
-        exclude_resource_types: list[str] = dataclasses.field(
-            default_factory=list, repr=False
-        )
+    require_model_names_without_spaces: bool = False
+    source_freshness_run_project_hooks: bool = False
+    exclude_resource_types: list[str] = dataclasses.field(
+        default_factory=list, repr=False
+    )
 
     def __post_init__(self):
         """Post initialization actions for a dbt configuration."""
@@ -318,53 +304,33 @@ class BaseConfig:
         flags.set_from_args(self, {})  # type: ignore
         project, profile = self.create_dbt_project_and_profile(extra_targets)
 
-        self.cls.set_log_format()
+        if not DBT_INSTALLED_GTE_1_9:
+            self.cls.set_log_format()  # type: ignore[attr-defined]
+
         initialize_from_flags(self.send_anonymous_usage_stats, self.profiles_dir)
 
         local_flags = flags.get_flags()
 
         runtime_config = self.create_runtime_config(project, profile)
 
-        if DBT_INSTALLED_GTE_1_8:
-            if issubclass(self.dbt_task, ConfiguredTask) and runtime_config:
-                manifest = parse_manifest(
-                    runtime_config,
-                    write_perf_info=write_perf_info,
-                    write=False,
-                    write_json=False,
-                )
-                task: BaseTask = self.dbt_task(
-                    args=local_flags, config=runtime_config, manifest=manifest
-                )
-            elif issubclass(self.dbt_task, DepsTask):
-                task = self.dbt_task(args=local_flags, project=project)
-            elif issubclass(self.dbt_task, DebugTask):
-                task = self.dbt_task(args=local_flags)
-            elif issubclass(self.dbt_task, CleanTask):
-                task = self.dbt_task(args=local_flags, config=project)
-            else:
-                task = self.dbt_task(args=local_flags)
+        if issubclass(self.dbt_task, ConfiguredTask) and runtime_config:
+            manifest = parse_manifest(
+                runtime_config,
+                write_perf_info=write_perf_info,
+                write=False,
+                write_json=False,
+            )
+            task: BaseTask = self.dbt_task(
+                args=local_flags, config=runtime_config, manifest=manifest
+            )
+        elif issubclass(self.dbt_task, DepsTask):
+            task = self.dbt_task(args=local_flags, project=project)
+        elif issubclass(self.dbt_task, DebugTask):
+            task = self.dbt_task(args=local_flags)
+        elif issubclass(self.dbt_task, CleanTask):
+            task = self.dbt_task(args=local_flags, config=project)
         else:
-            if issubclass(self.dbt_task, ConfiguredTask) and runtime_config:
-                register_adapter(runtime_config)  # type: ignore[call-arg]
-                manifest = ManifestLoader.get_full_manifest(
-                    runtime_config, write_perf_info=write_perf_info
-                )
-                task = self.dbt_task(
-                    args=self,  # type: ignore[arg-type]
-                    config=runtime_config,
-                    manifest=manifest,
-                )
-            elif issubclass(self.dbt_task, DepsTask):
-                task = self.dbt_task(args=self, project=project)
-            elif issubclass(self.dbt_task, DebugTask):
-                task = self.dbt_task(args=self, config=runtime_config)  # type: ignore[arg-type,call-arg]
-            else:
-                task = self.dbt_task(  # type: ignore[call-arg]
-                    args=self,  # type: ignore[arg-type]
-                    config=runtime_config,
-                    project=project,
-                )
+            task = self.dbt_task(args=local_flags)
 
         if self.compiled_target is not None:
             # Only supported by subclasses of dbt's GraphRunnableTask.
@@ -473,11 +439,10 @@ class BaseConfig:
         Returns:
             A dbt profile for the task represented by this configuration.
         """
-        if DBT_INSTALLED_GTE_1_8:
-            from dbt_common.clients.system import get_env
-            from dbt_common.context import set_invocation_context
+        from dbt_common.clients.system import get_env
+        from dbt_common.context import set_invocation_context
 
-            set_invocation_context(get_env())
+        set_invocation_context(get_env())
 
         if self.profiles_dir is not None:
             raw_profiles = read_profile(self.profiles_dir)
@@ -695,6 +660,7 @@ class TestTaskConfig(SelectionConfig):
     singular: Optional[bool] = None
     store_failures: Optional[bool] = None
     which: str = dataclasses.field(default="test", init=False)
+    resource_types: Optional[list[str]] = None
 
     def __post_init__(self):
         """Support for type casting arguments."""

airflow_dbt_python/utils/url.py

@@ -465,7 +465,7 @@ def tar_dir_from_url(url: URL, tar_url: URL) -> None:
     except IndexError:
         compression = ""
 
-    with tarfile.open(tar_url, f"w:{compression}") as tf:
+    with tarfile.open(tar_url, f"w:{compression}") as tf:  # type: ignore[call-overload]
         for _file in url:
             tf.add(_file)
 
@@ -473,6 +473,6 @@ def tar_dir_from_url(url: URL, tar_url: URL) -> None:
 if __name__ == "__main__":
     import doctest
 
-    import airflow_dbt_python.utils.url as url
+    import airflow_dbt_python.utils.url as url_utils
 
-    doctest.testmod(url)
+    doctest.testmod(url_utils)

airflow_dbt_python/utils/version.py

@@ -10,18 +10,17 @@ except ImportError:
 
 from dbt.version import installed
 
-DBT_1_7 = VersionSpecifier(
-    major="1", minor="7", patch="0", matcher=Matchers.GREATER_THAN_OR_EQUAL
-)
 DBT_1_8 = VersionSpecifier(
     major="1", minor="8", patch="0", matcher=Matchers.GREATER_THAN_OR_EQUAL
 )
 DBT_1_9 = VersionSpecifier(
     major="1", minor="9", patch="0", matcher=Matchers.GREATER_THAN_OR_EQUAL
 )
+DBT_2_0 = VersionSpecifier(
+    major="2", minor="0", patch="0", matcher=Matchers.GREATER_THAN_OR_EQUAL
+)
 
-DBT_INSTALLED_GTE_1_7 = installed.compare(DBT_1_7) == 1
-DBT_INSTALLED_GTE_1_8 = installed.compare(DBT_1_8) == 1
+DBT_INSTALLED_GTE_1_9 = installed.compare(DBT_1_9) == 1
 
-DBT_INSTALLED_1_7 = DBT_1_7 < installed < DBT_1_8
 DBT_INSTALLED_1_8 = DBT_1_8 < installed < DBT_1_9
+DBT_INSTALLED_1_9 = DBT_1_9 < installed < DBT_2_0

{airflow_dbt_python-2.1.0.dist-info → airflow_dbt_python-2.2.0.dist-info}/METADATA

@@ -1,25 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: airflow-dbt-python
-Version: 2.1.0
+Version: 2.2.0
 Summary: A collection of Airflow operators, hooks, and utilities to execute dbt commands
-Home-page: https://github.com/tomasfarias/airflow-dbt-python
 License: MIT
 Author: Tomás Farías Santana
 Author-email: tomas@tomasfarias.dev
-Requires-Python: >=3.8,<3.13
+Requires-Python: >=3.9,<3.13
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Provides-Extra: adapters
 Provides-Extra: airflow-providers
 Provides-Extra: bigquery
@@ -30,17 +24,17 @@ Provides-Extra: redshift
 Provides-Extra: s3
 Provides-Extra: snowflake
 Provides-Extra: spark
-Requires-Dist: apache-airflow (>=2.7)
+Requires-Dist: apache-airflow (>=2.8)
 Requires-Dist: apache-airflow-providers-amazon (>=3.0.0) ; extra == "airflow-providers" or extra == "s3"
 Requires-Dist: apache-airflow-providers-ssh (>=3.0.0) ; extra == "airflow-providers" or extra == "git"
 Requires-Dist: connexion (<3.0)
 Requires-Dist: contextlib-chdir (==1.0.2) ; python_version < "3.11"
-Requires-Dist: dbt-bigquery (>=1.7.0,<1.9.0) ; extra == "adapters" or extra == "bigquery"
-Requires-Dist: dbt-core (>=1.7.5,<1.9.0)
-Requires-Dist: dbt-postgres (>=1.7.0,<1.9.0) ; extra == "adapters" or extra == "postgres"
-Requires-Dist: dbt-redshift (>=1.7.0,<1.9.0) ; extra == "adapters" or extra == "redshift"
-Requires-Dist: dbt-snowflake (>=1.7.0,<1.9.0) ; extra == "adapters" or extra == "snowflake"
-Requires-Dist: dbt-spark (>=1.7.0,<1.9.0) ; extra == "adapters" or extra == "spark"
+Requires-Dist: dbt-bigquery (>=1.8.0,<2.0.0) ; extra == "adapters" or extra == "bigquery"
+Requires-Dist: dbt-core (>=1.8.0,<2.0.0)
+Requires-Dist: dbt-postgres (>=1.8.0,<2.0.0) ; extra == "adapters" or extra == "postgres"
+Requires-Dist: dbt-redshift (>=1.8.0,<2.0.0) ; extra == "adapters" or extra == "redshift"
+Requires-Dist: dbt-snowflake (>=1.8.0,<2.0.0) ; extra == "adapters" or extra == "snowflake"
+Requires-Dist: dbt-spark (>=1.8.0,<2.0.0) ; extra == "adapters" or extra == "spark"
 Requires-Dist: dulwich (>=0.21) ; extra == "git"
 Project-URL: Repository, https://github.com/tomasfarias/airflow-dbt-python
 Description-Content-Type: text/markdown
@@ -62,8 +56,8 @@ Read the [documentation](https://airflow-dbt-python.readthedocs.io) for examples
 ## Requirements
 
 Before using *airflow-dbt-python*, ensure you meet the following requirements:
-* A *dbt* project using [dbt-core](https://pypi.org/project/dbt-core/) version 1.7.5 or later.
-* An Airflow environment using version 2.7 or later.
+* A *dbt* project using [dbt-core](https://pypi.org/project/dbt-core/) version 1.8 or later.
+* An Airflow environment using version 2.8 or later.
 
   * If using any managed service, like AWS MWAA or GCP Cloud Composer 2/3, ensure your environment is created with a supported version of Airflow.
   * If self-hosting, Airflow installation instructions can be found in their [official documentation](https://airflow.apache.org/docs/apache-airflow/stable/installation/index.html).

{airflow_dbt_python-2.1.0.dist-info → airflow_dbt_python-2.2.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 airflow_dbt_python/__init__.py,sha256=qYIsTHy4p3NX0QYIsLdatz6GlnaMwYsSoD3wtPD0BqY,153
-airflow_dbt_python/__version__.py,sha256=Cg2ny00d28tIcWGoNq-HQZrF04uPVlxF18H_Cg743V4,190
+airflow_dbt_python/__version__.py,sha256=R3gvi55VePWbBsovUbmgfU1cEWnzuFVlZFXx74rtufo,190
 airflow_dbt_python/hooks/__init__.py,sha256=dcQQ5e8EpcQ_CzKVOeg_cRbqOEmloNLnWSp3B0bDSXs,57
-airflow_dbt_python/hooks/dbt.py,sha256=3QOgGpB4sLiFvZZ75v-UF6lQMapAMPHNUkIygEz6cWw,20245
+airflow_dbt_python/hooks/dbt.py,sha256=_M-WnwAgUtlpWP2hIa4g9ZlCy5QFXSYQOL_S5ARucYk,20001
 airflow_dbt_python/hooks/git.py,sha256=bxzyd1g9WPfZs8ukj-FSafrVki4hyw_GF06jF61ncxk,7126
 airflow_dbt_python/hooks/localfs.py,sha256=i49VldNRFyvsd8bMdpkWaaviP2VoqMnl-VmHYgrpfZM,5387
 airflow_dbt_python/hooks/remote.py,sha256=Wx6zP9DH6blIiremwicxgYFxssQ-5Na9UaHyZjcNJSI,5478
@@ -9,12 +9,12 @@ airflow_dbt_python/hooks/s3.py,sha256=AUYtpI609fBzZXCY7esJbdFhijHoMVJWa6lERPFuAr
 airflow_dbt_python/operators/__init__.py,sha256=zveHW17YWoCpdsQhCZtvdPoEiFiwWykqPnAnOAQ8vk0,46
 airflow_dbt_python/operators/dbt.py,sha256=6WF6yxjNJZI5HgVLA5eEnoBK7V8Jz2MZcfgEmAXRLg8,22098
 airflow_dbt_python/utils/__init__.py,sha256=J3_g-tV35XkrZSwYULsAq4B0TUa6rw0uxP-LFwl_k2Q,45
-airflow_dbt_python/utils/configs.py,sha256=gxdEc-dQF15Jd42StxOgTdhUHatjLuLIOVW0NO4i4xw,26767
+airflow_dbt_python/utils/configs.py,sha256=BfYyws28MnMYvqgN9YcnrYWXa_x1cs9fmUknbmGFijI,25322
 airflow_dbt_python/utils/enums.py,sha256=rktUM8cTkEUsdNbzd_f6fxfgNiZGifJfOr0zvrsMyuQ,969
 airflow_dbt_python/utils/env.py,sha256=o2Y3RMyXADSpUCU-G0yRiqXB-yo3oPsXtCEI7H5GIyM,646
-airflow_dbt_python/utils/url.py,sha256=P1JKBuJDLyt0j7KO3BSVP7mpmxmFlLabfAiF5o0u3Q4,16068
-airflow_dbt_python/utils/version.py,sha256=xRgpjlUQjzxK3iOQotWEeNNijqcS8rb-2S3CxTM7FIc,867
-airflow_dbt_python-2.1.0.dist-info/LICENSE,sha256=8yx5JCe-4cW52JiqVrMlA990r7tuac2foiUryhV9dfY,1073
-airflow_dbt_python-2.1.0.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-airflow_dbt_python-2.1.0.dist-info/METADATA,sha256=yVShosgyVGNRRvw_0sa03NeTWgrTz56HHQPS5sgEN24,15859
-airflow_dbt_python-2.1.0.dist-info/RECORD,,
+airflow_dbt_python/utils/url.py,sha256=Ac7PJMl3AsrVMXGPgFdzOrAVsvCfS4hMWAtwgRMdbP0,16111
+airflow_dbt_python/utils/version.py,sha256=RAMagzZofIAiFUFc9g06yZXM81BaMI3hH58q4xjfE0M,811
+airflow_dbt_python-2.2.0.dist-info/LICENSE,sha256=8yx5JCe-4cW52JiqVrMlA990r7tuac2foiUryhV9dfY,1073
+airflow_dbt_python-2.2.0.dist-info/METADATA,sha256=Lfx7ptaVOY1ABFbIZe04Ru-ODdZMQf3ie8ct_Hx1LvA,15544
+airflow_dbt_python-2.2.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+airflow_dbt_python-2.2.0.dist-info/RECORD,,

{airflow_dbt_python-2.1.0.dist-info → airflow_dbt_python-2.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.4.0
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any