Fix interference bug - #485

Merged
jan-janssen merged 1 commit into
mainfrom
interference_bug
Nov 9, 2024
Merged

Fix interference bug#485
jan-janssen merged 1 commit into
mainfrom
interference_bug

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 9, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Improved handling of resource dictionaries to prevent unintended modifications.
    • Clarified core allocation logic when submitting tasks.

These changes enhance the stability and reliability of task submissions within the application.

@coderabbitai

coderabbitaiBot commented Nov 9, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The changes in this pull request focus on the _submit_function_to_separate_process method within the executorlib/interactive/shared.py file. A copy of the resource_dict is created when it is popped from task_dict, preventing unintended modifications. Additionally, the logic for determining the number of cores to use has been clarified, ensuring that resource_dict["cores"] is explicitly set based on executor_kwargs["cores"] when certain conditions are met. No other significant changes were made to the logic or structure of the code.

Changes

FileChange Summary
executorlib/interactive/shared.pyModified _submit_function_to_separate_process to use .copy() on resource_dict and clarified core allocation logic.

Possibly related PRs

  • Fix resource dict in interactive jobs #482: Fix resource dict in interactive jobs - This PR modifies the resource_dict handling in the same file (executorlib/interactive/shared.py) and is directly related to the changes made in the _submit_function_to_separate_process method regarding resource management.

🐰 In the code where bunnies hop,
A copy made, no need to stop.
Cores aligned, clear as day,
Resource handling's here to stay!
With every task, we leap and bound,
In shared.py, joy is found! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c8648ed and 897309e.

📒 Files selected for processing (1)
  • executorlib/interactive/shared.py (1 hunks)
🔇 Additional comments (1)
executorlib/interactive/shared.py (1)

517-517: Good fix for preventing resource dictionary interference!

The addition of .copy() when popping resource_dict prevents unintended modifications to the original dictionary, fixing potential interference between tasks. This is particularly important in concurrent execution scenarios.

Consider adding a comment explaining why the copy is necessary to prevent future regressions:

- resource_dict = task_dict.pop("resource_dict").copy()+ # Create a copy to prevent modifications from affecting the original dictionary+ # This prevents interference between tasks sharing the same resource dictionary+ resource_dict = task_dict.pop("resource_dict").copy()

Let's verify if there are any other places in the codebase where resource dictionaries might need similar protection:

✅ Verification successful

Resource dictionary protection is consistently implemented

The codebase already follows best practices for handling resource dictionaries:

  • In executorlib/cache/shared.py, task resource dictionaries are copied before modification
  • In executorlib/interactive/shared.py, the reviewed change aligns with existing patterns
  • Other modifications to resource dictionaries occur on already-copied or newly created instances

The added .copy() in the review is consistent with the codebase's approach to preventing dictionary interference.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other instances of resource dictionary usage
rg "resource_dict.*=.*task_dict" -A 2

Length of output: 770


Script:

#!/bin/bash# Let's check the context of these usages to understand their purpose
rg "resource_dict.*=.*task_dict" -B 5 -A 5
# Also check for any other direct modifications to resource_dict
rg "resource_dict\[.*\].*=|resource_dict\.update" -B 2 -A 2

Length of output: 6890


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@jan-janssen
jan-janssen merged commit 649ef6c into mainNov 9, 2024
@jan-janssen
jan-janssen deleted the interference_bug branch November 9, 2024 09:38
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@jan-janssen
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} 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 interference bug - #485

Merged
jan-janssen merged 1 commit into
mainfrom
interference_bug
Nov 9, 2024
Merged

Fix interference bug#485
jan-janssen merged 1 commit into
mainfrom
interference_bug

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 9, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Improved handling of resource dictionaries to prevent unintended modifications.
    • Clarified core allocation logic when submitting tasks.

These changes enhance the stability and reliability of task submissions within the application.

@coderabbitai

coderabbitaiBot commented Nov 9, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The changes in this pull request focus on the _submit_function_to_separate_process method within the executorlib/interactive/shared.py file. A copy of the resource_dict is created when it is popped from task_dict, preventing unintended modifications. Additionally, the logic for determining the number of cores to use has been clarified, ensuring that resource_dict["cores"] is explicitly set based on executor_kwargs["cores"] when certain conditions are met. No other significant changes were made to the logic or structure of the code.

Changes

FileChange Summary
executorlib/interactive/shared.pyModified _submit_function_to_separate_process to use .copy() on resource_dict and clarified core allocation logic.

Possibly related PRs

  • Fix resource dict in interactive jobs #482: Fix resource dict in interactive jobs - This PR modifies the resource_dict handling in the same file (executorlib/interactive/shared.py) and is directly related to the changes made in the _submit_function_to_separate_process method regarding resource management.

🐰 In the code where bunnies hop,
A copy made, no need to stop.
Cores aligned, clear as day,
Resource handling's here to stay!
With every task, we leap and bound,
In shared.py, joy is found! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c8648ed and 897309e.

📒 Files selected for processing (1)
  • executorlib/interactive/shared.py (1 hunks)
🔇 Additional comments (1)
executorlib/interactive/shared.py (1)

517-517: Good fix for preventing resource dictionary interference!

The addition of .copy() when popping resource_dict prevents unintended modifications to the original dictionary, fixing potential interference between tasks. This is particularly important in concurrent execution scenarios.

Consider adding a comment explaining why the copy is necessary to prevent future regressions:

- resource_dict = task_dict.pop("resource_dict").copy()+ # Create a copy to prevent modifications from affecting the original dictionary+ # This prevents interference between tasks sharing the same resource dictionary+ resource_dict = task_dict.pop("resource_dict").copy()

Let's verify if there are any other places in the codebase where resource dictionaries might need similar protection:

✅ Verification successful

Resource dictionary protection is consistently implemented

The codebase already follows best practices for handling resource dictionaries:

  • In executorlib/cache/shared.py, task resource dictionaries are copied before modification
  • In executorlib/interactive/shared.py, the reviewed change aligns with existing patterns
  • Other modifications to resource dictionaries occur on already-copied or newly created instances

The added .copy() in the review is consistent with the codebase's approach to preventing dictionary interference.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other instances of resource dictionary usage
rg "resource_dict.*=.*task_dict" -A 2

Length of output: 770


Script:

#!/bin/bash# Let's check the context of these usages to understand their purpose
rg "resource_dict.*=.*task_dict" -B 5 -A 5
# Also check for any other direct modifications to resource_dict
rg "resource_dict\[.*\].*=|resource_dict\.update" -B 2 -A 2

Length of output: 6890


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@jan-janssen
jan-janssen merged commit 649ef6c into mainNov 9, 2024
@jan-janssen
jan-janssen deleted the interference_bug branch November 9, 2024 09:38
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

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

Fix interference bug - #485

Merged
jan-janssen merged 1 commit into
mainfrom
interference_bug
Nov 9, 2024
Merged

Fix interference bug#485
jan-janssen merged 1 commit into
mainfrom
interference_bug

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 9, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Improved handling of resource dictionaries to prevent unintended modifications.
    • Clarified core allocation logic when submitting tasks.

These changes enhance the stability and reliability of task submissions within the application.

@coderabbitai

coderabbitaiBot commented Nov 9, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The changes in this pull request focus on the _submit_function_to_separate_process method within the executorlib/interactive/shared.py file. A copy of the resource_dict is created when it is popped from task_dict, preventing unintended modifications. Additionally, the logic for determining the number of cores to use has been clarified, ensuring that resource_dict["cores"] is explicitly set based on executor_kwargs["cores"] when certain conditions are met. No other significant changes were made to the logic or structure of the code.

Changes

FileChange Summary
executorlib/interactive/shared.pyModified _submit_function_to_separate_process to use .copy() on resource_dict and clarified core allocation logic.

Possibly related PRs

  • Fix resource dict in interactive jobs #482: Fix resource dict in interactive jobs - This PR modifies the resource_dict handling in the same file (executorlib/interactive/shared.py) and is directly related to the changes made in the _submit_function_to_separate_process method regarding resource management.

🐰 In the code where bunnies hop,
A copy made, no need to stop.
Cores aligned, clear as day,
Resource handling's here to stay!
With every task, we leap and bound,
In shared.py, joy is found! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c8648ed and 897309e.

📒 Files selected for processing (1)
  • executorlib/interactive/shared.py (1 hunks)
🔇 Additional comments (1)
executorlib/interactive/shared.py (1)

517-517: Good fix for preventing resource dictionary interference!

The addition of .copy() when popping resource_dict prevents unintended modifications to the original dictionary, fixing potential interference between tasks. This is particularly important in concurrent execution scenarios.

Consider adding a comment explaining why the copy is necessary to prevent future regressions:

- resource_dict = task_dict.pop("resource_dict").copy()+ # Create a copy to prevent modifications from affecting the original dictionary+ # This prevents interference between tasks sharing the same resource dictionary+ resource_dict = task_dict.pop("resource_dict").copy()

Let's verify if there are any other places in the codebase where resource dictionaries might need similar protection:

✅ Verification successful

Resource dictionary protection is consistently implemented

The codebase already follows best practices for handling resource dictionaries:

  • In executorlib/cache/shared.py, task resource dictionaries are copied before modification
  • In executorlib/interactive/shared.py, the reviewed change aligns with existing patterns
  • Other modifications to resource dictionaries occur on already-copied or newly created instances

The added .copy() in the review is consistent with the codebase's approach to preventing dictionary interference.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other instances of resource dictionary usage
rg "resource_dict.*=.*task_dict" -A 2

Length of output: 770


Script:

#!/bin/bash# Let's check the context of these usages to understand their purpose
rg "resource_dict.*=.*task_dict" -B 5 -A 5
# Also check for any other direct modifications to resource_dict
rg "resource_dict\[.*\].*=|resource_dict\.update" -B 2 -A 2

Length of output: 6890


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@jan-janssen
jan-janssen merged commit 649ef6c into mainNov 9, 2024
@jan-janssen
jan-janssen deleted the interference_bug branch November 9, 2024 09:38
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

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

Fix interference bug - #485

Merged
jan-janssen merged 1 commit into
mainfrom
interference_bug
Nov 9, 2024
Merged

Fix interference bug#485
jan-janssen merged 1 commit into
mainfrom
interference_bug

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 9, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Improved handling of resource dictionaries to prevent unintended modifications.
    • Clarified core allocation logic when submitting tasks.

These changes enhance the stability and reliability of task submissions within the application.

@coderabbitai

coderabbitaiBot commented Nov 9, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The changes in this pull request focus on the _submit_function_to_separate_process method within the executorlib/interactive/shared.py file. A copy of the resource_dict is created when it is popped from task_dict, preventing unintended modifications. Additionally, the logic for determining the number of cores to use has been clarified, ensuring that resource_dict["cores"] is explicitly set based on executor_kwargs["cores"] when certain conditions are met. No other significant changes were made to the logic or structure of the code.

Changes

FileChange Summary
executorlib/interactive/shared.pyModified _submit_function_to_separate_process to use .copy() on resource_dict and clarified core allocation logic.

Possibly related PRs

  • Fix resource dict in interactive jobs #482: Fix resource dict in interactive jobs - This PR modifies the resource_dict handling in the same file (executorlib/interactive/shared.py) and is directly related to the changes made in the _submit_function_to_separate_process method regarding resource management.

🐰 In the code where bunnies hop,
A copy made, no need to stop.
Cores aligned, clear as day,
Resource handling's here to stay!
With every task, we leap and bound,
In shared.py, joy is found! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c8648ed and 897309e.

📒 Files selected for processing (1)
  • executorlib/interactive/shared.py (1 hunks)
🔇 Additional comments (1)
executorlib/interactive/shared.py (1)

517-517: Good fix for preventing resource dictionary interference!

The addition of .copy() when popping resource_dict prevents unintended modifications to the original dictionary, fixing potential interference between tasks. This is particularly important in concurrent execution scenarios.

Consider adding a comment explaining why the copy is necessary to prevent future regressions:

- resource_dict = task_dict.pop("resource_dict").copy()+ # Create a copy to prevent modifications from affecting the original dictionary+ # This prevents interference between tasks sharing the same resource dictionary+ resource_dict = task_dict.pop("resource_dict").copy()

Let's verify if there are any other places in the codebase where resource dictionaries might need similar protection:

✅ Verification successful

Resource dictionary protection is consistently implemented

The codebase already follows best practices for handling resource dictionaries:

  • In executorlib/cache/shared.py, task resource dictionaries are copied before modification
  • In executorlib/interactive/shared.py, the reviewed change aligns with existing patterns
  • Other modifications to resource dictionaries occur on already-copied or newly created instances

The added .copy() in the review is consistent with the codebase's approach to preventing dictionary interference.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other instances of resource dictionary usage
rg "resource_dict.*=.*task_dict" -A 2

Length of output: 770


Script:

#!/bin/bash# Let's check the context of these usages to understand their purpose
rg "resource_dict.*=.*task_dict" -B 5 -A 5
# Also check for any other direct modifications to resource_dict
rg "resource_dict\[.*\].*=|resource_dict\.update" -B 2 -A 2

Length of output: 6890


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@jan-janssen
jan-janssen merged commit 649ef6c into mainNov 9, 2024
@jan-janssen
jan-janssen deleted the interference_bug branch November 9, 2024 09:38
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@jan-janssen
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } 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 interference bug - #485

Merged
jan-janssen merged 1 commit into
mainfrom
interference_bug
Nov 9, 2024
Merged

Fix interference bug#485
jan-janssen merged 1 commit into
mainfrom
interference_bug

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 9, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Improved handling of resource dictionaries to prevent unintended modifications.
    • Clarified core allocation logic when submitting tasks.

These changes enhance the stability and reliability of task submissions within the application.

@coderabbitai

coderabbitaiBot commented Nov 9, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The changes in this pull request focus on the _submit_function_to_separate_process method within the executorlib/interactive/shared.py file. A copy of the resource_dict is created when it is popped from task_dict, preventing unintended modifications. Additionally, the logic for determining the number of cores to use has been clarified, ensuring that resource_dict["cores"] is explicitly set based on executor_kwargs["cores"] when certain conditions are met. No other significant changes were made to the logic or structure of the code.

Changes

FileChange Summary
executorlib/interactive/shared.pyModified _submit_function_to_separate_process to use .copy() on resource_dict and clarified core allocation logic.

Possibly related PRs

  • Fix resource dict in interactive jobs #482: Fix resource dict in interactive jobs - This PR modifies the resource_dict handling in the same file (executorlib/interactive/shared.py) and is directly related to the changes made in the _submit_function_to_separate_process method regarding resource management.

🐰 In the code where bunnies hop,
A copy made, no need to stop.
Cores aligned, clear as day,
Resource handling's here to stay!
With every task, we leap and bound,
In shared.py, joy is found! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c8648ed and 897309e.

📒 Files selected for processing (1)
  • executorlib/interactive/shared.py (1 hunks)
🔇 Additional comments (1)
executorlib/interactive/shared.py (1)

517-517: Good fix for preventing resource dictionary interference!

The addition of .copy() when popping resource_dict prevents unintended modifications to the original dictionary, fixing potential interference between tasks. This is particularly important in concurrent execution scenarios.

Consider adding a comment explaining why the copy is necessary to prevent future regressions:

- resource_dict = task_dict.pop("resource_dict").copy()+ # Create a copy to prevent modifications from affecting the original dictionary+ # This prevents interference between tasks sharing the same resource dictionary+ resource_dict = task_dict.pop("resource_dict").copy()

Let's verify if there are any other places in the codebase where resource dictionaries might need similar protection:

✅ Verification successful

Resource dictionary protection is consistently implemented

The codebase already follows best practices for handling resource dictionaries:

  • In executorlib/cache/shared.py, task resource dictionaries are copied before modification
  • In executorlib/interactive/shared.py, the reviewed change aligns with existing patterns
  • Other modifications to resource dictionaries occur on already-copied or newly created instances

The added .copy() in the review is consistent with the codebase's approach to preventing dictionary interference.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other instances of resource dictionary usage
rg "resource_dict.*=.*task_dict" -A 2

Length of output: 770


Script:

#!/bin/bash# Let's check the context of these usages to understand their purpose
rg "resource_dict.*=.*task_dict" -B 5 -A 5
# Also check for any other direct modifications to resource_dict
rg "resource_dict\[.*\].*=|resource_dict\.update" -B 2 -A 2

Length of output: 6890


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@jan-janssen
jan-janssen merged commit 649ef6c into mainNov 9, 2024
@jan-janssen
jan-janssen deleted the interference_bug branch November 9, 2024 09:38
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

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

Fix interference bug - #485

Merged
jan-janssen merged 1 commit into
mainfrom
interference_bug
Nov 9, 2024
Merged

Fix interference bug#485
jan-janssen merged 1 commit into
mainfrom
interference_bug

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 9, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Improved handling of resource dictionaries to prevent unintended modifications.
    • Clarified core allocation logic when submitting tasks.

These changes enhance the stability and reliability of task submissions within the application.

@coderabbitai

coderabbitaiBot commented Nov 9, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The changes in this pull request focus on the _submit_function_to_separate_process method within the executorlib/interactive/shared.py file. A copy of the resource_dict is created when it is popped from task_dict, preventing unintended modifications. Additionally, the logic for determining the number of cores to use has been clarified, ensuring that resource_dict["cores"] is explicitly set based on executor_kwargs["cores"] when certain conditions are met. No other significant changes were made to the logic or structure of the code.

Changes

FileChange Summary
executorlib/interactive/shared.pyModified _submit_function_to_separate_process to use .copy() on resource_dict and clarified core allocation logic.

Possibly related PRs

  • Fix resource dict in interactive jobs #482: Fix resource dict in interactive jobs - This PR modifies the resource_dict handling in the same file (executorlib/interactive/shared.py) and is directly related to the changes made in the _submit_function_to_separate_process method regarding resource management.

🐰 In the code where bunnies hop,
A copy made, no need to stop.
Cores aligned, clear as day,
Resource handling's here to stay!
With every task, we leap and bound,
In shared.py, joy is found! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c8648ed and 897309e.

📒 Files selected for processing (1)
  • executorlib/interactive/shared.py (1 hunks)
🔇 Additional comments (1)
executorlib/interactive/shared.py (1)

517-517: Good fix for preventing resource dictionary interference!

The addition of .copy() when popping resource_dict prevents unintended modifications to the original dictionary, fixing potential interference between tasks. This is particularly important in concurrent execution scenarios.

Consider adding a comment explaining why the copy is necessary to prevent future regressions:

- resource_dict = task_dict.pop("resource_dict").copy()+ # Create a copy to prevent modifications from affecting the original dictionary+ # This prevents interference between tasks sharing the same resource dictionary+ resource_dict = task_dict.pop("resource_dict").copy()

Let's verify if there are any other places in the codebase where resource dictionaries might need similar protection:

✅ Verification successful

Resource dictionary protection is consistently implemented

The codebase already follows best practices for handling resource dictionaries:

  • In executorlib/cache/shared.py, task resource dictionaries are copied before modification
  • In executorlib/interactive/shared.py, the reviewed change aligns with existing patterns
  • Other modifications to resource dictionaries occur on already-copied or newly created instances

The added .copy() in the review is consistent with the codebase's approach to preventing dictionary interference.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other instances of resource dictionary usage
rg "resource_dict.*=.*task_dict" -A 2

Length of output: 770


Script:

#!/bin/bash# Let's check the context of these usages to understand their purpose
rg "resource_dict.*=.*task_dict" -B 5 -A 5
# Also check for any other direct modifications to resource_dict
rg "resource_dict\[.*\].*=|resource_dict\.update" -B 2 -A 2

Length of output: 6890


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@jan-janssen
jan-janssen merged commit 649ef6c into mainNov 9, 2024
@jan-janssen
jan-janssen deleted the interference_bug branch November 9, 2024 09:38
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

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

Fix interference bug - #485

Merged
jan-janssen merged 1 commit into
mainfrom
interference_bug
Nov 9, 2024
Merged

Fix interference bug#485
jan-janssen merged 1 commit into
mainfrom
interference_bug

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 9, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Improved handling of resource dictionaries to prevent unintended modifications.
    • Clarified core allocation logic when submitting tasks.

These changes enhance the stability and reliability of task submissions within the application.

@coderabbitai

coderabbitaiBot commented Nov 9, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The changes in this pull request focus on the _submit_function_to_separate_process method within the executorlib/interactive/shared.py file. A copy of the resource_dict is created when it is popped from task_dict, preventing unintended modifications. Additionally, the logic for determining the number of cores to use has been clarified, ensuring that resource_dict["cores"] is explicitly set based on executor_kwargs["cores"] when certain conditions are met. No other significant changes were made to the logic or structure of the code.

Changes

FileChange Summary
executorlib/interactive/shared.pyModified _submit_function_to_separate_process to use .copy() on resource_dict and clarified core allocation logic.

Possibly related PRs

  • Fix resource dict in interactive jobs #482: Fix resource dict in interactive jobs - This PR modifies the resource_dict handling in the same file (executorlib/interactive/shared.py) and is directly related to the changes made in the _submit_function_to_separate_process method regarding resource management.

🐰 In the code where bunnies hop,
A copy made, no need to stop.
Cores aligned, clear as day,
Resource handling's here to stay!
With every task, we leap and bound,
In shared.py, joy is found! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c8648ed and 897309e.

📒 Files selected for processing (1)
  • executorlib/interactive/shared.py (1 hunks)
🔇 Additional comments (1)
executorlib/interactive/shared.py (1)

517-517: Good fix for preventing resource dictionary interference!

The addition of .copy() when popping resource_dict prevents unintended modifications to the original dictionary, fixing potential interference between tasks. This is particularly important in concurrent execution scenarios.

Consider adding a comment explaining why the copy is necessary to prevent future regressions:

- resource_dict = task_dict.pop("resource_dict").copy()+ # Create a copy to prevent modifications from affecting the original dictionary+ # This prevents interference between tasks sharing the same resource dictionary+ resource_dict = task_dict.pop("resource_dict").copy()

Let's verify if there are any other places in the codebase where resource dictionaries might need similar protection:

✅ Verification successful

Resource dictionary protection is consistently implemented

The codebase already follows best practices for handling resource dictionaries:

  • In executorlib/cache/shared.py, task resource dictionaries are copied before modification
  • In executorlib/interactive/shared.py, the reviewed change aligns with existing patterns
  • Other modifications to resource dictionaries occur on already-copied or newly created instances

The added .copy() in the review is consistent with the codebase's approach to preventing dictionary interference.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other instances of resource dictionary usage
rg "resource_dict.*=.*task_dict" -A 2

Length of output: 770


Script:

#!/bin/bash# Let's check the context of these usages to understand their purpose
rg "resource_dict.*=.*task_dict" -B 5 -A 5
# Also check for any other direct modifications to resource_dict
rg "resource_dict\[.*\].*=|resource_dict\.update" -B 2 -A 2

Length of output: 6890


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@jan-janssen
jan-janssen merged commit 649ef6c into mainNov 9, 2024
@jan-janssen
jan-janssen deleted the interference_bug branch November 9, 2024 09:38
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

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

Fix interference bug - #485

Merged
jan-janssen merged 1 commit into
mainfrom
interference_bug
Nov 9, 2024
Merged

Fix interference bug#485
jan-janssen merged 1 commit into
mainfrom
interference_bug

Conversation

@jan-janssen

@jan-janssenjan-janssen commented Nov 9, 2024

Copy link
Copy Markdown
Member

Summary by CodeRabbit

  • Bug Fixes
    • Improved handling of resource dictionaries to prevent unintended modifications.
    • Clarified core allocation logic when submitting tasks.

These changes enhance the stability and reliability of task submissions within the application.

@coderabbitai

coderabbitaiBot commented Nov 9, 2024

Copy link
Copy Markdown
Contributor

Walkthrough

The changes in this pull request focus on the _submit_function_to_separate_process method within the executorlib/interactive/shared.py file. A copy of the resource_dict is created when it is popped from task_dict, preventing unintended modifications. Additionally, the logic for determining the number of cores to use has been clarified, ensuring that resource_dict["cores"] is explicitly set based on executor_kwargs["cores"] when certain conditions are met. No other significant changes were made to the logic or structure of the code.

Changes

FileChange Summary
executorlib/interactive/shared.pyModified _submit_function_to_separate_process to use .copy() on resource_dict and clarified core allocation logic.

Possibly related PRs

  • Fix resource dict in interactive jobs #482: Fix resource dict in interactive jobs - This PR modifies the resource_dict handling in the same file (executorlib/interactive/shared.py) and is directly related to the changes made in the _submit_function_to_separate_process method regarding resource management.

🐰 In the code where bunnies hop,
A copy made, no need to stop.
Cores aligned, clear as day,
Resource handling's here to stay!
With every task, we leap and bound,
In shared.py, joy is found! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between c8648ed and 897309e.

📒 Files selected for processing (1)
  • executorlib/interactive/shared.py (1 hunks)
🔇 Additional comments (1)
executorlib/interactive/shared.py (1)

517-517: Good fix for preventing resource dictionary interference!

The addition of .copy() when popping resource_dict prevents unintended modifications to the original dictionary, fixing potential interference between tasks. This is particularly important in concurrent execution scenarios.

Consider adding a comment explaining why the copy is necessary to prevent future regressions:

- resource_dict = task_dict.pop("resource_dict").copy()+ # Create a copy to prevent modifications from affecting the original dictionary+ # This prevents interference between tasks sharing the same resource dictionary+ resource_dict = task_dict.pop("resource_dict").copy()

Let's verify if there are any other places in the codebase where resource dictionaries might need similar protection:

✅ Verification successful

Resource dictionary protection is consistently implemented

The codebase already follows best practices for handling resource dictionaries:

  • In executorlib/cache/shared.py, task resource dictionaries are copied before modification
  • In executorlib/interactive/shared.py, the reviewed change aligns with existing patterns
  • Other modifications to resource dictionaries occur on already-copied or newly created instances

The added .copy() in the review is consistent with the codebase's approach to preventing dictionary interference.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash# Search for other instances of resource dictionary usage
rg "resource_dict.*=.*task_dict" -A 2

Length of output: 770


Script:

#!/bin/bash# Let's check the context of these usages to understand their purpose
rg "resource_dict.*=.*task_dict" -B 5 -A 5
# Also check for any other direct modifications to resource_dict
rg "resource_dict\[.*\].*=|resource_dict\.update" -B 2 -A 2

Length of output: 6890


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

@jan-janssen
jan-janssen merged commit 649ef6c into mainNov 9, 2024
@jan-janssen
jan-janssen deleted the interference_bug branch November 9, 2024 09:38
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@jan-janssen