Merge branch 'main' into ct-1944-use_mashumaro_jsonschema

core/dbt/contracts/connection.py

@@ -16,15 +16,14 @@
 from dbt.events.functions import fire_event
 from dbt.events.types import NewConnectionOpening
 from dbt.events.contextvars import get_node_info
-from typing_extensions import Protocol
+from typing_extensions import Protocol, Annotated
 from dbt.dataclass_schema import (
     dbtClassMixin,
     StrEnum,
     ExtensibleDbtClassMixin,
     ValidatedStringMixin,
 )
 from dbt.contracts.util import Replaceable
-from typing import Annotated
 from mashumaro.jsonschema.annotations import Pattern
 
 

core/dbt/contracts/graph/model_config.py

@@ -2,6 +2,7 @@
 from enum import Enum
 from itertools import chain
 from typing import Any, List, Optional, Dict, Union, Type, TypeVar, Callable
+from typing_extensions import Annotated
 
 from dbt.dataclass_schema import (
     dbtClassMixin,
@@ -14,7 +15,6 @@
 from dbt.exceptions import DbtInternalError, CompilationError
 from dbt import hooks
 from dbt.node_types import NodeType
-from typing import Annotated
 from mashumaro.jsonschema.annotations import Pattern
 
 

core/dbt/contracts/project.py

@@ -8,7 +8,8 @@
     dbtMashConfig,
 )
 from dataclasses import dataclass, field
-from typing import Optional, List, Dict, Union, Any, ClassVar, Annotated
+from typing import Optional, List, Dict, Union, Any, ClassVar
+from typing_extensions import Annotated
 from mashumaro.types import SerializableType
 from mashumaro.jsonschema.annotations import Pattern
 

core/dbt/dataclass_schema.py

@@ -73,7 +73,7 @@ def __post_serialize__(self, data):
 
     @classmethod
     def json_schema(cls):
-        json_schema_obj = build_json_schema(cls)
+        json_schema_obj = build_json_schema(cls, all_refs=True)
         json_schema = json_schema_obj.to_dict()
         return json_schema
 

core/setup.py

@@ -71,7 +71,7 @@
         "sqlparse>=0.2.3,<0.5",
         # ----
         # These are major-version-0 packages also maintained by dbt-labs. Accept patches.
-        "dbt-extractor~=0.4.1",
+        "dbt-extractor~=0.5.0",
         "minimal-snowplow-tracker~=0.0.2",
         # DSI is under active development, so we're pinning to specific dev versions for now.
         "dbt-semantic-interfaces~=0.2.0",

plugins/postgres/dbt/adapters/postgres/connections.py

@@ -11,7 +11,8 @@
 
 from dbt.helper_types import Port
 from dataclasses import dataclass
-from typing import Optional, Annotated
+from typing import Optional
+from typing_extensions import Annotated
 from mashumaro.jsonschema.annotations import Maximum, Minimum