chalk-remote-call-python 1.10.0__tar.gz → 1.10.1__tar.gz

{chalk_remote_call_python-1.10.0/chalk_remote_call_python.egg-info → chalk_remote_call_python-1.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chalk-remote-call-python
-Version: 1.10.0
+Version: 1.10.1
 Summary: Chalk remote call Python runtime interface client
 Author: Chalk AI, Inc.
 Project-URL: Homepage, https://chalk.ai

{chalk_remote_call_python-1.10.0 → chalk_remote_call_python-1.10.1}/chalk-remote-call-rs/Cargo.lock

@@ -511,7 +511,7 @@ dependencies = [
 [[package]]
 name = "chalk-queue"
 version = "0.0.0"
-source = "git+https://github.com/chalk-ai/chalk-private.git?rev=c6eed6bd7bdad1f2a7568ef206e570c719c4c64f#c6eed6bd7bdad1f2a7568ef206e570c719c4c64f"
+source = "git+https://github.com/chalk-ai/chalk-private.git?rev=41458754e6916245a092ddc09562bcaf4dea373e#41458754e6916245a092ddc09562bcaf4dea373e"
 dependencies = [
  "base64 0.22.1",
  "redis",

{chalk_remote_call_python-1.10.0 → chalk_remote_call_python-1.10.1}/chalk-remote-call-rs/chalk-remote-call-server/Cargo.toml

@@ -37,6 +37,6 @@ futures-util = "0.3"
 # `[patch.crates-io]` here it builds against vanilla crates.io redis (it only
 # uses standard APIs). Metrics and StatsD share a revision so their client types agree.
 [target.'cfg(target_os = "linux")'.dependencies]
-chalk-queue = { git = "https://github.com/chalk-ai/chalk-private.git", rev = "c6eed6bd7bdad1f2a7568ef206e570c719c4c64f" }
+chalk-queue = { git = "https://github.com/chalk-ai/chalk-private.git", rev = "41458754e6916245a092ddc09562bcaf4dea373e" }
 chalk_metrics = { git = "https://github.com/chalk-ai/chalk-private.git", rev = "a0f8932ec10d3b8340af3e98cf63b800d60b4926" }
 chalk_statsd = { git = "https://github.com/chalk-ai/chalk-private.git", rev = "a0f8932ec10d3b8340af3e98cf63b800d60b4926" }

{chalk_remote_call_python-1.10.0 → chalk_remote_call_python-1.10.1}/chalk-remote-call-rs/chalk-remote-call-server/src/self_consumer.rs

@@ -108,6 +108,7 @@ const PEER: &str = "fnq-self-consumer";
 enum ResultDestination {
     PerCall {
         stream_key: String,
+        result_ttl: Duration,
     },
     Batch {
         stream_key: String,
@@ -125,10 +126,18 @@ impl ResultDestination {
                 batch_result.row_index,
             )
         });
-        Self::from_routing(queue.stream_key_for(call_uuid), batch)
+        Self::from_routing(
+            queue.stream_key_for(call_uuid),
+            Duration::from_secs(work.result_ttl_seconds),
+            batch,
+        )
     }
 
-    fn from_routing(per_call_stream_key: String, batch: Option<(String, String, u64)>) -> Self {
+    fn from_routing(
+        per_call_stream_key: String,
+        result_ttl: Duration,
+        batch: Option<(String, String, u64)>,
+    ) -> Self {
         match batch {
             Some((stream_key, call_id, row_index)) => Self::Batch {
                 stream_key,
@@ -137,6 +146,7 @@ impl ResultDestination {
             },
             None => Self::PerCall {
                 stream_key: per_call_stream_key,
+                result_ttl,
             },
         }
     }
@@ -148,7 +158,7 @@ impl ResultDestination {
         data: &[u8],
     ) -> Result<(), redis::RedisError> {
         match self {
-            Self::PerCall { stream_key } => {
+            Self::PerCall { stream_key, .. } => {
                 stream_writer::write_chunk(conn, stream_key, seq, data).await
             }
             Self::Batch {
@@ -169,7 +179,10 @@ impl ResultDestination {
         seq: u64,
     ) -> Result<(), redis::RedisError> {
         match self {
-            Self::PerCall { stream_key } => stream_writer::write_end(conn, stream_key, seq).await,
+            Self::PerCall {
+                stream_key,
+                result_ttl,
+            } => stream_writer::write_end_with_ttl(conn, stream_key, seq, *result_ttl).await,
             Self::Batch {
                 stream_key,
                 call_id,
@@ -191,9 +204,20 @@ impl ResultDestination {
         traceback: Option<&str>,
     ) -> Result<(), redis::RedisError> {
         match self {
-            Self::PerCall { stream_key } => {
-                stream_writer::write_error(conn, stream_key, seq, exc_type, message, traceback)
-                    .await
+            Self::PerCall {
+                stream_key,
+                result_ttl,
+            } => {
+                stream_writer::write_error_with_ttl(
+                    conn,
+                    stream_key,
+                    seq,
+                    exc_type,
+                    message,
+                    traceback,
+                    *result_ttl,
+                )
+                .await
             }
             Self::Batch {
                 stream_key,
@@ -683,7 +707,7 @@ async fn run_one_call(
     {
         Ok(Ok(())) => true,
         Ok(Err(e)) => {
-            // The call's result stream may be incomplete; the call's 24h stream TTL
+            // The call's result stream may be incomplete; the enqueue safety TTL
             // and the meta status are the backstop for a stuck poller.
             error!(call_id = %call_id, error = %e, "failed to execute/write queued call");
             false
@@ -769,8 +793,8 @@ async fn run_one_coalesced_call(
     {
         Ok(()) => true,
         Err(e) => {
-            // The call's result stream may be incomplete; the 24h stream TTL and
-            // the meta status are the backstop for a stuck poller.
+            // The call's result stream may be incomplete; the enqueue safety TTL
+            // and the meta status are the backstop for a stuck poller.
             error!(call_id = %call_id, error = %e, "failed to execute/write coalesced queued call");
             false
         }
@@ -1128,9 +1152,14 @@ mod tests {
     #[test]
     fn result_destination_preserves_per_call_stream() {
         assert_eq!(
-            ResultDestination::from_routing("tenant:gen:call-1:stream".to_string(), None),
+            ResultDestination::from_routing(
+                "tenant:gen:call-1:stream".to_string(),
+                Duration::from_secs(60),
+                None,
+            ),
             ResultDestination::PerCall {
                 stream_key: "tenant:gen:call-1:stream".to_string(),
+                result_ttl: Duration::from_secs(60),
             }
         );
     }
@@ -1140,6 +1169,7 @@ mod tests {
         assert_eq!(
             ResultDestination::from_routing(
                 "unused-per-call-stream".to_string(),
+                Duration::from_secs(60),
                 Some((
                     "tenant:batch:batch-1:results".to_string(),
                     "call-1".to_string(),

chalk_remote_call_python-1.10.1/chalk_remote_call/_version.py

@@ -0,0 +1 @@
+__version__ = "1.10.1"

{chalk_remote_call_python-1.10.0 → chalk_remote_call_python-1.10.1/chalk_remote_call_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chalk-remote-call-python
-Version: 1.10.0
+Version: 1.10.1
 Summary: Chalk remote call Python runtime interface client
 Author: Chalk AI, Inc.
 Project-URL: Homepage, https://chalk.ai

chalk_remote_call_python-1.10.0/chalk_remote_call/_version.py

@@ -1 +0,0 @@
-__version__ = "1.10.0"