You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "Lee-W (via GitHub)" <gi...@apache.org> on 2025/10/27 14:17:24 UTC
[PR] fix(asset): fix asset event extra [airflow]
Lee-W opened a new pull request, #57352:
URL: https://github.com/apache/airflow/pull/57352
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<!--
Thank you for contributing! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
In case of an existing issue, reference it using one of the following:
closes: #ISSUE
related: #ISSUE
How to write a good git commit message:
http://chris.beams.io/posts/git-commit/
-->
<!-- Please keep an empty line above the dashes. -->
---
**^ Add meaningful description above**
Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information.
In case of fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
In case of a new dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
In case of backwards incompatible changes please leave a note in a newsfragment file, named `{pr_number}.significant.rst` or `{issue_number}.significant.rst`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Make `extra` of Asset, AssetAlias, AssetEvent a `dict[str, JsonValue]` [airflow]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #57352:
URL: https://github.com/apache/airflow/pull/57352#issuecomment-3479237653
### Backport successfully created: v3-1-test
<table>
<tr>
<th>Status</th>
<th>Branch</th>
<th>Result</th>
</tr>
<tr>
<td>✅</td>
<td>v3-1-test</td>
<td><a href="https://github.com/apache/airflow/pull/57728"><img src="https://img.shields.io/badge/PR-57728-blue" alt="PR Link"></a></td>
</tr>
</table>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Make `extra` of Asset, AssetAlias, AssetEvent a `dict[str, JsonValue]` [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on code in PR #57352:
URL: https://github.com/apache/airflow/pull/57352#discussion_r2468708540
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
@@ -1422,7 +1424,7 @@ def _asset_event_extras_from_aliases() -> dict[tuple[AssetUniqueKey, frozenset],
task_instance=ti,
asset=asset_key,
source_alias_names=event_aliase_names,
- extra=dict(extra_key),
+ extra=extra_key,
Review Comment:
updated
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
@@ -1399,19 +1400,20 @@ def _asset_event_extras_from_aliases() -> dict[tuple[AssetUniqueKey, frozenset],
if alias_name not in outlet_alias_names:
continue
asset_key = AssetUniqueKey(**event["dest_asset_key"])
- extra_key = frozenset(event["extra"].items())
- d[asset_key, extra_key].add(alias_name)
+ extra_json = json.dumps(event["extra"], sort_keys=True)
+ d[asset_key, extra_json].add(alias_name)
return d
outlet_alias_names = {o.name for o in task_outlets if o.type == AssetAlias.__name__ and o.name}
if outlet_alias_names and (event_extras_from_aliases := _asset_event_extras_from_aliases()):
- for (asset_key, extra_key), event_aliase_names in event_extras_from_aliases.items():
+ for (asset_key, extra_json), event_aliase_names in event_extras_from_aliases.items():
+ extra_key = json.loads(extra_json)
ti.log.debug("register event for asset %s with aliases %s", asset_key, event_aliase_names)
event = asset_manager.register_asset_change(
task_instance=ti,
asset=asset_key,
source_alias_names=event_aliase_names,
- extra=dict(extra_key),
+ extra=extra_key,
Review Comment:
updated
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
@@ -1399,19 +1400,20 @@ def _asset_event_extras_from_aliases() -> dict[tuple[AssetUniqueKey, frozenset],
if alias_name not in outlet_alias_names:
continue
asset_key = AssetUniqueKey(**event["dest_asset_key"])
- extra_key = frozenset(event["extra"].items())
- d[asset_key, extra_key].add(alias_name)
+ extra_json = json.dumps(event["extra"], sort_keys=True)
+ d[asset_key, extra_json].add(alias_name)
return d
outlet_alias_names = {o.name for o in task_outlets if o.type == AssetAlias.__name__ and o.name}
if outlet_alias_names and (event_extras_from_aliases := _asset_event_extras_from_aliases()):
- for (asset_key, extra_key), event_aliase_names in event_extras_from_aliases.items():
+ for (asset_key, extra_json), event_aliase_names in event_extras_from_aliases.items():
+ extra_key = json.loads(extra_json)
Review Comment:
updated
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Make `extra` of Asset, AssetAlias, AssetEvent a `dict[str, JsonValue]` [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on code in PR #57352:
URL: https://github.com/apache/airflow/pull/57352#discussion_r2468757997
##########
airflow-core/src/airflow/api_fastapi/execution_api/datamodels/asset.py:
##########
@@ -26,7 +28,7 @@ class AssetResponse(BaseModel):
name: str
uri: str
group: str
- extra: dict | None = None
+ extra: dict[str, JsonValue] | None = None
Review Comment:
agree it's not needed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Make `extra` of Asset, AssetAlias, AssetEvent a `dict[str, JsonValue]` [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W merged PR #57352:
URL: https://github.com/apache/airflow/pull/57352
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Make `extra` of Asset, AssetAlias, AssetEvent a `dict[str, JsonValue]` [airflow]
Posted by "uranusjr (via GitHub)" <gi...@apache.org>.
uranusjr commented on code in PR #57352:
URL: https://github.com/apache/airflow/pull/57352#discussion_r2468670619
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
@@ -1399,19 +1400,20 @@ def _asset_event_extras_from_aliases() -> dict[tuple[AssetUniqueKey, frozenset],
if alias_name not in outlet_alias_names:
continue
asset_key = AssetUniqueKey(**event["dest_asset_key"])
- extra_key = frozenset(event["extra"].items())
- d[asset_key, extra_key].add(alias_name)
+ extra_json = json.dumps(event["extra"], sort_keys=True)
+ d[asset_key, extra_json].add(alias_name)
return d
outlet_alias_names = {o.name for o in task_outlets if o.type == AssetAlias.__name__ and o.name}
if outlet_alias_names and (event_extras_from_aliases := _asset_event_extras_from_aliases()):
- for (asset_key, extra_key), event_aliase_names in event_extras_from_aliases.items():
+ for (asset_key, extra_json), event_aliase_names in event_extras_from_aliases.items():
+ extra_key = json.loads(extra_json)
Review Comment:
```suggestion
extra = json.loads(extra_json)
```
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
@@ -1399,19 +1400,20 @@ def _asset_event_extras_from_aliases() -> dict[tuple[AssetUniqueKey, frozenset],
if alias_name not in outlet_alias_names:
continue
asset_key = AssetUniqueKey(**event["dest_asset_key"])
- extra_key = frozenset(event["extra"].items())
- d[asset_key, extra_key].add(alias_name)
+ extra_json = json.dumps(event["extra"], sort_keys=True)
+ d[asset_key, extra_json].add(alias_name)
return d
outlet_alias_names = {o.name for o in task_outlets if o.type == AssetAlias.__name__ and o.name}
if outlet_alias_names and (event_extras_from_aliases := _asset_event_extras_from_aliases()):
- for (asset_key, extra_key), event_aliase_names in event_extras_from_aliases.items():
+ for (asset_key, extra_json), event_aliase_names in event_extras_from_aliases.items():
+ extra_key = json.loads(extra_json)
ti.log.debug("register event for asset %s with aliases %s", asset_key, event_aliase_names)
event = asset_manager.register_asset_change(
task_instance=ti,
asset=asset_key,
source_alias_names=event_aliase_names,
- extra=dict(extra_key),
+ extra=extra_key,
Review Comment:
```suggestion
extra=extra,
```
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
@@ -1422,7 +1424,7 @@ def _asset_event_extras_from_aliases() -> dict[tuple[AssetUniqueKey, frozenset],
task_instance=ti,
asset=asset_key,
source_alias_names=event_aliase_names,
- extra=dict(extra_key),
+ extra=extra_key,
Review Comment:
```suggestion
extra=extra,
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(asset): fix asset event extra [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on code in PR #57352:
URL: https://github.com/apache/airflow/pull/57352#discussion_r2468311270
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
@@ -1399,13 +1400,14 @@ def _asset_event_extras_from_aliases() -> dict[tuple[AssetUniqueKey, frozenset],
if alias_name not in outlet_alias_names:
continue
asset_key = AssetUniqueKey(**event["dest_asset_key"])
- extra_key = frozenset(event["extra"].items())
- d[asset_key, extra_key].add(alias_name)
+ extra_json = json.dumps(event["extra"], sort_keys=True, ensure_ascii=True)
Review Comment:
yep, this is not user-facing. should be good
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(asset): fix asset event extra [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on code in PR #57352:
URL: https://github.com/apache/airflow/pull/57352#discussion_r2468329441
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
Review Comment:
yep, didn't notice it. will update it
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Make `extra` of Asset, AssetAlias, AssetEvent a `dict[str, JsonValue]` [airflow]
Posted by "amoghrajesh (via GitHub)" <gi...@apache.org>.
amoghrajesh commented on code in PR #57352:
URL: https://github.com/apache/airflow/pull/57352#discussion_r2468735667
##########
airflow-core/src/airflow/api_fastapi/execution_api/datamodels/asset.py:
##########
@@ -26,7 +28,7 @@ class AssetResponse(BaseModel):
name: str
uri: str
group: str
- extra: dict | None = None
+ extra: dict[str, JsonValue] | None = None
Review Comment:
On the runtime side, the runtime json remains the same, so I do not think we need a cadywn migration here
##########
airflow-core/src/airflow/api_fastapi/core_api/datamodels/assets.py:
##########
@@ -19,7 +19,14 @@
from datetime import datetime
-from pydantic import AliasPath, ConfigDict, Field, NonNegativeInt, field_validator
+from pydantic import (
+ AliasPath,
+ ConfigDict,
+ Field,
+ JsonValue,
+ NonNegativeInt,
+ field_validator,
+)
Review Comment:
Can we undo formatting changes here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(asset): fix asset event extra [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on PR #57352:
URL: https://github.com/apache/airflow/pull/57352#issuecomment-3455078568
The nested dict works fine. The numpy thing doesn't. will mark it as ready once finished adding the tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(asset): fix asset event extra [airflow]
Posted by "uranusjr (via GitHub)" <gi...@apache.org>.
uranusjr commented on code in PR #57352:
URL: https://github.com/apache/airflow/pull/57352#discussion_r2468297183
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
@@ -1399,13 +1400,14 @@ def _asset_event_extras_from_aliases() -> dict[tuple[AssetUniqueKey, frozenset],
if alias_name not in outlet_alias_names:
continue
asset_key = AssetUniqueKey(**event["dest_asset_key"])
- extra_key = frozenset(event["extra"].items())
- d[asset_key, extra_key].add(alias_name)
+ extra_json = json.dumps(event["extra"], sort_keys=True, ensure_ascii=True)
Review Comment:
```suggestion
extra_json = json.dumps(event["extra"], sort_keys=True)
```
Probably don’t need to be ASCII?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] fix(asset): fix asset event extra [airflow]
Posted by "uranusjr (via GitHub)" <gi...@apache.org>.
uranusjr commented on code in PR #57352:
URL: https://github.com/apache/airflow/pull/57352#discussion_r2468299233
##########
airflow-core/src/airflow/models/taskinstance.py:
##########
Review Comment:
Should remove this `dict()` (and maybe rename the variable to just `extra`)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Make `extra` of Asset, AssetAlias, AssetEvent a `dict[str, JsonValue]` [airflow]
Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on code in PR #57352:
URL: https://github.com/apache/airflow/pull/57352#discussion_r2468755210
##########
airflow-core/src/airflow/api_fastapi/core_api/datamodels/assets.py:
##########
@@ -19,7 +19,14 @@
from datetime import datetime
-from pydantic import AliasPath, ConfigDict, Field, NonNegativeInt, field_validator
+from pydantic import (
+ AliasPath,
+ ConfigDict,
+ Field,
+ JsonValue,
+ NonNegativeInt,
+ field_validator,
+)
Review Comment:
done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org