You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "vincbeck (via GitHub)" <gi...@apache.org> on 2026/05/06 18:20:09 UTC

[PR] Move `allow_producer_teams` from asset model to `DagScheduleAssetReference` [airflow]

vincbeck opened a new pull request, #66487:
URL: https://github.com/apache/airflow/pull/66487

   Storing the `allow_producer_teams` parameter on the `AssetModel` was bad design decision. The same asset can be (and is expected to be) defined in multiple Dags across different bundles. For example:
   
   ## Producer Dag (team1 bundle):
   
   ```
      with DAG(
          dag_id="example_producer_team1",
          schedule="@once",
          catchup=False,
      ):
          task = EmptyOperator(task_id="produce_event", outlets=[Asset("my_asset")])
          chain(task)
   ```
   
   ## Consumer Dag (team2 bundle):
   ```
      asset = Asset("my_asset", allow_producer_teams=["team1", "team2"])
   
      with DAG(
          dag_id="example_consumer_team2",
          schedule=[asset],
          catchup=False,
      ):
          task = EmptyOperator(task_id="dummy_task")
   ```
   
   The asset `my_asset` is referenced in both Dags. The producer does not define `allow_producer_teams`, but the consumer does. Since each bundle is processed independently, whichever bundle is parsed last overwrites the asset row in the database. In other words, the producer bundle could wipe out the consumer's `allow_producer_teams`.
   
   Even though the asset is declared in multiple Dags, there is only one row in the `asset` table. Storing `allow_producer_teams` there was not the right choice because it is a consumer-side declaration: it controls which teams are allowed to trigger this specific consumer, not a global property of the asset itself.
   
   Solution: Move `allow_producer_teams` to the `dag_schedule_asset_reference` table, which represents the relationship between a consumer Dag and the asset it schedules on.
   
   
    <!-- SPDX-License-Identifier: Apache-2.0
         https://www.apache.org/licenses/LICENSE-2.0 -->
   
   <!--
   Thank you for contributing!
   
   Please provide above a brief description of the changes made in this pull request.
   Write a good git commit message following this guide: http://chris.beams.io/posts/git-commit/
   
   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 (in general) for the review if you do not see reaction for a few days
   (72 Hours is the minimum reaction time you can expect from volunteers) - we sometimes miss notifications.
   
   In case of an existing issue, reference it using one of the following:
   
   * closes: #ISSUE
   * related: #ISSUE
   -->
   
   ---
   
   ##### Was generative AI tooling used to co-author this PR?
   
   <!--
   If generative AI tooling has been used in the process of authoring this PR, please
   change below checkbox to `[X]` followed by the name of the tool, uncomment the "Generated-by".
   -->
   
   - [ ] Yes (please specify the tool below)
   
   <!--
   Generated-by: [Tool Name] following [the guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#gen-ai-assisted-contributions)
   -->
   
   ---
   
   * Read the **[Pull Request Guidelines](https://github.com/apache/airflow/blob/main/contributing-docs/05_pull_requests.rst#pull-request-guidelines)** for more information. Note: commit author/co-author name and email in commits become permanently public when merged.
   * For fundamental code changes, an Airflow Improvement Proposal ([AIP](https://cwiki.apache.org/confluence/display/AIRFLOW/Airflow+Improvement+Proposals)) is needed.
   * When adding dependency, check compliance with the [ASF 3rd Party License Policy](https://www.apache.org/legal/resolved.html#category-x).
   * For significant user-facing changes create newsfragment: `{pr_number}.significant.rst`, in [airflow-core/newsfragments](https://github.com/apache/airflow/tree/main/airflow-core/newsfragments). You can add this file in a follow-up commit after the PR is created so you know the PR number.
   


-- 
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] Move `allow_producer_teams` from asset model to `DagScheduleAssetReference` [airflow]

Posted by "vincbeck (via GitHub)" <gi...@apache.org>.
vincbeck commented on code in PR #66487:
URL: https://github.com/apache/airflow/pull/66487#discussion_r3202099383


##########
airflow-core/tests/unit/dag_processing/test_collection.py:
##########
@@ -327,6 +327,45 @@ def test_change_asset_property_sync_extra(self, dag_maker, session):
         assert len(orm_assets) == 1
         assert next(iter(orm_assets.values())).extra == {"foo": "new"}
 
+    @pytest.mark.usefixtures("testing_dag_bundle")
+    def test_sync_assets_preserves_allow_producer_teams_from_other_bundle(self, dag_maker, session):
+        """When a producer bundle (without allow_producer_teams) is synced after a consumer bundle
+        (with allow_producer_teams), the stored allow_producer_teams must not be wiped out."""
+        from airflow.models.asset import DagScheduleAssetReference

Review Comment:
   Sure thing



-- 
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] Move `allow_producer_teams` from asset model to `DagScheduleAssetReference` [airflow]

Posted by "vincbeck (via GitHub)" <gi...@apache.org>.
vincbeck merged PR #66487:
URL: https://github.com/apache/airflow/pull/66487


-- 
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] Move `allow_producer_teams` from asset model to `DagScheduleAssetReference` [airflow]

Posted by "Lee-W (via GitHub)" <gi...@apache.org>.
Lee-W commented on code in PR #66487:
URL: https://github.com/apache/airflow/pull/66487#discussion_r3199836448


##########
airflow-core/src/airflow/migrations/versions/0114_3_3_0_add_allow_producer_teams_to_dag_schedule_asset_reference.py:
##########
@@ -0,0 +1,49 @@
+#
+# 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.
+
+"""
+Add allow_producer_teams column to dag_schedule_asset_reference table.
+
+Revision ID: a7f3b2c1d4e5
+Revises: b8f3e4a1d2c9
+Create Date: 2026-05-06 12:00:00.000000
+
+"""
+
+from __future__ import annotations
+
+import sqlalchemy as sa
+from alembic import op
+
+revision = "a7f3b2c1d4e5"
+down_revision = "b8f3e4a1d2c9"
+branch_labels = None
+depends_on = None
+airflow_version = "3.3.0"
+
+
+def upgrade():
+    """Add allow_producer_teams column to dag_schedule_asset_reference."""
+    with op.batch_alter_table("dag_schedule_asset_reference", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("allow_producer_teams", sa.JSON(), nullable=False, server_default="[]"))
+
+
+def downgrade():
+    """Remove allow_producer_teams column from dag_schedule_asset_reference."""
+    with op.batch_alter_table("dag_schedule_asset_reference", schema=None) as batch_op:
+        batch_op.drop_column("allow_producer_teams")

Review Comment:
   ```suggestion
       from airflow.migrations.utils import disable_sqlite_fkeys
   
       with disable_sqlite_fkeys(op):
           with op.batch_alter_table("dag_schedule_asset_reference", schema=None) as batch_op:
               batch_op.drop_column("allow_producer_teams")
   ```



##########
airflow-core/tests/unit/assets/test_manager.py:
##########
@@ -326,12 +326,21 @@ def _make_dag(dag_id: str) -> DagModel:
     return dag
 
 
-def _make_asset_model(allow_producer_teams: list[str] | None = None) -> AssetModel:
+def _make_asset_model(
+    scheduled_dags: dict[str, list[str]] | None = None,
+) -> AssetModel:
+    """Create a mock AssetModel.
+
+    :param scheduled_dags: mapping of dag_id -> allow_producer_teams for each consumer reference.
+    """
     model = mock.Mock(spec=AssetModel)
-    extra = {}
-    if allow_producer_teams:
-        extra["allow_producer_teams"] = allow_producer_teams
-    model.extra = extra
+    refs = []
+    for dag_id, teams in (scheduled_dags or {}).items():
+        ref = mock.Mock()
+        ref.dag_id = dag_id
+        ref.allow_producer_teams = teams
+        refs.append(ref)
+    model.scheduled_dags = refs

Review Comment:
   ```suggestion
       model.scheduled_dags = [
           mock.Mock(dag_id=dag_id, allow_producer_teams=teams)
           for dag_id, teams in (scheduled_dags or {}).items()
       ]
   ```



##########
airflow-core/tests/unit/dag_processing/test_collection.py:
##########
@@ -327,6 +327,45 @@ def test_change_asset_property_sync_extra(self, dag_maker, session):
         assert len(orm_assets) == 1
         assert next(iter(orm_assets.values())).extra == {"foo": "new"}
 
+    @pytest.mark.usefixtures("testing_dag_bundle")
+    def test_sync_assets_preserves_allow_producer_teams_from_other_bundle(self, dag_maker, session):
+        """When a producer bundle (without allow_producer_teams) is synced after a consumer bundle
+        (with allow_producer_teams), the stored allow_producer_teams must not be wiped out."""
+        from airflow.models.asset import DagScheduleAssetReference

Review Comment:
   Could we move it to the top?



-- 
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