python: bugzilla search: add alias() support for queries

radhermit · Sep 20, 2024 · cf16fc4 · cf16fc4
1 parent 12ce0a9
commit cf16fc4
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/lib/src/service/bugzilla/search.rs b/crates/lib/src/service/bugzilla/search.rs
@@ -1240,6 +1240,7 @@ macro_rules! make_exists_or_values_match_ref {
     )+};
 }
 make_exists_or_values_match_ref!(&[&str], &Vec<&str>, &HashSet<&str>, &IndexSet<&str>);
+make_exists_or_values_match_ref!(Vec<&str>, HashSet<&str>, IndexSet<&str>);
 make_exists_or_values_match_ref!(
     &[&String],
     &Vec<&String>,
@@ -1257,6 +1258,7 @@ macro_rules! make_exists_or_values_match_owned {
     )+};
 }
 make_exists_or_values_match_owned!(&[String], &Vec<String>, &HashSet<String>, &IndexSet<String>);
+make_exists_or_values_match_owned!(Vec<String>, HashSet<String>, IndexSet<String>);
 
 macro_rules! make_exists_or_values_i64 {
     ($($x:ty),+) => {$(

diff --git a/crates/python/Cargo.toml b/crates/python/Cargo.toml
@@ -20,5 +20,6 @@ bugbite = { path = "../lib", version = "0.0.13", features = ["output", "python"]
 chrono = "0.4.38"
 futures-util = "0.3.30"
 indexmap = "2.5.0"
+itertools = "0.13.0"
 pyo3 = { version = "0.22.3", features = ["extension-module", "indexmap"] }
 tokio = { version = "1.40.0", features = ["full"] }
diff --git a/crates/python/src/bugzilla.rs b/crates/python/src/bugzilla.rs
@@ -71,6 +71,7 @@ impl Bugzilla {
         if let Some(values) = kwds {
             for (key, value) in values {
                 match key.to_str()? {
+                    "alias" => req.alias(value)?,
                     "created" => req.created(value.to_str()?)?,
                     "updated" => req.updated(value.to_str()?)?,
                     "closed" => req.closed(value.to_str()?)?,

diff --git a/crates/python/src/bugzilla/search.rs b/crates/python/src/bugzilla/search.rs
@@ -4,9 +4,13 @@ use bugbite::objects::bugzilla;
 use bugbite::service::bugzilla::search;
 use bugbite::traits::RequestTemplate;
 use futures_util::Stream;
+use itertools::Itertools;
+use pyo3::exceptions::PyTypeError;
 use pyo3::prelude::*;
+use pyo3::types::{PyBool, PyIterator};
 
 use crate::macros::stream_iterator;
+use crate::traits::ToStr;
 
 use super::Bug;
 
@@ -35,8 +39,23 @@ impl SearchRequest {
         Ok(())
     }
 
-    pub(super) fn summary(&mut self, value: &str) -> PyResult<()> {
-        self.0.summary([value]);
+    pub(super) fn alias(&mut self, value: Bound<'_, PyAny>) -> PyResult<()> {
+        if let Ok(value) = value.to_str() {
+            self.0.alias(value);
+        } else if let Ok(value) = value.downcast::<PyBool>() {
+            self.0.alias(value.is_true());
+        } else if let Ok(values) = value.downcast::<PyIterator>() {
+            let values: Vec<_> = values
+                .iter()?
+                .filter_map(|x| x.ok())
+                .map(|x| x.to_str_owned())
+                .try_collect()?;
+            self.0.alias(values);
+        } else {
+            return Err(PyTypeError::new_err(format!(
+                "invalid alias value: {value:?}"
+            )));
+        }
         Ok(())
     }
 
@@ -54,6 +73,11 @@ impl SearchRequest {
         self.0.closed(value.parse()?);
         Ok(())
     }
+
+    pub(super) fn summary(&mut self, value: &str) -> PyResult<()> {
+        self.0.summary([value]);
+        Ok(())
+    }
 }
 
 #[pyclass(module = "bugbite.bugzilla")]

diff --git a/crates/python/src/traits.rs b/crates/python/src/traits.rs
@@ -3,6 +3,9 @@ use pyo3::types::PyString;
 
 pub(crate) trait ToStr {
     fn to_str(&self) -> PyResult<&str>;
+    fn to_str_owned(&self) -> PyResult<String> {
+        self.to_str().map(|x| x.to_string())
+    }
 }
 
 pub(crate) trait ToStrWithBound {