GameCult/ModelConnector
Watch
9
0
Fork
You've already forked ModelConnector
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix test shadowing and gate the readout encoders to the daemon feature

Browse source 
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
Meta Vens 2026-10-29 19:00:15 +01:00
commit 8cf883ed11
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/claude-connector/src/backend/tests.rs
View file

@ -6,8 +6,8 @@ use std::time::Duration;
use model_connector::{
CallerAdmission, ModelPrice, PriceTable, Rates, ReasoningEffort, SpendCeiling, SpendWindowMs,
ToolDefinition, TransportAdmission, TransportDisposition, TransportInvocation, TransportKey,
TransportReceipt, TransportService, decrypt_result, encrypt_invocation,
StopReason, ToolDefinition, TransportAdmission, TransportDisposition, TransportInvocation,
TransportKey, TransportReceipt, TransportService, decrypt_result, encrypt_invocation,
};
use super::*;
@ -1893,28 +1893,28 @@ fn a_schema_turn_without_structured_output_is_a_provider_failure_billed_as_repor
#[test]
fn only_the_structured_output_tool_is_allowed_and_only_when_a_schema_was_sent() {
// Without a schema the same call is a tool in a tool-less turn.
let rig = rig(vec![structured_script()]);
let (kind, message, _) = failure_of(&rig.run(request(vec![user("hello")])));
let first = rig(vec![structured_script()]);
let (kind, message, _) = failure_of(&first.run(request(vec![user("hello")])));
assert_eq!(kind, FailureKind::Provider);
assert!(message.contains("tool"), "{message}");
// With a schema, any other tool is still refused.
let rig = rig(vec![Script::lines(vec![
let second = rig(vec![Script::lines(vec![
init_line(MODEL, SESSION),
structured_call_line("Bash"),
structured_result_line(),
])]);
let (kind, message, _) = failure_of(&rig.run(schema_request()));
let (kind, message, _) = failure_of(&second.run(schema_request()));
assert_eq!(kind, FailureKind::Provider);
assert!(message.contains("tool"), "{message}");
// `tool_use` is a stop reason only for a schema turn.
let rig = rig(vec![Script::lines(vec![
let third = rig(vec![Script::lines(vec![
init_line(MODEL, SESSION),
text_line("msg_1", "hi"),
result_line("tool_use", USAGE),
])]);
let (kind, message, _) = failure_of(&rig.run(request(vec![user("hello")])));
let (kind, message, _) = failure_of(&third.run(request(vec![user("hello")])));
assert_eq!(kind, FailureKind::Provider);
assert!(message.contains("stop reason"), "{message}");
}
@ -2243,7 +2243,7 @@ mod real {
let result = fake.run(request(vec![user("hello")]));
assert!(matches!(
outcome(&result),
TransportOutcome::Completed {{ .. }}
TransportOutcome::Completed { .. }
));
let read = |name: &str| std::fs::read_to_string(probe.path().join(name)).unwrap();
assert_eq!(read("first"), CANARY_TOKEN, "the pipe holds the token");

4
crates/model-connector/src/envelope.rs
View file

@ -152,7 +152,7 @@ pub(crate) fn encode_result_frame(envelope: &TransportEnvelope) -> Result<Vec<u8
response_frame(Operation::Invoke, envelope)
}
#[cfg(any(feature = "daemon", test))]
#[cfg(feature = "daemon")]
pub(crate) fn encode_spend_readout_response_frame(
envelope: &TransportEnvelope,
) -> Result<Vec<u8>, ServiceError> {
@ -441,7 +441,7 @@ pub(crate) fn decrypt_spend_readout_request(
decrypt_message(envelope, security).map(drop)
}
#[cfg(any(feature = "daemon", test))]
#[cfg(feature = "daemon")]
pub(crate) fn encrypt_spend_readout(
caller_runtime_id: &str,
request_id: &str,