refactor: update import paths for Catalog and CatalogV1 to reflect new schema structure

Author: gaurpulkit

src/datapilot/core/platforms/dbt/executor.py

@@ -15,7 +15,7 @@
 from datapilot.core.platforms.dbt.insights import INSIGHTS
 from datapilot.core.platforms.dbt.insights.schema import DBTInsightResult
 from datapilot.core.platforms.dbt.insights.schema import DBTModelInsightResponse
-from datapilot.core.platforms.dbt.schemas.manifest import Catalog
+from datapilot.core.platforms.dbt.schemas.catalog import Catalog
 from datapilot.core.platforms.dbt.schemas.manifest import Manifest
 from datapilot.core.platforms.dbt.utils import get_models
 from datapilot.utils.formatting.utils import RED

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

@@ -3,8 +3,8 @@
 from dbt_artifacts_parser.parsers.manifest.manifest_v11 import ManifestV11
 from dbt_artifacts_parser.parsers.manifest.manifest_v12 import ManifestV12
 
-from datapilot.core.platforms.dbt.schemas.manifest import Catalog
-from datapilot.core.platforms.dbt.schemas.manifest import CatalogV1
+from datapilot.core.platforms.dbt.schemas.catalog import Catalog
+from datapilot.core.platforms.dbt.schemas.catalog import CatalogV1
 from datapilot.core.platforms.dbt.schemas.manifest import Manifest
 from datapilot.core.platforms.dbt.wrappers.catalog.v1.wrapper import CatalogV1Wrapper
 from datapilot.core.platforms.dbt.wrappers.manifest.v10.wrapper import ManifestV10Wrapper

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

@@ -5,6 +5,8 @@
 from typing import Optional
 from typing import Union
 
+from dbt_artifacts_parser.parsers.catalog.catalog_v1 import CatalogV1 as BaseCatalogV1
+from dbt_artifacts_parser.parsers.catalog.catalog_v1 import Metadata as BaseMetadata
 from pydantic.main import BaseModel
 
 
@@ -52,3 +54,19 @@ class AltimateCatalogCatalogV1(BaseModel):
     nodes: Dict[str, AltimateCatalogTable]
     sources: Dict[str, AltimateCatalogTable]
     errors: Optional[Optional[List[str]]] = None
+
+
+# Custom classes to handle extra fields in newer dbt versions
+class Metadata(BaseMetadata):
+    class Config:
+        extra = "allow"  # Allow extra fields in metadata
+
+
+class CatalogV1(BaseCatalogV1):
+    metadata: Metadata  # Use our custom metadata class
+
+    class Config:
+        extra = "allow"  # Allow extra fields
+
+
+Catalog = CatalogV1

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

@@ -5,8 +5,6 @@
 from typing import Optional
 from typing import Union
 
-from dbt_artifacts_parser.parsers.catalog.catalog_v1 import CatalogV1 as BaseCatalogV1
-from dbt_artifacts_parser.parsers.catalog.catalog_v1 import Metadata as BaseMetadata
 from dbt_artifacts_parser.parsers.manifest.manifest_v1 import ManifestV1
 from dbt_artifacts_parser.parsers.manifest.manifest_v2 import ManifestV2
 from dbt_artifacts_parser.parsers.manifest.manifest_v3 import ManifestV3
@@ -45,21 +43,6 @@ class DBTVersion(BaseModel):
 ]
 
 
-class Metadata(BaseMetadata):
-    class Config:
-        extra = "allow"  # Allow extra fields in metadata
-
-
-class CatalogV1(BaseCatalogV1):
-    metadata: Metadata  # Use our custom metadata class
-
-    class Config:
-        extra = "allow"  # Allow extra fields
-
-
-Catalog = CatalogV1
-
-
 class AltimateDocs(BaseModel):
     show: Optional[bool] = True
     node_color: Optional[Optional[str]] = None

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

@@ -17,12 +17,12 @@
 from datapilot.core.platforms.dbt.constants import STAGING
 from datapilot.core.platforms.dbt.exceptions import AltimateInvalidManifestError
 from datapilot.core.platforms.dbt.factory import DBTFactory
+from datapilot.core.platforms.dbt.schemas.catalog import Catalog
+from datapilot.core.platforms.dbt.schemas.catalog import CatalogV1
 from datapilot.core.platforms.dbt.schemas.manifest import AltimateManifestExposureNode
 from datapilot.core.platforms.dbt.schemas.manifest import AltimateManifestNode
 from datapilot.core.platforms.dbt.schemas.manifest import AltimateManifestSourceNode
 from datapilot.core.platforms.dbt.schemas.manifest import AltimateManifestTestNode
-from datapilot.core.platforms.dbt.schemas.manifest import Catalog
-from datapilot.core.platforms.dbt.schemas.manifest import CatalogV1
 from datapilot.core.platforms.dbt.schemas.manifest import Manifest
 from datapilot.exceptions.exceptions import AltimateFileNotFoundError
 from datapilot.exceptions.exceptions import AltimateInvalidJSONError

src/datapilot/core/platforms/dbt/wrappers/catalog/v1/wrapper.py

@@ -1,4 +1,4 @@
-from datapilot.core.platforms.dbt.schemas.manifest import CatalogV1
+from datapilot.core.platforms.dbt.schemas.catalog import CatalogV1
 from datapilot.core.platforms.dbt.wrappers.catalog.wrapper import BaseCatalogWrapper
 
 

src/datapilot/utils/utils.py

@@ -12,7 +12,7 @@
 from dbt_artifacts_parser.parser import parse_manifest
 
 from datapilot.config.config import load_config
-from datapilot.core.platforms.dbt.schemas.manifest import CatalogV1
+from datapilot.core.platforms.dbt.schemas.catalog import CatalogV1
 from datapilot.schemas.nodes import ModelNode
 from datapilot.schemas.nodes import SourceNode