Fix: is_iterable_str now has an argument accept_str that must be spec…

…ified.
Labbeti · Apr 18, 2024 · a3c32ef · a3c32ef
1 parent 9b728c9
commit a3c32ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/aac_datasets/datasets/base.py b/src/aac_datasets/datasets/base.py
@@ -55,7 +55,7 @@ def _is_index(index: Any) -> TypeGuard[IndexType]:
 
 
 def _is_column(column: Any) -> TypeGuard[ColumnType]:
-    return isinstance(column, str) or is_iterable_str(column) or column is None
+    return is_iterable_str(column, accept_str=True) or column is None
 
 
 class AACDataset(Generic[ItemType], Dataset[ItemType]):

diff --git a/src/aac_datasets/utils/type_checks.py b/src/aac_datasets/utils/type_checks.py
@@ -10,9 +10,11 @@ def is_iterable_int(x: Any) -> TypeGuard[Iterable[int]]:
     return isinstance(x, Iterable) and all(isinstance(xi, int) for xi in x)
 
 
-def is_iterable_str(x: Any, accept_str: bool = False) -> TypeGuard[Iterable[str]]:
-    return (accept_str or not isinstance(x, str)) and (
-        isinstance(x, Iterable) and all(isinstance(xi, str) for xi in x)
+def is_iterable_str(x: Any, *, accept_str: bool) -> TypeGuard[Iterable[str]]:
+    return (accept_str and isinstance(x, str)) or (
+        not isinstance(x, str)
+        and isinstance(x, Iterable)
+        and all(isinstance(xi, str) for xi in x)
     )