optify 0.8.1__tar.gz → 0.8.2__tar.gz

{optify-0.8.1 → optify-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: optify
-Version: 0.8.1
+Version: 0.8.2
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{optify-0.8.1 → optify-0.8.2}/pyproject.toml

@@ -26,11 +26,11 @@ build-backend = "maturin"
 
 [package]
 name = "optify"
-version = "0.8.1"
+version = "0.8.2"
 
 [tool.poetry]
 name = "optify"
-version = "0.8.1"
+version = "0.8.2"
 description = "Simplifies getting the right configuration options for a process using pre-loaded configurations from files to manage options for experiments or flights."
 authors = ["Justin D. Harris"]
 maintainers = ["Justin D. Harris"]

{optify-0.8.1 → optify-0.8.2}/python/optify/Cargo.lock

@@ -1132,7 +1132,7 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "optify"
-version = "0.20.1"
+version = "0.20.2"
 dependencies = [
  "config",
  "dunce",
@@ -1150,7 +1150,7 @@ dependencies = [
 
 [[package]]
 name = "optify-python"
-version = "0.8.1"
+version = "0.8.2"
 dependencies = [
  "optify",
  "pyo3",

{optify-0.8.1 → optify-0.8.2}/python/optify/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "optify-python"
-version = "0.8.1"
+version = "0.8.2"
 edition = "2021"
 
 description = "Simplifies getting the right configuration options for a process using pre-loaded configurations from files (JSON, YAML, etc.) to manage options for experiments or flights. This library is mainly made to support building implementations for other languages such as Node.js, Python, and Ruby. It is not meant to be consumed directly yet."
@@ -15,5 +15,5 @@ name = "optify"
 crate-type = ["cdylib"]
 
 [dependencies]
-optify = { path = "../../rust/optify", version = "0.20.1" }
+optify = { path = "../../rust/optify", version = "0.20.2" }
 pyo3 = "0.24.1"

{optify-0.8.1 → optify-0.8.2}/rust/optify/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "optify"
-version = "0.20.1"
+version = "0.20.2"
 edition = "2021"
 build = "build.rs"
 

{optify-0.8.1 → optify-0.8.2}/rust/optify/src/builder/builder_impl.rs

@@ -12,9 +12,7 @@ use crate::builder::OptionsRegistryBuilder;
 use crate::configurable_string::locator::find_configurable_values;
 use crate::configurable_string::LoadedFiles;
 use crate::json::reader::read_json_from_file_as;
-use crate::provider::{
-    Aliases, Conditions, ConfigurableValuePointers, Features, OptionsProvider, Sources,
-};
+use crate::provider::{Aliases, Conditions, Features, OptionsProvider, Sources};
 use crate::schema::feature::FeatureConfiguration;
 use crate::schema::metadata::OptionsMetadata;
 
@@ -28,7 +26,7 @@ type Imports = HashMap<String, Vec<String>>;
 #[derive(Clone)]
 pub struct OptionsProviderBuilder {
     aliases: Aliases,
-    configurable_value_pointers: ConfigurableValuePointers,
+    all_configurable_value_pointers: HashSet<String>,
     dependents: Dependents,
     conditions: Conditions,
     features: Features,
@@ -184,8 +182,8 @@ impl OptionsProviderBuilder {
     pub fn new() -> Self {
         OptionsProviderBuilder {
             aliases: Aliases::new(),
+            all_configurable_value_pointers: HashSet::new(),
             conditions: Conditions::new(),
-            configurable_value_pointers: ConfigurableValuePointers::new(),
             dependents: Dependents::new(),
             features: Features::new(),
             imports: HashMap::new(),
@@ -198,10 +196,15 @@ impl OptionsProviderBuilder {
     pub fn build_and_clear(&mut self) -> Result<OptionsProvider, String> {
         self.prepare_build()?;
 
+        let all_configurable_value_pointers = self
+            .all_configurable_value_pointers
+            .iter()
+            .cloned()
+            .collect();
         Ok(OptionsProvider::new(
             std::mem::take(&mut self.aliases),
+            all_configurable_value_pointers,
             std::mem::take(&mut self.conditions),
-            std::mem::take(&mut self.configurable_value_pointers),
             std::mem::take(&mut self.features),
             std::mem::take(&mut self.loaded_files),
             std::mem::take(&mut self.sources),
@@ -389,10 +392,8 @@ impl OptionsProviderBuilder {
                 .insert(canonical_feature_name.clone(), imports.clone());
         }
         if !info.configurable_value_pointers.is_empty() {
-            self.configurable_value_pointers.insert(
-                canonical_feature_name.clone(),
-                info.configurable_value_pointers.clone(),
-            );
+            self.all_configurable_value_pointers
+                .extend(info.configurable_value_pointers.iter().cloned());
         }
         add_alias(
             &mut self.aliases,
@@ -524,10 +525,15 @@ impl OptionsRegistryBuilder<OptionsProvider> for OptionsProviderBuilder {
     fn build(&mut self) -> Result<OptionsProvider, String> {
         self.prepare_build()?;
 
+        let all_configurable_value_pointers = self
+            .all_configurable_value_pointers
+            .iter()
+            .cloned()
+            .collect();
         Ok(OptionsProvider::new(
             self.aliases.clone(),
+            all_configurable_value_pointers,
             self.conditions.clone(),
-            self.configurable_value_pointers.clone(),
             self.features.clone(),
             self.loaded_files.clone(),
             self.sources.clone(),

{optify-0.8.1 → optify-0.8.2}/rust/optify/src/provider/provider_impl.rs

@@ -1,8 +1,4 @@
-use std::{
-    collections::{HashMap, HashSet},
-    path::Path,
-    sync::RwLock,
-};
+use std::{collections::HashMap, path::Path, sync::RwLock};
 
 use crate::{
     builder::{OptionsProviderBuilder, OptionsRegistryBuilder},
@@ -22,7 +18,6 @@ pub(crate) type SourceValue = config::File<config::FileSourceString, config::Fil
 
 pub(crate) type Aliases = HashMap<unicase::UniCase<String>, String>;
 pub(crate) type Conditions = HashMap<String, ConditionExpression>;
-pub(crate) type ConfigurableValuePointers = HashMap<String, Vec<String>>;
 pub(crate) type Features = HashMap<String, OptionsMetadata>;
 pub(crate) type Sources = HashMap<String, SourceValue>;
 
@@ -34,9 +29,9 @@ pub struct CacheOptions {}
 /// ⚠️ Development in progress ⚠️\
 /// Not truly considered public and mainly available to support bindings for other languages.
 pub struct OptionsProvider {
+    all_configurable_value_pointers: Vec<String>,
     aliases: Aliases,
     conditions: Conditions,
-    configurable_value_pointers: ConfigurableValuePointers,
     features: Features,
     loaded_files: LoadedFiles,
     sources: Sources,
@@ -49,16 +44,16 @@ pub struct OptionsProvider {
 impl OptionsProvider {
     pub(crate) fn new(
         aliases: Aliases,
+        all_configurable_value_pointers: Vec<String>,
         conditions: Conditions,
-        configurable_value_pointers: ConfigurableValuePointers,
         features: Features,
         loaded_files: LoadedFiles,
         sources: Sources,
     ) -> Self {
         OptionsProvider {
+            all_configurable_value_pointers,
             aliases,
             conditions,
-            configurable_value_pointers,
             features,
             loaded_files,
             sources,
@@ -174,7 +169,6 @@ impl OptionsProvider {
     pub fn process_configurable_strings(
         &self,
         value: &mut serde_json::Value,
-        feature_names: &[String],
         key_prefix: Option<&str>,
         preferences: Option<&GetOptionsPreferences>,
     ) -> Result<(), String> {
@@ -186,40 +180,7 @@ impl OptionsProvider {
             return Ok(());
         }
 
-        if self.configurable_value_pointers.is_empty() {
-            // There are no configurable strings to process, assume they are not enabled for the provider, even for use in overrides.
-            return Ok(());
-        }
-
-        // When overrides are present, dynamically discover all configurable strings
-        // because overrides may contain ConfigurableStrings not in the original features
-        let has_overrides = preferences
-            .map(|p| p.overrides_json.is_some())
-            .unwrap_or(false);
-
-        // TODO It would be nice to save memory and use a `HashSet<&String>` instead of a `HashSet<String>`.
-        // `HashSet<String>` is needed when there are overrides, but that should be the exception rather than the rule.
-        let pointers: HashSet<String> = if has_overrides {
-            // Dynamically find all configurable strings in the merged value
-            crate::configurable_string::locator::find_configurable_values(Some(value))
-                .into_iter()
-                .collect()
-        } else {
-            // Collect all configurable pointers for the requested features.
-            feature_names
-                .iter()
-                .filter_map(|feature_name| self.configurable_value_pointers.get(feature_name))
-                .flat_map(|pointers| pointers.iter())
-                .cloned()
-                .collect()
-        };
-
-        if pointers.is_empty() {
-            // There are no configurable strings to process.
-            return Ok(());
-        }
-
-        for pointer in &pointers {
+        for pointer in &self.all_configurable_value_pointers {
             let relative_pointer = match key_prefix {
                 Some(key_prefix) => {
                     if !pointer.starts_with(key_prefix) {
@@ -333,7 +294,7 @@ impl OptionsRegistry for OptionsProvider {
 
         match config.try_deserialize::<serde_json::Value>() {
             Ok(mut value) => {
-                self.process_configurable_strings(&mut value, &feature_names, None, preferences)?;
+                self.process_configurable_strings(&mut value, None, preferences)?;
                 Ok(value)
             }
             Err(e) => Err(e.to_string()),
@@ -437,12 +398,7 @@ impl OptionsRegistry for OptionsProvider {
 
         match config.get::<serde_json::Value>(key) {
             Ok(mut value) => {
-                self.process_configurable_strings(
-                    &mut value,
-                    &filtered_feature_names,
-                    Some(key),
-                    preferences,
-                )?;
+                self.process_configurable_strings(&mut value, Some(key), preferences)?;
                 if cache_options.is_some() {
                     let are_configurable_strings_enabled = preferences
                         .map(|p| p.are_configurable_strings_enabled)