fix args and protocols

dbt/adapters/base/impl.py

@@ -90,7 +90,7 @@
     SnapshotTargetNotSnapshotTableError,
     UnexpectedNonTimestampError,
 )
-from dbt.adapters.protocol import AdapterConfig, MacroContextGeneratorCallable, CatalogIntegrationConfig
+from dbt.adapters.protocol import AdapterConfig, MacroContextGeneratorCallable, CatalogIntegrationConfigProtocol
 
 if TYPE_CHECKING:
     import agate
@@ -268,7 +268,7 @@ class BaseAdapter(metaclass=AdapterMeta):
     Relation: Type[BaseRelation] = BaseRelation
     Column: Type[BaseColumn] = BaseColumn
     ConnectionManager: Type[BaseConnectionManager]
-    CatalogIntegrations: Dict[str, Type[CatalogIntegration]]
+    CatalogIntegrations: Dict[str, Type[CatalogIntegrationConfigProtocol]]
 
     # A set of clobber config fields accepted by this adapter
     # for use in materializations
@@ -296,7 +296,7 @@ def __init__(self, config, mp_context: SpawnContext) -> None:
         self._macro_context_generator: Optional[MacroContextGeneratorCallable] = None
         self.behavior = DEFAULT_BASE_BEHAVIOR_FLAGS  # type: ignore
 
-    def add_catalog_integrations(self, catalog_integrations: Optional[List[CatalogIntegrationConfig]]) -> None:
+    def add_catalog_integrations(self, catalog_integrations: Optional[List[CatalogIntegrationConfigProtocol]]) -> None:
         if catalog_integrations:
             for integration_config in catalog_integrations:
                 catalog_type = integration_config.catalog_type
@@ -306,8 +306,9 @@ def add_catalog_integrations(self, catalog_integrations: Optional[List[CatalogIn
                 catalogs_client.add_catalog(integration, integration_config.catalog_name)
 
     @available
-    def get_catalog_integration(self, integration_name) -> CatalogIntegration:
+    def get_catalog_integration(self, integration_name: str) -> CatalogIntegration:
         return catalogs_client.get_catalog(integration_name)
+
     ###
     # Methods to set / access a macro resolver
     ###

dbt/adapters/clients/catalogs.py

@@ -2,15 +2,18 @@
 
 
 class CatalogIntegrations:
+    def __init__(self):
+        self._integrations = None
+
     def get(self, name: str) -> CatalogIntegration:
         return self.integrations[name]
 
     @property
     def integrations(self) -> dict[str, CatalogIntegration]:
-        return self.integrations
+        return self._integrations
 
     def add_integration(self, integration: CatalogIntegration, catalog_name: str):
-        self.integrations[catalog_name] = integration
+        self._integrations[catalog_name] = integration
 
 
 _CATALOG_CLIENT = CatalogIntegrations()

dbt/adapters/contracts/catalog.py

@@ -20,9 +20,9 @@ class CatalogIntegrationConfig:
     integration_name: str
     table_format: str
     catalog_type: str
-    external_volume: Optional[str]
-    namespace: Optional[str]
-    adapter_configs: Optional[Dict]
+    external_volume: Optional[str] = None
+    namespace: Optional[str] = None
+    adapter_configs: Optional[Dict] = None
 
 
 class CatalogIntegration(abc.ABC):
@@ -31,6 +31,8 @@ class CatalogIntegration(abc.ABC):
     interact with the catalog. This class is an abstract base class that should be subclassed by
     specific integrations in the adapters.
 
+    Implements the CatalogIntegrationProtocol.
+
     """
     catalog_name: str
     integration_name: str

dbt/adapters/protocol.py

@@ -52,6 +52,19 @@ class CatalogIntegrationConfigProtocol(Protocol):
     adapter_configs: Optional[Dict]
 
 
+class CatalogIntegrationProtocol(Protocol):
+    catalog_name: str
+    integration_name: str
+    table_format: str
+    integration_type: str
+    external_volume: Optional[str]
+    namespace: Optional[str]
+
+    def __init__(
+            self, integration_config: CatalogIntegrationConfigProtocol
+    ) -> None: ...
+
+
 Self = TypeVar("Self", bound="RelationProtocol")
 
 
@@ -72,7 +85,7 @@ def create_from(
 ConnectionManager_T = TypeVar("ConnectionManager_T", bound=ConnectionManagerProtocol)
 Relation_T = TypeVar("Relation_T", bound=RelationProtocol)
 Column_T = TypeVar("Column_T", bound=ColumnProtocol)
-ExtCatInteg_T = TypeVar("ExtCatInteg_T", bound=CatalogIntegrationProtocol)
+CatalogIntegration_T = TypeVar("CatalogIntegration_T", bound=CatalogIntegrationProtocol)
 
 
 class MacroContextGeneratorCallable(Protocol):
@@ -93,7 +106,6 @@ class AdapterProtocol(  # type: ignore[misc]
         ConnectionManager_T,
         Relation_T,
         Column_T,
-        ExtCatInteg_T,
     ],
 ):
     # N.B. Technically these are ClassVars, but mypy doesn't support putting type vars in a
@@ -103,6 +115,7 @@ class AdapterProtocol(  # type: ignore[misc]
     Column: Type[Column_T]
     Relation: Type[Relation_T]
     ConnectionManager: Type[ConnectionManager_T]
+    CatalogIntegrations: Dict[str, Type[CatalogIntegration_T]]
     connections: ConnectionManager_T
 
     def __init__(self, config: AdapterRequiredConfig) -> None: ...