mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-11 03:39:49 +08:00
merge(pr287): absorb remaining rust branch changes
Absorb the remaining changes from PR #287 into aether-rust-pioneer after resolving conflicts locally and preserving the admin fixes already landed in this branch. Closes #287 Co-authored-by: AAEE86 <[email protected]>
This commit is contained in:
@@ -77,7 +77,7 @@ mod tests {
|
||||
);
|
||||
assert_eq!(
|
||||
sync_cli_response_conversion_kind("claude:cli", "openai:compact"),
|
||||
None
|
||||
Some(SyncCliResponseConversionKind::ToOpenAIFamilyCli)
|
||||
);
|
||||
assert_eq!(
|
||||
sync_cli_response_conversion_kind("openai:compact", "claude:cli"),
|
||||
|
||||
@@ -192,7 +192,7 @@ async fn resolve_tunnel_owner_affinity_from_transport(
|
||||
state: PlannerAppState<'_>,
|
||||
transport: &GatewayProviderTransportSnapshot,
|
||||
) -> TunnelOwnerAffinityBucket {
|
||||
let Some(proxy) = resolve_transport_proxy_snapshot(&transport) else {
|
||||
let Some(proxy) = resolve_transport_proxy_snapshot(transport) else {
|
||||
return TunnelOwnerAffinityBucket::Neutral;
|
||||
};
|
||||
if proxy.enabled == Some(false) {
|
||||
|
||||
+1
-2
@@ -53,8 +53,7 @@ pub(super) async fn build_cross_format_local_openai_chat_decision_payload_for_ca
|
||||
else {
|
||||
return None;
|
||||
};
|
||||
if !request_pair_allowed_for_transport(&transport, "openai:chat", provider_api_format.as_str())
|
||||
{
|
||||
if !request_pair_allowed_for_transport(transport, "openai:chat", provider_api_format.as_str()) {
|
||||
let skip_reason =
|
||||
if request_conversion_requires_enable_flag("openai:chat", provider_api_format.as_str())
|
||||
&& !transport.provider.enable_format_conversion
|
||||
|
||||
Reference in New Issue
Block a user