A community-maintained Python framework for creating mathematical animations.
Add type annotations to `composition.py` (#4366)
Henrik Skov Midtibyc887b51d63ac
diff --git a/manim/animation/animation.py b/manim/animation/animation.pyindex 2e31edbea..ab0cd66bb 100644--- a/manim/animation/animation.py+++ b/manim/animation/animation.py@@ -129,7 +129,7 @@ class Animation:def __init__(self,- mobject: Mobject | None,+ mobject: Mobject | OpenGLMobject | None,lag_ratio: float = DEFAULT_ANIMATION_LAG_RATIO,run_time: float = DEFAULT_ANIMATION_RUN_TIME,rate_func: Callable[[float], float] = smooth,@@ -266,7 +266,7 @@ class Animation:# Keep track of where the mobject startsreturn self.mobject.copy()- def get_all_mobjects(self) -> Sequence[Mobject]:+ def get_all_mobjects(self) -> Sequence[Mobject | OpenGLMobject]:"""Get all mobjects involved in the animation.Ordering must match the ordering of arguments to interpolate_submobjectdiff --git a/manim/animation/composition.py b/manim/animation/composition.pyindex 128066ba8..0f319d27a 100644--- a/manim/animation/composition.py+++ b/manim/animation/composition.py@@ -2,9 +2,8 @@from __future__ import annotations-import typesfrom collections.abc import Iterable, Sequence-from typing import TYPE_CHECKING, Callable+from typing import TYPE_CHECKING, Any, Callableimport numpy as np@@ -12,7 +11,7 @@ from manim._config import configfrom manim.animation.animation import Animation, prepare_animationfrom manim.constants import RendererTypefrom manim.mobject.mobject import Group, Mobject-from manim.mobject.opengl.opengl_mobject import OpenGLGroup+from manim.mobject.opengl.opengl_mobject import OpenGLGroup, OpenGLMobjectfrom manim.scene.scene import Scenefrom manim.utils.iterables import remove_list_redundanciesfrom manim.utils.parameter_parsing import flatten_iterable_parameters@@ -54,31 +53,34 @@ class AnimationGroup(Animation):def __init__(self,- *animations: Animation | Iterable[Animation] | types.GeneratorType[Animation],- group: Group | VGroup | OpenGLGroup | OpenGLVGroup = None,+ *animations: Animation | Iterable[Animation],+ group: Group | VGroup | OpenGLGroup | OpenGLVGroup | None = None,run_time: float | None = None,rate_func: Callable[[float], float] = linear,lag_ratio: float = 0,- **kwargs,- ) -> None:+ **kwargs: Any,+ ):arg_anim = flatten_iterable_parameters(animations)self.animations = [prepare_animation(anim) for anim in arg_anim]self.rate_func = rate_func- self.group = group- if self.group is None:+ if group is None:mobjects = remove_list_redundancies([anim.mobject for anim in self.animations if not anim.is_introducer()],)if config["renderer"] == RendererType.OPENGL:- self.group = OpenGLGroup(*mobjects)+ self.group: Group | VGroup | OpenGLGroup | OpenGLVGroup = OpenGLGroup(+ *mobjects+ )else:self.group = Group(*mobjects)+ else:+ self.group = groupsuper().__init__(self.group, rate_func=self.rate_func, lag_ratio=lag_ratio, **kwargs)self.run_time: float = self.init_run_time(run_time)- def get_all_mobjects(self) -> Sequence[Mobject]:+ def get_all_mobjects(self) -> Sequence[Mobject | OpenGLMobject]:return list(self.group)def begin(self) -> None:@@ -93,7 +95,7 @@ class AnimationGroup(Animation):for anim in self.animations:anim.begin()- def _setup_scene(self, scene) -> None:+ def _setup_scene(self, scene: Scene) -> None:for anim in self.animations:anim._setup_scene(scene)@@ -118,7 +120,7 @@ class AnimationGroup(Animation):]:anim.update_mobjects(dt)- def init_run_time(self, run_time) -> float:+ def init_run_time(self, run_time: float | None) -> float:"""Calculates the run time of the animation, if different from ``run_time``.Parameters@@ -146,9 +148,9 @@ class AnimationGroup(Animation):run_times = np.array([anim.run_time for anim in self.animations])num_animations = run_times.shape[0]dtype = [("anim", "O"), ("start", "f8"), ("end", "f8")]- self.anims_with_timings = np.zeros(num_animations, dtype=dtype)- self.anims_begun = np.zeros(num_animations, dtype=bool)- self.anims_finished = np.zeros(num_animations, dtype=bool)+ self.anims_with_timings: np.ndarray = np.zeros(num_animations, dtype=dtype)+ self.anims_begun: np.ndarray = np.zeros(num_animations, dtype=bool)+ self.anims_finished: np.ndarray = np.zeros(num_animations, dtype=bool)if num_animations == 0:return@@ -228,7 +230,7 @@ class Succession(AnimationGroup):))"""- def __init__(self, *animations: Animation, lag_ratio: float = 1, **kwargs) -> None:+ def __init__(self, *animations: Animation, lag_ratio: float = 1, **kwargs: Any):super().__init__(*animations, lag_ratio=lag_ratio, **kwargs)def begin(self) -> None:@@ -247,7 +249,7 @@ class Succession(AnimationGroup):if self.active_animation:self.active_animation.update_mobjects(dt)- def _setup_scene(self, scene) -> None:+ def _setup_scene(self, scene: Scene | None) -> None:if scene is None:returnif self.is_introducer():@@ -339,7 +341,7 @@ class LaggedStart(AnimationGroup):self,*animations: Animation,lag_ratio: float = DEFAULT_LAGGED_START_LAG_RATIO,- **kwargs,+ **kwargs: Any,):super().__init__(*animations, lag_ratio=lag_ratio, **kwargs)@@ -384,20 +386,22 @@ class LaggedStartMap(LaggedStart):def __init__(self,- AnimationClass: Callable[..., Animation],+ animation_class: type[Animation],mobject: Mobject,- arg_creator: Callable[[Mobject], str] = None,+ arg_creator: Callable[[Mobject], Iterable[Any]] | None = None,run_time: float = 2,- **kwargs,- ) -> None:- args_list = []- for submob in mobject:- if arg_creator:- args_list.append(arg_creator(submob))- else:- args_list.append((submob,))+ **kwargs: Any,+ ):+ if arg_creator is None:++ def identity(mob: Mobject) -> Mobject:+ return mob++ arg_creator = identity++ args_list = [arg_creator(submob) for submob in mobject]anim_kwargs = dict(kwargs)if "lag_ratio" in anim_kwargs:anim_kwargs.pop("lag_ratio")- animations = [AnimationClass(*args, **anim_kwargs) for args in args_list]+ animations = [animation_class(*args, **anim_kwargs) for args in args_list]super().__init__(*animations, run_time=run_time, **kwargs)diff --git a/mypy.ini b/mypy.iniindex 0177eedf3..4b2758102 100644--- a/mypy.ini+++ b/mypy.ini@@ -54,9 +54,6 @@ ignore_errors = True[mypy-manim.animation.animation]ignore_errors = True-[mypy-manim.animation.composition]-ignore_errors = True-[mypy-manim.animation.creation]ignore_errors = True