drop chat-session and change tools and and provider tools optional in config

Author: noise64

llm/anthropic/src/conversions.rs

@@ -12,22 +12,28 @@ use std::collections::HashMap;
 pub fn events_to_request(events: Vec<Event>, config: Config) -> Result<MessagesRequest, Error> {
     let options = config
         .provider_options
-        .into_iter()
-        .map(|kv| (kv.key, kv.value))
-        .collect::<HashMap<_, _>>();
+        .map(|options| {
+            options
+                .into_iter()
+                .map(|kv| (kv.key, kv.value))
+                .collect::<HashMap<_, _>>()
+        })
+        .unwrap_or_default();
 
     let (user_messages, system_messages) = events_to_messages_and_system_messages(events);
 
     let tool_choice = config.tool_choice.map(convert_tool_choice);
-    let tools = if config.tools.is_empty() {
-        None
-    } else {
-        let mut tools = Vec::new();
-        for tool in &config.tools {
-            tools.push(tool_definition_to_tool(tool)?)
-        }
-        Some(tools)
-    };
+    let tools = config
+        .tools
+        .and_then(|tools| {
+            (!tools.is_empty()).then(|| {
+                tools
+                    .into_iter()
+                    .map(tool_definition_to_tool)
+                    .collect::<Result<Vec<_>, _>>()
+            })
+        })
+        .transpose()?;
 
     Ok(MessagesRequest {
         max_tokens: config.max_tokens.unwrap_or(4096),
@@ -280,13 +286,13 @@ fn content_parts_to_content(content_parts: Vec<ContentPart>) -> Vec<Content> {
     result
 }
 
-fn tool_definition_to_tool(tool: &ToolDefinition) -> Result<Tool, Error> {
+fn tool_definition_to_tool(tool: ToolDefinition) -> Result<Tool, Error> {
     match serde_json::from_str(&tool.parameters_schema) {
         Ok(value) => Ok(Tool::CustomTool {
             input_schema: value,
-            name: tool.name.clone(),
+            name: tool.name,
             cache_control: None,
-            description: tool.description.clone(),
+            description: tool.description,
         }),
         Err(error) => Err(Error {
             code: ErrorCode::InternalError,

llm/anthropic/src/lib.rs

@@ -7,7 +7,6 @@ use crate::client::{
 use crate::conversions::{
     convert_usage, events_to_request, process_response, stop_reason_to_finish_reason,
 };
-use golem_llm::chat_session::ChatSession;
 use golem_llm::chat_stream::{LlmChatStream, LlmChatStreamState};
 use golem_llm::config::{get_config_key, with_config_key};
 use golem_llm::durability::{DurableLLM, ExtendedGuest};
@@ -277,7 +276,6 @@ impl AnthropicComponent {
 
 impl Guest for AnthropicComponent {
     type ChatStream = LlmChatStream<AnthropicChatStream>;
-    type ChatSession = ChatSession<DurableAnthropicComponent>;
 
     fn send(events: Vec<Event>, config: Config) -> Result<Response, Error> {
         let anthropic_api_key = get_config_key(Self::ENV_VAR_NAME)?;

llm/anthropic/wit/deps/golem-llm/golem-llm.wit

@@ -173,11 +173,11 @@ interface llm {
     /// A sequence where the model stops generating tokens
     stop-sequences: option<list<string>>,
     /// List of available tools
-    tools: list<tool-definition>,
+    tools: option<list<tool-definition>>,
     /// Tool choice policy
     tool-choice: option<string>,
     /// Additional LLM provider specific key-value pairs
-    provider-options: list<kv>,
+    provider-options: option<list<kv>>,
   }
 
   // --- Usage / Metadata ---
@@ -286,33 +286,6 @@ interface llm {
     events: list<event>,
     config: config,
   ) -> chat-stream;
-
-  // --- Chat session ---
-
-  /// Chat session is a simple wrapper on top of events to help with maintaining chat history
-  resource chat-session {
-    /// Create new session with the provided config
-    constructor(config: config);
-
-    /// Add a single user message to the chat events
-    add-message: func(message: message);
-    /// Add multiple user messages to the chat events
-    add-messages: func(messages: list<message>);
-    /// Add a single tool result to the chat events
-    add-tool-result: func(tool-result: tool-result);
-    /// Add multiple tool results to the chat events
-    add-tool-results: func(tool-results: list<tool-result>);
-
-    /// Observe all events in the session
-    get-chat-events: func() -> list<event>;
-    // Replace all events in the session, which allows e.g. compacting them
-    set-chat-events: func(events: list<event>);
-
-    /// Send the full accumulated chat events, responses are automatically added to the session chat events
-    send: func() -> result<response, error>;
-    /// Like Send, but streams responses
-    %stream: func() -> chat-stream;
-  }
 }
 
 world llm-library {

llm/bedrock/src/conversions.rs

@@ -30,9 +30,13 @@ impl BedrockInput {
 
         let options = config
             .provider_options
-            .iter()
-            .map(|kv| (kv.key.clone(), Document::String(kv.value.clone())))
-            .collect::<HashMap<_, _>>();
+            .map(|options| {
+                options
+                    .into_iter()
+                    .map(|kv| (kv.key, Document::String(kv.value)))
+                    .collect::<HashMap<_, _>>()
+            })
+            .unwrap_or_default();
 
         Ok(BedrockInput {
             model_id: config.model.clone(),
@@ -47,7 +51,7 @@ impl BedrockInput {
                 .build(),
             messages: user_messages,
             system_instructions,
-            tools: tool_defs_to_bedrock_tool_config(config.tools.clone())?,
+            tools: tool_defs_to_bedrock_tool_config(config.tools.unwrap_or_default())?,
             additional_fields: Document::Object(options),
         })
     }

llm/bedrock/src/lib.rs

@@ -1,6 +1,5 @@
 use async_utils::get_async_runtime;
 use client::Bedrock;
-use golem_llm::chat_session::ChatSession;
 use golem_llm::durability::{DurableLLM, ExtendedGuest};
 use golem_llm::golem::llm::llm::{
     self, ChatStream, Config, Error, Event, Guest, Message, Response,
@@ -19,7 +18,6 @@ struct BedrockComponent;
 
 impl Guest for BedrockComponent {
     type ChatStream = BedrockChatStream;
-    type ChatSession = ChatSession<DurableBedrockComponent>;
 
     fn send(events: Vec<Event>, config: Config) -> Result<Response, Error> {
         let runtime = get_async_runtime();

llm/bedrock/wit/deps/golem-llm/golem-llm.wit

@@ -173,11 +173,11 @@ interface llm {
     /// A sequence where the model stops generating tokens
     stop-sequences: option<list<string>>,
     /// List of available tools
-    tools: list<tool-definition>,
+    tools: option<list<tool-definition>>,
     /// Tool choice policy
     tool-choice: option<string>,
     /// Additional LLM provider specific key-value pairs
-    provider-options: list<kv>,
+    provider-options: option<list<kv>>,
   }
 
   // --- Usage / Metadata ---
@@ -286,33 +286,6 @@ interface llm {
     events: list<event>,
     config: config,
   ) -> chat-stream;
-
-  // --- Chat session ---
-
-  /// Chat session is a simple wrapper on top of events to help with maintaining chat history
-  resource chat-session {
-    /// Create new session with the provided config
-    constructor(config: config);
-
-    /// Add a single user message to the chat events
-    add-message: func(message: message);
-    /// Add multiple user messages to the chat events
-    add-messages: func(messages: list<message>);
-    /// Add a single tool result to the chat events
-    add-tool-result: func(tool-result: tool-result);
-    /// Add multiple tool results to the chat events
-    add-tool-results: func(tool-results: list<tool-result>);
-
-    /// Observe all events in the session
-    get-chat-events: func() -> list<event>;
-    // Replace all events in the session, which allows e.g. compacting them
-    set-chat-events: func(events: list<event>);
-
-    /// Send the full accumulated chat events, responses are automatically added to the session chat events
-    send: func() -> result<response, error>;
-    /// Like Send, but streams responses
-    %stream: func() -> chat-stream;
-  }
 }
 
 world llm-library {

llm/grok/src/conversions.rs

@@ -9,9 +9,13 @@ use std::collections::HashMap;
 pub fn events_to_request(events: Vec<Event>, config: Config) -> Result<CompletionsRequest, Error> {
     let options = config
         .provider_options
-        .into_iter()
-        .map(|kv| (kv.key, kv.value))
-        .collect::<HashMap<_, _>>();
+        .map(|options| {
+            options
+                .into_iter()
+                .map(|kv| (kv.key, kv.value))
+                .collect::<HashMap<_, _>>()
+        })
+        .unwrap_or_default();
 
     let mut completion_messages = Vec::new();
     for event in events {
@@ -61,7 +65,7 @@ pub fn events_to_request(events: Vec<Event>, config: Config) -> Result<Completio
     }
 
     let mut tools = Vec::new();
-    for tool in config.tools {
+    for tool in config.tools.unwrap_or_default() {
         tools.push(tool_definition_to_tool(tool)?)
     }
 

llm/grok/src/lib.rs

@@ -6,7 +6,6 @@ use crate::conversions::{
     convert_client_tool_call_to_tool_call, convert_finish_reason, convert_usage, events_to_request,
     process_response,
 };
-use golem_llm::chat_session::ChatSession;
 use golem_llm::chat_stream::{LlmChatStream, LlmChatStreamState};
 use golem_llm::config::{get_config_key, with_config_key};
 use golem_llm::durability::{DurableLLM, ExtendedGuest};
@@ -155,7 +154,6 @@ impl GrokComponent {
 
 impl Guest for GrokComponent {
     type ChatStream = LlmChatStream<GrokChatStream>;
-    type ChatSession = ChatSession<DurableGrokComponent>;
 
     fn send(events: Vec<Event>, config: Config) -> Result<Response, Error> {
         let xai_api_key = get_config_key(Self::ENV_VAR_NAME)?;

llm/grok/wit/deps/golem-llm/golem-llm.wit

@@ -173,11 +173,11 @@ interface llm {
     /// A sequence where the model stops generating tokens
     stop-sequences: option<list<string>>,
     /// List of available tools
-    tools: list<tool-definition>,
+    tools: option<list<tool-definition>>,
     /// Tool choice policy
     tool-choice: option<string>,
     /// Additional LLM provider specific key-value pairs
-    provider-options: list<kv>,
+    provider-options: option<list<kv>>,
   }
 
   // --- Usage / Metadata ---
@@ -286,33 +286,6 @@ interface llm {
     events: list<event>,
     config: config,
   ) -> chat-stream;
-
-  // --- Chat session ---
-
-  /// Chat session is a simple wrapper on top of events to help with maintaining chat history
-  resource chat-session {
-    /// Create new session with the provided config
-    constructor(config: config);
-
-    /// Add a single user message to the chat events
-    add-message: func(message: message);
-    /// Add multiple user messages to the chat events
-    add-messages: func(messages: list<message>);
-    /// Add a single tool result to the chat events
-    add-tool-result: func(tool-result: tool-result);
-    /// Add multiple tool results to the chat events
-    add-tool-results: func(tool-results: list<tool-result>);
-
-    /// Observe all events in the session
-    get-chat-events: func() -> list<event>;
-    // Replace all events in the session, which allows e.g. compacting them
-    set-chat-events: func(events: list<event>);
-
-    /// Send the full accumulated chat events, responses are automatically added to the session chat events
-    send: func() -> result<response, error>;
-    /// Like Send, but streams responses
-    %stream: func() -> chat-stream;
-  }
 }
 
 world llm-library {