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

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

@@ -2,6 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -23,6 +29,21 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
 [[package]]
 name = "anes"
 version = "0.1.6"
@@ -91,6 +112,18 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "async-compression"
+version = "0.4.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d10e4f991a553474232bc0a31799f6d24b034a84c0971d80d2e2f78b2e576e40"
+dependencies = [
+ "compression-codecs",
+ "compression-core",
+ "pin-project-lite",
+ "tokio",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.89"
@@ -177,6 +210,27 @@ dependencies = [
  "cpufeatures",
 ]
 
+[[package]]
+name = "brotli"
+version = "8.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "5.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
 [[package]]
 name = "bumpalo"
 version = "3.19.1"
@@ -295,6 +349,24 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
+[[package]]
+name = "compression-codecs"
+version = "0.4.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00828ba6fd27b45a448e57dbfe84f1029d4c9f26b368157e9a448a5f49a2ec2a"
+dependencies = [
+ "brotli",
+ "compression-core",
+ "flate2",
+ "memchr",
+]
+
+[[package]]
+name = "compression-core"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.4.2"
@@ -345,6 +417,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "criterion"
 version = "0.5.1"
@@ -501,6 +582,16 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8591b0bcc8a98a64310a2fae1bb3e9b8564dd10e381e6e28010fde8e8e8568db"
 
+[[package]]
+name = "flate2"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1165,6 +1256,16 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
 [[package]]
 name = "mio"
 version = "1.1.1"
@@ -2033,9 +2134,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+
 [[package]]
 name = "simple-agent-type"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "async-trait",
  "blake3",
@@ -2050,7 +2157,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-cache"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "async-trait",
  "simple-agent-type",
@@ -2059,7 +2166,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-cli"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "clap",
  "serde",
@@ -2076,10 +2183,11 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-core"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "async-trait",
  "futures-core",
+ "futures-util",
  "serde",
  "serde_json",
  "simple-agent-type",
@@ -2087,11 +2195,12 @@ dependencies = [
  "simple-agents-healing",
  "simple-agents-router",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "simple-agents-examples"
-version = "0.1.0"
+version = "0.2.1"
 dependencies = [
  "dotenv",
  "futures-util",
@@ -2104,7 +2213,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-ffi"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "async-trait",
  "simple-agent-type",
@@ -2115,7 +2224,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-healing"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "criterion",
  "proptest",
@@ -2131,7 +2240,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-macros"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2143,7 +2252,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-napi"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "napi",
  "napi-derive",
@@ -2155,7 +2264,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-providers"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "async-trait",
  "bytes",
@@ -2183,7 +2292,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-py"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -2202,7 +2311,7 @@ dependencies = [
 
 [[package]]
 name = "simple-agents-router"
-version = "0.1.15"
+version = "0.2.1"
 dependencies = [
  "async-trait",
  "futures-core",
@@ -2552,13 +2661,18 @@ version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
+ "async-compression",
  "bitflags",
  "bytes",
+ "futures-core",
  "futures-util",
  "http",
  "http-body",
+ "http-body-util",
  "iri-string",
  "pin-project-lite",
+ "tokio",
+ "tokio-util",
  "tower",
  "tower-layer",
  "tower-service",

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

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.1.15"
+version = "0.2.1"
 edition = "2021"
 rust-version = "1.75"
 authors = ["SimpleAgents Contributors"]
@@ -28,3 +28,6 @@ futures-util = "0.3"
 metrics = "0.23"
 metrics-exporter-prometheus = "0.15"
 governor = "0.6"
+simple-agent-type = { version = "0.2.0", path = "crates/simple-agent-type" }
+simple-agents-healing = { version = "0.2.0", path = "crates/simple-agents-healing" }
+simple-agents-providers = { version = "0.2.0", path = "crates/simple-agents-providers" }

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-agents-py
-Version: 0.1.15
+Version: 0.2.1
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Rust
 Classifier: License :: OSI Approved :: MIT License
@@ -69,7 +69,7 @@ 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):
+for chunk in client.complete("gpt-4o-mini", messages, max_tokens=64, stream=True):
     if chunk.content:
         print(chunk.content, end="", flush=True)
 print()
@@ -91,7 +91,12 @@ schema = {
     "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")
+json_text = client.complete(
+    "gpt-4o-mini",
+    messages,
+    schema=schema,
+    schema_name="person",
+)
 print(json.loads(json_text))
 ```
 
@@ -107,7 +112,12 @@ class Person(BaseModel):
 
 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")
+json_text = client.complete(
+    "gpt-4o-mini",
+    messages,
+    schema=Person,
+    schema_name="person",
+)
 print(json_text)
 ```
 
@@ -129,7 +139,13 @@ schema = {
     "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):
+for event in client.complete(
+    "gpt-4o-mini",
+    messages,
+    schema=schema,
+    max_tokens=64,
+    stream=True,
+):
     if event.is_partial:
         print("partial:", event.partial_value)
     else:
@@ -143,7 +159,13 @@ 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)
+healed = client.complete(
+    "gpt-4o-mini",
+    messages,
+    max_tokens=64,
+    response_format="json",
+    heal=True,
+)
 print(healed.content)
 print(healed.was_healed, healed.confidence)
 print(healed.usage.get("total_tokens"))
@@ -173,7 +195,7 @@ tools = [
     }
 ]
 messages = [{"role": "user", "content": "What's the weather in Tokyo?"}]
-response = client.complete_with_tools("gpt-4o-mini", messages, tools)
+response = client.complete("gpt-4o-mini", messages, tools=tools)
 print(response.tool_calls)
 ```
 

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

@@ -54,7 +54,7 @@ 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):
+for chunk in client.complete("gpt-4o-mini", messages, max_tokens=64, stream=True):
     if chunk.content:
         print(chunk.content, end="", flush=True)
 print()
@@ -76,7 +76,12 @@ schema = {
     "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")
+json_text = client.complete(
+    "gpt-4o-mini",
+    messages,
+    schema=schema,
+    schema_name="person",
+)
 print(json.loads(json_text))
 ```
 
@@ -92,7 +97,12 @@ class Person(BaseModel):
 
 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")
+json_text = client.complete(
+    "gpt-4o-mini",
+    messages,
+    schema=Person,
+    schema_name="person",
+)
 print(json_text)
 ```
 
@@ -114,7 +124,13 @@ schema = {
     "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):
+for event in client.complete(
+    "gpt-4o-mini",
+    messages,
+    schema=schema,
+    max_tokens=64,
+    stream=True,
+):
     if event.is_partial:
         print("partial:", event.partial_value)
     else:
@@ -128,7 +144,13 @@ 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)
+healed = client.complete(
+    "gpt-4o-mini",
+    messages,
+    max_tokens=64,
+    response_format="json",
+    heal=True,
+)
 print(healed.content)
 print(healed.was_healed, healed.confidence)
 print(healed.usage.get("total_tokens"))
@@ -158,7 +180,7 @@ tools = [
     }
 ]
 messages = [{"role": "user", "content": "What's the weather in Tokyo?"}]
-response = client.complete_with_tools("gpt-4o-mini", messages, tools)
+response = client.complete("gpt-4o-mini", messages, tools=tools)
 print(response.tool_calls)
 ```
 

{simple_agents_py-0.1.15 → simple_agents_py-0.2.1}/crates/simple-agents-cache/Cargo.toml

@@ -11,7 +11,7 @@ documentation.workspace = true
 description = "Caching utilities for SimpleAgents"
 
 [dependencies]
-simple-agent-type = { path = "../simple-agent-type", version = "0.1.0" }
+simple-agent-type = { workspace = true }
 tokio = { workspace = true, features = ["sync", "time"] }
 async-trait.workspace = true
 

{simple_agents_py-0.1.15 → simple_agents_py-0.2.1}/crates/simple-agents-cache/src/memory.rs

@@ -132,11 +132,31 @@ impl InMemoryCache {
 #[async_trait]
 impl Cache for InMemoryCache {
     async fn get(&self, key: &str) -> Result<Option<Vec<u8>>> {
-        // First evict expired entries
-        self.evict_expired().await;
+        {
+            let store = self.store.read().await;
+            match store.get(key) {
+                Some(entry) if !entry.is_expired() => {
+                    drop(store);
+
+                    let mut store = self.store.write().await;
+                    if let Some(entry) = store.get_mut(key) {
+                        if entry.is_expired() {
+                            store.remove(key);
+                            return Ok(None);
+                        }
+
+                        entry.touch();
+                        return Ok(Some(entry.data.clone()));
+                    }
+
+                    return Ok(None);
+                }
+                Some(_) => {} // expired; clean up below
+                None => return Ok(None),
+            }
+        }
 
         let mut store = self.store.write().await;
-
         if let Some(entry) = store.get_mut(key) {
             if entry.is_expired() {
                 store.remove(key);
@@ -162,6 +182,9 @@ impl Cache for InMemoryCache {
             store.insert(key.to_string(), entry);
         }
 
+        // Periodically clear expired entries before enforcing limits
+        self.evict_expired().await;
+
         // Evict if needed
         self.evict_lru().await;
 
@@ -324,6 +347,25 @@ mod tests {
         assert!(cache.get("key3").await.unwrap().is_some());
     }
 
+    #[tokio::test]
+    async fn test_concurrent_gets_do_not_serialize_readers() {
+        let cache = Arc::new(InMemoryCache::new(1024, 10));
+        cache
+            .set("shared", b"value".to_vec(), Duration::from_secs(60))
+            .await
+            .unwrap();
+
+        let mut handles = Vec::new();
+        for _ in 0..25 {
+            let cache = cache.clone();
+            handles.push(tokio::spawn(async move { cache.get("shared").await.unwrap() }));
+        }
+
+        for handle in handles {
+            assert_eq!(handle.await.unwrap(), Some(b"value".to_vec()));
+        }
+    }
+
     #[tokio::test]
     async fn test_cache_name() {
         let cache = InMemoryCache::new(1024, 10);

{simple_agents_py-0.1.15 → simple_agents_py-0.2.1}/crates/simple-agents-core/Cargo.toml

@@ -16,11 +16,13 @@ async-trait.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 tokio.workspace = true
+futures-util.workspace = true
+tracing = "0.1"
 
-simple-agent-type = { path = "../simple-agent-type", version = "0.1.0" }
-simple-agents-router = { path = "../simple-agents-router", version = "0.1.15" }
-simple-agents-cache = { path = "../simple-agents-cache", version = "0.1.15" }
-simple-agents-healing = { path = "../simple-agents-healing", version = "0.1.15" }
+simple-agent-type = { workspace = true }
+simple-agents-router = { path = "../simple-agents-router", version = "0.2.1" }
+simple-agents-cache = { path = "../simple-agents-cache", version = "0.2.1" }
+simple-agents-healing = { path = "../simple-agents-healing", version = "0.2.1" }
 futures-core = "0.3"
 
 [dev-dependencies]

{simple_agents_py-0.1.15 → simple_agents_py-0.2.1}/crates/simple-agents-core/README.md

@@ -15,7 +15,9 @@ healing, and middleware into a single entry point.
 
 ```rust
 use async_trait::async_trait;
-use simple_agents_core::{RoutingMode, SimpleAgentsClientBuilder};
+use simple_agents_core::{
+    CompletionOptions, CompletionOutcome, RoutingMode, SimpleAgentsClientBuilder,
+};
 use simple_agent_type::prelude::*;
 use std::sync::Arc;
 
@@ -59,7 +61,11 @@ let request = CompletionRequest::builder()
     .message(Message::user("Hello"))
     .build()?;
 
-let response = client.complete(&request).await?;
+let outcome = client.complete(&request, CompletionOptions::default()).await?;
+let response = match outcome {
+    CompletionOutcome::Response(response) => response,
+    _ => return Ok(()),
+};
 println!("{}", response.content().unwrap_or(""));
 # Ok(())
 # }
@@ -72,7 +78,7 @@ Use healing for JSON outputs:
 ```rust
 use simple_agents_healing::schema::Schema;
 # use simple_agent_type::prelude::*;
-# use simple_agents_core::SimpleAgentsClientBuilder;
+# use simple_agents_core::{CompletionMode, CompletionOptions, CompletionOutcome, SimpleAgentsClientBuilder};
 # use std::sync::Arc;
 # use async_trait::async_trait;
 # struct MockProvider;
@@ -113,7 +119,18 @@ let request = CompletionRequest::builder()
     .message(Message::user("Give JSON"))
     .build()?;
 
-let healed = client.complete_with_schema(&request, &schema).await?;
+let healed = client
+    .complete(
+        &request,
+        CompletionOptions {
+            mode: CompletionMode::CoercedSchema(schema),
+        },
+    )
+    .await?;
+let healed = match healed {
+    CompletionOutcome::CoercedSchema(healed) => healed,
+    _ => return Ok(()),
+};
 assert_eq!(healed.coerced.value["count"], 5);
 # Ok(())
 # }

{simple_agents_py-0.1.15 → simple_agents_py-0.2.1}/crates/simple-agents-core/examples/basic_client.rs

@@ -1,6 +1,8 @@
 use async_trait::async_trait;
-use simple_agents_core::{RoutingMode, SimpleAgentsClientBuilder};
 use simple_agent_type::prelude::*;
+use simple_agents_core::{
+    CompletionOptions, CompletionOutcome, RoutingMode, SimpleAgentsClientBuilder,
+};
 use std::sync::Arc;
 
 struct MockProvider;
@@ -49,7 +51,13 @@ async fn main() -> Result<()> {
         .message(Message::user("Say hi"))
         .build()?;
 
-    let response = client.complete(&request).await?;
+    let outcome = client
+        .complete(&request, CompletionOptions::default())
+        .await?;
+    let response = match outcome {
+        CompletionOutcome::Response(response) => response,
+        _ => return Ok(()),
+    };
     println!("{}", response.content().unwrap_or_default());
 
     Ok(())