manim 0.17.0__py3-none-any.whl → 0.19.1__py3-none-any.whl

manim/utils/iterables.py

@@ -19,12 +19,30 @@ __all__ = [
 ]
 
 import itertools as it
-from typing import Any, Callable, Collection, Generator, Iterable, Reversible, Sequence
+from collections.abc import (
+    Callable,
+    Collection,
+    Generator,
+    Hashable,
+    Iterable,
+    Reversible,
+    Sequence,
+)
+from typing import TYPE_CHECKING, TypeVar, overload
 
 import numpy as np
 
+T = TypeVar("T")
+U = TypeVar("U")
+F = TypeVar("F", np.float64, np.int_)
+H = TypeVar("H", bound=Hashable)
 
-def adjacent_n_tuples(objects: Sequence, n: int) -> zip:
+
+if TYPE_CHECKING:
+    import numpy.typing as npt
+
+
+def adjacent_n_tuples(objects: Sequence[T], n: int) -> zip[tuple[T, ...]]:
     """Returns the Sequence objects cyclically split into n length tuples.
 
     See Also
@@ -33,18 +51,17 @@ def adjacent_n_tuples(objects: Sequence, n: int) -> zip:
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
-        list(adjacent_n_tuples([1, 2, 3, 4], 2))
-        # returns [(1, 2), (2, 3), (3, 4), (4, 1)]
-
-        list(adjacent_n_tuples([1, 2, 3, 4], 3))
-        # returns [(1, 2, 3), (2, 3, 4), (3, 4, 1), (4, 1, 2)]
+        >>> list(adjacent_n_tuples([1, 2, 3, 4], 2))
+        [(1, 2), (2, 3), (3, 4), (4, 1)]
+        >>> list(adjacent_n_tuples([1, 2, 3, 4], 3))
+        [(1, 2, 3), (2, 3, 4), (3, 4, 1), (4, 1, 2)]
     """
     return zip(*([*objects[k:], *objects[:k]] for k in range(n)))
 
 
-def adjacent_pairs(objects: Sequence) -> zip:
+def adjacent_pairs(objects: Sequence[T]) -> zip[tuple[T, ...]]:
     """Alias for ``adjacent_n_tuples(objects, 2)``.
 
     See Also
@@ -53,24 +70,24 @@ def adjacent_pairs(objects: Sequence) -> zip:
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
-        list(adjacent_pairs([1, 2, 3, 4]))
-        # returns [(1, 2), (2, 3), (3, 4), (4, 1)]
+        >>> list(adjacent_pairs([1, 2, 3, 4]))
+        [(1, 2), (2, 3), (3, 4), (4, 1)]
     """
     return adjacent_n_tuples(objects, 2)
 
 
-def all_elements_are_instances(iterable: Iterable, Class) -> bool:
+def all_elements_are_instances(iterable: Iterable[object], Class: type[object]) -> bool:
     """Returns ``True`` if all elements of iterable are instances of Class.
     False otherwise.
     """
-    return all([isinstance(e, Class) for e in iterable])
+    return all(isinstance(e, Class) for e in iterable)
 
 
 def batch_by_property(
-    items: Sequence, property_func: Callable
-) -> list[tuple[list, Any]]:
+    items: Iterable[T], property_func: Callable[[T], U]
+) -> list[tuple[list[T], U | None]]:
     """Takes in a Sequence, and returns a list of tuples, (batch, prop)
     such that all items in a batch have the same output when
     put into the Callable property_func, and such that chaining all these
@@ -79,13 +96,13 @@ def batch_by_property(
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
-        batch_by_property([(1, 2), (3, 4), (5, 6, 7), (8, 9)], len)
-        # returns [([(1, 2), (3, 4)], 2), ([(5, 6, 7)], 3), ([(8, 9)], 2)]
+        >>> batch_by_property([(1, 2), (3, 4), (5, 6, 7), (8, 9)], len)
+        [([(1, 2), (3, 4)], 2), ([(5, 6, 7)], 3), ([(8, 9)], 2)]
     """
-    batch_prop_pairs = []
-    curr_batch = []
+    batch_prop_pairs: list[tuple[list[T], U | None]] = []
+    curr_batch: list[T] = []
     curr_prop = None
     for item in items:
         prop = property_func(item)
@@ -103,67 +120,84 @@ def batch_by_property(
     return batch_prop_pairs
 
 
-def concatenate_lists(*list_of_lists: Iterable) -> list:
+def concatenate_lists(*list_of_lists: Iterable[T]) -> list[T]:
     """Combines the Iterables provided as arguments into one list.
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
-        concatenate_lists([1, 2], [3, 4], [5])
-        # returns [1, 2, 3, 4, 5]
+        >>> concatenate_lists([1, 2], [3, 4], [5])
+        [1, 2, 3, 4, 5]
     """
     return [item for lst in list_of_lists for item in lst]
 
 
-def list_difference_update(l1: Iterable, l2: Iterable) -> list:
+def list_difference_update(l1: Iterable[T], l2: Iterable[T]) -> list[T]:
     """Returns a list containing all the elements of l1 not in l2.
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
-        list_difference_update([1, 2, 3, 4], [2, 4])
-        # returns [1, 3]
+        >>> list_difference_update([1, 2, 3, 4], [2, 4])
+        [1, 3]
     """
     return [e for e in l1 if e not in l2]
 
 
-def list_update(l1: Iterable, l2: Iterable) -> list:
+def list_update(l1: Iterable[T], l2: Iterable[T]) -> list[T]:
     """Used instead of ``set.update()`` to maintain order,
         making sure duplicates are removed from l1, not l2.
         Removes overlap of l1 and l2 and then concatenates l2 unchanged.
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
-        list_update([1, 2, 3], [2, 4, 4])
-        # returns [1, 3, 2, 4, 4]
+        >>> list_update([1, 2, 3], [2, 4, 4])
+        [1, 3, 2, 4, 4]
     """
     return [e for e in l1 if e not in l2] + list(l2)
 
 
-def listify(obj) -> list:
+@overload
+def listify(obj: str) -> list[str]: ...
+
+
+@overload
+def listify(obj: Iterable[T]) -> list[T]: ...
+
+
+@overload
+def listify(obj: T) -> list[T]: ...
+
+
+def listify(obj: str | Iterable[T] | T) -> list[str] | list[T]:
     """Converts obj to a list intelligently.
 
     Examples
     --------
-    Normal usage::
-
-        listify('str')   # ['str']
-        listify((1, 2))  # [1, 2]
-        listify(len)     # [<built-in function len>]
+    .. code-block:: pycon
+
+        >>> listify("str")
+        ['str']
+        >>> listify((1, 2))
+        [1, 2]
+        >>> listify(len)
+        [<built-in function len>]
     """
     if isinstance(obj, str):
         return [obj]
-    try:
+    if isinstance(obj, Iterable):
         return list(obj)
-    except TypeError:
+    else:
         return [obj]
 
 
-def make_even(iterable_1: Iterable, iterable_2: Iterable) -> tuple[list, list]:
+def make_even(
+    iterable_1: Iterable[T], iterable_2: Iterable[U]
+) -> tuple[list[T], list[U]]:
     """Extends the shorter of the two iterables with duplicate values until its
         length is equal to the longer iterable (favours earlier elements).
 
@@ -173,13 +207,13 @@ def make_even(iterable_1: Iterable, iterable_2: Iterable) -> tuple[list, list]:
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
-        make_even([1, 2], [3, 4, 5, 6])
+        >>> make_even([1, 2], [3, 4, 5, 6])
         ([1, 1, 2, 2], [3, 4, 5, 6])
 
-        make_even([1, 2], [3, 4, 5, 6, 7])
-        # ([1, 1, 1, 2, 2], [3, 4, 5, 6, 7])
+        >>> make_even([1, 2], [3, 4, 5, 6, 7])
+        ([1, 1, 1, 2, 2], [3, 4, 5, 6, 7])
     """
     list_1, list_2 = list(iterable_1), list(iterable_2)
     len_list_1 = len(list_1)
@@ -192,8 +226,8 @@ def make_even(iterable_1: Iterable, iterable_2: Iterable) -> tuple[list, list]:
 
 
 def make_even_by_cycling(
-    iterable_1: Collection, iterable_2: Collection
-) -> tuple[list, list]:
+    iterable_1: Collection[T], iterable_2: Collection[U]
+) -> tuple[list[T], list[U]]:
     """Extends the shorter of the two iterables with duplicate values until its
         length is equal to the longer iterable (cycles over shorter iterable).
 
@@ -203,13 +237,13 @@ def make_even_by_cycling(
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
-        make_even_by_cycling([1, 2], [3, 4, 5, 6])
+        >>> make_even_by_cycling([1, 2], [3, 4, 5, 6])
         ([1, 2, 1, 2], [3, 4, 5, 6])
 
-        make_even_by_cycling([1, 2], [3, 4, 5, 6, 7])
-        # ([1, 2, 1, 2, 1], [3, 4, 5, 6, 7])
+        >>> make_even_by_cycling([1, 2], [3, 4, 5, 6, 7])
+        ([1, 2, 1, 2, 1], [3, 4, 5, 6, 7])
     """
     length = max(len(iterable_1), len(iterable_2))
     cycle1 = it.cycle(iterable_1)
@@ -220,7 +254,7 @@ def make_even_by_cycling(
     )
 
 
-def remove_list_redundancies(lst: Reversible) -> list:
+def remove_list_redundancies(lst: Reversible[H]) -> list[H]:
     """Used instead of ``list(set(l))`` to maintain order.
     Keeps the last occurrence of each element.
     """
@@ -234,21 +268,21 @@ def remove_list_redundancies(lst: Reversible) -> list:
     return reversed_result
 
 
-def remove_nones(sequence: Iterable) -> list:
+def remove_nones(sequence: Iterable[T | None]) -> list[T]:
     """Removes elements where bool(x) evaluates to False.
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
-        remove_nones(['m', '', 'l', 0, 42, False, True])
-        # ['m', 'l', 42, True]
+        >>> remove_nones(["m", "", "l", 0, 42, False, True])
+        ['m', 'l', 42, True]
     """
     # Note this is redundant with it.chain
     return [x for x in sequence if x]
 
 
-def resize_array(nparray: np.ndarray, length: int) -> np.ndarray:
+def resize_array(nparray: npt.NDArray[F], length: int) -> npt.NDArray[F]:
     """Extends/truncates nparray so that ``len(result) == length``.
         The elements of nparray are cycled to achieve the desired length.
 
@@ -259,7 +293,7 @@ def resize_array(nparray: np.ndarray, length: int) -> np.ndarray:
 
     Examples
     --------
-    Normal usage::
+    .. code-block:: pycon
 
         >>> points = np.array([[1, 2], [3, 4]])
         >>> resize_array(points, 1)
@@ -277,7 +311,9 @@ def resize_array(nparray: np.ndarray, length: int) -> np.ndarray:
     return np.resize(nparray, (length, *nparray.shape[1:]))
 
 
-def resize_preserving_order(nparray: np.ndarray, length: int) -> np.ndarray:
+def resize_preserving_order(
+    nparray: npt.NDArray[np.float64], length: int
+) -> npt.NDArray[np.float64]:
     """Extends/truncates nparray so that ``len(result) == length``.
         The elements of nparray are duplicated to achieve the desired length
         (favours earlier elements).
@@ -291,21 +327,19 @@ def resize_preserving_order(nparray: np.ndarray, length: int) -> np.ndarray:
 
     Examples
     --------
-    Normal usage::
-
-        resize_preserving_order(np.array([]), 5)
-        # np.array([0., 0., 0., 0., 0.])
+    .. code-block:: pycon
 
-        nparray = np.array([[1, 2],
-                            [3, 4]])
+        >>> resize_preserving_order(np.array([]), 5)
+        array([0., 0., 0., 0., 0.])
 
-        resize_preserving_order(nparray, 1)
-        # np.array([[1, 2]])
+        >>> nparray = np.array([[1, 2], [3, 4]])
+        >>> resize_preserving_order(nparray, 1)
+        array([[1, 2]])
 
-        resize_preserving_order(nparray, 3)
-        # np.array([[1, 2],
-        #           [1, 2],
-        #           [3, 4]])
+        >>> resize_preserving_order(nparray, 3)
+        array([[1, 2],
+               [1, 2],
+               [3, 4]])
     """
     if len(nparray) == 0:
         return np.zeros((length, *nparray.shape[1:]))
@@ -315,7 +349,7 @@ def resize_preserving_order(nparray: np.ndarray, length: int) -> np.ndarray:
     return nparray[indices]
 
 
-def resize_with_interpolation(nparray: np.ndarray, length: int) -> np.ndarray:
+def resize_with_interpolation(nparray: npt.NDArray[F], length: int) -> npt.NDArray[F]:
     """Extends/truncates nparray so that ``len(result) == length``.
         New elements are interpolated to achieve the desired length.
 
@@ -329,39 +363,29 @@ def resize_with_interpolation(nparray: np.ndarray, length: int) -> np.ndarray:
 
     Examples
     --------
-    Normal usage::
-
-        nparray = np.array([[1, 2],
-                            [3, 4]])
-
-        resize_with_interpolation(nparray, 1)
-        # np.array([[1., 2.]])
-
-        resize_with_interpolation(nparray, 4)
-        # np.array([[1.        , 2.        ],
-        #           [1.66666667, 2.66666667],
-        #           [2.33333333, 3.33333333],
-        #           [3.        , 4.        ]])
-
-        nparray = np.array([[[1, 2],[3, 4]]])
-        resize_with_interpolation(nparray, 3)
-        # np.array([[[1., 2.], [3., 4.]],
-        #           [[1., 2.], [3., 4.]],
-        #           [[1., 2.], [3., 4.]]])
-
-        nparray = np.array([[1, 2], [3, 4], [5, 6]])
-        resize_with_interpolation(nparray, 4)
-        # np.array([[1.        , 2.        ],
-        #           [2.33333333, 3.33333333],
-        #           [3.66666667, 4.66666667],
-        #           [5.        , 6.        ]])
-
-        nparray = np.array([[1, 2], [3, 4], [1, 2]])
-        resize_with_interpolation(nparray, 4)
-        # np.array([[1.        , 2.        ],
-        #           [2.33333333, 3.33333333],
-        #           [2.33333333, 3.33333333],
-        #           [1.        , 2.        ]])
+    .. code-block:: pycon
+
+        >>> nparray = np.array([[1, 2], [3, 4]])
+        >>> resize_with_interpolation(nparray, 1)
+        array([[1., 2.]])
+        >>> resize_with_interpolation(nparray, 4)
+        array([[1.        , 2.        ],
+               [1.66666667, 2.66666667],
+               [2.33333333, 3.33333333],
+               [3.        , 4.        ]])
+        >>> nparray = np.array([[[1, 2], [3, 4]]])
+        >>> nparray = np.array([[1, 2], [3, 4], [5, 6]])
+        >>> resize_with_interpolation(nparray, 4)
+        array([[1.        , 2.        ],
+               [2.33333333, 3.33333333],
+               [3.66666667, 4.66666667],
+               [5.        , 6.        ]])
+        >>> nparray = np.array([[1, 2], [3, 4], [1, 2]])
+        >>> resize_with_interpolation(nparray, 4)
+        array([[1.        , 2.        ],
+               [2.33333333, 3.33333333],
+               [2.33333333, 3.33333333],
+               [1.        , 2.        ]])
     """
     if len(nparray) == length:
         return nparray
@@ -375,7 +399,7 @@ def resize_with_interpolation(nparray: np.ndarray, length: int) -> np.ndarray:
     )
 
 
-def stretch_array_to_length(nparray: np.ndarray, length: int) -> np.ndarray:
+def stretch_array_to_length(nparray: npt.NDArray[F], length: int) -> npt.NDArray[F]:
     # todo: is this the same as resize_preserving_order()?
     curr_len = len(nparray)
     if curr_len > length:
@@ -385,35 +409,54 @@ def stretch_array_to_length(nparray: np.ndarray, length: int) -> np.ndarray:
     return nparray[indices.astype(int)]
 
 
-def tuplify(obj) -> tuple:
+@overload
+def tuplify(obj: str) -> tuple[str]: ...
+
+
+@overload
+def tuplify(obj: Iterable[T]) -> tuple[T]: ...
+
+
+@overload
+def tuplify(obj: T) -> tuple[T]: ...
+
+
+def tuplify(obj: str | Iterable[T] | T) -> tuple[str] | tuple[T]:
     """Converts obj to a tuple intelligently.
 
     Examples
     --------
-    Normal usage::
-
-        tuplify('str')   # ('str',)
-        tuplify([1, 2])  # (1, 2)
-        tuplify(len)     # (<built-in function len>,)
+    .. code-block:: pycon
+
+        >>> tuplify("str")
+        ('str',)
+        >>> tuplify([1, 2])
+        (1, 2)
+        >>> tuplify(len)
+        (<built-in function len>,)
     """
     if isinstance(obj, str):
         return (obj,)
-    try:
+    if isinstance(obj, Iterable):
         return tuple(obj)
-    except TypeError:
+    else:
         return (obj,)
 
 
-def uniq_chain(*args: Iterable) -> Generator:
+def uniq_chain(*args: Iterable[T]) -> Generator[T, None, None]:
     """Returns a generator that yields all unique elements of the Iterables
         provided via args in the order provided.
 
     Examples
     --------
-    Normal usage::
-
-        uniq_chain([1, 2], [2, 3], [1, 4, 4])
-        # yields 1, 2, 3, 4
+    .. code-block:: pycon
+
+        >>> gen = uniq_chain([1, 2], [2, 3], [1, 4, 4])
+        >>> from collections.abc import Generator
+        >>> isinstance(gen, Generator)
+        True
+        >>> tuple(gen)
+        (1, 2, 3, 4)
     """
     unique_items = set()
     for x in it.chain(*args):

manim/utils/module_ops.py

@@ -2,18 +2,29 @@ from __future__ import annotations
 
 import importlib.util
 import inspect
-import os
 import re
 import sys
 import types
 import warnings
 from pathlib import Path
+from typing import TYPE_CHECKING, Any, Literal, overload
 
-from .. import config, console, constants, logger
-from ..scene.scene_file_writer import SceneFileWriter
+from manim._config import config, console, logger
+from manim.constants import (
+    CHOOSE_NUMBER_MESSAGE,
+    INVALID_NUMBER_MESSAGE,
+    NO_SCENE_MESSAGE,
+    SCENE_NOT_FOUND_MESSAGE,
+)
+from manim.scene.scene_file_writer import SceneFileWriter
 
+if TYPE_CHECKING:
+    from manim.scene.scene import Scene
 
-def get_module(file_name: Path):
+__all__ = ["scene_classes_from_file"]
+
+
+def get_module(file_name: Path) -> types.ModuleType:
     if str(file_name) == "-":
         module = types.ModuleType("input_scenes")
         logger.info(
@@ -46,19 +57,22 @@ def get_module(file_name: Path):
             )
 
             spec = importlib.util.spec_from_file_location(module_name, file_name)
-            module = importlib.util.module_from_spec(spec)
-            sys.modules[module_name] = module
-            sys.path.insert(0, str(file_name.parent.absolute()))
-            spec.loader.exec_module(module)
-            return module
+            if isinstance(spec, importlib.machinery.ModuleSpec):
+                module = importlib.util.module_from_spec(spec)
+                sys.modules[module_name] = module
+                sys.path.insert(0, str(file_name.parent.absolute()))
+                assert spec.loader
+                spec.loader.exec_module(module)
+                return module
+            raise FileNotFoundError(f"{file_name} not found")
         else:
             raise FileNotFoundError(f"{file_name} not found")
 
 
-def get_scene_classes_from_module(module):
+def get_scene_classes_from_module(module: types.ModuleType) -> list[type[Scene]]:
     from ..scene.scene import Scene
 
-    def is_child_scene(obj, module):
+    def is_child_scene(obj: Any, module: types.ModuleType) -> bool:
         return (
             inspect.isclass(obj)
             and issubclass(obj, Scene)
@@ -72,9 +86,9 @@ def get_scene_classes_from_module(module):
     ]
 
 
-def get_scenes_to_render(scene_classes):
+def get_scenes_to_render(scene_classes: list[type[Scene]]) -> list[type[Scene]]:
     if not scene_classes:
-        logger.error(constants.NO_SCENE_MESSAGE)
+        logger.error(NO_SCENE_MESSAGE)
         return []
     if config["write_all"]:
         return scene_classes
@@ -87,7 +101,7 @@ def get_scenes_to_render(scene_classes):
                 found = True
                 break
         if not found and (scene_name != ""):
-            logger.error(constants.SCENE_NOT_FOUND_MESSAGE.format(scene_name))
+            logger.error(SCENE_NOT_FOUND_MESSAGE.format(scene_name))
     if result:
         return result
     if len(scene_classes) == 1:
@@ -96,7 +110,7 @@ def get_scenes_to_render(scene_classes):
     return prompt_user_for_choice(scene_classes)
 
 
-def prompt_user_for_choice(scene_classes):
+def prompt_user_for_choice(scene_classes: list[type[Scene]]) -> list[type[Scene]]:
     num_to_class = {}
     SceneFileWriter.force_output_as_scene_name = True
     for count, scene_class in enumerate(scene_classes, 1):
@@ -105,16 +119,22 @@ def prompt_user_for_choice(scene_classes):
         num_to_class[count] = scene_class
     try:
         user_input = console.input(
-            f"[log.message] {constants.CHOOSE_NUMBER_MESSAGE} [/log.message]",
+            f"[log.message] {CHOOSE_NUMBER_MESSAGE} [/log.message]",
         )
-        scene_classes = [
-            num_to_class[int(num_str)]
-            for num_str in re.split(r"\s*,\s*", user_input.strip())
+
+        if user_input == "*":
+            selected_scenes_classes = scene_classes
+        else:
+            selected_scenes_classes = [
+                num_to_class[int(num_str)]
+                for num_str in re.split(r"\s*,\s*", user_input.strip())
+            ]
+        config["scene_names"] = [
+            scene_class.__name__ for scene_class in selected_scenes_classes
         ]
-        config["scene_names"] = [scene_class.__name__ for scene_class in scene_classes]
-        return scene_classes
+        return selected_scenes_classes
     except KeyError:
-        logger.error(constants.INVALID_NUMBER_MESSAGE)
+        logger.error(INVALID_NUMBER_MESSAGE)
         sys.exit(2)
     except EOFError:
         sys.exit(1)
@@ -123,9 +143,31 @@ def prompt_user_for_choice(scene_classes):
         sys.exit(1)
 
 
+@overload
+def scene_classes_from_file(
+    file_path: Path, require_single_scene: bool, full_list: Literal[True]
+) -> list[type[Scene]]: ...
+
+
+@overload
+def scene_classes_from_file(
+    file_path: Path,
+    require_single_scene: Literal[True],
+    full_list: Literal[False] = False,
+) -> type[Scene]: ...
+
+
+@overload
+def scene_classes_from_file(
+    file_path: Path,
+    require_single_scene: Literal[False] = False,
+    full_list: Literal[False] = False,
+) -> list[type[Scene]]: ...
+
+
 def scene_classes_from_file(
-    file_path: Path, require_single_scene=False, full_list=False
-):
+    file_path: Path, require_single_scene: bool = False, full_list: bool = False
+) -> type[Scene] | list[type[Scene]]:
     module = get_module(file_path)
     all_scene_classes = get_scene_classes_from_module(module)
     if full_list: