Skip to content

Commit

Permalink
not writting batch and _event_status
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChenyuLInx
ChenyuLInx committed Dec 12, 2024
1 parent bb5a7d0 commit 0f762b9
Show file tree
Hide file tree
Showing 4 changed files with 168 additions and 32 deletions.
8 changes: 8 additions & 0 deletions core/dbt/contracts/graph/nodes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,8 @@ def __post_serialize__(self, dct: Dict, context: Optional[Dict] = None):
del dct["_has_this"]
if "previous_batch_results" in dct:
del dct["previous_batch_results"]
if "batch" in dct:
del dct["batch"]
return dct

@classmethod
Expand Down Expand Up @@ -1371,6 +1373,12 @@ def search_name(self):
def group(self):
return None

def __post_serialize__(self, dct: Dict, context: Optional[Dict] = None):
dct = super().__post_serialize__(dct, context)
if "_event_status" in dct:
del dct["_event_status"]
return dct


# ====================================
# Exposure node
Expand Down
188 changes: 157 additions & 31 deletions schemas/dbt/manifest/v12.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"dbt_version": {
"type": "string",
"default": "1.9.0b4"
"default": "1.10.0a1"
},
"generated_at": {
"type": "string"
Expand Down Expand Up @@ -4205,6 +4205,12 @@
},
"additionalProperties": false
},
"_extra": {
"type": "object",
"propertyNames": {
"type": "string"
}
},
"access": {
"enum": [
"private",
Expand Down Expand Up @@ -4779,7 +4785,7 @@
"default": null
}
},
"additionalProperties": false,
"additionalProperties": true,
"required": [
"database",
"schema",
Expand Down Expand Up @@ -7690,6 +7696,12 @@
"identifier": {
"type": "string"
},
"_extra": {
"type": "object",
"propertyNames": {
"type": "string"
}
},
"quoting": {
"type": "object",
"title": "Quoting",
Expand Down Expand Up @@ -8223,7 +8235,7 @@
"default": null
}
},
"additionalProperties": false,
"additionalProperties": true,
"required": [
"database",
"schema",
Expand Down Expand Up @@ -9121,19 +9133,7 @@
"type": "integer"
},
"granularity": {
"enum": [
"nanosecond",
"microsecond",
"millisecond",
"second",
"minute",
"hour",
"day",
"week",
"month",
"quarter",
"year"
]
"type": "string"
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -14014,6 +14014,12 @@
},
"additionalProperties": false
},
"_extra": {
"type": "object",
"propertyNames": {
"type": "string"
}
},
"access": {
"enum": [
"private",
Expand Down Expand Up @@ -14588,7 +14594,7 @@
"default": null
}
},
"additionalProperties": false,
"additionalProperties": true,
"required": [
"database",
"schema",
Expand Down Expand Up @@ -17490,6 +17496,12 @@
"identifier": {
"type": "string"
},
"_extra": {
"type": "object",
"propertyNames": {
"type": "string"
}
},
"quoting": {
"type": "object",
"title": "Quoting",
Expand Down Expand Up @@ -18023,7 +18035,7 @@
"default": null
}
},
"additionalProperties": false,
"additionalProperties": true,
"required": [
"database",
"schema",
Expand Down Expand Up @@ -18712,19 +18724,7 @@
"type": "integer"
},
"granularity": {
"enum": [
"nanosecond",
"microsecond",
"millisecond",
"second",
"minute",
"hour",
"day",
"week",
"month",
"quarter",
"year"
]
"type": "string"
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -20024,6 +20024,27 @@
}
],
"default": null
},
"config": {
"anyOf": [
{
"type": "object",
"title": "SemanticLayerElementConfig",
"properties": {
"meta": {
"type": "object",
"propertyNames": {
"type": "string"
}
}
},
"additionalProperties": false
},
{
"type": "null"
}
],
"default": null
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -20178,6 +20199,27 @@
}
],
"default": null
},
"config": {
"anyOf": [
{
"type": "object",
"title": "SemanticLayerElementConfig",
"properties": {
"meta": {
"type": "object",
"propertyNames": {
"type": "string"
}
}
},
"additionalProperties": false
},
{
"type": "null"
}
],
"default": null
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -20341,6 +20383,27 @@
}
],
"default": null
},
"config": {
"anyOf": [
{
"type": "object",
"title": "SemanticLayerElementConfig",
"properties": {
"meta": {
"type": "object",
"propertyNames": {
"type": "string"
}
}
},
"additionalProperties": false
},
{
"type": "null"
}
],
"default": null
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -21586,6 +21649,27 @@
}
],
"default": null
},
"config": {
"anyOf": [
{
"type": "object",
"title": "SemanticLayerElementConfig",
"properties": {
"meta": {
"type": "object",
"propertyNames": {
"type": "string"
}
}
},
"additionalProperties": false
},
{
"type": "null"
}
],
"default": null
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -21740,6 +21824,27 @@
}
],
"default": null
},
"config": {
"anyOf": [
{
"type": "object",
"title": "SemanticLayerElementConfig",
"properties": {
"meta": {
"type": "object",
"propertyNames": {
"type": "string"
}
}
},
"additionalProperties": false
},
{
"type": "null"
}
],
"default": null
}
},
"additionalProperties": false,
Expand Down Expand Up @@ -21903,6 +22008,27 @@
}
],
"default": null
},
"config": {
"anyOf": [
{
"type": "object",
"title": "SemanticLayerElementConfig",
"properties": {
"meta": {
"type": "object",
"propertyNames": {
"type": "string"
}
}
},
"additionalProperties": false
},
{
"type": "null"
}
],
"default": null
}
},
"additionalProperties": false,
Expand Down
2 changes: 2 additions & 0 deletions tests/functional/artifacts/test_artifacts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,8 @@ def verify_manifest(project, expected_manifest, start_time, manifest_schema_path
elif key in ["nodes", "sources", "exposures", "metrics", "disabled", "docs"]:
for unique_id, node in expected_manifest[key].items():
assert unique_id in manifest[key]
# if "_event_status" in manifest[key][unique_id]:
# del manifest[key][unique_id]["_event_status"]
assert manifest[key][unique_id] == node, f"{unique_id} did not match"
else: # ['docs', 'parent_map', 'child_map', 'group_map', 'selectors', 'semantic_models', 'saved_queries']
assert manifest[key] == expected_manifest[key]
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/utils/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ def assert_from_dict(obj, dct, cls=None):
if hasattr(obj, "created_at"):
obj_from_dict.created_at = 1
obj.created_at = 1
if "_event_status" in obj.extra:
if hasattr(obj, "extra") and "_event_status" in obj.extra:
obj.extra["_event_status"] = None
obj_from_dict.extra["_event_status"] = None
assert obj_from_dict == obj
Expand Down

0 comments on commit 0f762b9

Please sign in to comment.