improve type annotation

Author: Joshix-1

python/hangman_solver/__init__.pyi

@@ -1,4 +1,4 @@
-from collections.abc import Collection, Mapping
+from collections.abc import Collection, Sequence, Mapping
 from typing import Final, Never
 
 
@@ -17,15 +17,15 @@ def read_words_with_length(language: Language, word_length: int, /) -> Collectio
 
 def solve(
     pattern_string: str,
-    invalid_letters: str,
+    invalid_letters: Sequence[str],
     language: Language,
     max_words_to_collect: int
 ) -> HangmanResult:
     pass
 
 def solve_crossword(
     pattern_string: str,
-    invalid_letters: str,
+    invalid_letters: Sequence[str],
     language: Language,
     max_words_to_collect: int
 ) -> HangmanResult:

src/lib.rs

@@ -31,23 +31,39 @@ pub use crate::language::UnknownLanguageError;
 #[cfg(feature = "pyo3")]
 use pyo3::prelude::*;
 
+#[cfg(feature = "pyo3")]
+#[derive(FromPyObject)]
+pub enum InvalidLetters<'py> {
+    String(Bound<'py, PyString>),
+    Chars(Vec<char>),
+}
+
 #[cfg(feature = "pyo3")]
 #[pyfunction]
 #[pyo3(signature = (pattern_string, invalid_letters, language, max_words_to_collect))]
 #[allow(clippy::needless_pass_by_value)]
 pub fn solve(
     pattern_string: Bound<'_, PyString>,
-    invalid_letters: Bound<'_, PyString>,
+    invalid_letters: InvalidLetters<'_>,
     language: Language,
     max_words_to_collect: usize,
 ) -> PyResult<HangmanResult> {
-    crate::solver::solve(
-        &pattern_string,
-        &invalid_letters,
-        true,
-        language,
-        Some(max_words_to_collect),
-    )
+    match invalid_letters {
+        InvalidLetters::String(invalid_letters) => crate::solver::solve(
+            &pattern_string,
+            &invalid_letters,
+            true,
+            language,
+            Some(max_words_to_collect),
+        ),
+        InvalidLetters::Chars(invalid_letters) => crate::solver::solve(
+            &pattern_string,
+            &invalid_letters,
+            true,
+            language,
+            Some(max_words_to_collect),
+        ),
+    }
 }
 
 #[cfg(feature = "pyo3")]
@@ -56,17 +72,26 @@ pub fn solve(
 #[allow(clippy::needless_pass_by_value)]
 pub fn solve_crossword(
     pattern_string: Bound<'_, PyString>,
-    invalid_letters: Bound<'_, PyString>,
+    invalid_letters: InvalidLetters<'_>,
     language: Language,
     max_words_to_collect: usize,
 ) -> PyResult<HangmanResult> {
-    crate::solver::solve(
-        &pattern_string,
-        &invalid_letters,
-        false,
-        language,
-        Some(max_words_to_collect),
-    )
+    match invalid_letters {
+        InvalidLetters::String(invalid_letters) => crate::solver::solve(
+            &pattern_string,
+            &invalid_letters,
+            false,
+            language,
+            Some(max_words_to_collect),
+        ),
+        InvalidLetters::Chars(invalid_letters) => crate::solver::solve(
+            &pattern_string,
+            &invalid_letters,
+            false,
+            language,
+            Some(max_words_to_collect),
+        ),
+    }
 }
 
 #[must_use]

src/solver/pattern.rs

@@ -67,19 +67,21 @@ impl Pattern {
             pattern_as_chars.extend(ch.to_lowercase());
         }
 
-
         let mut invalid_letters_vec: Vec<char> = invalid_letters
             .try_iter_chars()?
-            .filter(|ch| !ch.as_ref().is_ok_and(|ch| ch.is_whitespace() || ch.is_wildcard()))
+            .filter(|ch| {
+                !ch.as_ref()
+                    .is_ok_and(|ch| ch.is_whitespace() || ch.is_wildcard())
+            })
             .collect::<Result<_, _>>()?;
 
         if letters_in_pattern_have_no_other_occurrences {
             for ch in &pattern_as_chars {
                 if ch.is_normalised_wildcard() {
-                    continue
+                    continue;
                 }
                 if invalid_letters_vec.contains(ch) {
-                    continue
+                    continue;
                 }
                 invalid_letters_vec.push(*ch);
             }