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

hotfix: using custom models, create custom provider #4986

Merged
merged 1 commit into from
Jul 12, 2024

Conversation

lloydzhou
Copy link
Contributor

@lloydzhou lloydzhou commented Jul 12, 2024

Summary by CodeRabbit

  • Refactor
    • Updated internal functions to improve consistency and maintainability of model management.

Copy link

vercel bot commented Jul 12, 2024

@lloydzhou 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 Jul 12, 2024

Walkthrough

The recent updates involve modifying the customProvider function and the collectModelTable function in app/utils/model.ts. These changes ensure that customProvider now uses providerName instead of modelName, and the structure of objects returned by these functions has been adjusted accordingly. This includes setting the id as the lowercase version of providerName and correctly handling customModelName and customProviderName within the collectModelTable function.

Changes

Files Change Summary
app/utils/model.ts Modified customProvider to accept providerName and updated object structure in both functions.

Poem

In the code where models dwell,
Changes cast a magic spell,
Providers named with care and grace,
Unique IDs now take their place.
Models and providers, hand in hand,
Code refined, a better land.
Cheers to progress, swift and bright,
A rabbit's joy in code's delight! 🐇✨


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 Configration 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 e8088d6 and 9203870.

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

4-6: LGTM! But verify the function usage in the codebase.

The changes to the customProvider function are approved.

However, ensure that all function calls to customProvider match the new signature.

Verification successful

Verification Successful: The function usage matches the new signature.

The occurrences of customProvider in app/utils/model.ts correctly pass the providerName parameter as required by the new function signature.

  • app/utils/model.ts:
    • Line 4: const customProvider = (providerName: string) => ({
    • Line 37: const provider = customProvider(customProviderName || customModelName,
Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify all function calls to `customProvider` match the new signature.

# Test: Search for the function usage. Expect: Only occurances of the new signature.
rg --type js -A 5 $'customProvider'

Length of output: 34


Script:

#!/bin/bash
# Description: Re-verify all function calls to `customProvider` match the new signature.

# Test: Search for the function usage in all files. Expect: Only occurrences of the new signature.
rg 'customProvider'

Length of output: 542


Script:

#!/bin/bash
# Description: Extract lines around occurrences of `customProvider` for detailed inspection.

# Test: Extract the context around the function usage to confirm the new signature.
rg 'customProvider' -A 3 -B 3

Length of output: 1768


74-80: LGTM! But verify the function usage in the codebase.

The changes to the collectModelTable function are approved.

However, ensure that all function calls to collectModelTable are updated correctly and the logic remains intact.

Verification successful

LGTM! Function usage verified.

The changes to the collectModelTable function are approved and no external dependencies or usages were found that require further verification.

Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify all function calls to `collectModelTable` are updated correctly.

# Test: Search for the function usage. Expect: Only occurances of the new signature.
rg --type js -A 5 $'collectModelTable'

Length of output: 37


Script:

#!/bin/bash
# Description: Verify all function calls to `collectModelTable` are updated correctly.

# Test: Search for the function usage in both JavaScript and TypeScript files. Expect: Only occurrences of the new signature.
rg --type-add 'ts:*.ts' -t js -t ts -A 5 'collectModelTable'

Length of output: 1583


Script:

#!/bin/bash
# Description: Verify all imports of the `collectModelTable` function to ensure its usage is updated correctly.

# Test: Search for imports of `collectModelTable` in the codebase.
rg --type-add 'ts:*.ts' -t js -t ts -A 5 'import { collectModelTable' 

Length of output: 189


Script:

#!/bin/bash
# Description: Verify all imports of the `collectModelTable` function to ensure its usage is updated correctly.

# Test: Search for imports of `collectModelTable` in the codebase.
rg --type-add 'ts:*.ts' -t js -t ts -A 5 'import \{ collectModelTable' 

Length of output: 72


Script:

#!/bin/bash
# Description: Verify the export and usage of the `collectModelTable` function to ensure its usage is updated correctly.

# Test: Search for export statements of `collectModelTable` in the codebase.
rg --type-add 'ts:*.ts' -t js -t ts -A 5 'export \{ collectModelTable'

# Test: Search for any usage of `collectModelTable` in the codebase.
rg --type-add 'ts:*.ts' -t js -t ts -A 5 'collectModelTable'

Length of output: 1656

@lloydzhou
Copy link
Contributor Author

#4985

通义千问兼容接口文档

如果使用官方提供的openai兼容api接口。

  1. 可以尝试使用CUSTOM_MODELS自定义模型,这个操作类似给OpenAI配置了一个新的模型
CUSTOM_MODELS=-all,+qwen-turbo@OpenAI
  1. 由于[Bug] 配置阿里的通义千问报错,显示 cors限制 #4980 提到千问的api不支持跨域,所以这里还需要在后端配置BASE_URL=https://dashscope.aliyuncs.com/compatible-mode,以及OPENAI_API_KEY使用通义千问的key。

@ElricLiu ElricLiu merged commit 4ea8c08 into ChatGPTNextWeb:main Jul 12, 2024
0 of 2 checks passed
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.

2 participants