manim 0.18.0.post0__py3-none-any.whl → 0.19.0__py3-none-any.whl

manim/__init__.py

@@ -1,14 +1,10 @@
 #!/usr/bin/env python
-
-
 from __future__ import annotations
 
-import pkg_resources
-
-__version__: str = pkg_resources.get_distribution(__name__).version
+from importlib.metadata import version
 
+__version__ = version(__name__)
 
-import sys
 
 # isort: off
 
@@ -20,6 +16,7 @@ from ._config import *
 from .utils.commands import *
 
 # isort: on
+import numpy as np
 
 from .animation.animation import *
 from .animation.changing import *

manim/__main__.py

@@ -1,27 +1,54 @@
 from __future__ import annotations
 
-import sys
-
 import click
 import cloup
 
-from . import __version__, cli_ctx_settings, console
-from .cli.cfg.group import cfg
-from .cli.checkhealth.commands import checkhealth
-from .cli.default_group import DefaultGroup
-from .cli.init.commands import init
-from .cli.new.group import new
-from .cli.plugins.commands import plugins
-from .cli.render.commands import render
-from .constants import EPILOG
+from manim import __version__
+from manim._config import cli_ctx_settings, console
+from manim.cli.cfg.group import cfg
+from manim.cli.checkhealth.commands import checkhealth
+from manim.cli.default_group import DefaultGroup
+from manim.cli.init.commands import init
+from manim.cli.plugins.commands import plugins
+from manim.cli.render.commands import render
+from manim.constants import EPILOG
+
 
+def show_splash(ctx: click.Context, param: click.Option, value: str | None) -> None:
+    """When giving a value by console, show an initial message with the Manim
+    version before executing any other command: ``Manim Community vA.B.C``.
 
-def exit_early(ctx, param, value):
+    Parameters
+    ----------
+    ctx
+        The Click context.
+    param
+        A Click option.
+    value
+        A string value given by console, or None.
+    """
     if value:
-        sys.exit()
+        console.print(f"Manim Community [green]v{__version__}[/green]\n")
+
 
+def print_version_and_exit(
+    ctx: click.Context, param: click.Option, value: str | None
+) -> None:
+    """Same as :func:`show_splash`, but also exit when giving a value by
+    console.
 
-console.print(f"Manim Community [green]v{__version__}[/green]\n")
+    Parameters
+    ----------
+    ctx
+        The Click context.
+    param
+        A Click option.
+    value
+        A string value given by console, or None.
+    """
+    show_splash(ctx, param, value)
+    if value:
+        ctx.exit()
 
 
 @cloup.group(
@@ -35,17 +62,32 @@ console.print(f"Manim Community [green]v{__version__}[/green]\n")
     "is specified. Run 'manim render --help' if you would like to know what the "
     f"'-ql' or '-p' flags do, for example.\n\n{EPILOG}",
 )
-@click.option(
+@cloup.option(
     "--version",
     is_flag=True,
     help="Show version and exit.",
-    callback=exit_early,
+    callback=print_version_and_exit,
     is_eager=True,
     expose_value=False,
 )
-@click.pass_context
-def main(ctx):
-    """The entry point for manim."""
+@click.option(
+    "--show-splash/--hide-splash",
+    is_flag=True,
+    default=True,
+    help="Print splash message with version information.",
+    callback=show_splash,
+    is_eager=True,
+    expose_value=False,
+)
+@cloup.pass_context
+def main(ctx: click.Context) -> None:
+    """The entry point for Manim.
+
+    Parameters
+    ----------
+    ctx
+        The Click context.
+    """
     pass
 
 
@@ -53,7 +95,6 @@ main.add_command(checkhealth)
 main.add_command(cfg)
 main.add_command(plugins)
 main.add_command(init)
-main.add_command(new)
 main.add_command(render)
 
 if __name__ == "__main__":

manim/_config/__init__.py

@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 import logging
-from contextlib import _GeneratorContextManager, contextmanager
+from collections.abc import Generator
+from contextlib import contextmanager
+from typing import Any
 
 from .cli_colors import parse_cli_ctx
 from .logger_utils import make_logger
@@ -35,12 +37,14 @@ logging.getLogger("PIL").setLevel(logging.INFO)
 logging.getLogger("matplotlib").setLevel(logging.INFO)
 
 config = ManimConfig().digest_parser(parser)
+# TODO: to be used in the future - see PR #620
+# https://github.com/ManimCommunity/manim/pull/620
 frame = ManimFrame(config)
 
 
 # This has to go here because it needs access to this module's config
 @contextmanager
-def tempconfig(temp: ManimConfig | dict) -> _GeneratorContextManager:
+def tempconfig(temp: ManimConfig | dict[str, Any]) -> Generator[None, None, None]:
     """Context manager that temporarily modifies the global ``config`` object.
 
     Inside the ``with`` statement, the modified config will be used.  After
@@ -64,7 +68,6 @@ def tempconfig(temp: ManimConfig | dict) -> _GeneratorContextManager:
        8.0
        >>> with tempconfig({"frame_height": 100.0}):
        ...     print(config["frame_height"])
-       ...
        100.0
        >>> config["frame_height"]
        8.0

manim/_config/cli_colors.py

@@ -1,10 +1,15 @@
+from __future__ import annotations
+
 import configparser
+from typing import Any
 
 from cloup import Context, HelpFormatter, HelpTheme, Style
 
+__all__ = ["parse_cli_ctx"]
+
 
-def parse_cli_ctx(parser: configparser.ConfigParser) -> Context:
-    formatter_settings = {
+def parse_cli_ctx(parser: configparser.SectionProxy) -> dict[str, Any]:
+    formatter_settings: dict[str, str | int] = {
         "indent_increment": int(parser["indent_increment"]),
         "width": int(parser["width"]),
         "col1_max_width": int(parser["col1_max_width"]),
@@ -30,16 +35,19 @@ def parse_cli_ctx(parser: configparser.ConfigParser) -> Context:
     formatter = {}
     theme = parser["theme"] if parser["theme"] else None
     if theme is None:
-        formatter = HelpFormatter().settings(
-            theme=HelpTheme(**theme_settings), **formatter_settings
+        formatter = HelpFormatter.settings(
+            theme=HelpTheme(**theme_settings),
+            **formatter_settings,  # type: ignore[arg-type]
         )
     elif theme.lower() == "dark":
-        formatter = HelpFormatter().settings(
-            theme=HelpTheme.dark().with_(**theme_settings), **formatter_settings
+        formatter = HelpFormatter.settings(
+            theme=HelpTheme.dark().with_(**theme_settings),
+            **formatter_settings,  # type: ignore[arg-type]
         )
     elif theme.lower() == "light":
-        formatter = HelpFormatter().settings(
-            theme=HelpTheme.light().with_(**theme_settings), **formatter_settings
+        formatter = HelpFormatter.settings(
+            theme=HelpTheme.light().with_(**theme_settings),
+            **formatter_settings,  # type: ignore[arg-type]
         )
 
     return Context.settings(

manim/_config/default.cfg

@@ -221,9 +221,7 @@ repr_number = green
 # Uncomment the following line to manually set the loglevel for ffmpeg. See
 # ffmpeg manpage for accepted values
 loglevel = ERROR
-# defaults to the one present in path
-ffmpeg_executable = ffmpeg
 
 [jupyter]
-media_embed =
+media_embed = False
 media_width = 60%%

manim/_config/logger_utils.py

@@ -9,13 +9,13 @@ Both ``logger`` and ``console`` use the ``rich`` library to produce rich text
 format.
 
 """
+
 from __future__ import annotations
 
 import configparser
 import copy
 import json
 import logging
-import sys
 from typing import TYPE_CHECKING
 
 from rich import color, errors
@@ -27,6 +27,8 @@ from rich.theme import Theme
 if TYPE_CHECKING:
     from pathlib import Path
 
+__all__ = ["make_logger", "parse_theme", "set_file_logger", "JSONFormatter"]
+
 HIGHLIGHTED_KEYWORDS = [  # these keywords are highlighted specially
     "Played",
     "animations",
@@ -50,9 +52,9 @@ Loading the default color configuration.[/logging.level.error]
 
 
 def make_logger(
-    parser: configparser.ConfigParser,
+    parser: configparser.SectionProxy,
     verbosity: str,
-) -> tuple[logging.Logger, Console]:
+) -> tuple[logging.Logger, Console, Console]:
     """Make the manim logger and console.
 
     Parameters
@@ -84,25 +86,29 @@ def make_logger(
     theme = parse_theme(parser)
     console = Console(theme=theme)
 
-    # With rich 9.5.0+ we could pass stderr=True instead
-    error_console = Console(theme=theme, file=sys.stderr)
+    error_console = Console(theme=theme, stderr=True)
 
     # set the rich handler
-    RichHandler.KEYWORDS = HIGHLIGHTED_KEYWORDS
     rich_handler = RichHandler(
         console=console,
         show_time=parser.getboolean("log_timestamps"),
+        keywords=HIGHLIGHTED_KEYWORDS,
     )
 
     # finally, the logger
     logger = logging.getLogger("manim")
     logger.addHandler(rich_handler)
     logger.setLevel(verbosity)
+    logger.propagate = False
+
+    if not (libav_logger := logging.getLogger()).hasHandlers():
+        libav_logger.addHandler(rich_handler)
+        libav_logger.setLevel(verbosity)
 
     return logger, console, error_console
 
 
-def parse_theme(parser: configparser.ConfigParser) -> Theme:
+def parse_theme(parser: configparser.SectionProxy) -> Theme:
     """Configure the rich style of logger and console output.
 
     Parameters
@@ -178,7 +184,7 @@ class JSONFormatter(logging.Formatter):
 
     """
 
-    def format(self, record: dict) -> str:
+    def format(self, record: logging.LogRecord) -> str:
         """Format the record in a custom JSON format."""
         record_c = copy.deepcopy(record)
         if record_c.args: