eppo-server-sdk 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6fb69972c523dd9d2c7c683c751c012608c63bb36fd3a6fe9463fb27d77d3d6
-  data.tar.gz: dfb6b27af63f652094f2141791aaf31be01ce8277801ce6537b30f0cbfa64820
+  metadata.gz: 9cd858b9082e0b7d776c90f73c086271ac4e7983c7c0d981f060cc44ee2953b1
+  data.tar.gz: 9fa7706a5fc234775980808cafed2924322b8d4db797fe878346b78da8b34d8c
 SHA512:
-  metadata.gz: 1d191dfefc76fb61a1b873c61da265066e1d674e628864d326d3d51bb3a5c14933fb69aa48e72a1325bd2753a4acc2083bde48d1daf1a408c29b90cea4f858b5
-  data.tar.gz: b79006cc38615b15e44d12362fcc61520ae34f852272fe5a42d4761d7e36e5c407aa1a63df0226109c2198a4798fbb0ded3ce3c0b22fa27e004a69165a2a1696
+  metadata.gz: cb6fa1371ed76e2c0f041625ac1aa336ae13c2fe303e722749efb4ddf9b9e7d0ba1536978b8d889e78f1e573a8021be0f9396f51a0f623dcaac1f7e66c4e9c75
+  data.tar.gz: bb022578cba95db2cdfae89cc1431abaf30cb7c83875f18ee8ca1d9feecfb93e735aa72d3e9990d59a4e718d401ec95d65063ccc2d3aef57d8f0a1ae5f2d6410

data/Cargo.lock

@@ -304,7 +304,7 @@ dependencies = [
 
 [[package]]
 name = "eppo_client"
-version = "3.1.1"
+version = "3.2.0"
 dependencies = [
  "env_logger",
  "eppo_core",
@@ -312,17 +312,19 @@ dependencies = [
  "magnus",
  "rb-sys",
  "serde",
+ "serde_json",
  "serde_magnus",
 ]
 
 [[package]]
 name = "eppo_core"
-version = "3.0.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34f3fc5a7f54cc47a5ebf063025176726db7eb5e51661185b5f4d20aaacea611"
+checksum = "b071fed21065318dcd6a91a443bd9f6b39796d727297b03d092e2e8dc9e02414"
 dependencies = [
  "chrono",
  "derive_more",
+ "faststr",
  "log",
  "md5",
  "rand",
@@ -367,6 +369,17 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
+[[package]]
+name = "faststr"
+version = "0.2.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dc21a7d5a45182c2bb5ae9471b93f10919c0744b54403e54a9e2329c26ed5a3"
+dependencies = [
+ "bytes",
+ "serde",
+ "simdutf8",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -1283,9 +1296,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.124"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
  "memchr",
@@ -1328,6 +1341,12 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
 [[package]]
 name = "slab"
 version = "0.4.9"

data/ext/eppo_client/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "eppo_client"
 # TODO: this version and lib/eppo_client/version.rb should be in sync
-version = "3.1.1"
+version = "3.2.0"
 edition = "2021"
 license = "MIT"
 publish = false
@@ -12,9 +12,10 @@ crate-type = ["cdylib"]
 
 [dependencies]
 env_logger = { version = "0.11.3", features = ["unstable-kv"] }
-eppo_core = { version = "3.0.0" }
+eppo_core = { version = "4.0.0" }
 log = { version = "0.4.21", features = ["kv_serde"] }
-magnus = { version = "0.6.2" }
+magnus = { version = "0.6.4" }
 serde = { version = "1.0.203", features = ["derive"] }
 serde_magnus = "0.8.1"
 rb-sys = "0.9"
+serde_json = "1.0.128"

data/ext/eppo_client/src/client.rs

@@ -1,20 +1,24 @@
-use std::{cell::RefCell, sync::Arc};
+use std::{cell::RefCell, sync::Arc, time::Duration};
 
 use eppo_core::{
     configuration_fetcher::{ConfigurationFetcher, ConfigurationFetcherConfig},
     configuration_store::ConfigurationStore,
     eval::{Evaluator, EvaluatorConfig},
-    poller_thread::PollerThread,
+    poller_thread::{PollerThread, PollerThreadConfig},
     ufc::VariationType,
-    Attributes, ContextAttributes, SdkMetadata,
+    Attributes, ContextAttributes,
 };
 use magnus::{error::Result, exception, prelude::*, Error, TryConvert, Value};
 
+use crate::{configuration::Configuration, SDK_METADATA};
+
 #[derive(Debug)]
 #[magnus::wrap(class = "EppoClient::Core::Config", size, free_immediately)]
 pub struct Config {
     api_key: String,
     base_url: String,
+    poll_interval: Option<Duration>,
+    poll_jitter: Duration,
 }
 
 impl TryConvert for Config {
@@ -22,12 +26,21 @@ impl TryConvert for Config {
     fn try_convert(val: magnus::Value) -> Result<Self> {
         let api_key = String::try_convert(val.funcall("api_key", ())?)?;
         let base_url = String::try_convert(val.funcall("base_url", ())?)?;
-        Ok(Config { api_key, base_url })
+        let poll_interval_seconds =
+            Option::<u64>::try_convert(val.funcall("poll_interval_seconds", ())?)?;
+        let poll_jitter_seconds = u64::try_convert(val.funcall("poll_jitter_seconds", ())?)?;
+        Ok(Config {
+            api_key,
+            base_url,
+            poll_interval: poll_interval_seconds.map(Duration::from_secs),
+            poll_jitter: Duration::from_secs(poll_jitter_seconds),
+        })
     }
 }
 
 #[magnus::wrap(class = "EppoClient::Core::Client")]
 pub struct Client {
+    configuration_store: Arc<ConfigurationStore>,
     evaluator: Evaluator,
     // Magnus only allows sharing aliased references (&T) through the API, so we need to use RefCell
     // to get interior mutability.
@@ -41,29 +54,35 @@ impl Client {
     pub fn new(config: Config) -> Client {
         let configuration_store = Arc::new(ConfigurationStore::new());
 
-        let sdk_metadata = SdkMetadata {
-            name: "ruby",
-            version: env!("CARGO_PKG_VERSION"),
+        let poller_thread = if let Some(poll_interval) = config.poll_interval {
+            Some(
+                PollerThread::start_with_config(
+                    ConfigurationFetcher::new(ConfigurationFetcherConfig {
+                        base_url: config.base_url,
+                        api_key: config.api_key,
+                        sdk_metadata: SDK_METADATA,
+                    }),
+                    configuration_store.clone(),
+                    PollerThreadConfig {
+                        interval: poll_interval,
+                        jitter: config.poll_jitter,
+                    },
+                )
+                .expect("should be able to start poller thread"),
+            )
+        } else {
+            None
         };
 
-        let poller_thread = PollerThread::start(
-            ConfigurationFetcher::new(ConfigurationFetcherConfig {
-                base_url: config.base_url,
-                api_key: config.api_key,
-                sdk_metadata: sdk_metadata.clone(),
-            }),
-            configuration_store.clone(),
-        )
-        .expect("should be able to start poller thread");
-
         let evaluator = Evaluator::new(EvaluatorConfig {
-            configuration_store,
-            sdk_metadata,
+            configuration_store: configuration_store.clone(),
+            sdk_metadata: SDK_METADATA,
         });
 
         Client {
+            configuration_store,
             evaluator,
-            poller_thread: RefCell::new(Some(poller_thread)),
+            poller_thread: RefCell::new(poller_thread),
         }
     }
 
@@ -81,8 +100,8 @@ impl Client {
             .evaluator
             .get_assignment(
                 &flag_key,
-                &subject_key,
-                &subject_attributes,
+                &subject_key.into(),
+                &Arc::new(subject_attributes),
                 Some(expected_type),
             )
             // TODO: maybe expose possible errors individually.
@@ -103,8 +122,8 @@ impl Client {
 
         let result = self.evaluator.get_assignment_details(
             &flag_key,
-            &subject_key,
-            &subject_attributes,
+            &subject_key.into(),
+            &Arc::new(subject_attributes),
             Some(expected_type),
         );
 
@@ -132,10 +151,10 @@ impl Client {
 
         let result = self.evaluator.get_bandit_action(
             &flag_key,
-            &subject_key,
+            &subject_key.into(),
             &subject_attributes,
             &actions,
-            &default_variation,
+            &default_variation.into(),
         );
 
         serde_magnus::serialize(&result)
@@ -162,15 +181,26 @@ impl Client {
 
         let result = self.evaluator.get_bandit_action_details(
             &flag_key,
-            &subject_key,
+            &subject_key.into(),
             &subject_attributes,
             &actions,
-            &default_variation,
+            &default_variation.into(),
         );
 
         serde_magnus::serialize(&result)
     }
 
+    pub fn get_configuration(&self) -> Option<Configuration> {
+        self.configuration_store
+            .get_configuration()
+            .map(|it| it.into())
+    }
+
+    pub fn set_configuration(&self, configuration: &Configuration) {
+        self.configuration_store
+            .set_configuration(configuration.clone().into())
+    }
+
     pub fn shutdown(&self) {
         if let Some(t) = self.poller_thread.take() {
             let _ = t.shutdown();

data/ext/eppo_client/src/configuration.rs

@@ -0,0 +1,113 @@
+use std::sync::Arc;
+
+use magnus::{function, method, prelude::*, scan_args::get_kwargs, Error, RHash, RString, Ruby};
+
+use eppo_core::{ufc::UniversalFlagConfig, Configuration as CoreConfiguration};
+
+use crate::{gc_lock::GcLock, SDK_METADATA};
+
+pub(crate) fn init(ruby: &Ruby) -> Result<(), Error> {
+    let eppo_client = ruby.define_module("EppoClient")?;
+
+    let configuration = eppo_client.define_class("Configuration", magnus::class::object())?;
+    configuration.define_singleton_method("new", function!(Configuration::new, 1))?;
+    configuration.define_method(
+        "flags_configuration",
+        method!(Configuration::flags_configuration, 0),
+    )?;
+    configuration.define_method(
+        "bandits_configuration",
+        method!(Configuration::bandits_configuration, 0),
+    )?;
+
+    Ok(())
+}
+
+#[derive(Debug, Clone)]
+#[magnus::wrap(class = "EppoClient::Configuration", free_immediately)]
+pub struct Configuration {
+    inner: Arc<CoreConfiguration>,
+}
+
+impl Configuration {
+    fn new(ruby: &Ruby, kw: RHash) -> Result<Configuration, Error> {
+        let args = get_kwargs(kw, &["flags_configuration"], &["bandits_configuration"])?;
+        let (flags_configuration,): (RString,) = args.required;
+        let (bandits_configuration,): (Option<Option<RString>>,) = args.optional;
+        let rest: RHash = args.splat;
+        if !rest.is_empty() {
+            return Err(Error::new(
+                ruby.exception_arg_error(),
+                format!("unexpected keyword arguments: {:?}", rest),
+            ));
+        }
+
+        let inner = {
+            let _gc_lock = GcLock::new(ruby);
+
+            Arc::new(CoreConfiguration::from_server_response(
+                UniversalFlagConfig::from_json(
+                    SDK_METADATA,
+                    unsafe {
+                        // SAFETY: we have disabled GC, so the memory can't be modified concurrently.
+                        flags_configuration.as_slice()
+                    }
+                    .to_vec(),
+                )
+                .map_err(|err| {
+                    Error::new(
+                        ruby.exception_arg_error(),
+                        format!("failed to parse flags_configuration: {err:?}"),
+                    )
+                })?,
+                bandits_configuration
+                    .flatten()
+                    .map(|bandits| {
+                        serde_json::from_slice(unsafe {
+                            // SAFETY: we have disabled GC, so the memory can't be modified concurrently.
+                            bandits.as_slice()
+                        })
+                    })
+                    .transpose()
+                    .map_err(|err| {
+                        Error::new(
+                            ruby.exception_arg_error(),
+                            format!("failed to parse bandits_configuration: {err:?}"),
+                        )
+                    })?,
+            ))
+        };
+
+        Ok(Configuration { inner })
+    }
+
+    fn flags_configuration(ruby: &Ruby, rb_self: &Self) -> Result<RString, Error> {
+        Ok(ruby.str_from_slice(rb_self.inner.flags.to_json()))
+    }
+
+    fn bandits_configuration(ruby: &Ruby, rb_self: &Self) -> Result<Option<RString>, Error> {
+        let Some(bandits) = &rb_self.inner.bandits else {
+            return Ok(None)
+        };
+        let vec = serde_json::to_vec(bandits).map_err(|err| {
+            // this should never happen
+            Error::new(
+                ruby.exception_runtime_error(),
+                format!("failed to serialize bandits configuration: {err:?}"),
+            )
+        })?;
+        Ok(Some(ruby.str_from_slice(&vec)))
+    }
+}
+
+impl From<Arc<CoreConfiguration>> for Configuration {
+    fn from(inner: Arc<CoreConfiguration>) -> Configuration {
+        Configuration { inner }
+    }
+}
+
+impl From<Configuration> for Arc<CoreConfiguration> {
+    fn from(value: Configuration) -> Arc<CoreConfiguration> {
+        value.inner
+    }
+}

data/ext/eppo_client/src/gc_lock.rs

@@ -0,0 +1,25 @@
+use magnus::Ruby;
+
+pub struct GcLock<'a> {
+    ruby: &'a Ruby,
+    /// Holds `true` if GC was already disabled before acquiring the lock (so it doesn't need to be
+    /// re-enabled).
+    gc_was_disabled: bool,
+}
+
+impl<'a> GcLock<'a> {
+    pub fn new(ruby: &'a Ruby) -> GcLock<'a> {
+        GcLock {
+            ruby,
+            gc_was_disabled: ruby.gc_disable(),
+        }
+    }
+}
+
+impl<'a> Drop for GcLock<'a> {
+    fn drop(&mut self) {
+        if !self.gc_was_disabled {
+            self.ruby.gc_enable();
+        }
+    }
+}

data/ext/eppo_client/src/lib.rs

@@ -1,12 +1,20 @@
 mod client;
+mod configuration;
+mod gc_lock;
 
+use eppo_core::SdkMetadata;
 use magnus::{function, method, prelude::*, Error, Object, Ruby};
 
 use crate::client::Client;
 
+pub(crate) const SDK_METADATA: SdkMetadata = SdkMetadata {
+    name: "ruby",
+    version: env!("CARGO_PKG_VERSION"),
+};
+
 #[magnus::init]
 fn init(ruby: &Ruby) -> Result<(), Error> {
-    env_logger::Builder::from_env(env_logger::Env::new().default_filter_or("eppo")).init();
+    env_logger::Builder::from_env(env_logger::Env::new().default_filter_or("eppo=debug")).init();
 
     let eppo_client = ruby.define_module("EppoClient")?;
     let core = eppo_client.define_module("Core")?;
@@ -23,12 +31,24 @@ fn init(ruby: &Ruby) -> Result<(), Error> {
         "get_bandit_action_details",
         method!(Client::get_bandit_action_details, 5),
     )?;
+    core_client.define_method("configuration", method!(Client::get_configuration, 0))?;
+    core_client.define_method("configuration=", method!(Client::set_configuration, 1))?;
     core_client.define_method("shutdown", method!(Client::shutdown, 0))?;
 
     core.const_set(
         "DEFAULT_BASE_URL",
         eppo_core::configuration_fetcher::DEFAULT_BASE_URL,
     )?;
+    core.const_set(
+        "DEFAULT_POLL_INTERVAL_SECONDS",
+        eppo_core::poller_thread::PollerThreadConfig::DEFAULT_POLL_INTERVAL.as_secs(),
+    )?;
+    core.const_set(
+        "DEFAULT_POLL_JITTER_SECONDS",
+        eppo_core::poller_thread::PollerThreadConfig::DEFAULT_POLL_JITTER.as_secs(),
+    )?;
+
+    configuration::init(ruby)?;
 
     Ok(())
 }

data/lib/eppo_client/client.rb

@@ -24,6 +24,14 @@ module EppoClient
       @core = EppoClient::Core::Client.new(config)
     end
 
+    def configuration
+      @core.configuration
+    end
+
+    def configuration=(configuration)
+      @core.configuration = configuration
+    end
+
     def shutdown
       @core.shutdown
     end

data/lib/eppo_client/config.rb

@@ -6,12 +6,14 @@ require_relative "assignment_logger"
 module EppoClient
   # The class for configuring the Eppo client singleton
   class Config
-    attr_reader :api_key, :assignment_logger, :base_url
+    attr_reader :api_key, :assignment_logger, :base_url, :poll_interval_seconds, :poll_jitter_seconds
 
-    def initialize(api_key, assignment_logger: AssignmentLogger.new, base_url: EppoClient::Core::DEFAULT_BASE_URL)
+    def initialize(api_key, assignment_logger: AssignmentLogger.new, base_url: EppoClient::Core::DEFAULT_BASE_URL, poll_interval_seconds: EppoClient::Core::DEFAULT_POLL_INTERVAL_SECONDS, poll_jitter_seconds: EppoClient::Core::DEFAULT_POLL_JITTER_SECONDS, initial_configuration: nil)
       @api_key = api_key
       @assignment_logger = assignment_logger
       @base_url = base_url
+      @poll_interval_seconds = poll_interval_seconds
+      @poll_jitter_seconds = poll_jitter_seconds
     end
 
     def validate

data/lib/eppo_client/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# TODO: this version and ext/eppo_rb/Cargo.toml should be in sync
+# TODO: this version and ext/eppo_client/Cargo.toml should be in sync
 module EppoClient
-  VERSION = "3.1.1"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eppo-server-sdk
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Eppo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -31,6 +31,8 @@ files:
 - ext/eppo_client/build.rs
 - ext/eppo_client/extconf.rb
 - ext/eppo_client/src/client.rs
+- ext/eppo_client/src/configuration.rs
+- ext/eppo_client/src/gc_lock.rs
 - ext/eppo_client/src/lib.rs
 - lib/eppo_client.rb
 - lib/eppo_client/assignment_logger.rb