statsig-python-core 0.19.1b2604130314__tar.gz → 0.19.2b2604150312__tar.gz

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/Cargo.lock

@@ -2869,7 +2869,7 @@ dependencies = [
 
 [[package]]
 name = "sigstat-grpc"
-version = "0.19.1-beta.2604130314"
+version = "0.19.2-beta.2604150312"
 dependencies = [
  "async-trait",
  "chrono",
@@ -2961,7 +2961,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
 [[package]]
 name = "statsig-node"
-version = "0.19.1-beta.2604130314"
+version = "0.19.2-beta.2604150312"
 dependencies = [
  "async-trait",
  "napi",
@@ -2976,7 +2976,7 @@ dependencies = [
 
 [[package]]
 name = "statsig-pyo3"
-version = "0.19.1-beta.2604130314"
+version = "0.19.2-beta.2604150312"
 dependencies = [
  "async-trait",
  "lazy_static",
@@ -2991,7 +2991,7 @@ dependencies = [
 
 [[package]]
 name = "statsig-rust"
-version = "0.19.1-beta.2604130314"
+version = "0.19.2-beta.2604150312"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3006,6 +3006,7 @@ dependencies = [
  "file-guard",
  "flate2",
  "futures",
+ "indexmap 2.13.0",
  "lazy_static",
  "libc",
  "log",
@@ -3040,7 +3041,7 @@ dependencies = [
 
 [[package]]
 name = "statsig_elixir"
-version = "0.19.1-beta.2604130314"
+version = "0.19.2-beta.2604150312"
 dependencies = [
  "async-trait",
  "parking_lot",
@@ -3053,7 +3054,7 @@ dependencies = [
 
 [[package]]
 name = "statsig_ffi"
-version = "0.19.1-beta.2604130314"
+version = "0.19.2-beta.2604150312"
 dependencies = [
  "async-trait",
  "cbindgen",

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/Cargo.toml

@@ -19,7 +19,7 @@ exclude = [
 [workspace.package]
 edition = "2021"
 license = "ISC"
-version = "0.19.1-beta.2604130314"
+version = "0.19.2-beta.2604150312"
 homepage = "https://statsig.com/"
 authors = ["Statsig", "Daniel Loomb <daniel@statsig.com>"]
 readme = "README.md"

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: statsig_python_core
-Version: 0.19.1b2604130314
+Version: 0.19.2b2604150312
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-pyo3/Cargo.toml

@@ -21,6 +21,7 @@ serde_json = { version = "1.0.125", features = ["float_roundtrip"] }
 statsig-rust = { path = "../statsig-rust", features = [
     "with_grpc",
     "ffi-support",
+    "ordered_user_data_maps",
 ] }
 async-trait = "0.1.81"
 serde = { version = "1.0.204", features = ["derive"] }

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-pyo3/src/pyo_utils.rs

@@ -6,7 +6,7 @@ use pyo3::types::{
 use pyo3::{Bound, Py, PyAny, PyErr, PyResult, PyTypeCheck, Python};
 use serde_json::{json, Number, Value};
 use statsig_rust::evaluation::dynamic_string::DynamicString;
-use statsig_rust::{log_e, log_w, DynamicValue};
+use statsig_rust::{log_e, log_w, DynamicValue, StatsigUserDataMap};
 use std::borrow::Cow;
 use std::collections::HashMap;
 
@@ -234,9 +234,7 @@ pub fn py_any_to_dynamic_value(value: &Bound<PyAny>) -> PyResult<DynamicValue> {
 
 // ------------------------------------------------------------------------------- [ Statsig User Creation ]
 
-pub fn opt_py_dict_ref_to_hashmap(
-    data: Option<&Bound<'_, PyDict>>,
-) -> Option<HashMap<String, DynamicValue>> {
+pub fn opt_py_dict_ref_to_hashmap(data: Option<&Bound<'_, PyDict>>) -> Option<StatsigUserDataMap> {
     let data = data?;
     Some(py_dict_ref_to_hashmap(data))
 }
@@ -278,8 +276,8 @@ fn py_any_ref_to_dynamic_value(value: &Bound<'_, PyAny>) -> Option<DynamicValue>
     None
 }
 
-fn py_dict_ref_to_hashmap(dict: &Bound<'_, PyDict>) -> HashMap<String, DynamicValue> {
-    let mut values = HashMap::with_capacity(dict.len());
+fn py_dict_ref_to_hashmap(dict: &Bound<'_, PyDict>) -> StatsigUserDataMap {
+    let mut values = StatsigUserDataMap::with_capacity(dict.len());
 
     for (key, value) in dict.iter() {
         let dynamic_val = match py_any_ref_to_dynamic_value(&value) {
@@ -389,5 +387,5 @@ fn try_as_dict<'py>(value: &'py Bound<'py, PyAny>) -> Option<HashMap<String, Dyn
 
     // SAFETY: This is what the "safe" version does internally, but its faster because we skip the Error creation
     let pydict = unsafe { value.cast_unchecked::<PyDict>() };
-    Some(py_dict_ref_to_hashmap(pydict))
+    Some(py_dict_ref_to_hashmap(pydict).into_iter().collect())
 }

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-pyo3/src/statsig_user_py.rs

@@ -6,7 +6,7 @@ use crate::{
 use pyo3::types::PyBytes;
 use pyo3::{prelude::*, types::PyDict};
 use pyo3_stub_gen::derive::*;
-use statsig_rust::{log_e, log_w, DynamicValue, StatsigUser, StatsigUserData};
+use statsig_rust::{log_e, log_w, DynamicValue, StatsigUser, StatsigUserData, StatsigUserDataMap};
 use std::{collections::HashMap, str};
 
 const TAG: &str = stringify!(StatsigUserPy);
@@ -321,7 +321,7 @@ impl StatsigUserPy {
 }
 
 fn get_map_field_ref<'a>(
-    field: &'a Option<HashMap<String, DynamicValue>>,
+    field: &'a Option<StatsigUserDataMap>,
 ) -> Option<HashMap<&'a str, Option<ValidPrimitivesPyRef<'a>>>> {
     let value = field.as_ref()?;
 

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/Cargo.toml

@@ -17,6 +17,7 @@ dashmap = "6.1.0"
 file-guard = "0.2.0"
 flate2 = "1.0.35"
 futures = "0.3.30"
+indexmap = { version = "2.13.0", features = ["serde"], optional = true }
 lazy_static = "1.5.0"
 log = "0.4.22"
 parking_lot = "0.12.1"
@@ -39,7 +40,7 @@ serde_json = { version = "1.0.143", features = [
 ] }
 serde_with = "3.4.0"
 sha2 = "0.10.8"
-sigstat-grpc = { path = "../statsig-grpc", version = "0.19.1-beta.2604130314", optional = true }
+sigstat-grpc = { path = "../statsig-grpc", version = "0.19.2-beta.2604150312", optional = true }
 simple_logger = { version = "5.0.0" }
 tempfile = "3.8.1"
 tokio = { version = "1.39.1", features = ["full"] }
@@ -76,3 +77,4 @@ with_grpc = ["sigstat-grpc"]
 testing = []
 with_zstd = []
 ffi-support = []
+ordered_user_data_maps = ["dep:indexmap"]

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/src/console_capture/console_capture_instances.rs

@@ -8,8 +8,8 @@ use crate::console_capture::console_log_line_levels::StatsigLogLineLevel;
 use parking_lot::RwLock;
 
 use crate::{
-    log_e, observability::ops_stats::OpsStatsForInstance, user::StatsigUserLoggable, DynamicValue,
-    StatsigOptions, OPS_STATS,
+    log_e, observability::ops_stats::OpsStatsForInstance, user::user_data::UserDataMap,
+    user::StatsigUserLoggable, DynamicValue, StatsigOptions, OPS_STATS,
 };
 
 const TAG: &str = stringify!(ConsoleCaptureRegistry);
@@ -51,12 +51,12 @@ impl ConsoleCaptureInstance {
         let loggable_user = if let Some(console_capture_user) = console_capture_options.user {
             StatsigUserLoggable::new(
                 &console_capture_user.data,
-                environment.clone(),
+                to_user_data_map(environment),
                 statsig_options.global_custom_fields.clone(),
             )
         } else {
             StatsigUserLoggable::default_console_capture_user(
-                environment.clone(),
+                to_user_data_map(environment),
                 statsig_options.global_custom_fields.clone(),
             )
         };
@@ -74,6 +74,15 @@ impl ConsoleCaptureInstance {
     }
 }
 
+fn to_user_data_map(environment: &Option<HashMap<String, DynamicValue>>) -> Option<UserDataMap> {
+    environment.as_ref().map(|environment| {
+        environment
+            .iter()
+            .map(|(key, value)| (key.clone(), value.clone()))
+            .collect()
+    })
+}
+
 impl ConsoleCaptureRegistry {
     pub fn get_for_instance(
         &self,

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/src/lib.rs

@@ -29,7 +29,10 @@ pub use statsig_core_api_options::{
 pub use statsig_err::StatsigErr;
 pub use statsig_options::StatsigOptions;
 pub use statsig_runtime::StatsigRuntime;
-pub use user::user_data::UserData as StatsigUserData;
+pub use user::user_data::{
+    UserData as StatsigUserData, UserDataMap as StatsigUserDataMap,
+    UserDataStringMap as StatsigUserDataStringMap,
+};
 pub use user::{StatsigUser, StatsigUserBuilder};
 
 pub mod compression;

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/src/statsig_metadata.rs

@@ -10,7 +10,7 @@ lazy_static! {
     static ref STATSIG_METADATA: RwLock<StatsigMetadata> = RwLock::new(StatsigMetadata::new());
 }
 
-pub const SDK_VERSION: &str = "0.19.1-beta.2604130314";
+pub const SDK_VERSION: &str = "0.19.2-beta.2604150312";
 
 const TAG: &str = stringify!(StatsigMetadata);
 

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/src/user/statsig_user.rs

@@ -3,7 +3,11 @@ use crate::statsig_metadata;
 use crate::{dyn_value, evaluation::dynamic_string::DynamicString};
 use std::{collections::HashMap, sync::Arc};
 
-use super::{into_optional::IntoOptional, unit_id::UnitID, user_data::UserData};
+use super::{
+    into_optional::IntoOptional,
+    unit_id::UnitID,
+    user_data::{UserData, UserDataMap},
+};
 
 #[derive(Clone)]
 pub struct StatsigUser {
@@ -28,7 +32,7 @@ impl StatsigUser {
         K: Into<String>,
         U: Into<UnitID>,
     {
-        let custom_ids: HashMap<String, DynamicValue> = custom_ids
+        let custom_ids: UserDataMap = custom_ids
             .into_iter()
             .map(|(k, v)| (k.into(), v.into().into()))
             .collect();
@@ -75,7 +79,7 @@ macro_rules! string_field_accessor {
 
 macro_rules! map_field_accessor {
     ($self:ident, $getter_name:ident, $setter_name:ident, $field:ident) => {
-        pub fn $getter_name(&self) -> Option<&HashMap<String, DynamicValue>> {
+        pub fn $getter_name(&self) -> Option<&UserDataMap> {
             self.data.$field.as_ref()
         }
 
@@ -194,7 +198,7 @@ impl StatsigUser {
             }
         };
 
-        let statsig_environment: HashMap<String, DynamicValue> = statsig_environment
+        let statsig_environment: UserDataMap = statsig_environment
             .into_iter()
             .map(|(k, v)| (k.into(), v.into().into()))
             .collect();

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/src/user/statsig_user_builder.rs

@@ -1,13 +1,12 @@
 use super::unit_id::UnitID;
-use super::user_data::UserData;
+use super::user_data::{UserData, UserDataMap, UserDataMapOf, UserDataStringMap};
 use super::StatsigUser;
 use crate::dyn_value;
 use crate::evaluation::dynamic_value::DynamicValue;
-use std::collections::HashMap;
 
 pub struct StatsigUserBuilder {
     pub user_id: Option<UnitID>,
-    pub custom_ids: Option<HashMap<String, UnitID>>,
+    pub custom_ids: Option<UserDataMapOf<UnitID>>,
 
     pub email: Option<DynamicValue>,
     pub ip: Option<DynamicValue>,
@@ -16,10 +15,10 @@ pub struct StatsigUserBuilder {
     pub locale: Option<DynamicValue>,
     pub app_version: Option<DynamicValue>,
 
-    pub custom: Option<HashMap<String, DynamicValue>>,
-    pub private_attributes: Option<HashMap<String, DynamicValue>>,
+    pub custom: Option<UserDataMap>,
+    pub private_attributes: Option<UserDataMap>,
 
-    pub statsig_environment: Option<HashMap<String, DynamicValue>>,
+    pub statsig_environment: Option<UserDataMap>,
 }
 
 impl StatsigUserBuilder {
@@ -32,8 +31,9 @@ impl StatsigUserBuilder {
     }
 
     #[must_use]
-    pub fn new_with_custom_ids<K, U>(custom_ids: HashMap<K, U>) -> Self
+    pub fn new_with_custom_ids<K, U, I>(custom_ids: I) -> Self
     where
+        I: IntoIterator<Item = (K, U)>,
         K: Into<String>,
         U: Into<UnitID>,
     {
@@ -63,10 +63,12 @@ impl StatsigUserBuilder {
         self
     }
 
-    pub fn custom_ids(
-        mut self,
-        custom_ids: Option<HashMap<impl Into<String>, impl Into<UnitID>>>,
-    ) -> Self {
+    pub fn custom_ids<K, U, I>(mut self, custom_ids: Option<I>) -> Self
+    where
+        I: IntoIterator<Item = (K, U)>,
+        K: Into<String>,
+        U: Into<UnitID>,
+    {
         if let Some(custom_ids) = custom_ids {
             self.custom_ids = Some(
                 custom_ids
@@ -120,10 +122,7 @@ impl StatsigUserBuilder {
         self
     }
 
-    pub fn statsig_environment(
-        mut self,
-        statsig_environment: Option<HashMap<String, String>>,
-    ) -> Self {
+    pub fn statsig_environment(mut self, statsig_environment: Option<UserDataStringMap>) -> Self {
         if let Some(statsig_environment) = statsig_environment {
             self.statsig_environment = Some(convert_str_map_to_dyn_values(statsig_environment));
         }
@@ -131,14 +130,14 @@ impl StatsigUserBuilder {
     }
 
     // todo: support HashMap<String, String | Number | Boolean | Array<String>>
-    pub fn custom_from_str_map(mut self, custom: Option<HashMap<String, String>>) -> Self {
+    pub fn custom_from_str_map(mut self, custom: Option<UserDataStringMap>) -> Self {
         if let Some(custom) = custom {
             self.custom = Some(convert_str_map_to_dyn_values(custom));
         }
         self
     }
 
-    pub fn custom(mut self, custom: Option<HashMap<String, DynamicValue>>) -> Self {
+    pub fn custom(mut self, custom: Option<UserDataMap>) -> Self {
         if let Some(custom) = custom {
             self.custom = Some(custom);
         }
@@ -148,7 +147,7 @@ impl StatsigUserBuilder {
     // todo: support HashMap<String, String | Number | Boolean | Array<String>>
     pub fn private_attributes_from_str_map(
         mut self,
-        private_attributes: Option<HashMap<String, String>>,
+        private_attributes: Option<UserDataStringMap>,
     ) -> Self {
         if let Some(private_attributes) = private_attributes {
             self.private_attributes = Some(convert_str_map_to_dyn_values(private_attributes));
@@ -156,10 +155,7 @@ impl StatsigUserBuilder {
         self
     }
 
-    pub fn private_attributes(
-        mut self,
-        private_attributes: Option<HashMap<String, DynamicValue>>,
-    ) -> Self {
+    pub fn private_attributes(mut self, private_attributes: Option<UserDataMap>) -> Self {
         if let Some(private_attributes) = private_attributes {
             self.private_attributes = Some(private_attributes);
         }
@@ -187,9 +183,7 @@ impl StatsigUserBuilder {
     }
 }
 
-fn convert_str_map_to_dyn_values(
-    custom_ids: HashMap<String, String>,
-) -> HashMap<String, DynamicValue> {
+fn convert_str_map_to_dyn_values(custom_ids: UserDataStringMap) -> UserDataMap {
     custom_ids
         .into_iter()
         .map(|(k, v)| (k, dyn_value!(v)))

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/src/user/statsig_user_internal.rs

@@ -3,7 +3,7 @@ use std::sync::atomic::{AtomicU64, Ordering};
 
 use chrono::Utc;
 
-use super::StatsigUserLoggable;
+use super::{user_data::UserDataMap, StatsigUserLoggable};
 use crate::evaluation::dynamic_value::DynamicValue;
 use crate::hashing::djb2_number;
 use crate::{evaluation::dynamic_string::DynamicString, Statsig};
@@ -141,7 +141,7 @@ impl<'statsig, 'user> StatsigUserInternal<'statsig, 'user> {
 
         if let Some(statsig_instance) = &self.statsig_instance {
             if environment.is_none() {
-                environment = statsig_instance.use_statsig_env(|e| e.cloned());
+                environment = statsig_instance.use_statsig_env(hashmap_to_user_data_map);
             }
             global_custom = statsig_instance.use_global_custom_fields(|gc| gc.cloned());
         }
@@ -172,6 +172,14 @@ impl<'statsig, 'user> StatsigUserInternal<'statsig, 'user> {
     }
 }
 
+fn hashmap_to_user_data_map(map: Option<&HashMap<String, DynamicValue>>) -> Option<UserDataMap> {
+    map.map(|map| {
+        map.iter()
+            .map(|(key, value)| (key.clone(), value.clone()))
+            .collect()
+    })
+}
+
 fn throttled_version_check(user: &StatsigUser) {
     let current_version = statsig_metadata::SDK_VERSION;
 

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/src/user/statsig_user_loggable.rs

@@ -1,6 +1,9 @@
-use super::user_data::UserData;
+use super::user_data::{UserData, UserDataMap};
 use crate::{DynamicValue, StatsigUser};
-use serde::{ser::SerializeStruct, Deserialize, Serialize};
+use serde::{
+    ser::{SerializeMap, SerializeStruct},
+    Deserialize, Serialize,
+};
 use serde_json::Value;
 use std::{collections::HashMap, sync::Arc};
 
@@ -9,14 +12,14 @@ const TAG: &str = "StatsigUserLoggable";
 #[derive(Clone, Default)]
 pub struct StatsigUserLoggable {
     pub data: Arc<UserData>,
-    pub environment: Option<HashMap<String, DynamicValue>>,
+    pub environment: Option<UserDataMap>,
     pub global_custom: Option<HashMap<String, DynamicValue>>,
 }
 
 impl StatsigUserLoggable {
     pub fn new(
         user_inner: &Arc<UserData>,
-        environment: Option<HashMap<String, DynamicValue>>,
+        environment: Option<UserDataMap>,
         global_custom: Option<HashMap<String, DynamicValue>>,
     ) -> Self {
         Self {
@@ -31,7 +34,7 @@ impl StatsigUserLoggable {
     }
 
     pub fn default_console_capture_user(
-        environment: Option<HashMap<String, DynamicValue>>,
+        environment: Option<UserDataMap>,
         global_custom: Option<HashMap<String, DynamicValue>>,
     ) -> Self {
         Self::new(
@@ -81,10 +84,9 @@ impl<'de> Deserialize<'de> for StatsigUserLoggable {
             serde::de::Error::custom(format!("Error deserializing StatsigUserInner: {e}"))
         })?;
 
-        let environment = serde_json::from_value::<Option<HashMap<String, DynamicValue>>>(env)
-            .map_err(|e| {
-                serde::de::Error::custom(format!("Error deserializing StatsigUserInner: {e}"))
-            })?;
+        let environment = serde_json::from_value::<Option<UserDataMap>>(env).map_err(|e| {
+            serde::de::Error::custom(format!("Error deserializing StatsigUserInner: {e}"))
+        })?;
 
         Ok(StatsigUserLoggable {
             data: Arc::new(data),
@@ -111,7 +113,7 @@ where
 
 fn serialize_custom_field<S>(
     state: &mut S,
-    custom: &Option<HashMap<String, DynamicValue>>,
+    custom: &Option<UserDataMap>,
     global_custom: &Option<HashMap<String, DynamicValue>>,
 ) -> Result<(), S::Error>
 where
@@ -121,19 +123,68 @@ where
         return Ok(());
     }
 
-    let mut map = HashMap::new();
+    state.serialize_field(
+        "custom",
+        &MergedCustomFields {
+            custom: custom.as_ref(),
+            global_custom: global_custom.as_ref(),
+        },
+    )
+}
 
-    if let Some(global_custom) = global_custom.as_ref() {
-        for (k, v) in global_custom {
-            map.insert(k, v);
-        }
+struct MergedCustomFields<'a> {
+    custom: Option<&'a UserDataMap>,
+    global_custom: Option<&'a HashMap<String, DynamicValue>>,
+}
+
+impl MergedCustomFields<'_> {
+    fn serialized_len(&self) -> usize {
+        let global_len = self.global_custom.map_or(0, HashMap::len);
+        let custom_only_len = self.custom.map_or(0, |custom| {
+            custom
+                .keys()
+                .filter(|key| {
+                    !self
+                        .global_custom
+                        .is_some_and(|global_custom| global_custom.contains_key(*key))
+                })
+                .count()
+        });
+
+        global_len + custom_only_len
     }
+}
 
-    if let Some(custom) = custom.as_ref() {
-        for (k, v) in custom {
-            map.insert(k, v);
+impl Serialize for MergedCustomFields<'_> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let mut map = serializer.serialize_map(Some(self.serialized_len()))?;
+
+        if let Some(global_custom) = self.global_custom {
+            for (key, global_value) in global_custom {
+                let value = self
+                    .custom
+                    .and_then(|custom| custom.get(key))
+                    .unwrap_or(global_value);
+                map.serialize_entry(key, value)?;
+            }
         }
-    }
 
-    serialize_data_field(state, "custom", &Some(map))
+        if let Some(custom) = self.custom {
+            for (key, value) in custom {
+                if self
+                    .global_custom
+                    .is_some_and(|global_custom| global_custom.contains_key(key))
+                {
+                    continue;
+                }
+
+                map.serialize_entry(key, value)?;
+            }
+        }
+
+        map.end()
+    }
 }

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/src/user/user_data.rs

@@ -1,8 +1,19 @@
 use crate::{evaluation::dynamic_value::DynamicValue, hashing};
+#[cfg(feature = "ordered_user_data_maps")]
+use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
+#[cfg(not(feature = "ordered_user_data_maps"))]
 use std::collections::HashMap;
 
+#[cfg(feature = "ordered_user_data_maps")]
+pub type UserDataMapOf<T> = IndexMap<String, T>;
+#[cfg(not(feature = "ordered_user_data_maps"))]
+pub type UserDataMapOf<T> = HashMap<String, T>;
+
+pub type UserDataMap = UserDataMapOf<DynamicValue>;
+pub type UserDataStringMap = UserDataMapOf<String>;
+
 #[skip_serializing_none]
 #[derive(Clone, Deserialize, Serialize, Default)]
 #[serde(rename_all = "camelCase")]
@@ -10,7 +21,7 @@ pub struct UserData {
     #[serde(rename = "userID")]
     pub user_id: Option<DynamicValue>,
     #[serde(rename = "customIDs")]
-    pub custom_ids: Option<HashMap<String, DynamicValue>>,
+    pub custom_ids: Option<UserDataMap>,
 
     pub email: Option<DynamicValue>,
     pub ip: Option<DynamicValue>,
@@ -18,11 +29,11 @@ pub struct UserData {
     pub country: Option<DynamicValue>,
     pub locale: Option<DynamicValue>,
     pub app_version: Option<DynamicValue>,
-    pub statsig_environment: Option<HashMap<String, DynamicValue>>,
+    pub statsig_environment: Option<UserDataMap>,
 
     #[serde(skip_serializing)]
-    pub private_attributes: Option<HashMap<String, DynamicValue>>,
-    pub custom: Option<HashMap<String, DynamicValue>>,
+    pub private_attributes: Option<UserDataMap>,
+    pub custom: Option<UserDataMap>,
 }
 
 impl UserData {

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/tests/check_gate_tests.rs

@@ -2,7 +2,9 @@ mod utils;
 
 use crate::utils::mock_specs_adapter::MockSpecsAdapter;
 use lazy_static::lazy_static;
-use statsig_rust::{dyn_value, Statsig, StatsigOptions, StatsigUser, StatsigUserBuilder};
+use statsig_rust::{
+    dyn_value, Statsig, StatsigOptions, StatsigUser, StatsigUserBuilder, StatsigUserDataMap,
+};
 use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::Instant;
@@ -12,7 +14,7 @@ lazy_static! {
         "hubID".to_string(),
         "some-service-123".to_string()
     )]))
-    .custom(Some(HashMap::from([
+    .custom(Some(StatsigUserDataMap::from([
         ("flavor".to_string(), dyn_value!("chocolate")),
         ("region".to_string(), dyn_value!("somewhere")),
         ("service".to_string(), dyn_value!("some-service")),

{statsig_python_core-0.19.1b2604130314 → statsig_python_core-0.19.2b2604150312}/statsig-rust/tests/expected_evaluation_tests.rs

@@ -3,7 +3,7 @@ mod utils;
 use crate::utils::mock_event_logging_adapter::MockEventLoggingAdapter;
 use crate::utils::mock_specs_adapter::MockSpecsAdapter;
 use statsig_rust::StatsigUserBuilder;
-use statsig_rust::{dyn_value, Statsig, StatsigOptions, StatsigUser};
+use statsig_rust::{dyn_value, Statsig, StatsigOptions, StatsigUser, StatsigUserDataMap};
 use std::collections::HashMap;
 use std::sync::Arc;
 
@@ -18,7 +18,10 @@ fn build_full_user() -> StatsigUser {
         .email(Some("a_user@statsig.com".into()))
         .country(Some("US".into()))
         .user_id(Some("a_user".to_string()))
-        .custom(Some(HashMap::from([("level".to_string(), dyn_value!(9))])))
+        .custom(Some(StatsigUserDataMap::from([(
+            "level".to_string(),
+            dyn_value!(9),
+        )])))
         .custom_ids(Some(HashMap::from([
             ("companyID", "123"),
             ("stableID", ""),
@@ -157,7 +160,10 @@ async fn test_custom_number_value_passes() {
     let statsig = setup(None).await;
 
     let user = StatsigUserBuilder::new_with_user_id("a_user".to_string())
-        .custom(Some(HashMap::from([("level".to_string(), dyn_value!(9))])))
+        .custom(Some(StatsigUserDataMap::from([(
+            "level".to_string(),
+            dyn_value!(9),
+        )])))
         .build();
 
     let gate_name = "test_any_with_number_value";