Skip to content

fix: determine cpu cores determination in baseedpyright-check script on macos #28058

Merged
crazywoola merged 3 commits intolanggenius:mainfrom
bowenliang123:basepy-cpu-cores
Nov 12, 2025
Merged

fix: determine cpu cores determination in baseedpyright-check script on macos #28058
crazywoola merged 3 commits intolanggenius:mainfrom
bowenliang123:basepy-cpu-cores

Conversation

@bowenliang123
Copy link
Copy Markdown
Contributor

Important

  1. Make sure you have read our contribution guidelines
  2. Ensure there is an associated issue and you have been assigned to it
  3. Use the correct syntax to link this PR: Fixes #<issue number>.

Summary

Screenshots

Before:

% dev/basedpyright-check 
+++ realpath dev/basedpyright-check
++ dirname /Users/bw/dev/dify/dev/basedpyright-check
+ SCRIPT_DIR=/Users/bw/dev/dify/dev
+ cd /Users/bw/dev/dify/dev/..
+ PATH_TO_CHECK=
+ '[' -n '' ']'
++ nproc
dev/basedpyright-check: line 15: nproc: command not found
+ uv run --directory api --dev -- basedpyright --threads
0 errors, 0 warnings, 0 notes

After:

% dev/basedpyright-check 
+++ realpath dev/basedpyright-check
++ dirname /Users/bw/dev/dify/dev/basedpyright-check
+ SCRIPT_DIR=/Users/bw/dev/dify/dev
+ cd /Users/bw/dev/dify/dev/..
+ PATH_TO_CHECK=
+++ uname -s
++ [[ Darwin == \D\a\r\w\i\n ]]
++ sysctl -n hw.ncpu
+ CPU_CORES=16
+ uv run --directory api --dev -- basedpyright --threads 16
0 errors, 0 warnings, 0 notes

Checklist

  • This change requires a documentation update, included: Dify Document
  • I understand that this PR may be closed in case there was no previous discussion or issues. (This doesn't apply to typos!)
  • I've added a test for each change that was introduced, and I tried as much as possible to make a single atomic change.
  • I've updated the documentation accordingly.
  • I ran dev/reformat(backend) and cd web && npx lint-staged(frontend) to appease the lint gods

Copilot AI review requested due to automatic review settings November 10, 2025 12:33
@dosubot dosubot bot added the size:S This PR changes 10-29 lines, ignoring generated files. label Nov 10, 2025
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @bowenliang123, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a critical compatibility issue with the dev/basedpyright-check script on macOS. By implementing platform-specific CPU core detection, it ensures that the script can successfully execute basedpyright with the correct number of threads on both macOS and other Unix-like systems, thereby improving the developer experience and preventing script failures.

Highlights

  • macOS Compatibility Fix: The dev/basedpyright-check script has been updated to correctly determine the number of CPU cores on macOS by utilizing sysctl -n hw.ncpu, resolving an issue where the nproc command was not found on Apple systems.
  • Improved CPU Core Detection Logic: The script now includes conditional logic to detect the operating system (uname -s) and use the appropriate command (sysctl for macOS, nproc for others) to get the CPU core count, ensuring broader compatibility.
  • Script Refactoring: The basedpyright execution command has been streamlined, using a CPU_CORES variable to pass the determined core count, simplifying the script's structure.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR enhances the basedpyright type checking script to support macOS environments by adding cross-platform CPU core detection and simplifying the command execution logic.

  • Adds OS-specific CPU core detection using sysctl for macOS and nproc for Linux
  • Removes conditional branching by consolidating the basedpyright command into a single line

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request correctly addresses an issue where the basedpyright-check script fails on macOS due to the absence of the nproc command. The switch to sysctl on Darwin systems is appropriate. The simplification of the command execution logic is also a welcome improvement. However, I've identified a couple of issues. Firstly, the script lacks robustness in CPU core detection, which could lead to failures if the detection commands are not found. Secondly, a regression has been introduced where file paths with spaces are no longer handled correctly. I've provided specific suggestions to address both of these points.

@bowenliang123 bowenliang123 changed the title determin cpu cores with sysctl on macos in dev/basedpyright-check script determine cpu cores with sysctl on macos in dev/basedpyright-check script Nov 10, 2025
@dosubot dosubot bot added the lgtm This PR has been approved by a maintainer label Nov 12, 2025
@bowenliang123 bowenliang123 changed the title determine cpu cores with sysctl on macos in dev/basedpyright-check script fix: determine cpu cores dtermination in baseedpyright-check script on macos Nov 12, 2025
@bowenliang123 bowenliang123 changed the title fix: determine cpu cores dtermination in baseedpyright-check script on macos fix: determine cpu cores determination in baseedpyright-check script on macos Nov 12, 2025
@crazywoola crazywoola merged commit 1369119 into langgenius:main Nov 12, 2025
11 checks passed
frf12 pushed a commit to oceanbase/dify-on-mysql that referenced this pull request Nov 13, 2025
* fix(api): Trace Hierarchy, Span Status, and Broken Workflow for Arize & Phoenix Integration (langgenius#27937)

Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>

* chore: add type-check to pre-commit (langgenius#28005)

* fix document enable (langgenius#28081)

* chore: not SaaS version can query long log time range (langgenius#28109)

* When graph_engine worker run exception, keep the node_id for deep res… (langgenius#26205)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>

* fix document index test (langgenius#28113)

* chore: improve the user experience of not login into apps (langgenius#28120)

* feat(api): Introduce `WorkflowResumptionContext` for pause state management (langgenius#28122)

Certain metadata (including but not limited to `InvokeFrom`, `call_depth`, and `streaming`)  is required when resuming a paused workflow. However, these fields are not part of `GraphRuntimeState` and were not saved in the previous
 implementation of  `PauseStatePersistenceLayer`.

This commit addresses this limitation by introducing a `WorkflowResumptionContext` model that wraps both the `*GenerateEntity` and `GraphRuntimeState`. This approach provides:

- A structured container for all necessary resumption data
- Better separation of concerns between execution state and persistence
- Enhanced extensibility for future metadata additions
- Clearer naming that distinguishes from `GraphRuntimeState`

The `WorkflowResumptionContext` model makes extending the pause state easier while maintaining backward compatibility and proper version management for the entire execution state ecosystem.

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

* add transform-datasource-credentials command online check (langgenius#28124)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Garfield Dai <dai.hai@foxmail.com>

* feat: introduce trigger functionality (langgenius#27644)

Signed-off-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: Stream <Stream_2@qq.com>
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zhsama <torvalds@linux.do>
Co-authored-by: Harry <xh001x@hotmail.com>
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: yessenia <yessenia.contact@gmail.com>
Co-authored-by: hjlarry <hjlarry@163.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WTW0313 <twwu@dify.ai>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* fix: determine cpu cores determination in baseedpyright-check script on macos  (langgenius#28058)

* fix: variable assigner can't assign float number (langgenius#28068)

* Add file type validation to paste upload (langgenius#28017)

* test: create some hooks and utils test script, modified clipboard test script (langgenius#27928)

* convert to TypeBase (langgenius#27935)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* chore: disable workflow logs auto-cleanup by default (langgenius#28136)

This PR changes the default value of `WORKFLOW_LOG_CLEANUP_ENABLED` from `true` to `false` across all configuration files.

## Motivation

Setting the default to `false` provides safer default behavior by:

- Preventing unintended data loss for new installations
- Giving users explicit control over when to enable log cleanup
- Following the opt-in principle for data deletion features

Users who need automatic cleanup can enable it by setting `WORKFLOW_LOG_CLEANUP_ENABLED=true` in their configuration.

* fix: simplify graph structure validation in WorkflowService (langgenius#28146)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* fix: app's ai site text to speech api (langgenius#28091)

* refactor(web): reuse the same edit-custom-collection-modal component, and fix the pop up error (langgenius#28003)

* add doc (langgenius#28016)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

* fix: inconsistent behaviour of zoom in button and shortcut (langgenius#27944)

* consolve conficts

* fix

* fix

---------

Signed-off-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: Ali Saleh <saleh.a@turing.com>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: 湛露先生 <zhanluxianshen@163.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
Co-authored-by: Garfield Dai <dai.hai@foxmail.com>
Co-authored-by: Yeuoly <45712896+Yeuoly@users.noreply.github.com>
Co-authored-by: Stream <Stream_2@qq.com>
Co-authored-by: zhsama <torvalds@linux.do>
Co-authored-by: Harry <xh001x@hotmail.com>
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: yessenia <yessenia.contact@gmail.com>
Co-authored-by: hjlarry <hjlarry@163.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: WTW0313 <twwu@dify.ai>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Bowen Liang <liang.bowen.123@qq.com>
Co-authored-by: Gen Sato <52241300+halogen22@users.noreply.github.com>
Co-authored-by: Gritty_dev <101377478+codomposer@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
Co-authored-by: mnasrautinno <m.nasr@dai.autinno.com>
Co-authored-by: yangzheli <43645580+yangzheli@users.noreply.github.com>
Xiu-Lan pushed a commit to AICT-Team/dify that referenced this pull request Nov 13, 2025
@bowenliang123 bowenliang123 deleted the basepy-cpu-cores branch March 20, 2026 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm This PR has been approved by a maintainer size:S This PR changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

nproc: command not found on macOS when running dev/basedpyright-check script

3 participants