Fix Typing

.flake8

@@ -1,6 +1,7 @@
 [flake8]
 # Exclude the grpc generated code
-exclude = ./manim/grpc/gen/*
+exclude = ./manim/grpc/gen/*, __pycache__,.git,
+per-file-ignores = __init__.py:F401
 max-complexity = 15
 max-line-length = 88
 statistics = True
@@ -9,7 +10,7 @@ rst-roles = attr,class,func,meth,mod,obj,ref,doc,exc
 rst-directives = manim, SEEALSO, seealso
 docstring-convention=numpy
 
-select = A,A00,B,B9,C4,C90,D,E,F,F,PT,RST,SIM,W
+select = A,A00,B,B9,C4,C90,D,E,F,F,PT,RST,SIM,W,F401
 
                 # General Compatibility
 extend-ignore = E203, W503, D202, D212, D213, D404
@@ -40,4 +41,4 @@ extend-ignore = E203, W503, D202, D212, D213, D404
 
                 # Plug-in: flake8-rst-docstrings
                 RST201, RST203, RST210, RST212, RST213, RST215,
-                RST301, RST303,
+                RST301, RST303, RST499

.mypy.ini

@@ -1,30 +1,62 @@
 [mypy]
-show_error_codes = True
-
-# ignore most files; should be checked once proper types have been implemented
-[mypy-manim.__main__]
-ignore_errors = True
-
-[mypy-manim.camera.*]
-ignore_errors = True
-
-[mypy-manim.scene.*]
-ignore_errors = True
-
-[mypy-manim.cli.cfg.*]
-ignore_errors = True
-
-[mypy-manim.mobject.*]
-ignore_errors = True
-
-[mypy-manim._config.*]
-ignore_errors = True
-
-[mypy-manim.utils.*]
-ignore_errors = True
-
-[mypy-manim.animation.*]
+strict = False
+python_version = 3.10
+; plugins = numpy.typing.mypy_plugin
 ignore_errors = True
+cache_fine_grained = True
+use_fine_grained_cache = True
+
+# Disallow Dynamic Typing
+# disallow_any_unimported = True
+# disallow_any_expr = False
+# disallow_any_decorated = True
+# disallow_any_explicit = True
+# disallow_any_generics = True
+# disallow_subclassing_any = True
+#
+# # Disallow Untyped Defs and Calls
+disallow_untyped_calls = True
+disallow_untyped_defs = True
+disallow_incomplete_defs = True
+# check_untyped_defs = False
+# disallow_untyped_decorators = True
+#
+# # None and Optional Handling
+# implicit_optional = False
+# strict_optional = True
+#
+# # Configuring Warnings
+# warn_redundant_casts = True
+# warn_unused_ignores = True
+warn_return_any = True
+# warn_unreachable = True
+#
+# # Strictness Flags
+# allow_untyped_globals = False
+# allow_redefinition = False
+# local_partial_types = False
+# strict_equality = True
+#
+# # Configuring Error Messages
+# show_error_context = True
+# show_column_numbers = True
+# show_error_codes = True
+# pretty = True
+# color_output = True
+# error_summary = True
+#
+# disable_recursive_aliases = True
+
+[mypy-manim.typing]
+ignore_errors = False
+[mypy-manim.constants]
+ignore_errors = False
+[mypy-manim.utils.color]
+ignore_errors = False
+[mypy-manim.utils]
+ignore_errors = False
+[mypy-manim.utils.bezier]
+ignore_errors = False
 
 # ---------------- We can't properly type this ------------------------
 
@@ -37,10 +69,6 @@ ignore_errors = True
 [mypy-manimpango]
 ignore_missing_imports = True
 
-# Has stubs in 3.8
-[mypy-numpy]
-ignore_missing_imports = True
-
 # Has stubs in 3.8
 [mypy-pydub]
 ignore_missing_imports = True

manim/_config/utils.py

@@ -23,7 +23,6 @@
 from pathlib import Path
 from typing import Any, Iterable, Iterator
 
-import colour
 import numpy as np
 
 from .. import constants
@@ -1094,9 +1093,10 @@ def format(self, val: str) -> None:
         doc="Frame rate in frames per second.",
     )
 
+    # TODO: This was parsed before maybe add ManimColor(val), but results in circular import
     background_color = property(
         lambda self: self._d["background_color"],
-        lambda self, val: self._d.__setitem__("background_color", colour.Color(val)),
+        lambda self, val: self._d.__setitem__("background_color", val),
         doc="Background color of the scene (-c).",
     )
 

manim/animation/changing.py

@@ -6,12 +6,16 @@
 
 from typing import Callable
 
-from colour import Color
-
-from manim._config import config
 from manim.mobject.opengl.opengl_compatibility import ConvertToOpenGL
 from manim.mobject.types.vectorized_mobject import VGroup, VMobject
-from manim.utils.color import BLUE_B, BLUE_D, BLUE_E, GREY_BROWN, WHITE
+from manim.utils.color import (
+    BLUE_B,
+    BLUE_D,
+    BLUE_E,
+    GREY_BROWN,
+    WHITE,
+    ParsableManimColor,
+)
 from manim.utils.rate_functions import smooth
 
 
@@ -140,7 +144,7 @@ def __init__(
         self,
         traced_point_func: Callable,
         stroke_width: float = 2,
-        stroke_color: Color = WHITE,
+        stroke_color: ParsableManimColor | None = WHITE,
         dissipating_time: float | None = None,
         **kwargs,
     ):

manim/animation/creation.py

@@ -77,13 +77,13 @@ def construct(self):
 from typing import TYPE_CHECKING, Callable, Iterable, Sequence
 
 import numpy as np
-from colour import Color
 
 if TYPE_CHECKING:
     from manim.mobject.text.text_mobject import Text
 
 from manim.mobject.opengl.opengl_surface import OpenGLSurface
 from manim.mobject.opengl.opengl_vectorized_mobject import OpenGLVMobject
+from manim.utils.color import ManimColor
 
 from .. import config
 from ..animation.animation import Animation
@@ -92,7 +92,7 @@ def construct(self):
 from ..mobject.mobject import Group, Mobject
 from ..mobject.types.vectorized_mobject import VMobject
 from ..utils.bezier import integer_interpolate
-from ..utils.rate_functions import double_smooth, linear, smooth
+from ..utils.rate_functions import double_smooth, linear
 
 
 class ShowPartial(Animation):
@@ -259,7 +259,7 @@ def get_outline(self) -> Mobject:
             sm.set_stroke(color=self.get_stroke_color(sm), width=self.stroke_width)
         return outline
 
-    def get_stroke_color(self, vmobject: VMobject | OpenGLVMobject) -> Color:
+    def get_stroke_color(self, vmobject: VMobject | OpenGLVMobject) -> ManimColor:
         if self.stroke_color:
             return self.stroke_color
         elif vmobject.get_stroke_width() > 0:
@@ -404,7 +404,6 @@ def __init__(
         reverse: bool = True,
         **kwargs,
     ) -> None:
-
         run_time: float | None = kwargs.pop("run_time", None)
         lag_ratio: float | None = kwargs.pop("lag_ratio", None)
         run_time, lag_ratio = self._set_default_config_from_length(

manim/animation/indication.py

@@ -40,12 +40,12 @@ def construct(self):
 from typing import Callable, Iterable, Optional, Tuple, Type, Union
 
 import numpy as np
-from colour import Color
 
 from manim.mobject.geometry.arc import Circle, Dot
 from manim.mobject.geometry.line import Line
 from manim.mobject.geometry.polygram import Rectangle
 from manim.mobject.geometry.shape_matchers import SurroundingRectangle
+from manim.scene.scene import Scene
 
 from .. import config
 from ..animation.animation import Animation
@@ -58,7 +58,7 @@ def construct(self):
 from ..mobject.mobject import Mobject
 from ..mobject.types.vectorized_mobject import VGroup, VMobject
 from ..utils.bezier import interpolate, inverse_interpolate
-from ..utils.color import GREY, YELLOW
+from ..utils.color import GREY, YELLOW, ParsableManimColor
 from ..utils.deprecation import deprecated
 from ..utils.rate_functions import smooth, there_and_back, wiggle
 from ..utils.space_ops import normalize
@@ -314,7 +314,7 @@ def _get_bounds(self, alpha: float) -> Tuple[float]:
         lower = max(lower, 0)
         return (lower, upper)
 
-    def clean_up_from_scene(self, scene: "Scene") -> None:
+    def clean_up_from_scene(self, scene: Scene) -> None:
         super().clean_up_from_scene(scene)
         for submob, start in self.get_all_families_zipped():
             submob.pointwise_become_partial(start, 0, 1)
@@ -609,7 +609,7 @@ def __init__(
         fade_out=False,
         time_width=0.3,
         buff: float = SMALL_BUFF,
-        color: Color = YELLOW,
+        color: ParsableManimColor = YELLOW,
         run_time=1,
         stroke_width=DEFAULT_STROKE_WIDTH,
         **kwargs

manim/camera/camera.py

@@ -9,7 +9,6 @@
 import itertools as it
 import operator as op
 import pathlib
-import time
 from functools import reduce
 from typing import Any, Callable, Iterable
 
@@ -24,7 +23,7 @@
 from ..mobject.types.image_mobject import AbstractImageMobject
 from ..mobject.types.point_cloud_mobject import PMobject
 from ..mobject.types.vectorized_mobject import VMobject
-from ..utils.color import color_to_int_rgba
+from ..utils.color import ManimColor, ParsableManimColor, color_to_int_rgba
 from ..utils.family import extract_mobject_family_members
 from ..utils.images import get_full_raster_image_path
 from ..utils.iterables import list_difference_update
@@ -75,6 +74,8 @@ def __init__(
         frame_height: float | None = None,
         frame_width: float | None = None,
         frame_rate: float | None = None,
+        background_color: ParsableManimColor | None = None,
+        background_opacity: float | None = None,
         **kwargs,
     ):
         self.background_image = background_image
@@ -106,9 +107,14 @@ def __init__(
             frame_rate = config["frame_rate"]
         self.frame_rate = frame_rate
 
-        # TODO: change this to not use kwargs.get
-        for attr in ["background_color", "background_opacity"]:
-            setattr(self, f"_{attr}", kwargs.get(attr, config[attr]))
+        if background_color is None:
+            self._background_color = ManimColor.parse(config["background_color"])
+        else:
+            self._background_color = ManimColor.parse(background_color)
+        if background_opacity is None:
+            self._background_opacity = config["background_opacity"]
+        else:
+            self._background_opacity = background_opacity
 
         # This one is in the same boat as the above, but it doesn't have the
         # same name as the corresponding key so it has to be handled on its own

manim/constants.py

@@ -7,9 +7,11 @@
 from enum import Enum
 
 import numpy as np
-from cloup import Context
+from cloup import Context  # type: ignore
 from PIL.Image import Resampling
 
+from manim.typing import Point3D
+
 __all__ = [
     "SCENE_NOT_FOUND_MESSAGE",
     "CHOOSE_NUMBER_MESSAGE",
@@ -119,43 +121,43 @@
 }
 
 # Geometry: directions
-ORIGIN: np.ndarray = np.array((0.0, 0.0, 0.0))
+ORIGIN: Point3D = np.array((0.0, 0.0, 0.0))
 """The center of the coordinate system."""
 
-UP: np.ndarray = np.array((0.0, 1.0, 0.0))
+UP: Point3D = np.array((0.0, 1.0, 0.0))
 """One unit step in the positive Y direction."""
 
-DOWN: np.ndarray = np.array((0.0, -1.0, 0.0))
+DOWN: Point3D = np.array((0.0, -1.0, 0.0))
 """One unit step in the negative Y direction."""
 
-RIGHT: np.ndarray = np.array((1.0, 0.0, 0.0))
+RIGHT: Point3D = np.array((1.0, 0.0, 0.0))
 """One unit step in the positive X direction."""
 
-LEFT: np.ndarray = np.array((-1.0, 0.0, 0.0))
+LEFT: Point3D = np.array((-1.0, 0.0, 0.0))
 """One unit step in the negative X direction."""
 
-IN: np.ndarray = np.array((0.0, 0.0, -1.0))
+IN: Point3D = np.array((0.0, 0.0, -1.0))
 """One unit step in the negative Z direction."""
 
-OUT: np.ndarray = np.array((0.0, 0.0, 1.0))
+OUT: Point3D = np.array((0.0, 0.0, 1.0))
 """One unit step in the positive Z direction."""
 
 # Geometry: axes
-X_AXIS: np.ndarray = np.array((1.0, 0.0, 0.0))
-Y_AXIS: np.ndarray = np.array((0.0, 1.0, 0.0))
-Z_AXIS: np.ndarray = np.array((0.0, 0.0, 1.0))
+X_AXIS: Point3D = np.array((1.0, 0.0, 0.0))
+Y_AXIS: Point3D = np.array((0.0, 1.0, 0.0))
+Z_AXIS: Point3D = np.array((0.0, 0.0, 1.0))
 
 # Geometry: useful abbreviations for diagonals
-UL: np.ndarray = UP + LEFT
+UL: Point3D = UP + LEFT
 """One step up plus one step left."""
 
-UR: np.ndarray = UP + RIGHT
+UR: Point3D = UP + RIGHT
 """One step up plus one step right."""
 
-DL: np.ndarray = DOWN + LEFT
+DL: Point3D = DOWN + LEFT
 """One step down plus one step left."""
 
-DR: np.ndarray = DOWN + RIGHT
+DR: Point3D = DOWN + RIGHT
 """One step down plus one step right."""
 
 # Geometry