From ab0e4c429ebd4fc2beed22e608f1a8cf9f6c2357 Mon Sep 17 00:00:00 2001
From: colin-rogers-dbt <111200756+colin-rogers-dbt@users.noreply.github.com>
Date: Fri, 22 Dec 2023 09:03:12 -0800
Subject: [PATCH] Resolve unparsed.py conflict (#9311)

* Update parser to support conversion metrics (#9173)

* added ConversionTypeParams classes

* updated parser for ConversionTypeParams

* added step to populate input_measure for conversion metrics

* version bump on DSI

* comment back manifest generating line

* updated v12 schemas

* added tests

* added changelog

* Remove `--dry-run` flag from `dbt deps` (#9169)

* Rm --dry-run flag for dbt deps

* Add changelog entry

* Update test

* PR feedback

* adding clean_up methods to basic and unique_id tests (#9195)

* init attempt of adding clean_up methods to basic and unique_id tests

* swapping cleanup method drop of test_schema to unique_schema to test breakage on docs_generate test

* moving the clean_up method down into class BaseDocsGenerate

* remove drop relation for unique_schema

* manually define alternate_schema for clean_up as not being seen as part of project_config

* add changelog

* remove unneeded changelog

* uncomment line that generates new manifest and delete manifest our changes created

* make sure the manifest test is deleted and readd older version of manifest.json to appease test

* manually revert file to previous commit

* Revert "manually revert file to previous commit"

This reverts commit a755419e8b0ea9bd9ac5fbbcc4b14ba7fc6cec14.

---------

Co-authored-by: William Deng <33618746+WilliamDee@users.noreply.github.com>
Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>
Co-authored-by: Matthew McKnight <91097623+McKnight-42@users.noreply.github.com>
---
 core/dbt/contracts/graph/unparsed.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/dbt/contracts/graph/unparsed.py b/core/dbt/contracts/graph/unparsed.py
index d54309642ce..75c3304c5d1 100644
--- a/core/dbt/contracts/graph/unparsed.py
+++ b/core/dbt/contracts/graph/unparsed.py
@@ -6,6 +6,13 @@
     AdditionalPropertiesAllowed,
     AdditionalPropertiesMixin,
 )
+from dbt.common.exceptions import DbtInternalError, CompilationError
+from dbt.common.dataclass_schema import (
+    dbtClassMixin,
+    StrEnum,
+    ExtensibleDbtClassMixin,
+    ValidationError,
+)
 from dbt.node_types import NodeType
 from dbt.contracts.graph.semantic_models import (
     Defaults,
@@ -20,13 +27,6 @@
 # trigger the PathEncoder
 import dbt.common.helper_types  # noqa:F401
 from dbt.exceptions import ParsingError
-from dbt.common.exceptions import DbtInternalError, CompilationError
-from dbt.common.dataclass_schema import (
-    dbtClassMixin,
-    StrEnum,
-    ExtensibleDbtClassMixin,
-    ValidationError,
-)
 
 from dbt_semantic_interfaces.type_enums import ConversionCalculationType