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

CUSTOM_MODELS - support wildcard and entire providerName #5160

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

bestsanmao
Copy link

@bestsanmao bestsanmao commented Aug 1, 2024

#5050

for CUSTOM_MODELS
if start with "-", it supports -@providerName
and -modelname support wildcard (*),
eg:
CUSTOM_MODELS=-ernie-*,-doubao-*,-@azure

…eb#5050

for CUSTOM_MODELS
if start with "-", it supports -@providerName
and -modelname support wildcard (*), 
eg:
CUSTOM_MODELS=-ernie-*,-doubao-*,-@Azure
Copy link

vercel bot commented Aug 1, 2024

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

A member of the Team first needs to authorize it.

Copy link

coderabbitai bot commented Aug 1, 2024

Walkthrough

The recent changes enhance the functionality of the collectModelTable and collectModelTableWithDefaultModel functions. Key improvements include streamlined matching logic for model names, support for wildcards, and clearer control flow. These updates increase code maintainability and robustness, ensuring a more flexible handling of model collections and default assignments.

Changes

Files Change Summary
app/utils/model.ts Updated collectModelTable to include a boolean match for improved name matching with wildcards. Simplified control flow and added cases for hyphen-prefixed names. Enhanced collectModelTableWithDefaultModel for consistent quotation and clearer logic in setting default models.

Poem

In the garden where models bloom,
Changes sprout, dispelling gloom.
Wildcards dance with names so bright,
Code now flows with sheer delight.
Hopping through the logic, clear and fine,
A rabbit's cheer for this grand design! 🐇✨


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

@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 f6a6c51 and a938587.

Files selected for processing (1)
  • app/utils/model.ts (2 hunks)
Additional comments not posted (6)
app/utils/model.ts (6)

55-56: Introduce match variable to streamline logic.

The introduction of the match variable simplifies the logic for determining if a model name matches the provided customModelName and customProviderName.


61-61: Simplify matching logic.

The simplified matching logic improves readability and maintainability.


63-74: Enhance pattern matching with wildcards and exclusions.

The added logic for handling wildcards and exclusions (-) enhances the flexibility of model specifications. However, ensure that the regular expression construction is efficient and correctly handles edge cases.

Ensure that the regular expression correctly handles edge cases and does not introduce performance overhead.


76-76: Set available flag based on match.

Setting the available flag based on the match variable is a clear and efficient approach.


119-119: Improve consistency in quotation marks.

The change to use consistent quotation marks improves code readability.


125-128: Reformat logic for setting default model.

The reformatted logic for setting a model as default is clearer and separates the checks for availability and matching against the defaultModel.

Copy link
Contributor

github-actions bot commented Aug 1, 2024

Your build has completed!

Preview deployment

@Dogtiti Dogtiti requested a review from lloydzhou August 1, 2024 07:24
@Dogtiti Dogtiti changed the title CUSTOM_MODELS - support wildcard and entire providerName https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web/issues/5050 CUSTOM_MODELS - support wildcard and entire providerName Aug 1, 2024
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.

1 participant