Skip to content

Commit 91ccf35

Browse files
mdesmetmdesmet
authored
fix: use vendored dbt-artifacts-parser (#71)
1 parent f935b09 commit 91ccf35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+110109
-81
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# pre-commit install --install-hooks
33
# To update the versions:
44
# pre-commit autoupdate
5-
exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg)(/|$)'
5+
exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg|src/vendor)(/|$)'
66
# Note the order is intentional to avoid multiple passes of the hooks
77
repos:
88
- repo: https://github.com/astral-sh/ruff-pre-commit

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def read(*names, **kwargs):
6363
python_requires=">=3.8",
6464
install_requires=[
6565
"click~=8.1.7",
66-
"dbt-artifacts-parser @ git+https://github.com/mdesmet/dbt-artifacts-parser.git@2c0810ee557feeeaca66a8c46a0b764bb8f3a0bc",
66+
"pydantic >=2.0,<3.0",
6767
"ruamel.yaml~=0.18.6",
6868
"tabulate~=0.9.0",
6969
"requests>=2.31",

‎src/datapilot/core/platforms/dbt/factory.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
# Remove the import of CatalogV1 from dbt_artifacts_parser since we use our custom version
2-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import ManifestV10
3-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import ManifestV11
4-
from dbt_artifacts_parser.parsers.manifest.manifest_v12 import ManifestV12
5-
1+
# Remove the import of CatalogV1 from vendor.dbt_artifacts_parser since we use our custom version
62
from datapilot.core.platforms.dbt.schemas.catalog import Catalog
73
from datapilot.core.platforms.dbt.schemas.catalog import CatalogV1
84
from datapilot.core.platforms.dbt.schemas.manifest import Manifest
@@ -11,6 +7,9 @@
117
from datapilot.core.platforms.dbt.wrappers.manifest.v11.wrapper import ManifestV11Wrapper
128
from datapilot.core.platforms.dbt.wrappers.manifest.v12.wrapper import ManifestV12Wrapper
139
from datapilot.exceptions.exceptions import AltimateNotSupportedError
10+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import ManifestV10
11+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import ManifestV11
12+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v12 import ManifestV12
1413

1514

1615
class DBTFactory:

‎src/datapilot/core/platforms/dbt/schemas/catalog.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
from typing import Optional
66
from typing import Union
77

8-
from dbt_artifacts_parser.parsers.catalog.catalog_v1 import CatalogV1 as BaseCatalogV1
9-
from dbt_artifacts_parser.parsers.catalog.catalog_v1 import Metadata as BaseMetadata
108
from pydantic.main import BaseModel
119

10+
from vendor.dbt_artifacts_parser.parsers.catalog.catalog_v1 import CatalogV1 as BaseCatalogV1
11+
from vendor.dbt_artifacts_parser.parsers.catalog.catalog_v1 import Metadata as BaseMetadata
12+
1213

1314
class AltimateCatalogMetadata(BaseModel):
1415
dbt_schema_version: Optional[str] = "https://schemas.getdbt.com/dbt/catalog/v1.json"

‎src/datapilot/core/platforms/dbt/schemas/manifest.py‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,22 @@
55
from typing import Optional
66
from typing import Union
77

8-
from dbt_artifacts_parser.parsers.manifest.manifest_v1 import ManifestV1
9-
from dbt_artifacts_parser.parsers.manifest.manifest_v2 import ManifestV2
10-
from dbt_artifacts_parser.parsers.manifest.manifest_v3 import ManifestV3
11-
from dbt_artifacts_parser.parsers.manifest.manifest_v4 import ManifestV4
12-
from dbt_artifacts_parser.parsers.manifest.manifest_v5 import ManifestV5
13-
from dbt_artifacts_parser.parsers.manifest.manifest_v6 import ManifestV6
14-
from dbt_artifacts_parser.parsers.manifest.manifest_v7 import ManifestV7
15-
from dbt_artifacts_parser.parsers.manifest.manifest_v8 import ManifestV8
16-
from dbt_artifacts_parser.parsers.manifest.manifest_v9 import ManifestV9
17-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import ManifestV10
18-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import ManifestV11
19-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import SupportedLanguage
20-
from dbt_artifacts_parser.parsers.manifest.manifest_v12 import ManifestV12
218
from pydantic import BaseModel
229

10+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v1 import ManifestV1
11+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v2 import ManifestV2
12+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v3 import ManifestV3
13+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v4 import ManifestV4
14+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v5 import ManifestV5
15+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v6 import ManifestV6
16+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v7 import ManifestV7
17+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v8 import ManifestV8
18+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v9 import ManifestV9
19+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import ManifestV10
20+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import ManifestV11
21+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import SupportedLanguage
22+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v12 import ManifestV12
23+
2324

2425
class DBTVersion(BaseModel):
2526
MAJOR: int

‎src/datapilot/core/platforms/dbt/utils.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
from typing import Tuple
77
from typing import Union
88

9-
from dbt_artifacts_parser.parser import parse_manifest
10-
119
from datapilot.core.platforms.dbt.constants import BASE
1210
from datapilot.core.platforms.dbt.constants import FOLDER
1311
from datapilot.core.platforms.dbt.constants import INTERMEDIATE
@@ -30,6 +28,7 @@
3028
from datapilot.utils.utils import extract_folders_in_path
3129
from datapilot.utils.utils import is_superset_path
3230
from datapilot.utils.utils import load_json
31+
from vendor.dbt_artifacts_parser.parser import parse_manifest
3332

3433
MODEL_TYPE_PATTERNS = {
3534
STAGING: r"^stg_.*", # Example: models starting with 'stg_'

‎src/datapilot/core/platforms/dbt/wrappers/manifest/v10/schemas.py‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22
from typing import Type
33
from typing import Union
44

5-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import AnalysisNode
6-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import Exposure
7-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import GenericTestNode
8-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import HookNode
9-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import Macro
10-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import ModelNode
11-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import RPCNode
12-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import SeedNode
13-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import SingularTestNode
14-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import SnapshotNode
15-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import SourceDefinition
16-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import SqlNode
17-
185
from datapilot.core.platforms.dbt.constants import GENERIC
196
from datapilot.core.platforms.dbt.constants import SINGULAR
7+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import AnalysisNode
8+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import Exposure
9+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import GenericTestNode
10+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import HookNode
11+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import Macro
12+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import ModelNode
13+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import RPCNode
14+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import SeedNode
15+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import SingularTestNode
16+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import SnapshotNode
17+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import SourceDefinition
18+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import SqlNode
2019

2120
ManifestNode = Union[
2221
AnalysisNode,

‎src/datapilot/core/platforms/dbt/wrappers/manifest/v10/wrapper.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
from typing import Optional
33
from typing import Set
44

5-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import GenericTestNode
6-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import ManifestV10
7-
from dbt_artifacts_parser.parsers.manifest.manifest_v10 import SingularTestNode
8-
95
from datapilot.core.platforms.dbt.constants import GENERIC
106
from datapilot.core.platforms.dbt.constants import OTHER_TEST_NODE
117
from datapilot.core.platforms.dbt.constants import SEED
@@ -42,6 +38,9 @@
4238
from datapilot.core.platforms.dbt.wrappers.manifest.v10.schemas import SourceNode
4339
from datapilot.core.platforms.dbt.wrappers.manifest.v10.schemas import TestNode
4440
from datapilot.core.platforms.dbt.wrappers.manifest.wrapper import BaseManifestWrapper
41+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import GenericTestNode
42+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import ManifestV10
43+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v10 import SingularTestNode
4544

4645

4746
class ManifestV10Wrapper(BaseManifestWrapper):

‎src/datapilot/core/platforms/dbt/wrappers/manifest/v11/schemas.py‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22
from typing import Type
33
from typing import Union
44

5-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import AnalysisNode
6-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import Exposure
7-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import GenericTestNode
8-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import HookNode
9-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import Macro
10-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import ModelNode
11-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import RPCNode
12-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import SeedNode
13-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import SingularTestNode
14-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import SnapshotNode
15-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import SourceDefinition
16-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import SqlNode
17-
185
from datapilot.core.platforms.dbt.constants import GENERIC
196
from datapilot.core.platforms.dbt.constants import SINGULAR
7+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import AnalysisNode
8+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import Exposure
9+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import GenericTestNode
10+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import HookNode
11+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import Macro
12+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import ModelNode
13+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import RPCNode
14+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import SeedNode
15+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import SingularTestNode
16+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import SnapshotNode
17+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import SourceDefinition
18+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import SqlNode
2019

2120
ManifestNode = Union[
2221
AnalysisNode,

‎src/datapilot/core/platforms/dbt/wrappers/manifest/v11/wrapper.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
from typing import Optional
33
from typing import Set
44

5-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import GenericTestNode
6-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import ManifestV11
7-
from dbt_artifacts_parser.parsers.manifest.manifest_v11 import SingularTestNode
8-
95
from datapilot.core.platforms.dbt.constants import GENERIC
106
from datapilot.core.platforms.dbt.constants import OTHER_TEST_NODE
117
from datapilot.core.platforms.dbt.constants import SEED
@@ -42,6 +38,9 @@
4238
from datapilot.core.platforms.dbt.wrappers.manifest.v11.schemas import SourceNode
4339
from datapilot.core.platforms.dbt.wrappers.manifest.v11.schemas import TestNode
4440
from datapilot.core.platforms.dbt.wrappers.manifest.wrapper import BaseManifestWrapper
41+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import GenericTestNode
42+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import ManifestV11
43+
from vendor.dbt_artifacts_parser.parsers.manifest.manifest_v11 import SingularTestNode
4544

4645

4746
class ManifestV11Wrapper(BaseManifestWrapper):

0 commit comments

Comments
 (0)