Update to cel-interpreter 0.10

Author: hardbyte

CHANGELOG.md

@@ -0,0 +1,41 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Changed
+- Updated `cel-interpreter` from 0.9.0 to 0.10.0
+
+### Added
+- **Automatic Type Coercion**: Intelligent preprocessing of expressions to handle mixed int/float arithmetic
+  - Expressions with float literals automatically convert integer literals to floats
+  - Context variables containing floats trigger integer-to-float promotion for compatibility
+  - Preserves array indexing with integers (e.g., `list[2]` remains as integer)
+- **Enhanced Error Handling**: Added panic handling with `std::panic::catch_unwind` for parser errors
+  - Invalid expressions now return proper ValueError instead of crashing the Python process
+  - Graceful handling of upstream parser panics from cel-interpreter
+
+### Fixed
+- **Mixed-type arithmetic compatibility**: Expressions like `3.14 * 2`, `2 + 3.14`, `value * 2` (where value is float) now work as expected
+- **Parser panic handling**: Implemented `std::panic::catch_unwind` to gracefully handle upstream parser panics
+  - Users get proper error messages instead of application crashes
+- Fixed deprecation warnings by updating to compatible PyO3 APIs
+
+### Known Issues
+
+- **Bytes Concatenation**: cel-interpreter 0.10.0 does not implement bytes concatenation with `+` operator
+  - **CEL specification requires**: `b'hello' + b'world'` should work  
+  - **Current behavior**: Returns "Unsupported binary operator 'add'" error
+  - **Workaround**: Use `bytes(string(part1) + string(part2))` for concatenation
+  - **Status**: This is a missing feature in the cel-interpreter crate, not a design limitation
+
+### Dependencies Updated
+- cel-interpreter: 0.9.0 → 0.10.0 (major version update with breaking changes)
+- log: 0.4.22 → 0.4.27
+- chrono: 0.4.38 → 0.4.41
+- PyO3 and related crates: Updated to resolve deprecation warnings
+

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cel"
-version = "0.3.1"
+version = "0.4.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = { version = "0.22.6", features = ["chrono", "gil-refs", "py-clone"]}
-cel-interpreter = {  version = "0.9.0", features = ["chrono", "json", "regex"] }
-log = "0.4.22"
+cel-interpreter = {  version = "0.10.0", features = ["chrono", "json", "regex"] }
+log = "0.4.27"
 pyo3-log = "0.11.0"
-chrono = { version = "0.4.38", features = ["serde"] }
+chrono = { version = "0.4.41", features = ["serde"] }

pyproject.toml

@@ -1,6 +1,10 @@
 
 [project]
 name = "common-expression-language"
+description = "Python bindings for the Common Expression Language (CEL)"
+authors = [
+    {name = "Brian Thorne", email = "[email protected]"}
+]
 requires-python = ">=3.11"
 classifiers = [
     "Programming Language :: Rust",
@@ -11,8 +15,12 @@ dynamic = ["version"]
 dependencies = [
 ]
 
+[project.urls]
+Homepage = "https://github.com/hardbyte/python-common-expression-language"
+Repository = "https://github.com/hardbyte/python-common-expression-language"
+
 [build-system]
-requires = ["maturin>=1.5,<2.0"]
+requires = ["maturin>=1.8,<2.0"]
 build-backend = "maturin"
 
 
@@ -21,7 +29,7 @@ features = ["pyo3/extension-module"]
 
 [tool.uv]
 dev-dependencies = [
-    "pytest>=8.3.3",
-    "maturin>=1.7.4",
-    "pip>=24.3.1",
+    "pytest>=8.4.1",
+    "maturin>=1.8.0",
+    "pip>=25.0.0",
 ]

src/context.rs

@@ -2,7 +2,7 @@ use cel_interpreter::objects::TryIntoValue;
 use cel_interpreter::Value;
 use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
-use pyo3::types::{PyDict, PyTuple};
+use pyo3::types::PyDict;
 use std::collections::HashMap;
 
 #[pyo3::pyclass]
@@ -14,7 +14,8 @@ pub struct Context {
 #[pyo3::pymethods]
 impl Context {
     #[new]
-    pub fn new(variables: Option<&PyDict>, functions: Option<&PyDict>) -> PyResult<Self> {
+    #[pyo3(signature = (variables=None, functions=None))]
+    pub fn new(variables: Option<&Bound<'_, PyDict>>, functions: Option<&Bound<'_, PyDict>>) -> PyResult<Self> {
         let mut context = Context {
             variables: HashMap::new(),
             functions: HashMap::new(),
@@ -26,7 +27,7 @@ impl Context {
                 let key = k
                     .extract::<String>()
                     .map_err(|_| PyValueError::new_err("Variable name must be strings"));
-                key.map(|key| context.add_variable(key, v))??;
+                key.map(|key| context.add_variable(key, &v))??;
             }
         };
 
@@ -41,8 +42,8 @@ impl Context {
         self.functions.insert(name, function);
     }
 
-    pub fn add_variable(&mut self, name: String, value: &PyAny) -> PyResult<()> {
-        let value = crate::RustyPyType(value).try_into_value().map_err(|e| {
+    pub fn add_variable(&mut self, name: String, value: &Bound<'_, PyAny>) -> PyResult<()> {
+        let value = crate::RustyPyType(&value).try_into_value().map_err(|e| {
             pyo3::exceptions::PyValueError::new_err(format!(
                 "Failed to convert variable '{}': {}",
                 name, e
@@ -52,7 +53,7 @@ impl Context {
         Ok(())
     }
 
-    pub fn update(&mut self, variables: &PyDict) -> PyResult<()> {
+    pub fn update(&mut self, variables: &Bound<'_, PyDict>) -> PyResult<()> {
         for (key, value) in variables {
             // Attempt to extract the key as a String
             let key = key
@@ -65,7 +66,7 @@ impl Context {
                 self.functions.insert(key, py_function);
             } else {
                 // Value is a variable, add it to the variables hashmap
-                let value = crate::RustyPyType(value)
+                let value = crate::RustyPyType(&value)
                     .try_into_value()
                     .map_err(|e| PyValueError::new_err(e.to_string()))?;