You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by "potiuk (via GitHub)" <gi...@apache.org> on 2024/12/01 17:12:30 UTC
[PR] Remove AIP-44 from taskinstance [airflow]
potiuk opened a new pull request, #44540:
URL: https://github.com/apache/airflow/pull/44540
<!--
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 [newsfragments](https://github.com/apache/airflow/tree/main/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] Remove AIP-44 from taskinstance [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk merged PR #44540:
URL: https://github.com/apache/airflow/pull/44540
--
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] Remove AIP-44 from taskinstance [airflow]
Posted by "jscheffl (via GitHub)" <gi...@apache.org>.
jscheffl commented on code in PR #44540:
URL: https://github.com/apache/airflow/pull/44540#discussion_r1864961503
##########
airflow/models/taskinstance.py:
##########
@@ -2558,12 +2508,6 @@ def _check_and_change_state_before_execution(
if isinstance(task_instance, TaskInstance):
Review Comment:
Is that `if` still needed if there is no else?
##########
providers/src/airflow/providers/amazon/aws/transfers/google_api_to_s3.py:
##########
@@ -175,19 +174,15 @@ def _load_data_to_s3(self, data: dict) -> None:
replace=self.s3_overwrite,
)
- def _update_google_api_endpoint_params_via_xcom(
- self, task_instance: TaskInstance | TaskInstancePydantic
- ) -> None:
+ def _update_google_api_endpoint_params_via_xcom(self, task_instance: TaskInstance) -> None:
Review Comment:
As you change the signature in Google provider - will this not break compatibility of the provider with Airflow 2.10? Here I only see Type checking code... mhm, so functional should be working.
##########
airflow/sensors/base.py:
##########
@@ -230,7 +256,7 @@ def execute(self, context: Context) -> Any:
TaskReschedule.run_id == ti.run_id,
TaskReschedule.map_index == ti.map_index,
TaskReschedule.try_number == first_try_number,
- )
+ )
Review Comment:
This looks like an "whitespace-uuups"?
--
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] Remove AIP-44 from taskinstance [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #44540:
URL: https://github.com/apache/airflow/pull/44540#discussion_r1864963041
##########
airflow/models/taskinstance.py:
##########
@@ -2558,12 +2508,6 @@ def _check_and_change_state_before_execution(
if isinstance(task_instance, TaskInstance):
Review Comment:
Good point . No.
--
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] Remove AIP-44 from taskinstance [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #44540:
URL: https://github.com/apache/airflow/pull/44540#discussion_r1864963655
##########
providers/src/airflow/providers/amazon/aws/transfers/google_api_to_s3.py:
##########
@@ -175,19 +174,15 @@ def _load_data_to_s3(self, data: dict) -> None:
replace=self.s3_overwrite,
)
- def _update_google_api_endpoint_params_via_xcom(
- self, task_instance: TaskInstance | TaskInstancePydantic
- ) -> None:
+ def _update_google_api_endpoint_params_via_xcom(self, task_instance: TaskInstance) -> None:
Review Comment:
Yeah. It's just non-functional change.
--
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] Remove AIP-44 from taskinstance [airflow]
Posted by "jscheffl (via GitHub)" <gi...@apache.org>.
jscheffl commented on PR #44540:
URL: https://github.com/apache/airflow/pull/44540#issuecomment-2510103501
I'm adding "full tests needed" as I think especially the task instance is a "danger zone" of side effects - same as we had with sensor base.py changes.
--
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] Remove AIP-44 from taskinstance [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #44540:
URL: https://github.com/apache/airflow/pull/44540#discussion_r1864963458
##########
airflow/sensors/base.py:
##########
@@ -230,7 +256,7 @@ def execute(self, context: Context) -> Any:
TaskReschedule.run_id == ti.run_id,
TaskReschedule.map_index == ti.map_index,
TaskReschedule.try_number == first_try_number,
- )
+ )
Review Comment:
uuups..ruff fixed 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] Remove AIP-44 from taskinstance [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on PR #44540:
URL: https://github.com/apache/airflow/pull/44540#issuecomment-2510060412
I want to make this one pass - and then - separately - do refactoring with merging those changes in task instance.
--
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] Remove AIP-44 from taskinstance [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #44540:
URL: https://github.com/apache/airflow/pull/44540#discussion_r1864964385
##########
airflow/models/taskinstance.py:
##########
@@ -1557,33 +1531,16 @@ def _update_rtif(ti, rendered_fields, session: Session = NEW_SESSION):
RenderedTaskInstanceFields.delete_old_records(ti.task_id, ti.dag_id, session=session)
-def _coalesce_to_orm_ti(*, ti: TaskInstancePydantic | TaskInstance, session: Session):
- from airflow.models.dagrun import DagRun
- from airflow.serialization.pydantic.taskinstance import TaskInstancePydantic
-
- if isinstance(ti, TaskInstancePydantic):
- orm_ti = DagRun.fetch_task_instance(
- dag_id=ti.dag_id,
- dag_run_id=ti.run_id,
- task_id=ti.task_id,
- map_index=ti.map_index,
- session=session,
- )
- if TYPE_CHECKING:
- assert orm_ti
- ti, pydantic_ti = orm_ti, ti
- _set_ti_attrs(ti, pydantic_ti)
- ti.task = pydantic_ti.task
+def _coalesce_to_orm_ti(*, ti: TaskInstance, session: Session):
Review Comment:
We will be able to remove it .. but in a follow up PR.
--
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] Remove AIP-44 from taskinstance [airflow]
Posted by "potiuk (via GitHub)" <gi...@apache.org>.
potiuk commented on code in PR #44540:
URL: https://github.com/apache/airflow/pull/44540#discussion_r1864965487
##########
airflow/models/taskinstance.py:
##########
@@ -1557,33 +1531,16 @@ def _update_rtif(ti, rendered_fields, session: Session = NEW_SESSION):
RenderedTaskInstanceFields.delete_old_records(ti.task_id, ti.dag_id, session=session)
-def _coalesce_to_orm_ti(*, ti: TaskInstancePydantic | TaskInstance, session: Session):
- from airflow.models.dagrun import DagRun
- from airflow.serialization.pydantic.taskinstance import TaskInstancePydantic
-
- if isinstance(ti, TaskInstancePydantic):
- orm_ti = DagRun.fetch_task_instance(
- dag_id=ti.dag_id,
- dag_run_id=ti.run_id,
- task_id=ti.task_id,
- map_index=ti.map_index,
- session=session,
- )
- if TYPE_CHECKING:
- assert orm_ti
- ti, pydantic_ti = orm_ti, ti
- _set_ti_attrs(ti, pydantic_ti)
- ti.task = pydantic_ti.task
+def _coalesce_to_orm_ti(*, ti: TaskInstance, session: Session):
Review Comment:
Actually ... I can do it even now.
--
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