Skip to content

Commit

Permalink
Improve/simplify patching code (#48)
Browse files Browse the repository at this point in the history
* Improve simplify patching code

* Improve simplify patching code

* Improve simplify patching code
  • Loading branch information
ismailsimsek authored Dec 16, 2024
1 parent 7b351fc commit a4fe50d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 24 deletions.
17 changes: 9 additions & 8 deletions opendbt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,23 @@
import sys
from pathlib import Path

######################
from dbt.cli.main import dbtRunner as DbtCliRunner

######################
from opendbt.dbt import patch_dbt

patch_dbt()
######################
from opendbt.utils import Utils

from dbt.cli.main import dbtRunnerResult
from dbt.config import PartialProject
from dbt.contracts.graph.manifest import Manifest
from dbt.contracts.results import RunResult
from dbt.exceptions import DbtRuntimeError
from dbt.task.base import get_nearest_project_dir

from opendbt.dbt import patch_dbt
from opendbt.utils import Utils

######################
patch_dbt()


######################

class OpenDbtLogger:
_log = None
Expand Down
18 changes: 2 additions & 16 deletions opendbt/dbt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,14 @@ def patch_dbt():
# Monkey Patching! Override dbt lib code with new one
# ================================================================================================================
dbt_version = Version(dbt.version.get_installed_version().to_version_string(skip_matcher=True))
if Version("1.6.0") <= dbt_version < Version("1.7.0"):
if Version("1.6.0") <= dbt_version < Version("1.8.0"):
from opendbt.dbt.v17.task.docs.generate import OpenDbtGenerateTask
dbt.task.generate.GenerateTask = OpenDbtGenerateTask
from opendbt.dbt.v17.adapters.factory import OpenDbtAdapterContainer
dbt.adapters.factory.FACTORY = OpenDbtAdapterContainer()
from opendbt.dbt.v17.task.run import ModelRunner
dbt.task.run.ModelRunner = ModelRunner
elif Version("1.7.0") <= dbt_version < Version("1.8.0"):
from opendbt.dbt.v17.task.docs.generate import OpenDbtGenerateTask
dbt.task.generate.GenerateTask = OpenDbtGenerateTask
from opendbt.dbt.v17.adapters.factory import OpenDbtAdapterContainer
dbt.adapters.factory.FACTORY = OpenDbtAdapterContainer()
from opendbt.dbt.v17.task.run import ModelRunner
dbt.task.run.ModelRunner = ModelRunner
elif Version("1.8.0") <= dbt_version < Version("1.9.0"):
from opendbt.dbt.v18.task.docs.generate import OpenDbtGenerateTask
dbt.task.docs.generate.GenerateTask = OpenDbtGenerateTask
from opendbt.dbt.v18.adapters.factory import OpenDbtAdapterContainer
dbt.adapters.factory.FACTORY = OpenDbtAdapterContainer()
from opendbt.dbt.v18.task.run import ModelRunner
dbt.task.run.ModelRunner = ModelRunner
elif Version("1.9.0") >= dbt_version < Version("1.10.0"):
elif Version("1.8.0") <= dbt_version < Version("1.10.0"):
from opendbt.dbt.v18.task.docs.generate import OpenDbtGenerateTask
dbt.task.docs.generate.GenerateTask = OpenDbtGenerateTask
from opendbt.dbt.v18.adapters.factory import OpenDbtAdapterContainer
Expand Down

0 comments on commit a4fe50d

Please sign in to comment.