simple-agents-py 0.1.11__tar.gz → 0.1.15__tar.gz

{simple_agents_py-0.1.11 → simple_agents_py-0.1.15}/Cargo.lock

@@ -2035,7 +2035,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agent-type"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "async-trait",
  "blake3",
@@ -2050,7 +2050,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-cache"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "async-trait",
  "simple-agent-type",
@@ -2059,7 +2059,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-cli"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "clap",
  "serde",
@@ -2076,9 +2076,10 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-core"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "async-trait",
+ "futures-core",
  "serde",
  "serde_json",
  "simple-agent-type",
@@ -2103,7 +2104,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-ffi"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "async-trait",
  "simple-agent-type",
@@ -2114,7 +2115,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-healing"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "criterion",
  "proptest",
@@ -2130,7 +2131,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-macros"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2142,7 +2143,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-napi"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "napi",
  "napi-derive",
@@ -2154,7 +2155,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-providers"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "async-trait",
  "bytes",
@@ -2182,23 +2183,29 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-py"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
+ "async-trait",
+ "futures-util",
  "pyo3",
  "pythonize",
  "reqwest",
  "serde_json",
  "simple-agent-type",
+ "simple-agents-cache",
  "simple-agents-core",
+ "simple-agents-healing",
  "simple-agents-providers",
+ "simple-agents-router",
  "tokio",
 ]
 
 [[package]]
 name = "simple-agents-router"
-version = "0.1.11"
+version = "0.1.15"
 dependencies = [
  "async-trait",
+ "futures-core",
  "rand 0.8.5",
  "serde_json",
  "simple-agent-type",

{simple_agents_py-0.1.11 → simple_agents_py-0.1.15}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.1.11"
+version = "0.1.15"
 edition = "2021"
 rust-version = "1.75"
 authors = ["SimpleAgents Contributors"]

{simple_agents_py-0.1.11 → simple_agents_py-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-agents-py
-Version: 0.1.11
+Version: 0.1.15
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: MIT License
@@ -57,7 +57,145 @@ from simple_agents_py import Client
 
 client = Client("openai")
 response = client.complete("gpt-4", "Hello from Python!", max_tokens=128, temperature=0.7)
-print(response)
+print(response.content)
+```
+
+## Feature Guide
+
+### Streaming
+
+```python
+from simple_agents_py import Client
+
+client = Client("openai")
+messages = [{"role": "user", "content": "Say hello in one sentence."}]
+for chunk in client.stream("gpt-4o-mini", messages, max_tokens=64):
+    if chunk.content:
+        print(chunk.content, end="", flush=True)
+print()
+```
+
+### Structured Output (JSON Mode)
+
+```python
+from simple_agents_py import Client
+import json
+
+client = Client("openai")
+schema = {
+    "type": "object",
+    "properties": {
+        "name": {"type": "string"},
+        "age": {"type": "number"},
+    },
+    "required": ["name", "age"],
+}
+messages = [{"role": "user", "content": "Extract name and age: Alice is 28."}]
+json_text = client.complete_json_schema("gpt-4o-mini", messages, schema, "person")
+print(json.loads(json_text))
+```
+
+Pydantic models are accepted too:
+
+```python
+from pydantic import BaseModel
+from simple_agents_py import Client
+
+class Person(BaseModel):
+    name: str
+    age: int
+
+client = Client("openai")
+messages = [{"role": "user", "content": "Extract name and age: Alice is 28."}]
+json_text = client.complete_json_schema("gpt-4o-mini", messages, Person, "person")
+print(json_text)
+```
+
+**Healing for Structured Outputs**: Healing is enabled by default for structured outputs, automatically fixing malformed JSON, type mismatches, and missing fields. To disable healing:
+
+```python
+client = Client("openai", healing=False)
+```
+
+### Structured Streaming
+
+```python
+from simple_agents_py import Client
+
+client = Client("openai")
+schema = {
+    "type": "object",
+    "properties": {"name": {"type": "string"}, "age": {"type": "number"}},
+    "required": ["name", "age"],
+}
+messages = [{"role": "user", "content": "Extract name and age: Alice is 28."}]
+for event in client.stream_structured("gpt-4o-mini", messages, schema, max_tokens=64):
+    if event.is_partial:
+        print("partial:", event.partial_value)
+    else:
+        print("complete:", event.value)
+```
+
+### Response Healing
+
+```python
+from simple_agents_py import Client
+
+client = Client("openai")
+messages = [{"role": "user", "content": "Return JSON: {\"name\":\"Sam\",\"age\":30}"}]
+healed = client.complete_json_healed("gpt-4o-mini", messages, max_tokens=64)
+print(healed.content)
+print(healed.was_healed, healed.confidence)
+print(healed.usage.get("total_tokens"))
+```
+
+### Tool Calling
+
+```python
+from simple_agents_py import Client
+
+client = Client("openai")
+tools = [
+    {
+        "type": "function",
+        "function": {
+            "name": "get_weather",
+            "description": "Get the weather for a city",
+            "parameters": {
+                "type": "object",
+                "properties": {
+                    "city": {"type": "string"},
+                    "unit": {"type": "string", "enum": ["c", "f"]},
+                },
+                "required": ["city"],
+            },
+        },
+    }
+]
+messages = [{"role": "user", "content": "What's the weather in Tokyo?"}]
+response = client.complete_with_tools("gpt-4o-mini", messages, tools)
+print(response.tool_calls)
+```
+
+### ClientBuilder (Routing, Cache, Healing, Middleware)
+
+```python
+from simple_agents_py import ClientBuilder
+
+class TimingMiddleware:
+    def before_request(self, request):
+        print("sending", request.model)
+
+builder = (
+    ClientBuilder()
+    .add_provider("openai", api_key="sk-...")
+    .with_routing("direct")
+    .with_cache(ttl_seconds=60)
+    .with_healing_config({"enabled": True, "min_confidence": 0.7})
+    .add_middleware(TimingMiddleware())
+)
+client = builder.build()
+print(client.complete("gpt-4o-mini", "Give me one idea.").content)
 ```
 
 ## Examples
@@ -68,8 +206,8 @@ OpenAI with a short prompt:
 from simple_agents_py import Client
 
 client = Client("openai")
-text = client.complete("gpt-4o-mini", "Summarize this in one sentence.")
-print(text)
+response = client.complete("gpt-4o-mini", "Summarize this in one sentence.")
+print(response.content)
 ```
 
 Anthropic with custom tokens and temperature:
@@ -78,13 +216,13 @@ Anthropic with custom tokens and temperature:
 from simple_agents_py import Client
 
 client = Client("anthropic")
-text = client.complete(
+response = client.complete(
     "claude-3-5-sonnet-20240620",
     "Write a friendly welcome message for a new user.",
     max_tokens=120,
     temperature=0.5,
 )
-print(text)
+print(response.content)
 ```
 
 OpenRouter with a specific model:
@@ -93,8 +231,8 @@ OpenRouter with a specific model:
 from simple_agents_py import Client
 
 client = Client("openrouter")
-text = client.complete("openai/gpt-4o-mini", "Give me three project ideas.")
-print(text)
+response = client.complete("openai/gpt-4o-mini", "Give me three project ideas.")
+print(response.content)
 ```
 
 OpenRouter with explicit API base and key:
@@ -107,8 +245,8 @@ client = Client(
     api_base="https://openrouter.ai/api/v1",
     api_key="sk-your-openrouter-key",
 )
-text = client.complete("openai/gpt-4o-mini", "Give me three project ideas.")
-print(text)
+response = client.complete("openai/gpt-4o-mini", "Give me three project ideas.")
+print(response.content)
 ```
 
 OpenAI with a custom gateway:
@@ -121,8 +259,8 @@ client = Client(
     api_base="http://localhost:4000/v1",
     api_key="sk-your-openai-key",
 )
-text = client.complete("gpt-4o-mini", "Say hello from a local proxy.")
-print(text)
+response = client.complete("gpt-4o-mini", "Say hello from a local proxy.")
+print(response.content)
 ```
 
 Basic error handling:
@@ -132,7 +270,7 @@ from simple_agents_py import Client
 
 try:
     client = Client("openai")
-    print(client.complete("gpt-4o-mini", "Hello!"))
+    print(client.complete("gpt-4o-mini", "Hello!").content)
 except RuntimeError as exc:
     print(f"Request failed: {exc}")
 ```

{simple_agents_py-0.1.11/crates/simple-agents-py → simple_agents_py-0.1.15}/README.md

@@ -42,7 +42,145 @@ from simple_agents_py import Client
 
 client = Client("openai")
 response = client.complete("gpt-4", "Hello from Python!", max_tokens=128, temperature=0.7)
-print(response)
+print(response.content)
+```
+
+## Feature Guide
+
+### Streaming
+
+```python
+from simple_agents_py import Client
+
+client = Client("openai")
+messages = [{"role": "user", "content": "Say hello in one sentence."}]
+for chunk in client.stream("gpt-4o-mini", messages, max_tokens=64):
+    if chunk.content:
+        print(chunk.content, end="", flush=True)
+print()
+```
+
+### Structured Output (JSON Mode)
+
+```python
+from simple_agents_py import Client
+import json
+
+client = Client("openai")
+schema = {
+    "type": "object",
+    "properties": {
+        "name": {"type": "string"},
+        "age": {"type": "number"},
+    },
+    "required": ["name", "age"],
+}
+messages = [{"role": "user", "content": "Extract name and age: Alice is 28."}]
+json_text = client.complete_json_schema("gpt-4o-mini", messages, schema, "person")
+print(json.loads(json_text))
+```
+
+Pydantic models are accepted too:
+
+```python
+from pydantic import BaseModel
+from simple_agents_py import Client
+
+class Person(BaseModel):
+    name: str
+    age: int
+
+client = Client("openai")
+messages = [{"role": "user", "content": "Extract name and age: Alice is 28."}]
+json_text = client.complete_json_schema("gpt-4o-mini", messages, Person, "person")
+print(json_text)
+```
+
+**Healing for Structured Outputs**: Healing is enabled by default for structured outputs, automatically fixing malformed JSON, type mismatches, and missing fields. To disable healing:
+
+```python
+client = Client("openai", healing=False)
+```
+
+### Structured Streaming
+
+```python
+from simple_agents_py import Client
+
+client = Client("openai")
+schema = {
+    "type": "object",
+    "properties": {"name": {"type": "string"}, "age": {"type": "number"}},
+    "required": ["name", "age"],
+}
+messages = [{"role": "user", "content": "Extract name and age: Alice is 28."}]
+for event in client.stream_structured("gpt-4o-mini", messages, schema, max_tokens=64):
+    if event.is_partial:
+        print("partial:", event.partial_value)
+    else:
+        print("complete:", event.value)
+```
+
+### Response Healing
+
+```python
+from simple_agents_py import Client
+
+client = Client("openai")
+messages = [{"role": "user", "content": "Return JSON: {\"name\":\"Sam\",\"age\":30}"}]
+healed = client.complete_json_healed("gpt-4o-mini", messages, max_tokens=64)
+print(healed.content)
+print(healed.was_healed, healed.confidence)
+print(healed.usage.get("total_tokens"))
+```
+
+### Tool Calling
+
+```python
+from simple_agents_py import Client
+
+client = Client("openai")
+tools = [
+    {
+        "type": "function",
+        "function": {
+            "name": "get_weather",
+            "description": "Get the weather for a city",
+            "parameters": {
+                "type": "object",
+                "properties": {
+                    "city": {"type": "string"},
+                    "unit": {"type": "string", "enum": ["c", "f"]},
+                },
+                "required": ["city"],
+            },
+        },
+    }
+]
+messages = [{"role": "user", "content": "What's the weather in Tokyo?"}]
+response = client.complete_with_tools("gpt-4o-mini", messages, tools)
+print(response.tool_calls)
+```
+
+### ClientBuilder (Routing, Cache, Healing, Middleware)
+
+```python
+from simple_agents_py import ClientBuilder
+
+class TimingMiddleware:
+    def before_request(self, request):
+        print("sending", request.model)
+
+builder = (
+    ClientBuilder()
+    .add_provider("openai", api_key="sk-...")
+    .with_routing("direct")
+    .with_cache(ttl_seconds=60)
+    .with_healing_config({"enabled": True, "min_confidence": 0.7})
+    .add_middleware(TimingMiddleware())
+)
+client = builder.build()
+print(client.complete("gpt-4o-mini", "Give me one idea.").content)
 ```
 
 ## Examples
@@ -53,8 +191,8 @@ OpenAI with a short prompt:
 from simple_agents_py import Client
 
 client = Client("openai")
-text = client.complete("gpt-4o-mini", "Summarize this in one sentence.")
-print(text)
+response = client.complete("gpt-4o-mini", "Summarize this in one sentence.")
+print(response.content)
 ```
 
 Anthropic with custom tokens and temperature:
@@ -63,13 +201,13 @@ Anthropic with custom tokens and temperature:
 from simple_agents_py import Client
 
 client = Client("anthropic")
-text = client.complete(
+response = client.complete(
     "claude-3-5-sonnet-20240620",
     "Write a friendly welcome message for a new user.",
     max_tokens=120,
     temperature=0.5,
 )
-print(text)
+print(response.content)
 ```
 
 OpenRouter with a specific model:
@@ -78,8 +216,8 @@ OpenRouter with a specific model:
 from simple_agents_py import Client
 
 client = Client("openrouter")
-text = client.complete("openai/gpt-4o-mini", "Give me three project ideas.")
-print(text)
+response = client.complete("openai/gpt-4o-mini", "Give me three project ideas.")
+print(response.content)
 ```
 
 OpenRouter with explicit API base and key:
@@ -92,8 +230,8 @@ client = Client(
     api_base="https://openrouter.ai/api/v1",
     api_key="sk-your-openrouter-key",
 )
-text = client.complete("openai/gpt-4o-mini", "Give me three project ideas.")
-print(text)
+response = client.complete("openai/gpt-4o-mini", "Give me three project ideas.")
+print(response.content)
 ```
 
 OpenAI with a custom gateway:
@@ -106,8 +244,8 @@ client = Client(
     api_base="http://localhost:4000/v1",
     api_key="sk-your-openai-key",
 )
-text = client.complete("gpt-4o-mini", "Say hello from a local proxy.")
-print(text)
+response = client.complete("gpt-4o-mini", "Say hello from a local proxy.")
+print(response.content)
 ```
 
 Basic error handling:
@@ -117,7 +255,7 @@ from simple_agents_py import Client
 
 try:
     client = Client("openai")
-    print(client.complete("gpt-4o-mini", "Hello!"))
+    print(client.complete("gpt-4o-mini", "Hello!").content)
 except RuntimeError as exc:
     print(f"Request failed: {exc}")
 ```

{simple_agents_py-0.1.11 → simple_agents_py-0.1.15}/crates/simple-agent-type/src/lib.rs

@@ -58,6 +58,7 @@ pub mod provider;
 pub mod request;
 pub mod response;
 pub mod router;
+pub mod tool;
 pub mod validation;
 
 // Re-export commonly used types at crate root
@@ -101,6 +102,12 @@ pub mod prelude {
     // Coercion
     pub use crate::coercion::{CoercionFlag, CoercionResult};
 
+    // Tool calling
+    pub use crate::tool::{
+        ToolCall, ToolCallFunction, ToolChoice, ToolChoiceFunction, ToolChoiceMode, ToolChoiceTool,
+        ToolDefinition, ToolFunction, ToolType,
+    };
+
     // Traits
     pub use crate::cache::Cache;
     pub use crate::provider::Provider;

{simple_agents_py-0.1.11 → simple_agents_py-0.1.15}/crates/simple-agent-type/src/message.rs

@@ -4,6 +4,8 @@
 
 use serde::{Deserialize, Serialize};
 
+use crate::tool::ToolCall;
+
 /// Role of a message in a conversation.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[serde(rename_all = "lowercase")]
@@ -32,6 +34,9 @@ pub struct Message {
     /// Tool call ID (for tool role messages)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tool_call_id: Option<String>,
+    /// Tool calls emitted by the assistant.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub tool_calls: Option<Vec<ToolCall>>,
 }
 
 impl Message {
@@ -51,6 +56,7 @@ impl Message {
             content: content.into(),
             name: None,
             tool_call_id: None,
+            tool_calls: None,
         }
     }
 
@@ -69,6 +75,7 @@ impl Message {
             content: content.into(),
             name: None,
             tool_call_id: None,
+            tool_calls: None,
         }
     }
 
@@ -87,6 +94,7 @@ impl Message {
             content: content.into(),
             name: None,
             tool_call_id: None,
+            tool_calls: None,
         }
     }
 
@@ -106,6 +114,7 @@ impl Message {
             content: content.into(),
             name: None,
             tool_call_id: Some(tool_call_id.into()),
+            tool_calls: None,
         }
     }
 
@@ -122,6 +131,12 @@ impl Message {
         self.name = Some(name.into());
         self
     }
+
+    /// Set tool calls for assistant messages.
+    pub fn with_tool_calls(mut self, tool_calls: Vec<ToolCall>) -> Self {
+        self.tool_calls = Some(tool_calls);
+        self
+    }
 }
 
 #[cfg(test)]
@@ -135,6 +150,7 @@ mod tests {
         assert_eq!(msg.content, "test");
         assert_eq!(msg.name, None);
         assert_eq!(msg.tool_call_id, None);
+        assert_eq!(msg.tool_calls, None);
     }
 
     #[test]
@@ -142,6 +158,7 @@ mod tests {
         let msg = Message::assistant("response");
         assert_eq!(msg.role, Role::Assistant);
         assert_eq!(msg.content, "response");
+        assert_eq!(msg.tool_calls, None);
     }
 
     #[test]
@@ -149,6 +166,7 @@ mod tests {
         let msg = Message::system("instruction");
         assert_eq!(msg.role, Role::System);
         assert_eq!(msg.content, "instruction");
+        assert_eq!(msg.tool_calls, None);
     }
 
     #[test]
@@ -157,6 +175,7 @@ mod tests {
         assert_eq!(msg.role, Role::Tool);
         assert_eq!(msg.content, "result");
         assert_eq!(msg.tool_call_id, Some("call_123".to_string()));
+        assert_eq!(msg.tool_calls, None);
     }
 
     #[test]
@@ -194,6 +213,7 @@ mod tests {
         let json = serde_json::to_value(&msg).unwrap();
         assert!(json.get("name").is_none());
         assert!(json.get("tool_call_id").is_none());
+        assert!(json.get("tool_calls").is_none());
     }
 
     #[test]