amoghrajesh opened a new pull request, #67276:
URL: https://github.com/apache/airflow/pull/67276
(cherry picked from commit f799ab93aff94c9d1fb335f9452ece62b0474aa7)
<!-- 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)
-->
Several mypy errors across three providers were failing CI type checks, see
in
https://github.com/apache/airflow/actions/runs/26211631196/job/77125309480?pr=67118
```bash
providers/google/tests/unit/google/cloud/hooks/test_gen_ai.py:79: error:
Argument "contents" to "CreateCachedContentConfig" has incompatible type
"list[Content]"; expected
"Content | str | Image | File | Part | list[str | Image | File | Part] |
list[Content | str | Image | File | Part | list[str | Image | File | Part]] |
None" [arg-type]
contents=[
^
providers/google/tests/unit/google/cloud/hooks/test_gen_ai.py:79: note:
"list" is invariant -- see
https://mypy.readthedocs.io/en/stable/common_issues.html#variance
providers/google/tests/unit/google/cloud/hooks/test_gen_ai.py:79: note:
Consider using "Sequence" instead, which is covariant
providers/amazon/src/airflow/providers/amazon/aws/executors/batch/batch_executor.py:434:
error: Argument "key" to "BatchQueuedJob" has incompatible type
"TaskInstanceKey | str"; expected
"TaskInstanceKey | CallbackKey" [arg-type]
key=key,
^~~
providers/google/tests/unit/google/cloud/operators/test_gen_ai.py:64:
error: Argument "contents" to "CreateCachedContentConfig" has incompatible type
"list[Content]"; expected
"Content | str | Image | File | Part | list[str | Image | File | Part] |
list[Content | str | Image | File | Part | list[str | Image | File | Part]] |
None" [arg-type]
contents=[
^
providers/google/tests/unit/google/cloud/operators/test_gen_ai.py:64:
note: "list" is invariant -- see
https://mypy.readthedocs.io/en/stable/common_issues.html#variance
providers/google/tests/unit/google/cloud/operators/test_gen_ai.py:64:
note: Consider using "Sequence" instead, which is covariant
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:203:
error: Argument "contents" to "CreateCachedContentConfig" has incompatible
type "list[Content]"; expected
"Content | str | Image | File | Part | list[str | Image | File | Part] |
list[Content | str | Image | File | Part | list[str | Image | File | Part]] |
None" [arg-type]
contents=[
^
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:203:
note: "list" is invariant -- see
https://mypy.readthedocs.io/en/stable/common_issues.html#variance
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:203:
note: Consider using "Sequence" instead, which is covariant
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:259:
error: Argument "contents" to "GenAICountTokensOperator" has incompatible type
"list[str]"; expected
"Content | str | Image | File | Part | list[str | Image | File | Part] |
list[Content | str | Image | File | Part | list[str | Image | File | Part]] |
Content | ContentDict | str | Image | File | FileDict | Part | PartDict |
list[str | Image | File | FileDict | Part | PartDict] | list[Content |
ContentDict | str | Image | File | FileDict | Part | PartDict | list[str |
Image | File | FileDict | Part | PartDict]]"
[arg-type]
contents=CONTENTS,
^~~~~~~~
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:269:
error: Argument "contents" to "GenAIGenerateContentOperator" has incompatible
type "list[str]"; expected
"Content | ContentDict | str | Image | File | FileDict | Part | PartDict |
list[str | Image | File | FileDict | Part | PartDict] | list[Content |
ContentDict | str | Image | File | FileDict | Part | PartDict | list[str |
Image | File | FileDict | Part | PartDict]]"
[arg-type]
contents=CONTENTS,
^~~~~~~~
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:269:
note: "list" is invariant -- see
https://mypy.readthedocs.io/en/stable/common_issues.html#variance
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:269:
note: Consider using "Sequence" instead, which is covariant
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:327:
error: Argument "contents" to "GenAIGenerateContentOperator" has incompatible
type "list[str]"; expected
"Content | ContentDict | str | Image | File | FileDict | Part | PartDict |
list[str | Image | File | FileDict | Part | PartDict] | list[Content |
ContentDict | str | Image | File | FileDict | Part | PartDict | list[str |
Image | File | FileDict | Part | PartDict]]"
[arg-type]
contents=["What are the papers about?"],
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:327:
note: "list" is invariant -- see
https://mypy.readthedocs.io/en/stable/common_issues.html#variance
providers/google/tests/system/google/cloud/gen_ai/example_gen_ai_generative_model.py:327:
note: Consider using "Sequence" instead, which is covariant
```
Fix is to:
- add `| list[str]` to the contents parameter of
`GenAIGenerateContentOperator` and `GenAICountTokensOperator`, aligning them
with `GenAIGenerateEmbeddingsOperator`.
- Three gen_ai test files: extract the `[Content(...)]` literal into a
`_CACHED_CONTENTS: Sequence[Content]` typed variable before passing it to
`CreateCachedContentConfig`, fixing the list invariance error per mypy's own
recommendation.
The batch executor execute_async key type mismatch (TaskInstanceKey | str vs
TaskInstanceKey | CallbackKey) is tracked separately in PR #67269.
---
* 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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
