opensource/sub2api
3
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-10-16 14:57:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,226 Commits 48 Branches 63 Tags
cb56b96cd1769cdec8dbd7f2a53e40f3f9a51d1d
Commit Graph
3226 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
erio cb56b96cd1 chore: bump version to 0.1.108.2 2026-04-06 00:00:31 +08:00
erio f9369aa46d fix: remove duplicate isUpstreamModelRestrictedByChannel check from merge 2026-04-06 00:00:07 +08:00
erio c45b0f2238 fix: gofmt formatting after merge 2026-04-05 23:14:23 +08:00
erio db6413039a Merge tag 'v0.1.108' into release/custom-0.1.108 
彻底移除 Sora 平台功能，精简代码库约 24000 行；修复渠道平台定价隔离问题。

- 完全移除 Sora 平台：删除所有 Sora 相关的后端服务、前端组件、数据库 Schema 和 ent 代码
- 移除 Sora 相关的 S3 存储、媒体管理、配额管理、生成服务等模块
- 清理前端 Sora 视图、组件、composables、API 调用和国际化文本
- 移除 Sora OAuth 选项，简化 OpenAI OAuth 流程
- 更新 antigravity User-Agent 版本号至 1.21.9

- 修复 antigravity 分组错误匹配其他平台（anthropic/gemini）定价和模型映射的问题
- 修复渠道未映射模型时 BillingModel 被错误还原导致零计费的问题

# Conflicts:
#	backend/cmd/server/VERSION
#	backend/cmd/server/wire_gen.go
#	backend/ent/group.go
#	backend/ent/mutation.go
#	backend/ent/runtime/runtime.go
#	backend/ent/schema/group.go
#	backend/internal/handler/admin/channel_handler.go
#	backend/internal/handler/admin/channel_handler_test.go
#	backend/internal/handler/gateway_handler.go
#	backend/internal/pkg/antigravity/stream_transformer.go
#	backend/internal/server/api_contract_test.go
#	backend/internal/service/billing_service.go
#	backend/internal/service/channel_service.go
#	backend/internal/service/channel_service_test.go
#	backend/internal/service/gateway_service.go
#	backend/internal/service/openai_account_scheduler.go
#	backend/internal/service/openai_gateway_chat_completions.go
#	backend/internal/service/openai_gateway_service.go
#	backend/internal/service/openai_oauth_service.go
 2026-04-05 23:11:04 +08:00
erio 897244b832 refactor(channel): split long functions, extract shared validation, move billing validation to service 
- Split Update (98→25 lines), buildCache (54→20 lines), Create (51→25 lines)
  into focused sub-functions: applyUpdateInput, checkGroupConflicts,
  fetchChannelData, populateChannelCache, storeErrorCache, getOldGroupIDs,
  invalidateAuthCacheForGroups
- Extract validateChannelConfig to eliminate duplicated validation calls
  between Create and Update
- Move validatePricingBillingMode from handler to service layer for
  proper separation of concerns
- Add error logging to IsModelRestricted (was silently swallowing errors)
- Add 12 new tests: ToUsageFields, billing mode validation, antigravity
  wildcard mapping isolation, Create/Update mapping conflict integration
 2026-04-05 22:05:13 +08:00
Wesley Liddick c71b1d63e5 Merge pull request #1460 from imfusheng/main 
解决issue#1453提到的反重力不可用问题
 2026-04-05 22:01:08 +08:00
shaw a07296770c fix: remove remaining Sora references from frontend 
The previous Sora removal missed several frontend references, causing
TypeScript build errors for sora_client_enabled and a missing SoraView.vue
import. Clean up all remaining Sora code from types, router, sidebar,
settings, store, and accounts API.
 2026-04-05 21:26:47 +08:00
Wesley Liddick 8154575d70 Merge pull request #1464 from touwaeriol/fix/channel-platform-isolation 
fix(channel): remove cross-platform pricing/mapping leakage for antigravity groups
 2026-04-05 21:09:10 +08:00
Wesley Liddick d757df8a4b Merge pull request #1463 from touwaeriol/feat/remove-sora 
revert: completely remove Sora platform
 2026-04-05 21:08:48 +08:00
erio c5688fef9a fix: remove cross-platform pricing/mapping leakage for antigravity groups 
Antigravity groups were incorrectly matching pricing and model mapping
entries from anthropic/gemini platform tabs. Each platform should be
strictly isolated — antigravity groups only use antigravity-tagged pricing.
 2026-04-05 20:42:24 +08:00
erio 19655a15f1 fix: gofmt formatting 2026-04-05 18:56:40 +08:00
erio f345b0f595 fix: use upstream versions of shared files and remove only Sora code 
Restore gateway_service.go, setting_handler.go, routes/admin.go,
dto/settings.go, group_repo.go, api_key_repo.go, wire_gen.go to
upstream/main versions and surgically remove only Sora references.

This preserves upstream-only features (RequireOauthOnly, RequirePrivacySet,
GroupResolution, etc.) that were missing when using release branch versions.
 2026-04-05 18:48:41 +08:00
erio 58707f8a2a fix: restore upstream api_contract_test and remove Sora fields 2026-04-05 18:18:58 +08:00
erio c6089ccb33 fix: remove Sora DI from wire_gen.go and clean remaining upstream Sora references 2026-04-05 17:50:01 +08:00
shaw f585a15eff fix(billing): prevent channel_mapped override from reverting BillingModel when channel did not map 
When a channel has no model mapping for the requested model, ChannelMappedModel
equals OriginalModel (the user's arbitrary input). Combined with the default
BillingModelSource="channel_mapped", this incorrectly overrides the BillingModel
set by the OpenAI format conversion layer (e.g., gpt-5.4 from DefaultMappedModel)
back to the unmapped original model (e.g., glm) which has no pricing — resulting
in zero-cost billing.

Add guard condition so the channel_mapped override only fires when the channel
actually changed the model (ChannelMappedModel != OriginalModel).
 2026-04-05 17:31:18 +08:00
erio 08e69af572 fix: remove empty DataManagement tab from settings (was Sora S3 storage) 2026-04-05 17:22:22 +08:00
erio 294b4bcbac fix: remove Sora S3 profile code from DataManagementView, keep backup functionality 2026-04-05 17:22:22 +08:00
erio 67008b5d15 fix: restore DataManagementView.vue — incorrectly deleted during Sora removal 
This component is used by SettingsView.vue for backup/data management.
It was mistakenly deleted as "Sora storage management" but contains
non-Sora backup functionality from upstream.
 2026-04-05 17:22:22 +08:00
erio a29f5a4849 fix: gofmt formatting 2026-04-05 17:22:22 +08:00
erio 1b1c08f7fb fix: remove media_type from usage_log SQL queries and test stubs 
- Remove media_type column from all INSERT/SELECT/SCAN in usage_log_repo
- Remove media_type mock arg from request_type and integration tests
- Adjust scan stub value arrays from 47 to 46 elements
 2026-04-05 17:22:22 +08:00
erio 0c72be0403 fix: gofmt alignment and remove media_type from usage_log repo queries 2026-04-05 17:22:22 +08:00
erio b4bd89b96b fix: remove media_type from usage_log SQL queries + gofmt + inline test helpers 2026-04-05 17:22:22 +08:00
erio 5bb8b2add6 fix: resolve CI failures — gofmt, unused functions, test parameter mismatches 
- gofmt: user.go, config_test.go, group_handler.go, smart_retry_test.go
- Remove unused: mergeGroupIDs, resolveProxyURL, "time" import
- Fix api_contract_test.go: remove extra Sora args from NewAdminService,
  NewSettingHandler, NewAccountHandler; remove Sora field expectations
- Fix account_test_service_openai_test.go: restore test helpers
 2026-04-05 17:22:22 +08:00
erio 93b42ccfea fix: resolve CI failures — gofmt, unused functions, missing test helpers 
- Run gofmt on user schema, config test, group handler
- Remove unused mergeGroupIDs function
- Restore shared test helpers (newJSONResponse, queuedHTTPUpstream)
  that were in deleted Sora test file
 2026-04-05 17:21:36 +08:00
erio ff86154a03 refactor: remove unused OpenAIOAuthOptions after Sora platform removal 
The options parameter only served to switch between 'openai' and 'sora'
platforms. With Sora removed, the parameter is unnecessary.
 2026-04-05 17:19:27 +08:00
erio fcee67e317 fix: remove remaining unused Sora variables causing TypeScript build failure 
- Remove unused accessTokenInput ref from OAuthAuthorizationFlow
- Remove unused parsedSessionToken* computed and handleValidateSessionToken
- Prefix unused options parameter in useOpenAIOAuth
 2026-04-05 17:19:27 +08:00
erio 155900e62f fix: remove unused Sora references causing TypeScript build failure 
- Remove handleImportAccessToken event binding from CreateAccountModal
- Remove unused imports/variables from OAuthAuthorizationFlow (useAppStore,
  parsedAccessToken*, handleImportAccessToken)
- Remove unused oauthPlatform variable from useOpenAIOAuth composable
 2026-04-05 17:19:27 +08:00
erio 9c514c9808 chore: drop Sora database schema and regenerate ent code 2026-04-05 17:19:07 +08:00
erio 62e80c602d revert: completely remove all Sora functionality 2026-04-05 17:11:01 +08:00
erio 90134c72ed fix: remove cross-platform pricing/mapping leakage for antigravity groups 
Antigravity groups were incorrectly matching pricing and model mapping
entries from anthropic/gemini platform tabs. Each platform should be
strictly isolated — antigravity groups only use antigravity-tagged pricing.
 2026-04-05 16:17:30 +08:00
erio d80c7b0166 fix: remove empty DataManagement tab from settings (was Sora S3 storage) 2026-04-05 15:30:40 +08:00
erio 22f3cecc39 fix: remove Sora S3 profile code from DataManagementView, keep backup functionality 2026-04-05 15:12:13 +08:00
erio 084be0b8c2 fix: restore DataManagementView.vue — incorrectly deleted during Sora removal 
This component is used by SettingsView.vue for backup/data management.
It was mistakenly deleted as "Sora storage management" but contains
non-Sora backup functionality from upstream.
 2026-04-05 15:07:12 +08:00
erio e2047c35f6 fix: gofmt formatting 2026-04-05 14:37:21 +08:00
erio 47f6eab526 fix: remove media_type from usage_log SQL queries and test stubs 
- Remove media_type column from all INSERT/SELECT/SCAN in usage_log_repo
- Remove media_type mock arg from request_type and integration tests
- Adjust scan stub value arrays from 47 to 46 elements
 2026-04-05 14:31:33 +08:00
erio 75d9fe2c7b fix: gofmt alignment and remove media_type from usage_log repo queries 2026-04-05 14:25:29 +08:00
erio 608cac1073 fix: remove media_type from usage_log SQL queries + gofmt + inline test helpers 2026-04-05 14:18:04 +08:00
erio cf684a42bf fix: resolve CI failures — gofmt, unused functions, test parameter mismatches 
- gofmt: user.go, config_test.go, group_handler.go, smart_retry_test.go
- Remove unused: mergeGroupIDs, resolveProxyURL, "time" import
- Fix api_contract_test.go: remove extra Sora args from NewAdminService,
  NewSettingHandler, NewAccountHandler; remove Sora field expectations
- Fix account_test_service_openai_test.go: restore test helpers
 2026-04-05 14:05:15 +08:00
github-actions[bot] dbb248df52 chore: sync VERSION to 0.1.107 [skip ci] 2026-04-05 06:02:08 +00:00
erio 99e6dc9b8e fix: resolve CI failures — gofmt, unused functions, missing test helpers 
- Run gofmt on user schema, config test, group handler
- Remove unused mergeGroupIDs function
- Restore shared test helpers (newJSONResponse, queuedHTTPUpstream)
  that were in deleted Sora test file
 2026-04-05 13:52:48 +08:00
erio 066b18b405 refactor: remove unused OpenAIOAuthOptions after Sora platform removal 
The options parameter only served to switch between 'openai' and 'sora'
platforms. With Sora removed, the parameter is unnecessary.
 2026-04-05 13:41:51 +08:00
偷得浮生 66779f1c5f 同步ag版本号 2026-04-05 13:01:28 +08:00
偷得浮生 2c856b67ca Update oauth.go 2026-04-05 13:00:23 +08:00
erio 031ca66c7e fix: remove remaining unused Sora variables causing TypeScript build failure 
- Remove unused accessTokenInput ref from OAuthAuthorizationFlow
- Remove unused parsedSessionToken* computed and handleValidateSessionToken
- Prefix unused options parameter in useOpenAIOAuth
 2026-04-05 04:11:30 +08:00
erio 99e5a09d89 fix: remove unused Sora references causing TypeScript build failure 
- Remove handleImportAccessToken event binding from CreateAccountModal
- Remove unused imports/variables from OAuthAuthorizationFlow (useAppStore,
  parsedAccessToken*, handleImportAccessToken)
- Remove unused oauthPlatform variable from useOpenAIOAuth composable
 2026-04-05 04:04:47 +08:00
erio 5b849d10b7 chore: drop Sora database schema and regenerate ent code 
- Add migration 090_drop_sora.sql to drop sora_tasks, sora_generations,
  sora_accounts tables and Sora columns from groups/users/usage_logs
- Remove Sora fields from ent schemas (group, user, usage_log)
- Regenerate ent code via go generate ./ent/...
- All tests pass
 2026-04-05 00:55:14 +08:00
erio dece8987e9 revert: completely remove all Sora functionality 
Remove ALL Sora code — client, gateway, generation, S3 storage, accounts,
media, SDK, quota, scheduling, billing, OAuth, settings, and frontend UI.

Backend: 60+ files deleted/cleaned, including service layer (scheduling,
billing, token provider), handler layer (client/gateway handlers, DTOs),
repository layer (sora repos), config, wire DI, routes, domain constants.

Frontend: 14 files deleted + 29 files cleaned, including components, views,
API clients, composables, i18n keys, types, router entries.

Cloudflare challenge detection migrated from soraerror to httputil package.
Migration files retained (046/047/063/070) to preserve DB migration history.

136 files changed, ~24,300 lines removed. All tests pass.
 2026-04-04 23:50:00 +08:00
Wesley Liddick bf45581104 Merge pull request #1455 from touwaeriol/feat/channel-management 
feat(channel): add channel management with multi-mode pricing and billing integration
 2026-04-04 23:42:33 +08:00
erio 60d84d621c fix: remove leftover affinity test cases from gateway_multiplatform_test.go 2026-04-04 19:18:48 +08:00
erio 53afb8c540 fix: restore upstream Sora frontend components and remove leftover i18n affinity keys 2026-04-04 17:08:43 +08:00