Block-indexed streaming, message origin/custom/system patches, profile behaviour, media blocks (tinyagents#171)

crates/tinyinference-llm/src/error.rs

@@ -25,4 +25,7 @@ pub enum Error {
     /// A provider model catalog used an invalid response envelope.
     #[error("catalog error: {0}")]
     Catalog(String),
+    /// The requested operation is not supported by this adapter.
+    #[error("unsupported operation: {0}")]
+    Unsupported(String),
 }

crates/tinyinference-llm/src/lib.rs

@@ -12,6 +12,7 @@ pub mod error;
 pub mod failure;
 pub mod message;
 pub mod model;
+mod network_guard;
 pub mod prompt_tools;
 pub mod providers;
 pub mod sentiment;
@@ -28,6 +29,7 @@ pub use model::{
     ChatModel, ModelRequest, ModelResponse, ModelStream, ModelStreamItem,
     context_window_for_model_id, model_id_supports_vision,
 };
+pub use network_guard::{allow_network_models, deny_network_models, network_models_denied};
 pub use providers::{MockModel, ProviderKind, ProviderSpec};
 pub use tool::{ToolCall, ToolDelta, ToolFormat, ToolSchema};
 pub use usage::{Usage, UsageTotals};

crates/tinyinference-llm/src/message/mod.rs

@@ -86,6 +86,13 @@ impl ContentBlock {
             ContentBlock::Thinking { text, .. } => text.chars().count(),
             ContentBlock::RedactedThinking { data } => data.chars().count(),
             ContentBlock::ProviderExtension(value) => value.to_string().chars().count(),
+            // Non-text media has no character-based weight of its own;
+            // charge the same flat weight as an image so budgeting/compaction
+            // does not under-count a transcript dominated by audio, video, or
+            // document attachments.
+            ContentBlock::Audio(_) | ContentBlock::Video(_) | ContentBlock::Document(_) => {
+                IMAGE_CHAR_WEIGHT
+            }
         }
     }
 }
@@ -102,9 +109,7 @@ fn concat_text(content: &[ContentBlock]) -> String {
 impl Message {
     /// Creates a system message from text.
     pub fn system(content: impl Into<String>) -> Self {
-        Message::System(SystemMessage {
-            content: vec![ContentBlock::Text(content.into())],
-        })
+        Message::System(SystemMessage::text(content))
     }
 
     /// Creates a user message from text.
@@ -121,6 +126,7 @@ impl Message {
             content: vec![ContentBlock::Text(content.into())],
             tool_calls: Vec::new(),
             usage: None,
+            origin: None,
         })
     }
 
@@ -135,12 +141,16 @@ impl Message {
     }
 
     /// Returns the concatenated text of all text content blocks.
+    ///
+    /// [`Message::Custom`] carries no [`ContentBlock`]s; this returns its
+    /// `display` rendering (or an empty string when none was set).
     pub fn text(&self) -> String {
         match self {
             Message::System(m) => concat_text(&m.content),
             Message::User(m) => concat_text(&m.content),
             Message::Assistant(m) => concat_text(&m.content),
             Message::Tool(m) => concat_text(&m.content),
+            Message::Custom(m) => m.display.clone().unwrap_or_default(),
         }
     }
 
@@ -159,17 +169,27 @@ impl Message {
     /// `String` allocation, which matters on hot paths such as token estimation
     /// over a whole transcript.
     pub fn char_len(&self) -> usize {
-        let content = match self {
+        match self {
+            Message::Custom(m) => m.display.as_deref().map_or(0, |d| d.chars().count()),
+            other => other
+                .content_blocks()
+                .iter()
+                .filter_map(ContentBlock::as_text)
+                .map(|t| t.chars().count())
+                .sum(),
+        }
+    }
+
+    /// Returns the ordered [`ContentBlock`]s for message kinds that carry
+    /// them. [`Message::Custom`] carries none.
+    fn content_blocks(&self) -> &[ContentBlock] {
+        match self {
             Message::System(m) => &m.content,
             Message::User(m) => &m.content,
             Message::Assistant(m) => &m.content,
             Message::Tool(m) => &m.content,
-        };
-        content
-            .iter()
-            .filter_map(ContentBlock::as_text)
-            .map(|t| t.chars().count())
-            .sum()
+            Message::Custom(_) => &[],
+        }
     }
 
     /// Approximate character weight of provider-visible content and structural
@@ -181,13 +201,11 @@ impl Message {
     /// silently never trigger even as the real context window overflows. See
     /// [`ContentBlock::estimated_char_weight`].
     pub fn estimated_char_weight(&self) -> usize {
-        let content = match self {
-            Message::System(m) => &m.content,
-            Message::User(m) => &m.content,
-            Message::Assistant(m) => &m.content,
-            Message::Tool(m) => &m.content,
-        };
-        let content_weight: usize = content
+        if let Message::Custom(m) = self {
+            return m.display.as_deref().map_or(0, |d| d.chars().count());
+        }
+        let content_weight: usize = self
+            .content_blocks()
             .iter()
             .map(ContentBlock::estimated_char_weight)
             .sum();