[cherrypick][rc] Revert "chore: fix py chore typing issues" (#2259)

[auto][cherrypick] 9a3a598 Revert "chore: fix py chore typing issues" (#2258)

Author: xinlili-statsig

statsig-pyo3/py_src/statsig_python_core/__init__.py

@@ -4,39 +4,3 @@
 from statsig_python_core.data_store import *
 from statsig_python_core.persistent_storage import *
 from statsig_python_core.output_logger_provider import *
-
-__all__ = [
-    "StatsigBasePy",
-    "Statsig",
-    "StatsigOptions",
-    "StatsigUser",
-    
-    "FeatureGate",
-    "DynamicConfig",
-    "Experiment",
-    "Layer",
-    "ParameterStore",
-    
-    "FeatureGateEvaluationOptions",
-    "DynamicConfigEvaluationOptions",
-    "ExperimentEvaluationOptions",
-    "LayerEvaluationOptions",
-    "ParameterStoreEvaluationOptions",
-    
-    "EvaluationDetails",
-    "FailureDetails",
-    "InitializeDetails",
-
-    "DataStore",
-    "DataStoreResponse",
-    "ObservabilityClient",
-    "PersistentStorage",
-    "OutputLoggerProvider",
-    
-    "StickyValues",
-    "UserPersistedValues",
-    "PersistedValues",
-    
-    "ProxyConfig",
-    "SpecAdapterConfig",
-]

statsig-pyo3/py_src/statsig_python_core/statsig_python_core.pyi

@@ -139,22 +139,22 @@ class OutputLoggerProviderBase:
 
 class ParameterStore:
     name: builtins.str
-    def get_string(self, param_name:builtins.str, fallback:builtins.str) -> builtins.str:
+    def get_string(self, param_name:builtins.str, fallback:builtins.str) -> typing.Optional[builtins.str]:
         ...
 
-    def get_float(self, param_name:builtins.str, fallback:builtins.float) -> builtins.float:
+    def get_float(self, param_name:builtins.str, fallback:builtins.float) -> typing.Optional[builtins.float]:
         ...
 
-    def get_integer(self, param_name:builtins.str, fallback:builtins.int) -> builtins.int:
+    def get_integer(self, param_name:builtins.str, fallback:builtins.int) -> typing.Optional[builtins.int]:
         ...
 
-    def get_bool(self, param_name:builtins.str, fallback:builtins.bool) -> builtins.bool:
+    def get_bool(self, param_name:builtins.str, fallback:builtins.bool) -> typing.Optional[builtins.bool]:
         ...
 
-    def get_array(self, param_name:builtins.str, fallback:list) -> typing.Any:
+    def get_array(self, param_name:builtins.str, fallback:list) -> typing.Optional[typing.Any]:
         ...
 
-    def get_map(self, param_name:builtins.str, fallback:dict) -> typing.Any:
+    def get_map(self, param_name:builtins.str, fallback:dict) -> typing.Optional[typing.Any]:
         ...
 
 

statsig-pyo3/src/statsig_types_py.rs

@@ -229,79 +229,76 @@ pub struct ParameterStorePy {
 #[gen_stub_pymethods]
 #[pymethods]
 impl ParameterStorePy {
-    pub fn get_string(&self, param_name: &str, fallback: String) -> String {
+    pub fn get_string(&self, param_name: &str, fallback: String) -> Option<String> {
         match self.inner_statsig.upgrade() {
-            Some(inner_statsig) => inner_statsig
-                .get_string_parameter_from_store(
-                    &self.user,
-                    &self.name,
-                    param_name,
-                    Some(fallback.clone()),
-                    Some(self.options),
-                )
-                .unwrap_or(fallback),
+            Some(inner_statsig) => inner_statsig.get_string_parameter_from_store(
+                &self.user,
+                &self.name,
+                param_name,
+                Some(fallback),
+                Some(self.options),
+            ),
             None => {
                 log_e!(TAG, "Failed to upgrade Statsig instance");
-                fallback
+                Some(fallback)
             }
         }
     }
 
-    pub fn get_float(&self, param_name: &str, fallback: f64) -> f64 {
+    pub fn get_float(&self, param_name: &str, fallback: f64) -> Option<f64> {
         match self.inner_statsig.upgrade() {
-            Some(inner_statsig) => inner_statsig
-                .get_float_parameter_from_store(
-                    &self.user,
-                    &self.name,
-                    param_name,
-                    Some(fallback),
-                    Some(self.options),
-                )
-                .unwrap_or(fallback),
+            Some(inner_statsig) => inner_statsig.get_float_parameter_from_store(
+                &self.user,
+                &self.name,
+                param_name,
+                Some(fallback),
+                Some(self.options),
+            ),
             None => {
                 log_e!(TAG, "Failed to upgrade Statsig instance");
-                fallback
+                Some(fallback)
             }
         }
     }
 
-    pub fn get_integer(&self, param_name: &str, fallback: i64) -> i64 {
+    pub fn get_integer(&self, param_name: &str, fallback: i64) -> Option<i64> {
         match self.inner_statsig.upgrade() {
-            Some(inner_statsig) => inner_statsig
-                .get_integer_parameter_from_store(
-                    &self.user,
-                    &self.name,
-                    param_name,
-                    Some(fallback),
-                    Some(self.options),
-                )
-                .unwrap_or(fallback),
+            Some(inner_statsig) => inner_statsig.get_integer_parameter_from_store(
+                &self.user,
+                &self.name,
+                param_name,
+                Some(fallback),
+                Some(self.options),
+            ),
             None => {
                 log_e!(TAG, "Failed to upgrade Statsig instance");
-                fallback
+                Some(fallback)
             }
         }
     }
 
-    pub fn get_bool(&self, param_name: &str, fallback: bool) -> bool {
+    pub fn get_bool(&self, param_name: &str, fallback: bool) -> Option<bool> {
         match self.inner_statsig.upgrade() {
-            Some(inner_statsig) => inner_statsig
-                .get_boolean_parameter_from_store(
-                    &self.user,
-                    &self.name,
-                    param_name,
-                    Some(fallback),
-                    Some(self.options),
-                )
-                .unwrap_or(fallback),
+            Some(inner_statsig) => inner_statsig.get_boolean_parameter_from_store(
+                &self.user,
+                &self.name,
+                param_name,
+                Some(fallback),
+                Some(self.options),
+            ),
             None => {
                 log_e!(TAG, "Failed to upgrade Statsig instance");
-                fallback
+                Some(fallback)
             }
         }
     }
 
-    pub fn get_array(&self, py: Python, param_name: &str, fallback: Bound<PyList>) -> PyObject {
+    pub fn get_array(
+        &self,
+        py: Python,
+        param_name: &str,
+        fallback: Bound<PyList>,
+    ) -> Option<PyObject> {
         match self.inner_statsig.upgrade() {
             Some(inner_statsig) => {
                 let result = inner_statsig.get_array_parameter_from_store(
@@ -313,21 +310,26 @@ impl ParameterStorePy {
                 );
                 if let Some(result) = result {
                     match list_of_values_to_py_list(py, &result) {
-                        Ok(list) => list,
-                        Err(_) => fallback.into(),
+                        Ok(list) => Some(list),
+                        Err(_) => Some(fallback.into()),
                     }
                 } else {
-                    fallback.into()
+                    Some(fallback.into())
                 }
             }
             None => {
                 log_e!(TAG, "Failed to upgrade Statsig instance");
-                fallback.into()
+                Some(fallback.into())
             }
         }
     }
 
-    pub fn get_map(&self, py: Python, param_name: &str, fallback: Bound<PyDict>) -> PyObject {
+    pub fn get_map(
+        &self,
+        py: Python,
+        param_name: &str,
+        fallback: Bound<PyDict>,
+    ) -> Option<PyObject> {
         match self.inner_statsig.upgrade() {
             Some(inner_statsig) => {
                 let result = inner_statsig.get_object_parameter_from_store(
@@ -338,14 +340,14 @@ impl ParameterStorePy {
                     Some(self.options),
                 );
                 if let Some(result) = result {
-                    map_to_py_dict(py, &result)
+                    Some(map_to_py_dict(py, &result))
                 } else {
-                    fallback.into()
+                    Some(fallback.into())
                 }
             }
             None => {
                 log_e!(TAG, "Failed to upgrade Statsig instance");
-                fallback.into()
+                Some(fallback.into())
             }
         }
     }