added map datatype

introduced in STAM v1.2

Author: proycon

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stam-python"
-version = "0.10.2"
+version = "0.11.0"
 edition = "2021"
 authors = ["Maarten van Gompel <proycon@anaproy.nl>"]
 description = "STAM is a library for dealing with standoff annotations on text, this is the python binding."
@@ -19,8 +19,8 @@ crate-type = ["cdylib"]
 [dependencies]
 pyo3 = { version = "0.25.0", features = ["chrono"] }
 rayon = "1.10.0"
-stam = "0.16.6"
-stam-tools = "0.9.3"
+stam = "0.17.0"
+stam-tools = "0.11.0"
 
 [features]
 default = ["pyo3/extension-module"]

src/annotationdata.rs

@@ -3,6 +3,7 @@ use pyo3::prelude::*;
 use pyo3::pyclass::CompareOp;
 use pyo3::types::*;
 use std::borrow::Cow;
+use std::collections::BTreeMap;
 use std::hash::{Hash, Hasher};
 use std::ops::FnOnce;
 use std::sync::{Arc, RwLock};
@@ -299,6 +300,14 @@ pub(crate) fn datavalue_from_py<'py>(value: Bound<'py, PyAny>) -> Result<DataVal
                 list.push(pyitem);
             }
             return Ok(DataValue::List(list));
+        } else if value.is_instance_of::<PyDict>() {
+            let value: &Bound<'py, PyDict> = value.downcast().expect("downcast must succeed");
+            let mut map: BTreeMap<String, DataValue> = BTreeMap::new();
+            for (key, item) in value.iter() {
+                let pyitem = datavalue_from_py(item)?;
+                map.insert(key.to_string(), pyitem);
+            }
+            return Ok(DataValue::Map(map));
         }
         Err(StamError::OtherError(
             "Can't convert supplied Python object to a DataValue",
@@ -333,6 +342,14 @@ pub(crate) fn datavalue_into_py<'py>(
             }
             Ok(pylist.into_any())
         }
+        DataValue::Map(v) => {
+            let pydict = PyDict::new(py);
+            for (key, value) in v.iter() {
+                let pyvalue = datavalue_into_py(value, py)?;
+                pydict.add((key, pyvalue)).expect("adding value to dict");
+            }
+            Ok(pydict.into_any())
+        }
     }
 }