vectorwave 0.2.5__tar.gz → 0.2.6__tar.gz

{vectorwave-0.2.5 → vectorwave-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vectorwave
-Version: 0.2.5
+Version: 0.2.6
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11

{vectorwave-0.2.5 → vectorwave-0.2.6}/crates/Cargo.lock

@@ -8,12 +8,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
-[[package]]
-name = "bitflags"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -37,9 +31,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indoc"
@@ -62,21 +56,6 @@ version = "0.2.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
 
-[[package]]
-name = "lock_api"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
-dependencies = [
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
-
 [[package]]
 name = "memchr"
 version = "2.7.6"
@@ -98,29 +77,6 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
-[[package]]
-name = "parking_lot"
-version = "0.12.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-link",
-]
-
 [[package]]
 name = "portable-atomic"
 version = "1.12.0"
@@ -138,15 +94,15 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.20.3"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
+checksum = "7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872"
 dependencies = [
  "cfg-if",
  "indoc",
  "libc",
  "memoffset",
- "parking_lot",
+ "once_cell",
  "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
@@ -156,9 +112,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.20.3"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
+checksum = "94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -166,9 +122,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.20.3"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
+checksum = "e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -176,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.20.3"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
+checksum = "fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -188,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.20.3"
+version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
+checksum = "fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -208,15 +164,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
-dependencies = [
- "bitflags",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.22"
@@ -229,12 +176,6 @@ version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62049b2877bf12821e8f9ad256ee38fdc31db7387ec2d3b3f403024de2034aea"
 
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -278,12 +219,6 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "smallvec"
-version = "1.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-
 [[package]]
 name = "syn"
 version = "2.0.111"
@@ -318,14 +253,7 @@ name = "vectorwave_core"
 version = "0.1.0"
 dependencies = [
  "crossbeam-channel",
- "log",
  "pyo3",
  "serde",
  "serde_json",
 ]
-
-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"

{vectorwave-0.2.5 → vectorwave-0.2.6}/crates/Cargo.toml

@@ -8,8 +8,7 @@ name = "vectorwave_core"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.20.0", features = ["extension-module"] }
-crossbeam-channel = "0.5"
+pyo3 = { version = "0.23.3", features = ["extension-module"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-log = "0.4"
+crossbeam-channel = "0.5"

{vectorwave-0.2.5 → vectorwave-0.2.6}/crates/src/lib.rs

@@ -1,20 +1,21 @@
 use pyo3::prelude::*;
-use pyo3::types::{PyDict, PyList};
+use pyo3::types::{PyDict, PyList, PyString, PyBool, PyFloat, PyInt};
+use std::collections::HashSet;
 use std::thread;
 use std::time::{Duration, Instant};
 use crossbeam_channel::{bounded, Receiver, Sender, TrySendError};
 
 struct LogItem {
-    collection: Py<PyAny>,
+    collection: PyObject,
     properties: Py<PyDict>,
-    uuid: Option<Py<PyAny>>,
+    uuid: Option<PyObject>,
     vector: Option<Vec<f32>>,
 }
 
 #[pyclass]
 struct RustBatchManager {
     sender: Sender<LogItem>,
-    flush_callback: Py<PyAny>,
+    flush_callback: PyObject,
     worker_handle: Option<thread::JoinHandle<()>>,
     stop_signal: Sender<()>,
 }
@@ -23,14 +24,15 @@ struct RustBatchManager {
 impl RustBatchManager {
     #[new]
     fn new(
-        callback: Py<PyAny>,
+        py: Python<'_>,
+        callback: PyObject,
         batch_threshold: usize,
         flush_interval_ms: u64,
     ) -> Self {
         let (tx, rx) = bounded::<LogItem>(10000);
         let (stop_tx, stop_rx) = bounded(1);
 
-        let worker_callback = callback.clone();
+        let worker_callback = callback.clone_ref(py);
 
         let handle = thread::spawn(move || {
             Self::worker_loop(rx, stop_rx, worker_callback, batch_threshold, flush_interval_ms);
@@ -44,11 +46,12 @@ impl RustBatchManager {
         }
     }
 
+    #[pyo3(signature = (collection, properties, uuid=None, vector=None))]
     fn add_object(
         &self,
-        collection: Py<PyAny>,
+        collection: PyObject,
         properties: Py<PyDict>,
-        uuid: Option<Py<PyAny>>,
+        uuid: Option<PyObject>,
         vector: Option<Vec<f32>>,
     ) {
         let item = LogItem {
@@ -71,7 +74,6 @@ impl RustBatchManager {
 
     fn shutdown(&self) {
         let _ = self.stop_signal.send(());
-
     }
 }
 
@@ -79,7 +81,7 @@ impl RustBatchManager {
     fn worker_loop(
         rx: Receiver<LogItem>,
         stop_rx: Receiver<()>,
-        callback: Py<PyAny>,
+        callback: PyObject,
         threshold: usize,
         interval_ms: u64,
     ) {
@@ -109,12 +111,12 @@ impl RustBatchManager {
         }
     }
 
-    fn flush_buffer(buffer: &Vec<LogItem>, callback: &Py<PyAny>) {
+    fn flush_buffer(buffer: &Vec<LogItem>, callback: &PyObject) {
         Python::with_gil(|py| {
-            let py_list = PyList::empty(py);
+            let py_list = PyList::empty_bound(py);
 
             for item in buffer {
-                let dict = PyDict::new(py);
+                let dict = PyDict::new_bound(py);
                 let _ = dict.set_item("collection", &item.collection);
                 let _ = dict.set_item("properties", &item.properties);
 
@@ -141,8 +143,51 @@ impl RustBatchManager {
     }
 }
 
+
+fn process_recursive(py: Python, value: &Bound<'_, PyAny>, sensitive_set: &HashSet<String>) -> PyResult<PyObject> {
+    if let Ok(dict_obj) = value.downcast::<PyDict>() {
+        let new_dict = PyDict::new_bound(py);
+        for (k, v) in dict_obj {
+            let k_str = k.to_string().to_lowercase();
+            if sensitive_set.contains(&k_str) {
+                new_dict.set_item(k, "[MASKED]")?;
+            } else {
+                new_dict.set_item(k, process_recursive(py, &v, sensitive_set)?)?;
+            }
+        }
+        Ok(new_dict.into())
+    } else if let Ok(list_obj) = value.downcast::<PyList>() {
+        let new_list = PyList::empty_bound(py);
+        for item in list_obj {
+            new_list.append(process_recursive(py, &item, sensitive_set)?)?;
+        }
+        Ok(new_list.into())
+    } else {
+        if value.is_none()
+           || value.is_instance_of::<PyBool>()
+           || value.is_instance_of::<PyFloat>()
+           || value.is_instance_of::<PyInt>()
+           || value.is_instance_of::<PyString>() {
+            // [수정] unbind()를 사용하여 PyObject로 변환
+            Ok(value.clone().unbind())
+        } else {
+            match value.str() {
+                Ok(s) => Ok(s.into()),
+                Err(_) => Ok(PyString::new_bound(py, "[SERIALIZATION_ERROR]").into())
+            }
+        }
+    }
+}
+
+#[pyfunction]
+fn mask_and_serialize(py: Python, data: &Bound<'_, PyAny>, sensitive_keys: Vec<String>) -> PyResult<PyObject> {
+    let sensitive_set: HashSet<String> = sensitive_keys.into_iter().map(|s| s.to_lowercase()).collect();
+    process_recursive(py, data, &sensitive_set)
+}
+
 #[pymodule]
-fn vectorwave_core(_py: Python, m: &PyModule) -> PyResult<()> {
+fn vectorwave_core(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_class::<RustBatchManager>()?;
+    m.add_function(wrap_pyfunction!(mask_and_serialize, m)?)?;
     Ok(())
 }

{vectorwave-0.2.5 → vectorwave-0.2.6}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "maturin"
 
 [project]
 name = "vectorwave"
-version = "0.2.05"
+version = "0.2.06"
 authors = [
     { name = "junyeonggim", email = "junyeonggim5@gmail.com" },
 ]

{vectorwave-0.2.5 → vectorwave-0.2.6}/src/vectorwave/monitoring/tracer.py

@@ -9,6 +9,7 @@ from typing import Optional, List, Dict, Any, Callable
 from uuid import uuid4
 from datetime import datetime, timezone
 
+import vectorwave.vectorwave_core as vectorwave_core
 from .alert.base import BaseAlerter
 from ..batch.batch import get_batch_manager
 from ..models.db_config import get_weaviate_settings, WeaviateSettings
@@ -34,31 +35,6 @@ current_tracer_var: ContextVar[Optional[TraceCollector]] = ContextVar('current_t
 current_span_id_var: ContextVar[Optional[str]] = ContextVar('current_span_id', default=None)
 
 
-def _mask_and_serialize(data: Any, sensitive_keys: set) -> Any:
-    """
-    Recursively masks sensitive data in dicts/lists and prepares for serialization.
-    """
-    if isinstance(data, dict):
-        new_dict = {}
-        for k, v in data.items():
-            if str(k).lower() in sensitive_keys:
-                new_dict[k] = "[MASKED]"
-            else:
-                new_dict[k] = _mask_and_serialize(v, sensitive_keys)
-        return new_dict
-
-    if isinstance(data, list):
-        return [_mask_and_serialize(item, sensitive_keys) for item in data]
-
-    if not isinstance(data, (str, int, float, bool, type(None))):
-        try:
-            return str(data)
-        except Exception:
-            return "[SERIALIZATION_ERROR]"
-
-    return data
-
-
 def _capture_span_attributes(
         attributes_to_capture: Optional[List[str]],
         kwargs: Dict[str, Any],
@@ -76,7 +52,8 @@ def _capture_span_attributes(
                     processed_value = "[MASKED]"
                 else:
                     raw_value = kwargs[attr_name]
-                    processed_value = _mask_and_serialize(raw_value, sensitive_keys)
+                    # Rust extension expects a List[str] for sensitive_keys, not set
+                    processed_value = vectorwave_core.mask_and_serialize(raw_value, list(sensitive_keys))
 
                 captured_attributes[attr_name] = processed_value
 
@@ -160,8 +137,8 @@ def _create_input_vector_data(
     the core arguments and vectorize them
     """
     # 1. Process/Mask positional and keyword arguments
-    processed_args = _mask_and_serialize(list(args), sensitive_keys)
-    processed_kwargs = _mask_and_serialize(kwargs, sensitive_keys)
+    processed_args = vectorwave_core.mask_and_serialize(list(args), list(sensitive_keys))
+    processed_kwargs = vectorwave_core.mask_and_serialize(kwargs, list(sensitive_keys))
 
 
     texts_for_vector = [f"Function Context: {func_name}"]
@@ -309,7 +286,7 @@ def trace_span(
                     result = await func(*args, **kwargs)
 
                     if capture_return_value:
-                        processed_result = _mask_and_serialize(result, tracer.settings.sensitive_keys)
+                        processed_result = vectorwave_core.mask_and_serialize(result, list(tracer.settings.sensitive_keys))
                         try:
                             return_value_log = json.dumps(processed_result)
                         except TypeError:
@@ -442,7 +419,7 @@ def trace_span(
                     result = func(*args, **kwargs)
 
                     if capture_return_value:
-                        processed_result = _mask_and_serialize(result, tracer.settings.sensitive_keys)
+                        processed_result = vectorwave_core.mask_and_serialize(result, list(tracer.settings.sensitive_keys))
                         try:
                             return_value_log = json.dumps(processed_result)
                         except TypeError:
@@ -498,7 +475,7 @@ def trace_span(
 
                         if is_drift:
                             drift_alert_props = span_properties.copy()
-                            drift_alert_props["status"] = "WARNING" # 상태 변경
+                            drift_alert_props["status"] = "WARNING"
                             drift_alert_props["error_code"] = "SEMANTIC_DRIFT"
                             drift_alert_props["error_message"] = (
                                 f"Anomaly detected in data distribution.\n"
@@ -535,4 +512,4 @@ def trace_span(
     if _func is None:
         return decorator
     else:
-        return decorator(_func)
+        return decorator(_func)

{vectorwave-0.2.5 → vectorwave-0.2.6}/src/vectorwave/utils/replayer.py

@@ -12,7 +12,7 @@ import weaviate.classes.query as wvc_query
 
 from ..database.db import get_cached_client
 from ..models.db_config import get_weaviate_settings
-from ..monitoring.tracer import _mask_and_serialize
+import vectorwave.vectorwave_core as vectorwave_core
 from .context import execution_source_context
 
 logger = logging.getLogger(__name__)
@@ -238,7 +238,7 @@ class VectorWaveReplayer:
         collection_name = self.golden_collection_name if is_golden else self.collection_name
         collection = self.client.collections.get(collection_name)
 
-        processed_val = _mask_and_serialize(new_value, set())
+        processed_val = vectorwave_core.mask_and_serialize(new_value, [])
         try:
             val_str = json.dumps(processed_val)
         except (TypeError, ValueError):