Merged
Conversation
rebecca554owen
added a commit
to rebecca554owen/gpt-load
that referenced
this pull request
Feb 16, 2026
Merge upstream changes including: - Model redirect feature (tbphp#334, tbphp#335) - Key optimization (tbphp#371, tbphp#347) - Add openai-response channel type support (tbphp#387) - Upgrade dependencies and Go 1.24 documentation (tbphp#388) - Fix key last_used_at accuracy (tbphp#383) - Various bug fixes Conflicts to resolve: - models/types.go: Keep dev's LastUsedAt, ModelMappingList, Token fields - services/subgroup_manager.go: Use dev's enhanced version - proxy/server.go: Use dev's version (includes main's features) - go.mod: Keep dev's dependency versions (Go 1.26)
rebecca554owen
added a commit
to rebecca554owen/gpt-load
that referenced
this pull request
Feb 16, 2026
Merge upstream changes including: - Model redirect feature (tbphp#334, tbphp#335) - Key optimization (tbphp#371, tbphp#347) - Add openai-response channel type support (tbphp#387) - Upgrade dependencies and Go 1.24 documentation (tbphp#388) - Fix key last_used_at accuracy (tbphp#383) - Various bug fixes Conflicts resolved: - models/types.go: Keep dev's LastUsedAt, ModelMappingList, Token fields - services/subgroup_manager.go: Use dev's enhanced version - proxy/server.go: Use dev's version (includes main's features) - go.mod: Keep dev's dependency versions (Go 1.26) - channel: Use upstream's openai-response naming convention for compatibility
rebecca554owen
added a commit
to rebecca554owen/gpt-load
that referenced
this pull request
Feb 16, 2026
Merge upstream changes including: - Model redirect feature (tbphp#334, tbphp#335) - Key optimization (tbphp#371, tbphp#347) - Add openai-response channel type support (tbphp#387) - Upgrade dependencies and Go 1.24 documentation (tbphp#388) - Fix key last_used_at accuracy (tbphp#383) - Various bug fixes Conflicts resolved: - models/types.go: Keep dev's LastUsedAt, ModelMappingList, Token fields - services/subgroup_manager.go: Use dev's enhanced version - proxy/server.go: Use dev's version (includes main's features) - go.mod: Keep dev's dependency versions (Go 1.26) - channel: Use upstream's openai-response naming convention for compatibility
rebecca554owen
added a commit
to rebecca554owen/gpt-load
that referenced
this pull request
Feb 16, 2026
Merge upstream changes including: - Model redirect feature (tbphp#334, tbphp#335) - Key optimization (tbphp#371, tbphp#347) - Add openai-response channel type support (tbphp#387) - Upgrade dependencies and Go 1.24 documentation (tbphp#388) - Fix key last_used_at accuracy (tbphp#383) - Various bug fixes Conflicts resolved: - models/types.go: Keep dev's LastUsedAt, ModelMappingList, Token fields - services/subgroup_manager.go: Use dev's enhanced version - proxy/server.go: Use dev's version (includes main's features) - go.mod: Keep dev's dependency versions (Go 1.26) - channel: Use upstream's openai-response naming convention for compatibility
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
关联 Issue / Related Issue
Closes #
变更内容 / Change Content
自查清单 / Checklist