Type annotations for manim/scene/*.py #3981

henrikmidtiby · 2024-10-26T20:51:48Z

Overview: What does this pull request change?

The pull request add type annotations to the files manim/scene/*.py and some of its dependencies.
The request is still a work in progress, as mypy currently lists 90 errors.
With the pull request I hope to get some feedback and advise on how to proceed with the work.

The pull request is a continuation of the work in #3961

Motivation and Explanation: Why and how do your changes improve the library?

Type annotations help identify errors during development.

Further Information and Comments

I would suggest to make some changes to certain default values.
https://github.com/henrikmidtiby/manim/blob/6c137ee0f9f7b414bd5c1e0b6657eeaab005e088/manim/scene/scene.py#L128-L131
https://github.com/henrikmidtiby/manim/blob/6c137ee0f9f7b414bd5c1e0b6657eeaab005e088/manim/scene/scene.py#L119-L122
https://github.com/henrikmidtiby/manim/blob/6c137ee0f9f7b414bd5c1e0b6657eeaab005e088/manim/scene/scene.py#L119-L122

A change related to the background of a new Camera instance.
https://github.com/henrikmidtiby/manim/blob/6c137ee0f9f7b414bd5c1e0b6657eeaab005e088/manim/scene/vector_space_scene.py#L133-L135

It appears as the property target_text is not really used for something.
https://github.com/henrikmidtiby/manim/blob/6c137ee0f9f7b414bd5c1e0b6657eeaab005e088/manim/scene/vector_space_scene.py#L1117-L1122

In some cases I have chosen to insert assertions about the type of certain data.
See e.g. here. Is this a suitable approach?
https://github.com/henrikmidtiby/manim/blob/6c137ee0f9f7b414bd5c1e0b6657eeaab005e088/manim/scene/scene.py#L1333

Reviewer Checklist

The PR title is descriptive enough for the changelog, and the PR is labeled correctly
If applicable: newly added non-private functions and classes have a docstring including a short summary and a PARAMETERS section
If applicable: newly added functions and classes are tested

…her files

…ct.py

…e_matchers.py

…ructor.

…he constructor." This reverts commit 80ae857.

…sonGrace2282

This reverts commit d477c9a.

… from JasonGrace2282" This reverts commit 07bbe3f.

Error count: 308 -> 303

Error count: 303 -> 272

…y file Error count: 272 -> 343

Error count: 332 -> 330

Error count: 330 -> 285

Error count: 285 -> 282

Error count: 282 -> 281

Error count: 267

Error count: 267 -> 248

Error count: 248 -> 216

Error count: 216 -> 225

…era is the OpenGLCamera Error count: 225 -> 182

Error count: 182 -> 167

…rtain methods. This is mainly related to interactive elements and the 3D camera used in the ThreeDScene Error count: 167 -> 143

Error count: 143 -> 143

Error count: 143 -> 131

Error count: 131 -> 121

Error count: 121 -> 116

Error count: 116 -> 112

Error count: 112 -> 102

Error count: 102 -> 97

Error count: 97 -> 90

Error count: 90 -> 66

manim/gui/gui.py

@@ -11,6 +11,8 @@


 from .. import __version__, config
+from ..renderer.cairo_renderer import CairoRenderer


manim/gui/gui.py

@@ -11,6 +11,8 @@


 from .. import __version__, config
+from ..renderer.cairo_renderer import CairoRenderer
+from ..renderer.opengl_renderer import OpenGLRenderer


manim/renderer/opengl_renderer.py

+if TYPE_CHECKING:
+    from typing_extensions import Self
+
+    from manim.mobject.mobject import Mobject


manim/renderer/opengl_renderer.py

+    from typing_extensions import Self
+
+    from manim.mobject.mobject import Mobject
+    from manim.scene.scene import Scene


manim/scene/scene.py

 from ..constants import *
 from ..gui.gui import configure_pygui
 from ..renderer.cairo_renderer import CairoRenderer
-from ..renderer.opengl_renderer import OpenGLRenderer
+from ..renderer.opengl_renderer import OpenGLCamera, OpenGLRenderer


manim/scene/scene.py

            num_families = sum((mobject in family) for family in families)
            return num_families == 1

        return list(filter(is_top_level, self.mobjects))

-    def get_mobject_family_members(self):
+    def get_mobject_family_members(self) -> list[Mobject]:


manim/scene/scene.py

@@ -493,7 +514,7 @@
                self.add(mob)
                curr_mobjects += mob.get_family()

-    def remove(self, *mobjects: Mobject):
+    def remove(self, *mobjects: Mobject) -> Self:


manim/scene/scene.py

        if not self.check_interactive_embed_is_valid():
            return
        self.interactive_mode = True

-        def ipython(shell, namespace):
+        def ipython(shell: InteractiveShellEmbed, namespace: dict[str, Any]) -> None:


manim/scene/scene_file_writer.py

 from .section import DefaultSectionType, Section

 if TYPE_CHECKING:
+    from manim.renderer.cairo_renderer import CairoRenderer


manim/utils/family_ops.py

+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from manim.mobject.mobject import Mobject


henrikmidtiby added 30 commits October 28, 2024 08:34

Removed typing errors in mobject/geometry/shape_matchers.py

ba5c73a

Added type annotations fo mobject/types/image_mobject.py and a few ot…

c6e071f

…her files

Adding type annotations to types/point_cloud_mobject.py

758e199

Fixing issues revealed by type annotations in types/point_cloud_mobje…

b54a624

…ct.py

Fix issue in the CI step related to the Camera class.

bdf0049

Adding type annotations to geometry/line.py

1962c73

Ignore type errors related to super and sub class in line.py and shap…

92d9908

…e_matchers.py

Dealing with some issues and ignoring others identified by type checking

bd4f02a

Ignored a number of type issues related to float and floating[Any].

a4bda5d

Help mypy to determine types.

45e18e8

More work on addressing typing issues.

c29a38e

Reverting two changes that triggers an error in the automatic testing.

11e6ffa

Further work on type hinting.

935fd0c

Avoid forwarding positional arguments from Arrow to Line in the const…

00f546d

…ructor.

Revert "Avoid forwarding positional arguments from Arrow to Line in t…

020a777

…he constructor." This reverts commit 80ae857.

Removed several type ignore statements and addressed comments from Ja…

ef6158a

…sonGrace2282

Revert "Activate mypy check of mobject.geometry.*"

e79fd75

This reverts commit d477c9a.

Revert "Removed several type ignore statements and addressed comments…

c85a19d

… from JasonGrace2282" This reverts commit 07bbe3f.

Added type annotations to zoomed_scene.py

6243990

Error count: 308 -> 303

Adding type annotations to all methods in vector_space_scene.py

ae06d89

Error count: 303 -> 272

Get rid of no-untyped-call errors from my in the vector_space_scene.p…

8d6d9c4

…y file Error count: 272 -> 343

Handle type issues related to ManimColor in vector_space_scene.py

e2284b1

Handle var-annotated issues in vector_space_scene.py

bfe61b0

Error count: 332 -> 330

Handling has-type type errors in vector_space_scene.py

eae2296

Error count: 330 -> 285

Handled name-defined type issues in vector_space_scene.py

9dd785a

Error count: 285 -> 282

Address type issue with calling an untyped method.

822dba2

Error count: 282 -> 281

Fix some typing issues in transform_mathcing_parts.py

501d774

Change stroke_width to float in vector_space_scene.py

fa9cad9

Handled a few type errors.

99c12c0

Error count: 267

Handled several typing issues in three_d_scene.py

dee6ef9

Error count: 267 -> 248

henrikmidtiby added 14 commits October 28, 2024 08:47

Dealing with type errors in scene_file_writer.py

5bf2d0e

Error count: 248 -> 216

Ensured that all methods in scene.py have type declarations.

da35261

Error count: 216 -> 225

Handle type issues related to interactivity by asserting that the cam…

79790db

…era is the OpenGLCamera Error count: 225 -> 182

Handle type issues in scene.py

080113f

Error count: 182 -> 167

Asserting that the renderer or camera is of the proper type to use ce…

abd7022

…rtain methods. This is mainly related to interactive elements and the 3D camera used in the ThreeDScene Error count: 167 -> 143

Avoid cyclic import of dependencies

3fc6197

Error count: 143 -> 143

Handling no-untyped-call type errors in manim/scene/scene.py

c5d5743

Error count: 143 -> 131

Handling assignment type errors in manim/scene/*.py

90de428

Error count: 131 -> 121

Handling arg-type type errors in manim/scene/*.py

0a8c41e

Error count: 121 -> 116

Handling arg-type type errors in manim/scene/*.py

e8d9741

Error count: 116 -> 112

Fixing various type errors

059566e

Error count: 112 -> 102

Fixing various type errors

5bba091

Error count: 102 -> 97

Fixing various type errors

1165469

Error count: 97 -> 90

Some aggressive changes to silence a significant number of type errors.

4c14674

Error count: 90 -> 66

henrikmidtiby force-pushed the type_annotations_scene branch from 6c137ee to 4c14674 Compare October 28, 2024 07:51

github-advanced-security bot found potential problems Oct 28, 2024

View reviewed changes

Commented out an import (IPython) that makes the CI tests fail.

bf7a82f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Type annotations for manim/scene/*.py #3981

Type annotations for manim/scene/*.py #3981

henrikmidtiby commented Oct 26, 2024

		@@ -11,6 +11,8 @@


		from .. import __version__, config
		from ..renderer.cairo_renderer import CairoRenderer

Type annotations for manim/scene/*.py #3981

Are you sure you want to change the base?

Type annotations for manim/scene/*.py #3981

Conversation

henrikmidtiby commented Oct 26, 2024

Overview: What does this pull request change?

Motivation and Explanation: Why and how do your changes improve the library?

Further Information and Comments

Reviewer Checklist