Fix jupyter

Author: jsonvillanueva

manim/_config/default.cfg

@@ -40,7 +40,7 @@ show_in_file_browser = False
 verbosity = INFO
 
 # --progress_bar
-progress_bar = show
+progress_bar = display 
 
 # -o, --output_file
 output_file =

manim/_config/utils.py

@@ -758,7 +758,7 @@ def digest_file(self, filename: str) -> "ManimConfig":
     progress_bar = property(
         lambda self: self._d["progress_bar"],
         lambda self, val: self._set_from_list(
-            "progress_bar", val, ["none", "show", "leave"]
+            "progress_bar", val, ["none", "display", "leave"]
         ),
         doc="Whether to show progress bars while rendering animations.",
     )

manim/cli/render/commands.py

@@ -246,6 +246,7 @@ def open_file_if_needed(file_writer):
     help="Show the output file in the file browser.",
 )
 @optgroup.option("--sound", is_flag=True, help="Play a success/failure sound.")
+@optgroup.option("--jupyter", is_flag=True, help="Using jupyter notebook magic.")
 @click.pass_context
 def render(
     ctx,
@@ -275,6 +276,7 @@ def render(
     preview,
     show_in_file_browser,
     sound,
+    jupyter,
 ):
     """Render SCENE(S) from the input FILE.
 
@@ -310,6 +312,7 @@ def render(
         "preview": preview,
         "show_in_file_browser": show_in_file_browser,
         "sound": sound,
+        "jupyter": jupyter,
     }
 
     class ClickArgs:
@@ -327,8 +330,13 @@ def __eq__(self, other):
 
         def __contains__(self, key):
             return key in self.__dict__
+        
+        def __repr__(self):
+            return str(self.__dict__)
 
     click_args = ClickArgs(args)
+    if jupyter:
+        return config
     config.digest_args(click_args)
 
     if webgl_renderer:

manim/utils/ipython_magic.py

@@ -1,15 +1,12 @@
 """Utilities for using Manim with IPython (in particular: Jupyter notebooks)"""
 
-import hashlib
 import mimetypes
-import os
-import shutil
 from pathlib import Path
 
-from manim import config, tempconfig
+from manim.__main__ import main
+from click.testing import CliRunner
 
 try:
-    from IPython import get_ipython
     from IPython.core.magic import (
         Magics,
         magics_class,
@@ -62,73 +59,26 @@ def construct(self):
             """
             if cell:
                 exec(cell, local_ns)
-
-            cli_args = ["manim", ""] + line.split()
-            if len(cli_args) == 2:
-                # empty line.split(): no commands have been passed, call with -h
-                cli_args.append("-h")
-
-            class ClickArgs:
-                def __init__(self, args):
-                    for name in args:
-                        setattr(self, name, args[name])
-
-                def _get_kwargs(self):
-                    return list(self.__dict__.items())
-
-                def __eq__(self, other):
-                    if not isinstance(other, ClickArgs):
-                        return NotImplemented
-                    return vars(self) == vars(other)
-
-                def __contains__(self, key):
-                    return key in self.__dict__
-
-            try:
-                args = ClickArgs(cli_args)
-            except SystemExit:
-                return  # probably manim -h was called, process ended preemptively
-
-            with tempconfig(local_ns.get("config", {})):
-                config.digest_args(args)
-
-                exec(f"{config['scene_names'][0]}().render()", local_ns)
-                local_path = Path(config["output_file"]).relative_to(Path.cwd())
-                tmpfile = (
-                    Path(config["media_dir"])
-                    / "jupyter"
-                    / f"{_video_hash(local_path)}{local_path.suffix}"
-                )
-
-                if local_path in self.rendered_files:
-                    self.rendered_files[local_path].unlink()
-                self.rendered_files[local_path] = tmpfile
-                os.makedirs(tmpfile.parent, exist_ok=True)
-                shutil.copy(local_path, tmpfile)
-
-                file_type = mimetypes.guess_type(config["output_file"])[0]
-                if file_type.startswith("image"):
-                    display(Image(filename=config["output_file"]))
-                    return
-
-                # videos need to be embedded when running in google colab
-                video_embed = "google.colab" in str(get_ipython())
-
-                display(
-                    Video(
-                        tmpfile,
-                        html_attributes='controls autoplay loop style="max-width: 100%;"',
-                        embed=video_embed,
-                    )
+            args = line.split()
+            if not len(args) or "-h" in args or "--help" in args or "--version" in args:
+                main.main(args, standalone_mode=False)
+                return
+
+            runner = CliRunner() # This runs the command.
+            result = runner.invoke(main, args, input=cell)
+
+            config = main.main(["--jupyter"]+args, standalone_mode=False) # This runs the render subcommand, but returns config
+            file = Path(config.output_file)
+
+            file_type = mimetypes.guess_type(file)[0]
+            if file_type.startswith("image"):
+                display(Image(filename=config["output_file"]))
+                return
+
+            display(
+                Video(
+                    file,
+                    html_attributes='controls autoplay loop style="max-width: 100%;"',
+                    embed=True,
                 )
-
-
-def _video_hash(path):
-    sha1 = hashlib.sha1()
-    with open(path, "rb") as f:
-        while True:
-            data = f.read(65536)
-            if not data:
-                break
-            sha1.update(data)
-    return sha1.hexdigest()
+            )