Fix bulk action annotation - #50852

Merged
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation
May 27, 2025
Merged

Fix bulk action annotation#50852
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation

Conversation

@guan404ming

@guan404mingguan404ming commented May 20, 2025

Copy link
Copy Markdown
Member

Why

The type annotations for bulk action are incorrect, which is found when I dig into tracing ci error in #50443. I think this is independent thus split this from that one.

How

I update the action type with default value. This would affect bulk connection, variable and pool.

before (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "RaWlyerMwZB4HWkvpQ",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "create",
"entities": [
{
"connection_id": "qWspL.KI..EomTj-Z003JLNXUZ-c2iEB5y8OhfvShMBg",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "create",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

after (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "X_yo6QuSl9u4HVXxB9YNy.mHdmnNzcPCVjy3Fa9D2IHrwY7tkvlX",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "update",
"entities": [
{
"connection_id": "8sJhEpjO6-Ey9IyPGjL448pqIXIIu3bo9Vy4Sy1q2NoL5WS3bwNT2x6",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "delete",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
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.

@boring-cyborgboring-cyborgBot added area:airflow-ctl area:API Airflow's REST/HTTP API area:UI Related to UI/UX. For Frontend Developers. labels May 20, 2025
@guan404mingguan404ming changed the title Fix bulk api annotationFix bulk action annotationMay 20, 2025
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch 3 times, most recently from bf6f3ef to 22f6abaCompareMay 21, 2025 14:14
@guan404ming
guan404ming marked this pull request as ready for review May 21, 2025 14:14

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! Looks good overall! Small question :)

Comment threadairflow-core/src/airflow/api_fastapi/core_api/datamodels/common.py Outdated
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 22f6aba to 19a8208CompareMay 21, 2025 19:41
@guan404ming
guan404ming marked this pull request as draft May 21, 2025 20:01
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 19a8208 to 15b39cdCompareMay 25, 2025 12:59
@guan404ming
guan404ming marked this pull request as ready for review May 25, 2025 13:56

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@pierrejeambrunpierrejeambrun added this to the Airflow 3.0.2 milestone May 26, 2025
@pierrejeambrun

pierrejeambrun commented May 26, 2025

Copy link
Copy Markdown
Member

This is weird, since the action is not required, but this is the discriminator, so how can pydantic know what's the relevant deserializer if the action is not specified.

@pierrejeambrun

Copy link
Copy Markdown
Member

Removing the action will yield a discriminator error.

@pierrejeambrun

Copy link
Copy Markdown
Member

Maybe changing the enum to literal and do action: Literal[BulkAction.CREATE] = Field(description="The action to be performed on the entit...

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

action should be required.

@pierrejeambrun

Copy link
Copy Markdown
Member

I've pushed a commit to improve it, let me know what you think.

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks, Pierre! Making Literal makes sense and eliminates the stated problem while making them limited to being properly used by the discriminator.
This was exactly what I mentioned in my comment. #50852 (comment).

@pierrejeambrun

Copy link
Copy Markdown
Member

Yes, the tips for it to work was to make the enum extend string too.

@pierrejeambrun
pierrejeambrunforce-pushed the fix-bulk-api-annotation branch from edbe4df to 29912bfCompareMay 27, 2025 09:43
@guan404ming

guan404ming commented May 27, 2025

Copy link
Copy Markdown
MemberAuthor

Make sense! Thanks for fixing this and the tip is really helpful.
LGTM.

@pierrejeambrun
pierrejeambrun dismissed their stale reviewMay 27, 2025 11:43

stalte, has been fixed

@pierrejeambrun
pierrejeambrun merged commit 3208bbb into apache:mainMay 27, 2025
@guan404ming
guan404ming deleted the fix-bulk-api-annotation branch May 27, 2025 12:04
pierrejeambrun added a commit to astronomer/airflow that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
(cherry picked from commit 3208bbb)
pierrejeambrun added a commit that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
kaxil pushed a commit that referenced this pull request Jun 3, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
sanederchik pushed a commit to sanederchik/airflow that referenced this pull request Jun 7, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
jose-lehmkuhl pushed a commit to jose-lehmkuhl/airflow that referenced this pull request Jul 11, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:airflow-ctlarea:APIAirflow's REST/HTTP APIarea:UIRelated to UI/UX. For Frontend Developers.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@guan404ming@pierrejeambrun@bugraoz93
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

Fix bulk action annotation - #50852

Merged
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation
May 27, 2025
Merged

Fix bulk action annotation#50852
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation

Conversation

@guan404ming

@guan404mingguan404ming commented May 20, 2025

Copy link
Copy Markdown
Member

Why

The type annotations for bulk action are incorrect, which is found when I dig into tracing ci error in #50443. I think this is independent thus split this from that one.

How

I update the action type with default value. This would affect bulk connection, variable and pool.

before (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "RaWlyerMwZB4HWkvpQ",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "create",
"entities": [
{
"connection_id": "qWspL.KI..EomTj-Z003JLNXUZ-c2iEB5y8OhfvShMBg",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "create",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

after (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "X_yo6QuSl9u4HVXxB9YNy.mHdmnNzcPCVjy3Fa9D2IHrwY7tkvlX",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "update",
"entities": [
{
"connection_id": "8sJhEpjO6-Ey9IyPGjL448pqIXIIu3bo9Vy4Sy1q2NoL5WS3bwNT2x6",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "delete",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
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.

@boring-cyborgboring-cyborgBot added area:airflow-ctl area:API Airflow's REST/HTTP API area:UI Related to UI/UX. For Frontend Developers. labels May 20, 2025
@guan404mingguan404ming changed the title Fix bulk api annotationFix bulk action annotationMay 20, 2025
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch 3 times, most recently from bf6f3ef to 22f6abaCompareMay 21, 2025 14:14
@guan404ming
guan404ming marked this pull request as ready for review May 21, 2025 14:14

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! Looks good overall! Small question :)

Comment threadairflow-core/src/airflow/api_fastapi/core_api/datamodels/common.py Outdated
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 22f6aba to 19a8208CompareMay 21, 2025 19:41
@guan404ming
guan404ming marked this pull request as draft May 21, 2025 20:01
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 19a8208 to 15b39cdCompareMay 25, 2025 12:59
@guan404ming
guan404ming marked this pull request as ready for review May 25, 2025 13:56

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@pierrejeambrunpierrejeambrun added this to the Airflow 3.0.2 milestone May 26, 2025
@pierrejeambrun

pierrejeambrun commented May 26, 2025

Copy link
Copy Markdown
Member

This is weird, since the action is not required, but this is the discriminator, so how can pydantic know what's the relevant deserializer if the action is not specified.

@pierrejeambrun

Copy link
Copy Markdown
Member

Removing the action will yield a discriminator error.

@pierrejeambrun

Copy link
Copy Markdown
Member

Maybe changing the enum to literal and do action: Literal[BulkAction.CREATE] = Field(description="The action to be performed on the entit...

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

action should be required.

@pierrejeambrun

Copy link
Copy Markdown
Member

I've pushed a commit to improve it, let me know what you think.

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks, Pierre! Making Literal makes sense and eliminates the stated problem while making them limited to being properly used by the discriminator.
This was exactly what I mentioned in my comment. #50852 (comment).

@pierrejeambrun

Copy link
Copy Markdown
Member

Yes, the tips for it to work was to make the enum extend string too.

@pierrejeambrun
pierrejeambrunforce-pushed the fix-bulk-api-annotation branch from edbe4df to 29912bfCompareMay 27, 2025 09:43
@guan404ming

guan404ming commented May 27, 2025

Copy link
Copy Markdown
MemberAuthor

Make sense! Thanks for fixing this and the tip is really helpful.
LGTM.

@pierrejeambrun
pierrejeambrun dismissed their stale reviewMay 27, 2025 11:43

stalte, has been fixed

@pierrejeambrun
pierrejeambrun merged commit 3208bbb into apache:mainMay 27, 2025
@guan404ming
guan404ming deleted the fix-bulk-api-annotation branch May 27, 2025 12:04
pierrejeambrun added a commit to astronomer/airflow that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
(cherry picked from commit 3208bbb)
pierrejeambrun added a commit that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
kaxil pushed a commit that referenced this pull request Jun 3, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
sanederchik pushed a commit to sanederchik/airflow that referenced this pull request Jun 7, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
jose-lehmkuhl pushed a commit to jose-lehmkuhl/airflow that referenced this pull request Jul 11, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:airflow-ctlarea:APIAirflow's REST/HTTP APIarea:UIRelated to UI/UX. For Frontend Developers.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@guan404ming@pierrejeambrun@bugraoz93
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix bulk action annotation - #50852

Merged
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation
May 27, 2025
Merged

Fix bulk action annotation#50852
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation

Conversation

@guan404ming

@guan404mingguan404ming commented May 20, 2025

Copy link
Copy Markdown
Member

Why

The type annotations for bulk action are incorrect, which is found when I dig into tracing ci error in #50443. I think this is independent thus split this from that one.

How

I update the action type with default value. This would affect bulk connection, variable and pool.

before (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "RaWlyerMwZB4HWkvpQ",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "create",
"entities": [
{
"connection_id": "qWspL.KI..EomTj-Z003JLNXUZ-c2iEB5y8OhfvShMBg",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "create",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

after (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "X_yo6QuSl9u4HVXxB9YNy.mHdmnNzcPCVjy3Fa9D2IHrwY7tkvlX",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "update",
"entities": [
{
"connection_id": "8sJhEpjO6-Ey9IyPGjL448pqIXIIu3bo9Vy4Sy1q2NoL5WS3bwNT2x6",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "delete",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
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.

@boring-cyborgboring-cyborgBot added area:airflow-ctl area:API Airflow's REST/HTTP API area:UI Related to UI/UX. For Frontend Developers. labels May 20, 2025
@guan404mingguan404ming changed the title Fix bulk api annotationFix bulk action annotationMay 20, 2025
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch 3 times, most recently from bf6f3ef to 22f6abaCompareMay 21, 2025 14:14
@guan404ming
guan404ming marked this pull request as ready for review May 21, 2025 14:14

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! Looks good overall! Small question :)

Comment threadairflow-core/src/airflow/api_fastapi/core_api/datamodels/common.py Outdated
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 22f6aba to 19a8208CompareMay 21, 2025 19:41
@guan404ming
guan404ming marked this pull request as draft May 21, 2025 20:01
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 19a8208 to 15b39cdCompareMay 25, 2025 12:59
@guan404ming
guan404ming marked this pull request as ready for review May 25, 2025 13:56

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@pierrejeambrunpierrejeambrun added this to the Airflow 3.0.2 milestone May 26, 2025
@pierrejeambrun

pierrejeambrun commented May 26, 2025

Copy link
Copy Markdown
Member

This is weird, since the action is not required, but this is the discriminator, so how can pydantic know what's the relevant deserializer if the action is not specified.

@pierrejeambrun

Copy link
Copy Markdown
Member

Removing the action will yield a discriminator error.

@pierrejeambrun

Copy link
Copy Markdown
Member

Maybe changing the enum to literal and do action: Literal[BulkAction.CREATE] = Field(description="The action to be performed on the entit...

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

action should be required.

@pierrejeambrun

Copy link
Copy Markdown
Member

I've pushed a commit to improve it, let me know what you think.

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks, Pierre! Making Literal makes sense and eliminates the stated problem while making them limited to being properly used by the discriminator.
This was exactly what I mentioned in my comment. #50852 (comment).

@pierrejeambrun

Copy link
Copy Markdown
Member

Yes, the tips for it to work was to make the enum extend string too.

@pierrejeambrun
pierrejeambrunforce-pushed the fix-bulk-api-annotation branch from edbe4df to 29912bfCompareMay 27, 2025 09:43
@guan404ming

guan404ming commented May 27, 2025

Copy link
Copy Markdown
MemberAuthor

Make sense! Thanks for fixing this and the tip is really helpful.
LGTM.

@pierrejeambrun
pierrejeambrun dismissed their stale reviewMay 27, 2025 11:43

stalte, has been fixed

@pierrejeambrun
pierrejeambrun merged commit 3208bbb into apache:mainMay 27, 2025
@guan404ming
guan404ming deleted the fix-bulk-api-annotation branch May 27, 2025 12:04
pierrejeambrun added a commit to astronomer/airflow that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
(cherry picked from commit 3208bbb)
pierrejeambrun added a commit that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
kaxil pushed a commit that referenced this pull request Jun 3, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
sanederchik pushed a commit to sanederchik/airflow that referenced this pull request Jun 7, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
jose-lehmkuhl pushed a commit to jose-lehmkuhl/airflow that referenced this pull request Jul 11, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:airflow-ctlarea:APIAirflow's REST/HTTP APIarea:UIRelated to UI/UX. For Frontend Developers.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@guan404ming@pierrejeambrun@bugraoz93
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix bulk action annotation - #50852

Merged
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation
May 27, 2025
Merged

Fix bulk action annotation#50852
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation

Conversation

@guan404ming

@guan404mingguan404ming commented May 20, 2025

Copy link
Copy Markdown
Member

Why

The type annotations for bulk action are incorrect, which is found when I dig into tracing ci error in #50443. I think this is independent thus split this from that one.

How

I update the action type with default value. This would affect bulk connection, variable and pool.

before (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "RaWlyerMwZB4HWkvpQ",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "create",
"entities": [
{
"connection_id": "qWspL.KI..EomTj-Z003JLNXUZ-c2iEB5y8OhfvShMBg",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "create",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

after (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "X_yo6QuSl9u4HVXxB9YNy.mHdmnNzcPCVjy3Fa9D2IHrwY7tkvlX",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "update",
"entities": [
{
"connection_id": "8sJhEpjO6-Ey9IyPGjL448pqIXIIu3bo9Vy4Sy1q2NoL5WS3bwNT2x6",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "delete",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
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.

@boring-cyborgboring-cyborgBot added area:airflow-ctl area:API Airflow's REST/HTTP API area:UI Related to UI/UX. For Frontend Developers. labels May 20, 2025
@guan404mingguan404ming changed the title Fix bulk api annotationFix bulk action annotationMay 20, 2025
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch 3 times, most recently from bf6f3ef to 22f6abaCompareMay 21, 2025 14:14
@guan404ming
guan404ming marked this pull request as ready for review May 21, 2025 14:14

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! Looks good overall! Small question :)

Comment threadairflow-core/src/airflow/api_fastapi/core_api/datamodels/common.py Outdated
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 22f6aba to 19a8208CompareMay 21, 2025 19:41
@guan404ming
guan404ming marked this pull request as draft May 21, 2025 20:01
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 19a8208 to 15b39cdCompareMay 25, 2025 12:59
@guan404ming
guan404ming marked this pull request as ready for review May 25, 2025 13:56

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@pierrejeambrunpierrejeambrun added this to the Airflow 3.0.2 milestone May 26, 2025
@pierrejeambrun

pierrejeambrun commented May 26, 2025

Copy link
Copy Markdown
Member

This is weird, since the action is not required, but this is the discriminator, so how can pydantic know what's the relevant deserializer if the action is not specified.

@pierrejeambrun

Copy link
Copy Markdown
Member

Removing the action will yield a discriminator error.

@pierrejeambrun

Copy link
Copy Markdown
Member

Maybe changing the enum to literal and do action: Literal[BulkAction.CREATE] = Field(description="The action to be performed on the entit...

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

action should be required.

@pierrejeambrun

Copy link
Copy Markdown
Member

I've pushed a commit to improve it, let me know what you think.

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks, Pierre! Making Literal makes sense and eliminates the stated problem while making them limited to being properly used by the discriminator.
This was exactly what I mentioned in my comment. #50852 (comment).

@pierrejeambrun

Copy link
Copy Markdown
Member

Yes, the tips for it to work was to make the enum extend string too.

@pierrejeambrun
pierrejeambrunforce-pushed the fix-bulk-api-annotation branch from edbe4df to 29912bfCompareMay 27, 2025 09:43
@guan404ming

guan404ming commented May 27, 2025

Copy link
Copy Markdown
MemberAuthor

Make sense! Thanks for fixing this and the tip is really helpful.
LGTM.

@pierrejeambrun
pierrejeambrun dismissed their stale reviewMay 27, 2025 11:43

stalte, has been fixed

@pierrejeambrun
pierrejeambrun merged commit 3208bbb into apache:mainMay 27, 2025
@guan404ming
guan404ming deleted the fix-bulk-api-annotation branch May 27, 2025 12:04
pierrejeambrun added a commit to astronomer/airflow that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
(cherry picked from commit 3208bbb)
pierrejeambrun added a commit that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
kaxil pushed a commit that referenced this pull request Jun 3, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
sanederchik pushed a commit to sanederchik/airflow that referenced this pull request Jun 7, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
jose-lehmkuhl pushed a commit to jose-lehmkuhl/airflow that referenced this pull request Jul 11, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:airflow-ctlarea:APIAirflow's REST/HTTP APIarea:UIRelated to UI/UX. For Frontend Developers.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@guan404ming@pierrejeambrun@bugraoz93
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

Fix bulk action annotation - #50852

Merged
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation
May 27, 2025
Merged

Fix bulk action annotation#50852
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation

Conversation

@guan404ming

@guan404mingguan404ming commented May 20, 2025

Copy link
Copy Markdown
Member

Why

The type annotations for bulk action are incorrect, which is found when I dig into tracing ci error in #50443. I think this is independent thus split this from that one.

How

I update the action type with default value. This would affect bulk connection, variable and pool.

before (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "RaWlyerMwZB4HWkvpQ",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "create",
"entities": [
{
"connection_id": "qWspL.KI..EomTj-Z003JLNXUZ-c2iEB5y8OhfvShMBg",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "create",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

after (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "X_yo6QuSl9u4HVXxB9YNy.mHdmnNzcPCVjy3Fa9D2IHrwY7tkvlX",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "update",
"entities": [
{
"connection_id": "8sJhEpjO6-Ey9IyPGjL448pqIXIIu3bo9Vy4Sy1q2NoL5WS3bwNT2x6",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "delete",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
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.

@boring-cyborgboring-cyborgBot added area:airflow-ctl area:API Airflow's REST/HTTP API area:UI Related to UI/UX. For Frontend Developers. labels May 20, 2025
@guan404mingguan404ming changed the title Fix bulk api annotationFix bulk action annotationMay 20, 2025
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch 3 times, most recently from bf6f3ef to 22f6abaCompareMay 21, 2025 14:14
@guan404ming
guan404ming marked this pull request as ready for review May 21, 2025 14:14

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! Looks good overall! Small question :)

Comment threadairflow-core/src/airflow/api_fastapi/core_api/datamodels/common.py Outdated
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 22f6aba to 19a8208CompareMay 21, 2025 19:41
@guan404ming
guan404ming marked this pull request as draft May 21, 2025 20:01
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 19a8208 to 15b39cdCompareMay 25, 2025 12:59
@guan404ming
guan404ming marked this pull request as ready for review May 25, 2025 13:56

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@pierrejeambrunpierrejeambrun added this to the Airflow 3.0.2 milestone May 26, 2025
@pierrejeambrun

pierrejeambrun commented May 26, 2025

Copy link
Copy Markdown
Member

This is weird, since the action is not required, but this is the discriminator, so how can pydantic know what's the relevant deserializer if the action is not specified.

@pierrejeambrun

Copy link
Copy Markdown
Member

Removing the action will yield a discriminator error.

@pierrejeambrun

Copy link
Copy Markdown
Member

Maybe changing the enum to literal and do action: Literal[BulkAction.CREATE] = Field(description="The action to be performed on the entit...

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

action should be required.

@pierrejeambrun

Copy link
Copy Markdown
Member

I've pushed a commit to improve it, let me know what you think.

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks, Pierre! Making Literal makes sense and eliminates the stated problem while making them limited to being properly used by the discriminator.
This was exactly what I mentioned in my comment. #50852 (comment).

@pierrejeambrun

Copy link
Copy Markdown
Member

Yes, the tips for it to work was to make the enum extend string too.

@pierrejeambrun
pierrejeambrunforce-pushed the fix-bulk-api-annotation branch from edbe4df to 29912bfCompareMay 27, 2025 09:43
@guan404ming

guan404ming commented May 27, 2025

Copy link
Copy Markdown
MemberAuthor

Make sense! Thanks for fixing this and the tip is really helpful.
LGTM.

@pierrejeambrun
pierrejeambrun dismissed their stale reviewMay 27, 2025 11:43

stalte, has been fixed

@pierrejeambrun
pierrejeambrun merged commit 3208bbb into apache:mainMay 27, 2025
@guan404ming
guan404ming deleted the fix-bulk-api-annotation branch May 27, 2025 12:04
pierrejeambrun added a commit to astronomer/airflow that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
(cherry picked from commit 3208bbb)
pierrejeambrun added a commit that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
kaxil pushed a commit that referenced this pull request Jun 3, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
sanederchik pushed a commit to sanederchik/airflow that referenced this pull request Jun 7, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
jose-lehmkuhl pushed a commit to jose-lehmkuhl/airflow that referenced this pull request Jul 11, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:airflow-ctlarea:APIAirflow's REST/HTTP APIarea:UIRelated to UI/UX. For Frontend Developers.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@guan404ming@pierrejeambrun@bugraoz93
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix bulk action annotation - #50852

Merged
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation
May 27, 2025
Merged

Fix bulk action annotation#50852
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation

Conversation

@guan404ming

@guan404mingguan404ming commented May 20, 2025

Copy link
Copy Markdown
Member

Why

The type annotations for bulk action are incorrect, which is found when I dig into tracing ci error in #50443. I think this is independent thus split this from that one.

How

I update the action type with default value. This would affect bulk connection, variable and pool.

before (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "RaWlyerMwZB4HWkvpQ",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "create",
"entities": [
{
"connection_id": "qWspL.KI..EomTj-Z003JLNXUZ-c2iEB5y8OhfvShMBg",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "create",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

after (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "X_yo6QuSl9u4HVXxB9YNy.mHdmnNzcPCVjy3Fa9D2IHrwY7tkvlX",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "update",
"entities": [
{
"connection_id": "8sJhEpjO6-Ey9IyPGjL448pqIXIIu3bo9Vy4Sy1q2NoL5WS3bwNT2x6",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "delete",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
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.

@boring-cyborgboring-cyborgBot added area:airflow-ctl area:API Airflow's REST/HTTP API area:UI Related to UI/UX. For Frontend Developers. labels May 20, 2025
@guan404mingguan404ming changed the title Fix bulk api annotationFix bulk action annotationMay 20, 2025
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch 3 times, most recently from bf6f3ef to 22f6abaCompareMay 21, 2025 14:14
@guan404ming
guan404ming marked this pull request as ready for review May 21, 2025 14:14

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! Looks good overall! Small question :)

Comment threadairflow-core/src/airflow/api_fastapi/core_api/datamodels/common.py Outdated
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 22f6aba to 19a8208CompareMay 21, 2025 19:41
@guan404ming
guan404ming marked this pull request as draft May 21, 2025 20:01
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 19a8208 to 15b39cdCompareMay 25, 2025 12:59
@guan404ming
guan404ming marked this pull request as ready for review May 25, 2025 13:56

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@pierrejeambrunpierrejeambrun added this to the Airflow 3.0.2 milestone May 26, 2025
@pierrejeambrun

pierrejeambrun commented May 26, 2025

Copy link
Copy Markdown
Member

This is weird, since the action is not required, but this is the discriminator, so how can pydantic know what's the relevant deserializer if the action is not specified.

@pierrejeambrun

Copy link
Copy Markdown
Member

Removing the action will yield a discriminator error.

@pierrejeambrun

Copy link
Copy Markdown
Member

Maybe changing the enum to literal and do action: Literal[BulkAction.CREATE] = Field(description="The action to be performed on the entit...

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

action should be required.

@pierrejeambrun

Copy link
Copy Markdown
Member

I've pushed a commit to improve it, let me know what you think.

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks, Pierre! Making Literal makes sense and eliminates the stated problem while making them limited to being properly used by the discriminator.
This was exactly what I mentioned in my comment. #50852 (comment).

@pierrejeambrun

Copy link
Copy Markdown
Member

Yes, the tips for it to work was to make the enum extend string too.

@pierrejeambrun
pierrejeambrunforce-pushed the fix-bulk-api-annotation branch from edbe4df to 29912bfCompareMay 27, 2025 09:43
@guan404ming

guan404ming commented May 27, 2025

Copy link
Copy Markdown
MemberAuthor

Make sense! Thanks for fixing this and the tip is really helpful.
LGTM.

@pierrejeambrun
pierrejeambrun dismissed their stale reviewMay 27, 2025 11:43

stalte, has been fixed

@pierrejeambrun
pierrejeambrun merged commit 3208bbb into apache:mainMay 27, 2025
@guan404ming
guan404ming deleted the fix-bulk-api-annotation branch May 27, 2025 12:04
pierrejeambrun added a commit to astronomer/airflow that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
(cherry picked from commit 3208bbb)
pierrejeambrun added a commit that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
kaxil pushed a commit that referenced this pull request Jun 3, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
sanederchik pushed a commit to sanederchik/airflow that referenced this pull request Jun 7, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
jose-lehmkuhl pushed a commit to jose-lehmkuhl/airflow that referenced this pull request Jul 11, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:airflow-ctlarea:APIAirflow's REST/HTTP APIarea:UIRelated to UI/UX. For Frontend Developers.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@guan404ming@pierrejeambrun@bugraoz93
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

Fix bulk action annotation - #50852

Merged
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation
May 27, 2025
Merged

Fix bulk action annotation#50852
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation

Conversation

@guan404ming

@guan404mingguan404ming commented May 20, 2025

Copy link
Copy Markdown
Member

Why

The type annotations for bulk action are incorrect, which is found when I dig into tracing ci error in #50443. I think this is independent thus split this from that one.

How

I update the action type with default value. This would affect bulk connection, variable and pool.

before (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "RaWlyerMwZB4HWkvpQ",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "create",
"entities": [
{
"connection_id": "qWspL.KI..EomTj-Z003JLNXUZ-c2iEB5y8OhfvShMBg",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "create",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

after (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "X_yo6QuSl9u4HVXxB9YNy.mHdmnNzcPCVjy3Fa9D2IHrwY7tkvlX",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "update",
"entities": [
{
"connection_id": "8sJhEpjO6-Ey9IyPGjL448pqIXIIu3bo9Vy4Sy1q2NoL5WS3bwNT2x6",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "delete",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
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.

@boring-cyborgboring-cyborgBot added area:airflow-ctl area:API Airflow's REST/HTTP API area:UI Related to UI/UX. For Frontend Developers. labels May 20, 2025
@guan404mingguan404ming changed the title Fix bulk api annotationFix bulk action annotationMay 20, 2025
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch 3 times, most recently from bf6f3ef to 22f6abaCompareMay 21, 2025 14:14
@guan404ming
guan404ming marked this pull request as ready for review May 21, 2025 14:14

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! Looks good overall! Small question :)

Comment threadairflow-core/src/airflow/api_fastapi/core_api/datamodels/common.py Outdated
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 22f6aba to 19a8208CompareMay 21, 2025 19:41
@guan404ming
guan404ming marked this pull request as draft May 21, 2025 20:01
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 19a8208 to 15b39cdCompareMay 25, 2025 12:59
@guan404ming
guan404ming marked this pull request as ready for review May 25, 2025 13:56

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@pierrejeambrunpierrejeambrun added this to the Airflow 3.0.2 milestone May 26, 2025
@pierrejeambrun

pierrejeambrun commented May 26, 2025

Copy link
Copy Markdown
Member

This is weird, since the action is not required, but this is the discriminator, so how can pydantic know what's the relevant deserializer if the action is not specified.

@pierrejeambrun

Copy link
Copy Markdown
Member

Removing the action will yield a discriminator error.

@pierrejeambrun

Copy link
Copy Markdown
Member

Maybe changing the enum to literal and do action: Literal[BulkAction.CREATE] = Field(description="The action to be performed on the entit...

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

action should be required.

@pierrejeambrun

Copy link
Copy Markdown
Member

I've pushed a commit to improve it, let me know what you think.

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks, Pierre! Making Literal makes sense and eliminates the stated problem while making them limited to being properly used by the discriminator.
This was exactly what I mentioned in my comment. #50852 (comment).

@pierrejeambrun

Copy link
Copy Markdown
Member

Yes, the tips for it to work was to make the enum extend string too.

@pierrejeambrun
pierrejeambrunforce-pushed the fix-bulk-api-annotation branch from edbe4df to 29912bfCompareMay 27, 2025 09:43
@guan404ming

guan404ming commented May 27, 2025

Copy link
Copy Markdown
MemberAuthor

Make sense! Thanks for fixing this and the tip is really helpful.
LGTM.

@pierrejeambrun
pierrejeambrun dismissed their stale reviewMay 27, 2025 11:43

stalte, has been fixed

@pierrejeambrun
pierrejeambrun merged commit 3208bbb into apache:mainMay 27, 2025
@guan404ming
guan404ming deleted the fix-bulk-api-annotation branch May 27, 2025 12:04
pierrejeambrun added a commit to astronomer/airflow that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
(cherry picked from commit 3208bbb)
pierrejeambrun added a commit that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
kaxil pushed a commit that referenced this pull request Jun 3, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
sanederchik pushed a commit to sanederchik/airflow that referenced this pull request Jun 7, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
jose-lehmkuhl pushed a commit to jose-lehmkuhl/airflow that referenced this pull request Jul 11, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:airflow-ctlarea:APIAirflow's REST/HTTP APIarea:UIRelated to UI/UX. For Frontend Developers.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@guan404ming@pierrejeambrun@bugraoz93
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

Fix bulk action annotation - #50852

Merged
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation
May 27, 2025
Merged

Fix bulk action annotation#50852
pierrejeambrun merged 2 commits into
apache:mainfrom
guan404ming:fix-bulk-api-annotation

Conversation

@guan404ming

@guan404mingguan404ming commented May 20, 2025

Copy link
Copy Markdown
Member

Why

The type annotations for bulk action are incorrect, which is found when I dig into tracing ci error in #50443. I think this is independent thus split this from that one.

How

I update the action type with default value. This would affect bulk connection, variable and pool.

before (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "RaWlyerMwZB4HWkvpQ",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "create",
"entities": [
{
"connection_id": "qWspL.KI..EomTj-Z003JLNXUZ-c2iEB5y8OhfvShMBg",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "create",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

after (example value show on swagger)

{
"actions": [
{
"action": "create",
"entities": [
{
"connection_id": "X_yo6QuSl9u4HVXxB9YNy.mHdmnNzcPCVjy3Fa9D2IHrwY7tkvlX",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_existence": "fail"
},
{
"action": "update",
"entities": [
{
"connection_id": "8sJhEpjO6-Ey9IyPGjL448pqIXIIu3bo9Vy4Sy1q2NoL5WS3bwNT2x6",
"conn_type": "string",
"description": "string",
"host": "string",
"login": "string",
"schema": "string",
"port": 0,
"password": "string",
"extra": "string"
}
],
"action_on_non_existence": "fail"
},
{
"action": "delete",
"entities": [
"string"
],
"action_on_non_existence": "fail"
}
]
}

^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
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.

@boring-cyborgboring-cyborgBot added area:airflow-ctl area:API Airflow's REST/HTTP API area:UI Related to UI/UX. For Frontend Developers. labels May 20, 2025
@guan404mingguan404ming changed the title Fix bulk api annotationFix bulk action annotationMay 20, 2025
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch 3 times, most recently from bf6f3ef to 22f6abaCompareMay 21, 2025 14:14
@guan404ming
guan404ming marked this pull request as ready for review May 21, 2025 14:14

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot! Looks good overall! Small question :)

Comment threadairflow-core/src/airflow/api_fastapi/core_api/datamodels/common.py Outdated
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 22f6aba to 19a8208CompareMay 21, 2025 19:41
@guan404ming
guan404ming marked this pull request as draft May 21, 2025 20:01
@guan404ming
guan404mingforce-pushed the fix-bulk-api-annotation branch from 19a8208 to 15b39cdCompareMay 25, 2025 12:59
@guan404ming
guan404ming marked this pull request as ready for review May 25, 2025 13:56

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@pierrejeambrunpierrejeambrun added this to the Airflow 3.0.2 milestone May 26, 2025
@pierrejeambrun

pierrejeambrun commented May 26, 2025

Copy link
Copy Markdown
Member

This is weird, since the action is not required, but this is the discriminator, so how can pydantic know what's the relevant deserializer if the action is not specified.

@pierrejeambrun

Copy link
Copy Markdown
Member

Removing the action will yield a discriminator error.

@pierrejeambrun

Copy link
Copy Markdown
Member

Maybe changing the enum to literal and do action: Literal[BulkAction.CREATE] = Field(description="The action to be performed on the entit...

@pierrejeambrunpierrejeambrun left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

action should be required.

@pierrejeambrun

Copy link
Copy Markdown
Member

I've pushed a commit to improve it, let me know what you think.

@bugraoz93bugraoz93 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, thanks, Pierre! Making Literal makes sense and eliminates the stated problem while making them limited to being properly used by the discriminator.
This was exactly what I mentioned in my comment. #50852 (comment).

@pierrejeambrun

Copy link
Copy Markdown
Member

Yes, the tips for it to work was to make the enum extend string too.

@pierrejeambrun
pierrejeambrunforce-pushed the fix-bulk-api-annotation branch from edbe4df to 29912bfCompareMay 27, 2025 09:43
@guan404ming

guan404ming commented May 27, 2025

Copy link
Copy Markdown
MemberAuthor

Make sense! Thanks for fixing this and the tip is really helpful.
LGTM.

@pierrejeambrun
pierrejeambrun dismissed their stale reviewMay 27, 2025 11:43

stalte, has been fixed

@pierrejeambrun
pierrejeambrun merged commit 3208bbb into apache:mainMay 27, 2025
@guan404ming
guan404ming deleted the fix-bulk-api-annotation branch May 27, 2025 12:04
pierrejeambrun added a commit to astronomer/airflow that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
(cherry picked from commit 3208bbb)
pierrejeambrun added a commit that referenced this pull request May 27, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
kaxil pushed a commit that referenced this pull request Jun 3, 2025
* Fix bulk api annotation
* Small improvement
---------
(cherry picked from commit 3208bbb)
Co-authored-by: Guan Ming(Wesley) Chiu <105915352+guan404ming@users.noreply.github.com>
sanederchik pushed a commit to sanederchik/airflow that referenced this pull request Jun 7, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
jose-lehmkuhl pushed a commit to jose-lehmkuhl/airflow that referenced this pull request Jul 11, 2025
* Fix bulk api annotation
* Small improvement
---------
Co-authored-by: pierrejeambrun <pierrejbrun@gmail.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:airflow-ctlarea:APIAirflow's REST/HTTP APIarea:UIRelated to UI/UX. For Frontend Developers.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@guan404ming@pierrejeambrun@bugraoz93