Skip to content

Add pre-commit To Prevent Usage of session.query In Core Airflow - #45714

Closed
Prab-27 wants to merge 5 commits into
apache:mainfrom
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Closed

Add pre-commit To Prevent Usage of session.query In Core Airflow #45714
Prab-27 wants to merge 5 commits into
apache:mainfrom
Prab-27:add-pre-commit-to-prevent-usage-of-session.query

Conversation

@Prab-27

@Prab-27Prab-27 commented Jan 16, 2025

Copy link
Copy Markdown
Contributor

closes : #45461
Introduce a pre-commit hook to prevent the use of session.query in the core Airflow code.
This is limited to the source code and excludes the tests/ package.

^ 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 newsfragments.

@Prab-27

Prab-27 commented Jan 16, 2025

Copy link
Copy Markdown
ContributorAuthor

a conflict occurred with the images, and I'm not sure how to resolve it. Would you please help me?

@potiuk

potiuk commented Jan 16, 2025

Copy link
Copy Markdown
Member

as explained in slack - you can replace the confilcting images / .txt with either versions, rebase and re-run pre-commit. The images wil get regenerated to be "latest" automatically (in fact it should happen automatically when you rebase your PR and resolve the conflicts if you did pre-commit install before).

ephraimbuddy
ephraimbuddy reviewed Jan 17, 2025
View reviewed changes

@ephraimbuddyephraimbuddy left a comment •
edited
Loading

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.

The prove that this works would be that it detects all the session.query usages in Airflow core and we have to fix it.

Comment threadscripts/ci/pre_commit/usage_session_attribute.py Outdated
Comment on lines +46 to +47
if file_path.name.startswith("test_"):
continue

@ephraimbuddyephraimbuddyJan 17, 2025

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.

This check for tests file is not necessary because you have the files to look for at the pre-commit-config.yaml entry

@Prab-27Prab-27Jan 17, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done!

Comment threadscripts/ci/pre_commit/usage_session_attribute.py Outdated
and isinstance(node.func.value, ast.Name)
and node.func.value.id == "session"
):
console.print(f"Remove session.query from line {node.lineno}")

@ephraimbuddyephraimbuddyJan 17, 2025

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.

We are removing the session.query because it is deprecated in SQLAlchemy 2. The message should reflect this and suggest that the user use the new-style query constructs.

@Prab-27Prab-27Jan 17, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done !
I tried to write msg from session.query
IS it okay ?

@Prab-27
Prab-27force-pushed the add-pre-commit-to-prevent-usage-of-session.query branch from 433f780 to f5d0a67CompareJanuary 17, 2025 17:00
@Prab-27

Prab-27 commented Jan 18, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Could you please clarify it for me?
1 Is it okay to include providers in this pre-commit hook ?
2 Do I need to remove session.query from the codebases to pass this pre-commit check ?

@ephraimbuddy

ephraimbuddy commented Feb 18, 2025

Copy link
Copy Markdown
Contributor

Could you please clarify it for me? 1 Is it okay to include providers in this pre-commit hook ? 2 Do I need to remove session.query from the codebases to pass this pre-commit check ?

Providers should not be part of this. You have to specify that this should check in airflow/ and task_sdk/ and not providers/.
You also need to remove all usage of session.query for this to pass. Sorry for this late reply

@Prab-27Prab-27 mentioned this pull request Mar 2, 2025
Closed
@Prab-27

Prab-27 commented Mar 2, 2025

Copy link
Copy Markdown
ContributorAuthor

Sorry I have to close this PR

@Prab-27Prab-27 closed this Mar 2, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ephraimbuddyephraimbuddyephraimbuddy left review comments
@potiukpotiukAwaiting requested review from potiukpotiuk is a code owner
@ashbashbAwaiting requested review from ashbashb is a code owner
@jedcunninghamjedcunninghamAwaiting requested review from jedcunninghamjedcunningham is a code owner

Assignees

No one assigned

Labels

area:dev-tools

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add pre-commit to prevent usage of session.query in Airflow Core

3 participants

@Prab-27@potiuk@ephraimbuddy
, '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" + '
Add pre-commit To Prevent Usage of session.query In Core Airflow by Prab-27 · Pull Request #45714 · apache/airflow · GitHub
Skip to content
Add pre-commit To Prevent Usage of session.query In Core Airflow  - #45714
Closed
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Closed
Add pre-commit To Prevent Usage of session.query In Core Airflow #45714
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Conversation
@Prab-27
@Prab-27Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

Contributor
closes : #45461

Introduce a pre-commit hook to prevent the use of session.query in the core Airflow code.

This is limited to the source code and excludes the tests/ package.
^ 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 newsfragments.
@Prab-27
Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

ContributorAuthor
a conflict occurred with the images, and I'm not sure how to resolve it. Would you please help me?
@potiuk
potiuk
commented
Jan 16, 2025

Copy link


Copy Markdown

Member
as explained in slack - you can replace the confilcting images / .txt with either versions, rebase and re-run pre-commit. The images wil get regenerated to be "latest" automatically (in fact it should happen automatically when you rebase your PR and resolve the conflicts if you did pre-commit install before).
ephraimbuddy
ephraimbuddy
reviewed
Jan 17, 2025
View reviewed changes
@ephraimbuddyephraimbuddy
left a comment
•

edited

Loading

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.

The prove that this works would be that it detects all the session.query usages in Airflow core and we have to fix it.
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated


Comment on lines

+46
 to 
+47

 if file_path.name.startswith("test_"):
 continue
@ephraimbuddyephraimbuddyJan 17, 2025

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.

This check for tests file is not necessary because you have the files to look for at the pre-commit-config.yaml entry
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done!
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated

 and isinstance(node.func.value, ast.Name)
 and node.func.value.id == "session"
 ):
 console.print(f"Remove session.query from line {node.lineno}")
@ephraimbuddyephraimbuddyJan 17, 2025

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.

We are removing the session.query because it is deprecated in SQLAlchemy 2. The message should reflect this and suggest that the user use the new-style query constructs.
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done !

I tried to write msg from session.query

IS it okay ?
@Prab-27
Prab-27force-pushed
the
add-pre-commit-to-prevent-usage-of-session.query
branch
from
433f780 to
f5d0a67CompareJanuary 17, 2025 17:00
@Prab-27
Prab-27
commented
Jan 18, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Could you please clarify it for me?

1 Is it okay to include providers in this pre-commit hook ?

2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
@ephraimbuddy
ephraimbuddy
commented
Feb 18, 2025

Copy link


Copy Markdown

Contributor
Could you please clarify it for me? 1 Is it okay to include providers in this pre-commit hook ? 2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
Providers should not be part of this. You have to specify that this should check in airflow/ and task_sdk/ and not providers/.

You also need to remove all usage of session.query for this to pass. Sorry for this late reply
@Prab-27Prab-27
mentioned this pull request
Mar 2, 2025
 Closed

@Prab-27
Prab-27
commented
Mar 2, 2025

Copy link


Copy Markdown

ContributorAuthor
Sorry I have to close this PR
@Prab-27Prab-27
closed this
Mar 2, 2025
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ephraimbuddyephraimbuddyephraimbuddy left review comments
@potiukpotiukAwaiting requested review from potiukpotiuk is a code owner
@ashbashbAwaiting requested review from ashbashb is a code owner
@jedcunninghamjedcunninghamAwaiting requested review from jedcunninghamjedcunningham is a code owner

Assignees


No one assigned


Labels

area:dev-tools

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Add pre-commit to prevent usage of session.query in Airflow Core


3 participants

@Prab-27@potiuk@ephraimbuddy

, '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('^' + ".*" + '
Add pre-commit To Prevent Usage of session.query In Core Airflow by Prab-27 · Pull Request #45714 · apache/airflow · GitHub
Skip to content
Add pre-commit To Prevent Usage of session.query In Core Airflow  - #45714
Closed
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Closed
Add pre-commit To Prevent Usage of session.query In Core Airflow #45714
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Conversation
@Prab-27
@Prab-27Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

Contributor
closes : #45461

Introduce a pre-commit hook to prevent the use of session.query in the core Airflow code.

This is limited to the source code and excludes the tests/ package.
^ 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 newsfragments.
@Prab-27
Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

ContributorAuthor
a conflict occurred with the images, and I'm not sure how to resolve it. Would you please help me?
@potiuk
potiuk
commented
Jan 16, 2025

Copy link


Copy Markdown

Member
as explained in slack - you can replace the confilcting images / .txt with either versions, rebase and re-run pre-commit. The images wil get regenerated to be "latest" automatically (in fact it should happen automatically when you rebase your PR and resolve the conflicts if you did pre-commit install before).
ephraimbuddy
ephraimbuddy
reviewed
Jan 17, 2025
View reviewed changes
@ephraimbuddyephraimbuddy
left a comment
•

edited

Loading

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.

The prove that this works would be that it detects all the session.query usages in Airflow core and we have to fix it.
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated


Comment on lines

+46
 to 
+47

 if file_path.name.startswith("test_"):
 continue
@ephraimbuddyephraimbuddyJan 17, 2025

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.

This check for tests file is not necessary because you have the files to look for at the pre-commit-config.yaml entry
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done!
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated

 and isinstance(node.func.value, ast.Name)
 and node.func.value.id == "session"
 ):
 console.print(f"Remove session.query from line {node.lineno}")
@ephraimbuddyephraimbuddyJan 17, 2025

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.

We are removing the session.query because it is deprecated in SQLAlchemy 2. The message should reflect this and suggest that the user use the new-style query constructs.
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done !

I tried to write msg from session.query

IS it okay ?
@Prab-27
Prab-27force-pushed
the
add-pre-commit-to-prevent-usage-of-session.query
branch
from
433f780 to
f5d0a67CompareJanuary 17, 2025 17:00
@Prab-27
Prab-27
commented
Jan 18, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Could you please clarify it for me?

1 Is it okay to include providers in this pre-commit hook ?

2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
@ephraimbuddy
ephraimbuddy
commented
Feb 18, 2025

Copy link


Copy Markdown

Contributor
Could you please clarify it for me? 1 Is it okay to include providers in this pre-commit hook ? 2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
Providers should not be part of this. You have to specify that this should check in airflow/ and task_sdk/ and not providers/.

You also need to remove all usage of session.query for this to pass. Sorry for this late reply
@Prab-27Prab-27
mentioned this pull request
Mar 2, 2025
 Closed

@Prab-27
Prab-27
commented
Mar 2, 2025

Copy link


Copy Markdown

ContributorAuthor
Sorry I have to close this PR
@Prab-27Prab-27
closed this
Mar 2, 2025
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ephraimbuddyephraimbuddyephraimbuddy left review comments
@potiukpotiukAwaiting requested review from potiukpotiuk is a code owner
@ashbashbAwaiting requested review from ashbashb is a code owner
@jedcunninghamjedcunninghamAwaiting requested review from jedcunninghamjedcunningham is a code owner

Assignees


No one assigned


Labels

area:dev-tools

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Add pre-commit to prevent usage of session.query in Airflow Core


3 participants

@Prab-27@potiuk@ephraimbuddy

, '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('^' + ".*" + '
Add pre-commit To Prevent Usage of session.query In Core Airflow by Prab-27 · Pull Request #45714 · apache/airflow · GitHub
Skip to content
Add pre-commit To Prevent Usage of session.query In Core Airflow  - #45714
Closed
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Closed
Add pre-commit To Prevent Usage of session.query In Core Airflow #45714
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Conversation
@Prab-27
@Prab-27Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

Contributor
closes : #45461

Introduce a pre-commit hook to prevent the use of session.query in the core Airflow code.

This is limited to the source code and excludes the tests/ package.
^ 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 newsfragments.
@Prab-27
Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

ContributorAuthor
a conflict occurred with the images, and I'm not sure how to resolve it. Would you please help me?
@potiuk
potiuk
commented
Jan 16, 2025

Copy link


Copy Markdown

Member
as explained in slack - you can replace the confilcting images / .txt with either versions, rebase and re-run pre-commit. The images wil get regenerated to be "latest" automatically (in fact it should happen automatically when you rebase your PR and resolve the conflicts if you did pre-commit install before).
ephraimbuddy
ephraimbuddy
reviewed
Jan 17, 2025
View reviewed changes
@ephraimbuddyephraimbuddy
left a comment
•

edited

Loading

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.

The prove that this works would be that it detects all the session.query usages in Airflow core and we have to fix it.
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated


Comment on lines

+46
 to 
+47

 if file_path.name.startswith("test_"):
 continue
@ephraimbuddyephraimbuddyJan 17, 2025

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.

This check for tests file is not necessary because you have the files to look for at the pre-commit-config.yaml entry
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done!
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated

 and isinstance(node.func.value, ast.Name)
 and node.func.value.id == "session"
 ):
 console.print(f"Remove session.query from line {node.lineno}")
@ephraimbuddyephraimbuddyJan 17, 2025

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.

We are removing the session.query because it is deprecated in SQLAlchemy 2. The message should reflect this and suggest that the user use the new-style query constructs.
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done !

I tried to write msg from session.query

IS it okay ?
@Prab-27
Prab-27force-pushed
the
add-pre-commit-to-prevent-usage-of-session.query
branch
from
433f780 to
f5d0a67CompareJanuary 17, 2025 17:00
@Prab-27
Prab-27
commented
Jan 18, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Could you please clarify it for me?

1 Is it okay to include providers in this pre-commit hook ?

2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
@ephraimbuddy
ephraimbuddy
commented
Feb 18, 2025

Copy link


Copy Markdown

Contributor
Could you please clarify it for me? 1 Is it okay to include providers in this pre-commit hook ? 2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
Providers should not be part of this. You have to specify that this should check in airflow/ and task_sdk/ and not providers/.

You also need to remove all usage of session.query for this to pass. Sorry for this late reply
@Prab-27Prab-27
mentioned this pull request
Mar 2, 2025
 Closed

@Prab-27
Prab-27
commented
Mar 2, 2025

Copy link


Copy Markdown

ContributorAuthor
Sorry I have to close this PR
@Prab-27Prab-27
closed this
Mar 2, 2025
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ephraimbuddyephraimbuddyephraimbuddy left review comments
@potiukpotiukAwaiting requested review from potiukpotiuk is a code owner
@ashbashbAwaiting requested review from ashbashb is a code owner
@jedcunninghamjedcunninghamAwaiting requested review from jedcunninghamjedcunningham is a code owner

Assignees


No one assigned


Labels

area:dev-tools

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Add pre-commit to prevent usage of session.query in Airflow Core


3 participants

@Prab-27@potiuk@ephraimbuddy

, '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" + '
Add pre-commit To Prevent Usage of session.query In Core Airflow by Prab-27 · Pull Request #45714 · apache/airflow · GitHub
Skip to content
Add pre-commit To Prevent Usage of session.query In Core Airflow  - #45714
Closed
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Closed
Add pre-commit To Prevent Usage of session.query In Core Airflow #45714
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Conversation
@Prab-27
@Prab-27Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

Contributor
closes : #45461

Introduce a pre-commit hook to prevent the use of session.query in the core Airflow code.

This is limited to the source code and excludes the tests/ package.
^ 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 newsfragments.
@Prab-27
Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

ContributorAuthor
a conflict occurred with the images, and I'm not sure how to resolve it. Would you please help me?
@potiuk
potiuk
commented
Jan 16, 2025

Copy link


Copy Markdown

Member
as explained in slack - you can replace the confilcting images / .txt with either versions, rebase and re-run pre-commit. The images wil get regenerated to be "latest" automatically (in fact it should happen automatically when you rebase your PR and resolve the conflicts if you did pre-commit install before).
ephraimbuddy
ephraimbuddy
reviewed
Jan 17, 2025
View reviewed changes
@ephraimbuddyephraimbuddy
left a comment
•

edited

Loading

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.

The prove that this works would be that it detects all the session.query usages in Airflow core and we have to fix it.
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated


Comment on lines

+46
 to 
+47

 if file_path.name.startswith("test_"):
 continue
@ephraimbuddyephraimbuddyJan 17, 2025

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.

This check for tests file is not necessary because you have the files to look for at the pre-commit-config.yaml entry
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done!
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated

 and isinstance(node.func.value, ast.Name)
 and node.func.value.id == "session"
 ):
 console.print(f"Remove session.query from line {node.lineno}")
@ephraimbuddyephraimbuddyJan 17, 2025

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.

We are removing the session.query because it is deprecated in SQLAlchemy 2. The message should reflect this and suggest that the user use the new-style query constructs.
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done !

I tried to write msg from session.query

IS it okay ?
@Prab-27
Prab-27force-pushed
the
add-pre-commit-to-prevent-usage-of-session.query
branch
from
433f780 to
f5d0a67CompareJanuary 17, 2025 17:00
@Prab-27
Prab-27
commented
Jan 18, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Could you please clarify it for me?

1 Is it okay to include providers in this pre-commit hook ?

2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
@ephraimbuddy
ephraimbuddy
commented
Feb 18, 2025

Copy link


Copy Markdown

Contributor
Could you please clarify it for me? 1 Is it okay to include providers in this pre-commit hook ? 2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
Providers should not be part of this. You have to specify that this should check in airflow/ and task_sdk/ and not providers/.

You also need to remove all usage of session.query for this to pass. Sorry for this late reply
@Prab-27Prab-27
mentioned this pull request
Mar 2, 2025
 Closed

@Prab-27
Prab-27
commented
Mar 2, 2025

Copy link


Copy Markdown

ContributorAuthor
Sorry I have to close this PR
@Prab-27Prab-27
closed this
Mar 2, 2025
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ephraimbuddyephraimbuddyephraimbuddy left review comments
@potiukpotiukAwaiting requested review from potiukpotiuk is a code owner
@ashbashbAwaiting requested review from ashbashb is a code owner
@jedcunninghamjedcunninghamAwaiting requested review from jedcunninghamjedcunningham is a code owner

Assignees


No one assigned


Labels

area:dev-tools

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Add pre-commit to prevent usage of session.query in Airflow Core


3 participants

@Prab-27@potiuk@ephraimbuddy

, '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('^' + ".*" + '
Add pre-commit To Prevent Usage of session.query In Core Airflow by Prab-27 · Pull Request #45714 · apache/airflow · GitHub
Skip to content
Add pre-commit To Prevent Usage of session.query In Core Airflow  - #45714
Closed
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Closed
Add pre-commit To Prevent Usage of session.query In Core Airflow #45714
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Conversation
@Prab-27
@Prab-27Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

Contributor
closes : #45461

Introduce a pre-commit hook to prevent the use of session.query in the core Airflow code.

This is limited to the source code and excludes the tests/ package.
^ 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 newsfragments.
@Prab-27
Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

ContributorAuthor
a conflict occurred with the images, and I'm not sure how to resolve it. Would you please help me?
@potiuk
potiuk
commented
Jan 16, 2025

Copy link


Copy Markdown

Member
as explained in slack - you can replace the confilcting images / .txt with either versions, rebase and re-run pre-commit. The images wil get regenerated to be "latest" automatically (in fact it should happen automatically when you rebase your PR and resolve the conflicts if you did pre-commit install before).
ephraimbuddy
ephraimbuddy
reviewed
Jan 17, 2025
View reviewed changes
@ephraimbuddyephraimbuddy
left a comment
•

edited

Loading

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.

The prove that this works would be that it detects all the session.query usages in Airflow core and we have to fix it.
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated


Comment on lines

+46
 to 
+47

 if file_path.name.startswith("test_"):
 continue
@ephraimbuddyephraimbuddyJan 17, 2025

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.

This check for tests file is not necessary because you have the files to look for at the pre-commit-config.yaml entry
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done!
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated

 and isinstance(node.func.value, ast.Name)
 and node.func.value.id == "session"
 ):
 console.print(f"Remove session.query from line {node.lineno}")
@ephraimbuddyephraimbuddyJan 17, 2025

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.

We are removing the session.query because it is deprecated in SQLAlchemy 2. The message should reflect this and suggest that the user use the new-style query constructs.
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done !

I tried to write msg from session.query

IS it okay ?
@Prab-27
Prab-27force-pushed
the
add-pre-commit-to-prevent-usage-of-session.query
branch
from
433f780 to
f5d0a67CompareJanuary 17, 2025 17:00
@Prab-27
Prab-27
commented
Jan 18, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Could you please clarify it for me?

1 Is it okay to include providers in this pre-commit hook ?

2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
@ephraimbuddy
ephraimbuddy
commented
Feb 18, 2025

Copy link


Copy Markdown

Contributor
Could you please clarify it for me? 1 Is it okay to include providers in this pre-commit hook ? 2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
Providers should not be part of this. You have to specify that this should check in airflow/ and task_sdk/ and not providers/.

You also need to remove all usage of session.query for this to pass. Sorry for this late reply
@Prab-27Prab-27
mentioned this pull request
Mar 2, 2025
 Closed

@Prab-27
Prab-27
commented
Mar 2, 2025

Copy link


Copy Markdown

ContributorAuthor
Sorry I have to close this PR
@Prab-27Prab-27
closed this
Mar 2, 2025
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ephraimbuddyephraimbuddyephraimbuddy left review comments
@potiukpotiukAwaiting requested review from potiukpotiuk is a code owner
@ashbashbAwaiting requested review from ashbashb is a code owner
@jedcunninghamjedcunninghamAwaiting requested review from jedcunninghamjedcunningham is a code owner

Assignees


No one assigned


Labels

area:dev-tools

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Add pre-commit to prevent usage of session.query in Airflow Core


3 participants

@Prab-27@potiuk@ephraimbuddy

, '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('^' + ".*" + '
Add pre-commit To Prevent Usage of session.query In Core Airflow by Prab-27 · Pull Request #45714 · apache/airflow · GitHub
Skip to content
Add pre-commit To Prevent Usage of session.query In Core Airflow  - #45714
Closed
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Closed
Add pre-commit To Prevent Usage of session.query In Core Airflow #45714
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Conversation
@Prab-27
@Prab-27Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

Contributor
closes : #45461

Introduce a pre-commit hook to prevent the use of session.query in the core Airflow code.

This is limited to the source code and excludes the tests/ package.
^ 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 newsfragments.
@Prab-27
Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

ContributorAuthor
a conflict occurred with the images, and I'm not sure how to resolve it. Would you please help me?
@potiuk
potiuk
commented
Jan 16, 2025

Copy link


Copy Markdown

Member
as explained in slack - you can replace the confilcting images / .txt with either versions, rebase and re-run pre-commit. The images wil get regenerated to be "latest" automatically (in fact it should happen automatically when you rebase your PR and resolve the conflicts if you did pre-commit install before).
ephraimbuddy
ephraimbuddy
reviewed
Jan 17, 2025
View reviewed changes
@ephraimbuddyephraimbuddy
left a comment
•

edited

Loading

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.

The prove that this works would be that it detects all the session.query usages in Airflow core and we have to fix it.
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated


Comment on lines

+46
 to 
+47

 if file_path.name.startswith("test_"):
 continue
@ephraimbuddyephraimbuddyJan 17, 2025

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.

This check for tests file is not necessary because you have the files to look for at the pre-commit-config.yaml entry
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done!
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated

 and isinstance(node.func.value, ast.Name)
 and node.func.value.id == "session"
 ):
 console.print(f"Remove session.query from line {node.lineno}")
@ephraimbuddyephraimbuddyJan 17, 2025

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.

We are removing the session.query because it is deprecated in SQLAlchemy 2. The message should reflect this and suggest that the user use the new-style query constructs.
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done !

I tried to write msg from session.query

IS it okay ?
@Prab-27
Prab-27force-pushed
the
add-pre-commit-to-prevent-usage-of-session.query
branch
from
433f780 to
f5d0a67CompareJanuary 17, 2025 17:00
@Prab-27
Prab-27
commented
Jan 18, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Could you please clarify it for me?

1 Is it okay to include providers in this pre-commit hook ?

2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
@ephraimbuddy
ephraimbuddy
commented
Feb 18, 2025

Copy link


Copy Markdown

Contributor
Could you please clarify it for me? 1 Is it okay to include providers in this pre-commit hook ? 2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
Providers should not be part of this. You have to specify that this should check in airflow/ and task_sdk/ and not providers/.

You also need to remove all usage of session.query for this to pass. Sorry for this late reply
@Prab-27Prab-27
mentioned this pull request
Mar 2, 2025
 Closed

@Prab-27
Prab-27
commented
Mar 2, 2025

Copy link


Copy Markdown

ContributorAuthor
Sorry I have to close this PR
@Prab-27Prab-27
closed this
Mar 2, 2025
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ephraimbuddyephraimbuddyephraimbuddy left review comments
@potiukpotiukAwaiting requested review from potiukpotiuk is a code owner
@ashbashbAwaiting requested review from ashbashb is a code owner
@jedcunninghamjedcunninghamAwaiting requested review from jedcunninghamjedcunningham is a code owner

Assignees


No one assigned


Labels

area:dev-tools

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Add pre-commit to prevent usage of session.query in Airflow Core


3 participants

@Prab-27@potiuk@ephraimbuddy

, '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); }
})();
})();
Add pre-commit To Prevent Usage of session.query In Core Airflow by Prab-27 · Pull Request #45714 · apache/airflow · GitHub
Skip to content
Add pre-commit To Prevent Usage of session.query In Core Airflow  - #45714
Closed
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Closed
Add pre-commit To Prevent Usage of session.query In Core Airflow #45714
Prab-27 wants to merge 5 commits into
apache:mainfrom 
Prab-27:add-pre-commit-to-prevent-usage-of-session.query
Conversation
@Prab-27
@Prab-27Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

Contributor
closes : #45461

Introduce a pre-commit hook to prevent the use of session.query in the core Airflow code.

This is limited to the source code and excludes the tests/ package.
^ 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 newsfragments.
@Prab-27
Prab-27
commented
Jan 16, 2025

Copy link


Copy Markdown

ContributorAuthor
a conflict occurred with the images, and I'm not sure how to resolve it. Would you please help me?
@potiuk
potiuk
commented
Jan 16, 2025

Copy link


Copy Markdown

Member
as explained in slack - you can replace the confilcting images / .txt with either versions, rebase and re-run pre-commit. The images wil get regenerated to be "latest" automatically (in fact it should happen automatically when you rebase your PR and resolve the conflicts if you did pre-commit install before).
ephraimbuddy
ephraimbuddy
reviewed
Jan 17, 2025
View reviewed changes
@ephraimbuddyephraimbuddy
left a comment
•

edited

Loading

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.

The prove that this works would be that it detects all the session.query usages in Airflow core and we have to fix it.
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated


Comment on lines

+46
 to 
+47

 if file_path.name.startswith("test_"):
 continue
@ephraimbuddyephraimbuddyJan 17, 2025

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.

This check for tests file is not necessary because you have the files to look for at the pre-commit-config.yaml entry
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done!
Comment threadscripts/ci/pre_commit/usage_session_attribute.py
Outdated

 and isinstance(node.func.value, ast.Name)
 and node.func.value.id == "session"
 ):
 console.print(f"Remove session.query from line {node.lineno}")
@ephraimbuddyephraimbuddyJan 17, 2025

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.

We are removing the session.query because it is deprecated in SQLAlchemy 2. The message should reflect this and suggest that the user use the new-style query constructs.
@Prab-27Prab-27Jan 17, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done !

I tried to write msg from session.query

IS it okay ?
@Prab-27
Prab-27force-pushed
the
add-pre-commit-to-prevent-usage-of-session.query
branch
from
433f780 to
f5d0a67CompareJanuary 17, 2025 17:00
@Prab-27
Prab-27
commented
Jan 18, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Could you please clarify it for me?

1 Is it okay to include providers in this pre-commit hook ?

2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
@ephraimbuddy
ephraimbuddy
commented
Feb 18, 2025

Copy link


Copy Markdown

Contributor
Could you please clarify it for me? 1 Is it okay to include providers in this pre-commit hook ? 2 Do I need to remove session.query from the codebases to pass this pre-commit check ?
Providers should not be part of this. You have to specify that this should check in airflow/ and task_sdk/ and not providers/.

You also need to remove all usage of session.query for this to pass. Sorry for this late reply
@Prab-27Prab-27
mentioned this pull request
Mar 2, 2025
 Closed

@Prab-27
Prab-27
commented
Mar 2, 2025

Copy link


Copy Markdown

ContributorAuthor
Sorry I have to close this PR
@Prab-27Prab-27
closed this
Mar 2, 2025
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@ephraimbuddyephraimbuddyephraimbuddy left review comments
@potiukpotiukAwaiting requested review from potiukpotiuk is a code owner
@ashbashbAwaiting requested review from ashbashb is a code owner
@jedcunninghamjedcunninghamAwaiting requested review from jedcunninghamjedcunningham is a code owner

Assignees


No one assigned


Labels

area:dev-tools

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

Add pre-commit to prevent usage of session.query in Airflow Core


3 participants

@Prab-27@potiuk@ephraimbuddy