Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

解决禁止gpt4时禁止gtp4o-mini问题 #5218

Merged
merged 1 commit into from
Aug 7, 2024

Conversation

mayfwl
Copy link
Contributor

@mayfwl mayfwl commented Aug 7, 2024

💻 变更类型 | Change Type

  • feat
  • fix
  • refactor
  • perf
  • style
  • test
  • docs
  • ci
  • chore
  • build

🔀 变更说明 | Description of Change

📝 补充信息 | Additional Information

#5145

Summary by CodeRabbit

  • New Features

    • Enhanced filtering logic for model selection, allowing models with IDs starting with "gpt-40-mini" to be included.
    • Updated criteria to exclude models with names starting with "gpt-4o-mini" from the default model configuration.
  • Bug Fixes

    • Improved specificity in model selection to prevent unwanted models from affecting user configurations.

Copy link

vercel bot commented Aug 7, 2024

@mayfwl is attempting to deploy a commit to the NextChat Team on Vercel.

A member of the Team first needs to authorize it.

Copy link
Contributor

coderabbitai bot commented Aug 7, 2024

Walkthrough

The recent updates enhance the model filtering logic in the application, specifically targeting the inclusion of "gpt-40-mini" models while refining the exclusion of undesired "gpt-4" variants. These changes optimize the selection criteria for models, ensuring that only the relevant options are available under specific configurations, thus improving the overall functionality and user experience.

Changes

Files Change Summary
app/api/openai.ts Modified the getModels function to allow models starting with "gpt-40-mini" to bypass removal when disableGPT4 is enabled, broadening model inclusion.
app/config/server.ts Enhanced getServerSideConfig to exclude models starting with "gpt-4o-mini" from DEFAULT_MODELS and reset defaultModel, refining model selection criteria.

Poem

In the garden where models bloom,
A "gpt-40-mini" finds room.
With "gpt-4o-mini" kept at bay,
We hop and cheer for a brighter day!
🐰✨


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>.
    • 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 generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @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 as 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.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

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.

Copy link
Contributor

github-actions bot commented Aug 7, 2024

Your build has completed!

Preview deployment

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 624e4db and af21c57.

Files selected for processing (2)
  • app/api/openai.ts (1 hunks)
  • app/config/server.ts (1 hunks)
Additional comments not posted (2)
app/api/openai.ts (1)

16-16: LGTM! But verify the consistency of the logic.

The change to the filtering logic looks good and is correctly implemented.

However, ensure that this logic is consistent with the intended functionality and does not introduce any unintended side effects.

Verification successful

Let's generate a new shell script to search for the disableGPT4 flag within TypeScript files and analyze its usage to ensure the filtering logic is consistent.


LGTM! The filtering logic is consistent.

The change to the filtering logic is correctly implemented and consistent with the intended functionality. The disableGPT4 flag is used appropriately across the codebase to control the inclusion/exclusion of specific models.

  • app/api/openai.ts: Filtering logic to exclude models starting with "gpt-4" unless they start with "gpt-40-mini".
  • app/store/access.ts: Default value for disableGPT4 flag.
  • app/config/server.ts: Environment variable handling for disableGPT4.
  • app/api/config/route.ts: Passing disableGPT4 flag in the server configuration.
Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify consistency of the filtering logic.

# Test: Ensure that models with IDs starting with "gpt-40-mini" are correctly included/excluded based on the `disableGPT4` flag.
rg --type python -A 5 $'disableGPT4'

Length of output: 66


Script:

#!/bin/bash
# Description: Verify consistency of the filtering logic.

# Test: Ensure that models with IDs starting with "gpt-40-mini" are correctly included/excluded based on the `disableGPT4` flag.
rg --type ts -A 5 'disableGPT4'

Length of output: 1815

app/config/server.ts (1)

122-131: LGTM! But verify the consistency of the logic.

The changes to the filtering logic for DEFAULT_MODELS and defaultModel look good and are correctly implemented.

However, ensure that this logic is consistent with the intended functionality and does not introduce any unintended side effects.

Verification successful

LGTM! The changes are consistent with the intended functionality.

The filtering logic for DEFAULT_MODELS and defaultModel correctly excludes models starting with "gpt-4o-mini" and resets defaultModel as expected when disableGPT4 is true. No unintended side effects were found.

  • DEFAULT_MODELS is filtered to exclude models starting with "gpt-4o-mini".
  • defaultModel is reset if it starts with "gpt-4" but not "gpt-4o-mini".
Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify consistency of the filtering logic for `DEFAULT_MODELS` and `defaultModel`.

# Test: Ensure that models with names starting with "gpt-4o-mini" are correctly included/excluded based on the `disableGPT4` flag.
rg --type python -A 5 $'DEFAULT_MODELS'

Length of output: 69


Script:

#!/bin/bash
# Description: Verify consistency of the filtering logic for `DEFAULT_MODELS` and `defaultModel`.

# Test: Ensure that models with names starting with "gpt-4o-mini" are correctly included/excluded based on the filtering logic.

# Search for the definition and usage of `DEFAULT_MODELS` within TypeScript files.
rg --type ts 'DEFAULT_MODELS' -A 5

# Search for the definition and usage of `defaultModel` within TypeScript files.
rg --type ts 'defaultModel' -A 5

Length of output: 10517

@Dogtiti
Copy link
Member

Dogtiti commented Aug 7, 2024

close #5145

@Dogtiti Dogtiti merged commit 58b144b into ChatGPTNextWeb:main Aug 7, 2024
1 of 2 checks passed
@Issues-translate-bot
Copy link

Bot detected the issue body's language is not English, translate it automatically.


close #5145

@coderabbitai coderabbitai bot mentioned this pull request Nov 21, 2024
10 tasks
Sign up for free to 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.

3 participants