fawney19
|
cd1aa92931
|
Merge branch 'merge-pr-483'
|
2026-05-19 02:28:43 +08:00 |
|
fawney19
|
9fc9c334c9
|
Merge remote-tracking branch 'origin/pr/487'
# Conflicts:
# crates/aether-data/src/lifecycle/bootstrap/postgres.rs
# crates/aether-data/src/lifecycle/migrate/tests.rs
# crates/aether-data/src/repository/oauth_providers/postgres.rs
# crates/aether-data/src/repository/oauth_providers/sqlite.rs
# frontend/src/views/admin/OAuthSettings.vue
|
2026-05-19 02:27:39 +08:00 |
|
fawney19
|
c563c192b7
|
Merge remote-tracking branch 'origin/pr-483' into merge-pr-483
# Conflicts:
# apps/aether-gateway/src/ai_serving/planner/standard/openai/chat/decision/payload.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/chat/decision/request.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/responses/decision/payload.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/responses/decision/request.rs
# apps/aether-gateway/src/execution_runtime/chatgpt_web_image.rs
|
2026-05-19 02:23:14 +08:00 |
|
fawney19
|
afedd90c80
|
Merge commit 'refs/pull/481/head' of github-fawney19:fawney19/Aether
# Conflicts:
# apps/aether-gateway/src/ai_serving/api.rs
# apps/aether-gateway/src/ai_serving/planner/standard/family/request.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/chat/decision/request.rs
# apps/aether-gateway/src/ai_serving/planner/standard/openai/responses/decision/request.rs
|
2026-05-19 01:46:41 +08:00 |
|
fawney19
|
d392681c58
|
Merge branch 'pr-478'
# Conflicts:
# apps/aether-gateway/src/data/state/mod.rs
# apps/aether-gateway/src/handlers/admin/mod.rs
# apps/aether-gateway/src/handlers/admin/routes.rs
# crates/aether-data/src/lifecycle/bootstrap/postgres.rs
# crates/aether-data/src/lifecycle/migrate/tests.rs
# crates/aether-data/src/repository/announcements/postgres.rs
# frontend/src/features/auth/components/RegisterDialog.vue
|
2026-05-19 01:27:42 +08:00 |
|
fawney19
|
ed1d9fdb57
|
Fix postgres bigint counter decoding
|
2026-05-19 00:58:09 +08:00 |
|
ZheFox
|
c58ce63fc3
|
Merge branch 'fawney19:main' into main
|
2026-05-19 00:50:52 +08:00 |
|
fawney19
|
5eed329916
|
Rootfix usage counter outbox
|
2026-05-19 00:44:37 +08:00 |
|
fawney19
|
19c8688eb1
|
Merge pull request #477 from RWDai/feat/356-usage-record-columns
Add configurable usage record columns
|
2026-05-19 00:35:30 +08:00 |
|
ZheFox
|
61d5fdb0ec
|
fix(frontend): preserve fixed provider model test key inheritance
|
2026-05-18 22:06:27 +08:00 |
|
ZheFox
|
995ab302be
|
Merge remote-tracking branch 'upstream/main'
# Conflicts:
# apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/payloads.rs
# apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/reads.rs
# apps/aether-gateway/src/handlers/admin/provider/endpoints_admin/update.rs
# apps/aether-gateway/src/tests/control/admin/endpoints/routes.rs
# frontend/src/features/models/components/GlobalModelFormDialog.vue
# frontend/src/features/providers/components/ProviderModelFormDialog.vue
# frontend/src/features/providers/components/provider-tabs/__tests__/model-test-request.spec.ts
# frontend/src/features/providers/components/provider-tabs/model-test-request.ts
|
2026-05-18 22:02:31 +08:00 |
|
RWDai
|
24129d7f12
|
Merge upstream/main into feat/356-usage-record-columns
|
2026-05-18 20:33:05 +08:00 |
|
fawney19
|
d51b44d642
|
Merge remote-tracking branch 'origin/pr-485'
# Conflicts:
# crates/aether-data/src/repository/provider_catalog/sqlite.rs
|
2026-05-18 19:44:18 +08:00 |
|
RWDai
|
e8c55e8f1f
|
Label OpenAI JS SDK in cache monitoring
|
2026-05-18 19:30:39 +08:00 |
|
RWDai
|
9179516b19
|
Label OpenAI JS SDK in usage records
|
2026-05-18 19:30:19 +08:00 |
|
RWDai
|
37abfe66f0
|
Label OpenAI JS SDK in user usage
|
2026-05-18 19:29:59 +08:00 |
|
RWDai
|
ae9d4038b1
|
Prefer typed admin usage client family
|
2026-05-18 19:29:36 +08:00 |
|
RWDai
|
b6f558d10b
|
Project usage client family in Postgres reads
|
2026-05-18 19:29:10 +08:00 |
|
RWDai
|
6d994917a0
|
Add usage client family read model field
|
2026-05-18 19:28:36 +08:00 |
|
fawney19
|
b99f43783c
|
Merge remote-tracking branch 'origin/pr-482'
# Conflicts:
# .github/workflows/release.yml
|
2026-05-18 18:55:11 +08:00 |
|
fawney19
|
7f76eff827
|
Merge remote-tracking branch 'origin/pr-484'
|
2026-05-18 18:01:57 +08:00 |
|
fawney19
|
be939f7e63
|
Merge remote-tracking branch 'origin/pr-493'
|
2026-05-18 18:01:43 +08:00 |
|
fawney19
|
a8a87d2b41
|
Merge remote-tracking branch 'origin/pr-494'
|
2026-05-18 18:00:47 +08:00 |
|
RWDai
|
0a26accca4
|
Merge remote-tracking branch 'upstream/main' into feat/356-usage-record-columns
|
2026-05-18 17:49:35 +08:00 |
|
fawney19
|
40e925680c
|
Merge remote-tracking branch 'origin/pr-480'
|
2026-05-18 16:46:35 +08:00 |
|
fawney19
|
f2cdb74ed8
|
Merge remote-tracking branch 'origin/pr-473'
# Conflicts:
# frontend/src/features/providers/components/ProviderModelFormDialog.vue
|
2026-05-18 16:46:22 +08:00 |
|
fawney19
|
3f0fd15395
|
Merge remote-tracking branch 'origin/pr-491'
|
2026-05-18 16:14:07 +08:00 |
|
fawney19
|
90dbc279fd
|
Merge remote-tracking branch 'origin/pr-476'
|
2026-05-18 16:13:45 +08:00 |
|
fawney19
|
3723f165bc
|
Merge remote-tracking branch 'origin/pr-496'
|
2026-05-18 16:13:03 +08:00 |
|
fawney19
|
3bffecddf2
|
fix: route access log sanitizer through gateway api
|
2026-05-18 15:47:02 +08:00 |
|
fawney19
|
a818af7833
|
Merge remote-tracking branch 'origin/pr-492'
|
2026-05-18 14:52:29 +08:00 |
|
fawney19
|
187b3a08fb
|
Merge remote-tracking branch 'origin/pr-495'
|
2026-05-18 14:51:50 +08:00 |
|
fawney19
|
2405ccc0f2
|
Merge remote-tracking branch 'origin/pr-490'
|
2026-05-18 14:51:14 +08:00 |
|
fawney19
|
0fcfcae9c8
|
Merge remote-tracking branch 'origin/pr-486'
|
2026-05-18 14:50:48 +08:00 |
|
ZheFox
|
2de0cbbafc
|
Merge branch 'fawney19:main' into main
|
2026-05-18 13:13:37 +08:00 |
|
ZheFox
|
a4012ad353
|
Merge upstream/main
|
2026-05-18 13:11:11 +08:00 |
|
fawney19
|
e4315fbbf0
|
fix: refine frontend admin and auth UI
|
2026-05-18 12:41:57 +08:00 |
|
ZheFox
|
a10c02ef63
|
feat(billing): add image output range pricing support
|
2026-05-18 11:52:01 +08:00 |
|
fawney19
|
92813e6122
|
feat: add routing profile scheduling policies
|
2026-05-18 11:03:49 +08:00 |
|
ZheFox
|
a3094fda53
|
fix(gateway): ignore OpenAI tools for image intent routing
|
2026-05-18 09:54:10 +08:00 |
|
MMEXA
|
9586f5158e
|
Fix fixed-provider endpoint key counts
|
2026-05-17 20:55:36 +00:00 |
|
ZheFox
|
f5ace4fd6d
|
fix(frontend): stabilize image generation overrides in model forms
|
2026-05-18 03:39:55 +08:00 |
|
ZheFox
|
a05ae94cea
|
fix(frontend): update checkbox bindings to checked events
|
2026-05-18 03:27:31 +08:00 |
|
ZheFox
|
dff17b6cb1
|
feat(billing): support image output pricing in model forms and details
|
2026-05-18 03:19:58 +08:00 |
|
ZheFox
|
0b2a8fafce
|
feat(billing): add image output pricing and usage tracking
|
2026-05-18 02:49:56 +08:00 |
|
ZheFox
|
691ccaaa04
|
fix(usage): track OpenAI image SSE completion and usage estimates
|
2026-05-18 01:32:45 +08:00 |
|
RWDai
|
26900c8c9e
|
Show only client family in usage client column
|
2026-05-18 00:46:41 +08:00 |
|
MMEXA
|
226ce45d0d
|
fix: pass explicit local build version
|
2026-05-17 16:38:22 +00:00 |
|
Kayphoon
|
ae472d6744
|
fix(data): require provider id for provider usage aggregation
|
2026-05-18 00:36:29 +08:00 |
|
MMEXA
|
89d08d9953
|
fix: align provider model fetch state
|
2026-05-17 16:17:47 +00:00 |
|