pyodide-mkdocs-theme 5.4.16__tar.gz → 5.5.1__tar.gz

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyodide-mkdocs-theme
-Version: 5.4.16
+Version: 5.5.1
 Summary: Package embedding the necessary tools to host pyodide, ACE editors, jQuery terminals in mkdocs documentations
 License: GPL-3.0-or-later
 Keywords: mkdocs,mkdocs-plugin,pyodide,IDE,terminal

pyodide_mkdocs_theme-5.5.1/pyodide_mkdocs_theme/__version__.py

@@ -0,0 +1 @@
+__version__ = "5.5.1"

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/files_extractors/base0_extractors.py

@@ -25,7 +25,7 @@ If not, see <https://www.gnu.org/licenses/>.
 ------------------------------------
 
 
-Represent all the files associated to a runner (IDE, terminal, sqlide, ...), holding the 
+Represent all the files associated to a runner (IDE, terminal, sqlide, ...), holding the
 logic/tools to build the various sections contents.
 
 Context/Contracts/Goals:
@@ -36,10 +36,11 @@ Context/Contracts/Goals:
 * The PMT file can actually not exist at all! (in that case, exo_file is None)
 
 * A PMT file, if it exists, contains sections delimited by tokens (comments) in the form:
-        
+
         {head} (PMT|PYODIDE):{section} {tail}
-        
-  Where `head` and `tail` depend on the type of the file, to build a valide comment (python, sql, ...).
+
+  Where `head` and `tail` depend on the type of the file, to build a valide comment (python,
+  sql, ...).
 
 * An Extractor instance is cached based on the absolute/resolved path to the targeted
  file (aka `self.exo_file`).
@@ -47,11 +48,11 @@ Context/Contracts/Goals:
 * The file is automatically refreshed when a local file has been modified.
 
 * The concrete contents of the files are stored in the instance, avoiding multiple HDD
-reads operations. Note that the content is stored "as is", meaning the inclusions are not 
+reads operations. Note that the content is stored "as is", meaning the inclusions are not
 resolved yet, but the code is analyzed so that the inclusions are known upfront.
 
-* The final/actual contents are never stored in the object: the concrete contents are 
-always built on the fly/on demand, so that all inclusions redirections can apply where 
+* The final/actual contents are never stored in the object: the concrete contents are
+always built on the fly/on demand, so that all inclusions redirections can apply where
 needed.
 """
 # pylint: disable=multiple-statements, missing-function-docstring
@@ -118,7 +119,7 @@ class BaseFilesExtractor:
     Path to the master main file (if any).
     Also used as key cache to retrieve an Extractor instance.
 
-    WARNING: This path is absolute + resolved, whereas the runner_file for an IDE actually is 
+    WARNING: This path is absolute + resolved, whereas the runner_file for an IDE actually is
              absolute but NOT normalized (to reduce the needs of ID arugments in macros calls,
              when generating the html ids of the resulting elements).
     """
@@ -131,7 +132,7 @@ class BaseFilesExtractor:
 
     in_pages: Set[str] = field(default_factory=set)
     """
-
+    Set of pages uri (relative to the docs_dir) that use the current extractor.
     """
 
     # ---------------------------------------------------------------------------------
@@ -151,12 +152,6 @@ class BaseFilesExtractor:
             md_uri = self.env.page.file.src_uri
             self.in_pages.add(md_uri)
 
-        if self.arg_name and not self.runner_file:
-            raise PmtMacrosInvalidPmtFileError(
-                f"No file could be found for { self.ARG_NAME }='{ self.arg_name }'."
-                f"{ self.env.log() }"
-            )
-
 
     def __hash__(self):
         return hash(self.exo_file)
@@ -277,6 +272,11 @@ class BaseExtractorWithCache(BaseFilesExtractor):
         if not runner_file:
             runner_file = env.get_sibling_of_current_page(rel_path, tail=cls.EXTENSION)
 
+            if rel_path and not runner_file:
+                raise PmtMacrosInvalidPmtFileError(
+                    f"No file could be found for '{ rel_path }'.{ env.log() }"
+                )
+
         exo_file  = runner_file and Path(runner_file).resolve()
         extractor = cls._CACHED_EXTRACTORS.get(exo_file)
 

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/html_dependencies/deps.py

@@ -172,47 +172,50 @@ class HtmlDependencies:
     #      actually loaded sync (this avoids the need for yet another global async flag...)
 
 
-    lodash         = Cdn(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js")
-    jQuery         = Cdn(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/jquery@3.7.1")
+    lodash = Cdn(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/lodash@4.17.20/lodash.min.js")
+    jQuery = Cdn(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/jquery@3.7.1")
 
-    jQuery_css     = Css(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/jquery.terminal@2.43.1/css/jquery.terminal.min.css")
-    awesome_font   = Css(Block.libs, DepKind.always, {
-        "href": "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css",
-        "integrity": "sha512-SnH5WK+bZxgPHs44uWIX+LLJAJ9/2PkPKZ5QiAj6Ta86w+fsb2TkcmfRyVX3pBnMFcV7oQPJkl9QevSCWr3W6A==",
+    jQuery_css   = Css(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/jquery.terminal@2.43.1/css/jquery.terminal.min.css")
+    awesome_font = Css(Block.libs, DepKind.always, {
+        "href": "https://cdn.jsdelivr.net/npm/font-awesome@4.7.0/css/font-awesome.min.css",
+        "integrity": "sha256-eZrrJcwDc/3uDhsdt61sL2oOBY362qM3lon1gyExkL0=",
     })
-
-    jQterm         = Cdn(Block.libs, DepKind.term,   "https://cdn.jsdelivr.net/npm/jquery.terminal@2.43.1/js/jquery.terminal.min.js")
-    ace            = Cdn(Block.libs, DepKind.ide, {
-        'src': "https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.7/ace.min.js",
-        'integrity': "sha512-GQpIYSKNIPIC763JKTNALj+t18/nfLdzw5gITgFGa31aK/4NmjyPKsfqrjh7CuzpJaG3nqEleeVcWUhHad9Axg==",
+    jQterm = Cdn(Block.libs, DepKind.term,   "https://cdn.jsdelivr.net/npm/jquery.terminal@2.43.1/js/jquery.terminal.min.js")
+    ace    = Cdn(Block.libs, DepKind.ide, {
+        'src': "https://cdn.jsdelivr.net/npm/ace-builds@1.44.0/src-min-noconflict/ace.js",
+        'integrity': "sha256-By0T5T0R4s7M//4aD6fxXPacVDXYl99T2YxxvhxKLn8=",
     })
-    ace_tools      = Cdn(Block.libs, DepKind.ide, {
-        'src': "https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.7/ext-language_tools.min.js",
-        'integrity': "sha512-iK7yTkCkv7MbFwTqRgHTbmIqoiiLq6BsyNjymnFyB5a7pEQwYThj9QIgqBy9+XPPwj7+hAEHyR2npOHL1bz4Qg==",
+    ace_tools = Cdn(Block.libs, DepKind.ide, {
+        'src': "https://cdn.jsdelivr.net/npm/ace-builds@1.44.0/src-min-noconflict/ext-language_tools.js",
+        'integrity': "sha256-eZ46N0b3QkDX+7GjjlJfoBuXGKIH86UKJVARHhGzpWA=",
     })
-    pyodide        = Cdn(Block.libs, DepKind.pyodide, "https://cdn.jsdelivr.net/pyodide/v0.25.0/full/pyodide.js")
+    pyodide = Cdn(Block.libs, DepKind.pyodide, "https://cdn.jsdelivr.net/pyodide/v0.25.0/full/pyodide.js")
 
     #vvvvvvvvvvvvvvv
     # GENERATED-libs
-    config          = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/0-config.js", type="text/javascript", extra_dump="dump_to_js_config")
-    subscriber      = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/0-legacy-subscriber.js", type="text/javascript")
-    functools       = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functools.js", type="module")
-    jsLogger        = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/jsLogger.js", type="module")
-    mathjax         = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/mathjax-libs.js", type="text/javascript")
-    process_and_gui = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/process_and_gui.js", type="module")
-    generic         = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/0-generic.css")
-    header          = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/btns-header.css")
-    history         = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/history.css")
-    hourglass       = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/hourglass.css")
-    ide             = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/ide.css")
-    qcm             = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/qcm.css")
-    terminal        = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/terminal.css")
-    testing         = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/testing.css")
+    config             = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/0-config.js", type="text/javascript", extra_dump="dump_to_js_config")
+    subscriber         = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/0-legacy-subscriber.js", type="text/javascript")
+    functools          = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functools.js", type="module")
+    functoolsStorage   = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functoolsStorage.js", type="module")
+    functoolsTxt       = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functoolsTxt.js", type="module")
+    functoolsUi        = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functoolsUi.js", type="module")
+    functoolsUiBuilder = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/functoolsUiBuilder.js", type="module")
+    jsLogger           = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/jsLogger.js", type="module")
+    mathjax            = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/mathjax-libs.js", type="text/javascript")
+    process_and_gui    = Cdn(Block.libs, DepKind.always, "{base_url}/js-libs/process_and_gui.js", type="module")
+    generic            = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/0-generic.css")
+    header             = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/btns-header.css")
+    history            = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/history.css")
+    hourglass          = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/hourglass.css")
+    ide                = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/ide.css")
+    qcm                = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/qcm.css")
+    terminal           = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/terminal.css")
+    testing            = Css(Block.libs, DepKind.always, "{base_url}/pyodide-css/testing.css")
     # GENERATED-libs
     #^^^^^^^^^^^^^^^
 
     # Always _after_ the js mathjax-libs.js file (SYNC!)
-    mathjax_tex    = Cdn(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js")
+    mathjax_tex = Cdn(Block.libs, DepKind.always, "https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js")
 
 
     #---------------------------------------------------

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/macros/figure.py

@@ -23,7 +23,7 @@ from functools import wraps
 from typing import Optional
 
 
-from ..tools_and_constants import MACROS_WITH_INDENTS, HtmlClass, P5BtnLocation
+from ..tools_and_constants import PmtCte, HtmlClass, P5BtnLocation
 from .. import html_builder as Html
 from ..plugin.maestro_macros import MaestroMacros
 from .ide_manager import IdeManager
@@ -37,7 +37,7 @@ def figure(env:MaestroMacros):
     Macro pour insérer une <div> qui devra contenir une figure dessinée ensuite via matplotlib,
     par exemple(ou autre!).
     """
-    MACROS_WITH_INDENTS.add('figure')
+    PmtCte.MACROS_WITH_INDENTS.add('figure')
 
     def p5_btn(kind:str, div_id:str, side:str):
         return IdeManager.cls_create_button(

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/macros/ide_ide.py

@@ -31,7 +31,7 @@ from pyodide_mkdocs_theme.pyodide_macros.html_dependencies.deps_class import Dep
 
 
 from .. import html_builder as Html
-from ..tools_and_constants import HtmlClass, IdeConstants, IdeMode, PmtPyMacrosName, Prefix
+from ..tools_and_constants import HtmlClass, PmtCte, IdeMode, PmtPyMacrosName, Prefix
 from ..messages import Tip
 from ..parsing import add_indent, admonition_safe_html, build_code_fence, items_comma_joiner
 from ..plugin_tools.test_cases import Case
@@ -233,14 +233,22 @@ class Ide(CommonTermIde):
         )
 
         self.max_attempts, self.max_attempts_symbol = (
-            (inf, IdeConstants.infinity_symbol) if is_inf else (int(max_ide), max_ide)
+            (inf, PmtCte.infinity_symbol) if is_inf else (int(max_ide), max_ide)
         )
 
 
 
-    def _validate_files_config(self):
+    def _validate_config(self):
 
         msg = ""
+        if self.auto_run and self.export:
+            msg += self._build_error_msg_with_option(
+                "IDE with `EXPORT=True` should never have `AUTO_RUN=True` at the same time, because "
+                "it could present a risk of executing automatically arbitrary code on the teacher's "
+                "machine after importing a zip an reloading the page."
+            )
+
+
         if(
             self.has_check_btn
             and self.env.deactivate_stdout_for_secrets
@@ -366,7 +374,7 @@ class Ide(CommonTermIde):
         global_layout = Html.div(
             self.generate_empty_ide(),
             id = f"{ Prefix.global_ }{ self.editor_name }",
-            kls = HtmlClass.py_mk_ide,
+            kls = self._get_runner_html_class(HtmlClass.py_mk_ide),
         )
         solution_div = self.build_corr_and_rems()
 
@@ -495,7 +503,7 @@ class Ide(CommonTermIde):
         at_least_one = self.has_corr or self.has_rem
         anything     = at_least_one or self.has_vis_rem
         with_encrypt = self.env.encrypt_corrections_and_rems and anything
-        extra_tokens = ( IdeConstants.encryption_token, ) * with_encrypt
+        extra_tokens = ( PmtCte.encryption_token, ) * with_encrypt
 
 
         # Build the whole div content:

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/macros/ide_manager.py

@@ -37,13 +37,11 @@ from ..exceptions import (
     PmtMermaidConfigError
 )
 from ..tools_and_constants import (
-    KEYWORDS_SEPARATOR,
-    PYTHON_KEYWORDS,
-    RUN_GROUP_SKIP,
+    PmtCte,
     SCRIPT_DATA_TO_JS_EXPORTABLE_PROPS,
     HashPathMode,
     HtmlClass,
-    IdeConstants,
+    PmtCte,
     P5BtnLocation,
     PmtPyMacrosName,
     ScriptData,
@@ -186,16 +184,22 @@ class IdeManagerMacroArguments:
     runs are activated.
     """
 
+    extra_class: str
+    """
+    Additional html classes to put on the outer div of the runner. See self._get_runner_html_class.
+    """
+
     extra_kw: Optional[Dict[str,Any]] = None
     """
     Any kw left in the original call.
-    Should be always be None when reaching IdeManager.__post_init__. This allows subclasses
-    to handle the extra (legacy) keywords on their side.
+    Should always be None when reaching IdeManager.__post_init__. This allows subclasses to handle
+    the extra (legacy) keywords on their side.
     """
 
 
-    # defined during post_init or in child class
-    #-------------------------------------------
+
+    # defined during __post_init__ or in child class
+    #-----------------------------------------------
 
     exo_py: Optional[Path] = None
     """
@@ -406,17 +410,17 @@ class IdeSectionsManager(IdeManagerMacroArguments):
         self.contents = self._build_all_resolved_contents()
         self.py_name  = self.exo_py.stem if self.exo_py else ""
 
-        self._define_max_attempts_symbols_and_value()       # To do before files validation: MAX
+        self._define_max_attempts_symbols_and_value()       # To do before files validation because of MAX
 
-        self._validate_files_config()
+        self._validate_config()
 
         if self.rec_limit < -1:         # standardization
             self.rec_limit = -1
 
-        if -1 < self.rec_limit < IdeConstants.min_recursion_limit:
+        if -1 < self.rec_limit < PmtCte.min_recursion_limit:
             raise PmtMacrosInvalidArgumentError(
                 f"The recursion limit is set too low and may causes runtime troubles. "
-                f"Please set it to at least { IdeConstants.min_recursion_limit }.{ self.env.log() }"
+                f"Please set it to at least { PmtCte.min_recursion_limit }.{ self.env.log() }"
             )
 
         # REM contents won't be visible at page load time, hence mkdocs material might miss the requirement.
@@ -438,7 +442,7 @@ class IdeSectionsManager(IdeManagerMacroArguments):
         """ Placeholder, to insert (very...) specific logic for IDEs... """
 
 
-    def _validate_files_config(self):
+    def _validate_config(self):
         raise NotImplementedError()
 
     def _check_forbidden_sections(self, sections:str, err_header:str):
@@ -463,13 +467,13 @@ class IdeSectionsManager(IdeManagerMacroArguments):
         return msg
 
 
-    def _validation_outcome(self, msg:Optional[str]):
+    def _validation_outcome(self, msg:Optional[str], exception_class=PmtMacrosError):
         """
-        Routine that can be called from the _validate_files_config implementation, raising if given
+        Routine that can be called from the _validate_config implementation, raising if given
         an error message as argument.
         """
         if msg:
-            raise PmtMacrosError(f'{ msg }\n{self.env.log()}')
+            raise exception_class(f'{ msg }\n{self.env.log()}')
 
 
     def iter_over_sections_and_data(self, *, with_corr=True, with_rems=True, with_paths=False):
@@ -543,6 +547,13 @@ class IdeManagerMdHtmlGenerator(IdeSectionsManager):
         self.editor_name = self.generate_id()
 
 
+    def _get_runner_html_class(self, base_class:str):
+        """
+        Build the html class string to use for the top level element of the runner, merging any
+        additional class passed through the `extra_class` macro argument.
+        """
+        return f"{ base_class } { self.extra_class or '' }".rstrip()
+
 
     def make_element(self) -> str:
         """
@@ -984,9 +995,9 @@ class IdeManagerExporter(IdeManagerMdHtmlGenerator, metaclass=ABCMeta):
         """
         Build sequential runs related data.
 
-        The overall "state" of the runner, considering sequential runs, ios determined here:
+        The overall "state" of the runner, considering sequential runs, is determined here:
             - Check the RUN_GROUP argument validity
-            - what is its group ID (RUN_GROUP cleaned up)
+            - what is its group ID (RUN_GROUP, cleaned up)
             - is it in a sequential run group or not ?
             - does it have priority or not ?
 
@@ -994,7 +1005,7 @@ class IdeManagerExporter(IdeManagerMdHtmlGenerator, metaclass=ABCMeta):
             self.env.current_page_config.get_run_group_data(...) -> [int, int]
         """
         group_id     = self.run_group and self.run_group.strip('*')
-        is_skip      = group_id == RUN_GROUP_SKIP
+        is_skip      = group_id == PmtCte.RUN_GROUP_SKIP
         has_priority = group_id and (self.run_group.startswith('*') or self.run_group.endswith('*'))
 
         if isinstance(group_id, str) and is_skip and has_priority:
@@ -1028,7 +1039,7 @@ class IdeManagerExporter(IdeManagerMdHtmlGenerator, metaclass=ABCMeta):
         Compute all code exclusions and white list of imports
         """
 
-        non_kws, kws, *_ = self.excluded.split(KEYWORDS_SEPARATOR) + ['']
+        non_kws, kws, *_ = self.excluded.split(PmtCte.KEYWORDS_SEPARATOR) + ['']
         # print((non_kws, kws))
 
         all_excluded   = self._exclusion_string_to_list(string_prop=non_kws)
@@ -1045,8 +1056,8 @@ class IdeManagerExporter(IdeManagerMdHtmlGenerator, metaclass=ABCMeta):
         ]
         # print(*exclusions,sep='\n')
 
-        if excluded_kws and any(kw for kw in excluded_kws if kw not in PYTHON_KEYWORDS):
-            wrongs=', '.join(sorted(repr(kw) for kw in excluded_kws if kw not in PYTHON_KEYWORDS))
+        if excluded_kws and any(kw for kw in excluded_kws if kw not in PmtCte.PYTHON_KEYWORDS):
+            wrongs=', '.join(sorted(repr(kw) for kw in excluded_kws if kw not in PmtCte.PYTHON_KEYWORDS))
             raise PmtMacrosInvalidArgumentError(
                 f"Invalid python keywords for the `SANS` argument: { wrongs }.{ self.env.log() }"
             )

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/macros/ide_playground.py

@@ -149,11 +149,15 @@ normaux, que ce soit pour les tests publics ou les validations.
 
 <br>
 
-___Redirection d'urls :___
+^^___Redirection d'urls :___^^
 
-Si vous voulez utiliser des urls relatives à la localisation du fichier markdown d'origine des codes
-python, vous pouvez renseigner ci-dessous le chemin relatif vers le dossier cible, ___depuis la racine
-du site / du `docs_dir`___.
+Si vous voulez utiliser des urls relatives à la localisation du fichier markdown d'origine
+des codes python, vous pouvez renseigner ci-dessous le chemin relatif vers le dossier cible,
+___depuis la racine du site / du `docs_dir`___.
+<br>Si aucune redirection n'est renseignée, les urls relatives sont traitées normalement, en
+partant du dossier en cours.
+
+^^_Dossier cible de la redirection :_^^
 
 <input type="text" id="playground-url" placeholder="dossier-dans-docs_dir/sous-dossier/dossier-contenant-le-md">
 

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/macros/ide_py_btn.py

@@ -65,7 +65,7 @@ class PyBtn(IdeManager):
     tip_width: int = 0
 
 
-    def _validate_files_config(self):
+    def _validate_config(self):
         self._check_forbidden_sections(
             "env_term code corr tests secrets post_term REM VIS_REM",
             f"Only the `env` and `post` sections should be used, for { self.MACRO_NAME } macros"
@@ -88,7 +88,7 @@ class PyBtn(IdeManager):
         wrapper = getattr(Html, self.wrapper)(
             button_html,
             id = self.editor_name,
-            kls = HtmlClass.py_mk_py_btn,
+            kls = self._get_runner_html_class(HtmlClass.py_mk_py_btn),
             markdown = 1,       # in case material icon reference is used
         )
         return wrapper

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/macros/ide_run_macro.py

@@ -26,7 +26,8 @@ from dataclasses import dataclass
 from pyodide_mkdocs_theme.pyodide_macros.html_dependencies.deps_class import DepKind
 
 
-from ..tools_and_constants import PmtPyMacrosName, Prefix
+from ..exceptions import PmtMacrosInvalidArgumentError
+from ..tools_and_constants import PmtCte, PmtPyMacrosName, Prefix
 from .ide_py_btn import PyBtn
 
 
@@ -47,10 +48,20 @@ class AutoRun(PyBtn):
 
     DEPS_KIND: ClassVar[DepKind] = DepKind.run_macro
 
+    def _validate_config(self):
+        super()._validate_config()
+
+        if self.run_group not in (None, PmtCte.RUN_GROUP_SKIP):
+            self._validation_outcome(
+                f"The RUN_GROUP argument of `run` macros can only be in {(None, PmtCte.RUN_GROUP_SKIP)}",
+                exception_class=PmtMacrosInvalidArgumentError
+            )
+
+
     def make_element(self) -> str:
         """
         {{ run(...) }} elements cannot be inserted in the markdown content now, otherwise they
         will break the md rendering, adding new lines/paragraphs around the empty span. So the
-        html code is actually inserted through the plugin's on_page_context hook.
+        html code is actually inserted through the plugin's MaestroMacro.on_page_context event.
         """
         return ""

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/macros/ide_terminal.py

@@ -64,7 +64,7 @@ class Terminal(CommonTermIde):
         super().handle_extra_args()
 
 
-    def _validate_files_config(self):
+    def _validate_config(self):
         self._check_forbidden_sections(
             "code corr tests secrets REM VIS_REM",
             "No data should be provided in these sections"
@@ -83,7 +83,7 @@ class Terminal(CommonTermIde):
         """
         terminal_div = self.make_terminal(
             self.editor_name,
-            kls = f'{HtmlClass.py_mk_wrapper} {HtmlClass.term_solo}',
+            kls = self._get_runner_html_class(f'{HtmlClass.py_mk_wrapper} {HtmlClass.term_solo}'),
             n_lines_h = self.term_height,
         )
         return terminal_div

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/macros/py_script.py

@@ -27,7 +27,7 @@ from typing import Any, Tuple, TYPE_CHECKING, Type
 
 
 
-from ..tools_and_constants import MACROS_WITH_INDENTS, ScriptData
+from ..tools_and_constants import PmtCte, ScriptData
 from ..parsing import build_code_fence
 from ..plugin.maestro_macros import MaestroMacros
 from ..files_extractors.concrete_extractors import FileExtractor, PythonExtractor, SqlExtractor
@@ -81,7 +81,7 @@ def section(env:MaestroMacros):
     * This macro DOES NOT WORK with content built from different python files. Use the
     `composed_py` macro for this purpose.
     """
-    MACROS_WITH_INDENTS.add('section')
+    PmtCte.MACROS_WITH_INDENTS.add('section')
 
     @wraps(section)
     def _section(
@@ -113,7 +113,7 @@ def section(env:MaestroMacros):
 
 def composition_factory(env:MaestroMacros, func, ExtractorClass:Type[FileExtractor], lang:str):
 
-    MACROS_WITH_INDENTS.add(func.__name__)
+    PmtCte.MACROS_WITH_INDENTS.add(func.__name__)
 
     @wraps(func)
     def _composed(
@@ -173,13 +173,13 @@ def py(env:MaestroMacros):
     Macro python rapide, pour insérer le contenu d'un fichier python. Les parties HDR sont
     automatiquement supprimées, de même que les tests publics (cf. Pyodide-Mkdocs).
     Pour tout autre fichier python, tout le contenu est inséré automatiquement (notamment,
-    pour les fichiers du thème !).
+    pour les fichiers du thème, donc les sections env sont visibles !).
 
     Si l'argument @stop est fourni, ce doit être une chaîne de caractères compatible avec
     `re.split`, SANS matching groupes. Tout contenu après ce token sera ignoré (token compris)
     et "strippé".
     """
-    MACROS_WITH_INDENTS.add('py')
+    PmtCte.MACROS_WITH_INDENTS.add('py')
 
     @wraps(py)
     def wrapped(

{pyodide_mkdocs_theme-5.4.16 → pyodide_mkdocs_theme-5.5.1}/pyodide_mkdocs_theme/pyodide_macros/macros/qcm.py

@@ -28,7 +28,7 @@ from typing import Any, Dict, List, Tuple
 from ..exceptions import PmtMacrosInvalidArgumentError
 from ..parsing import add_indent
 from ..pyodide_logger import logger
-from ..tools_and_constants import MACROS_WITH_INDENTS, HtmlClass, IdeConstants
+from ..tools_and_constants import PmtCte, HtmlClass, PmtCte
 from ..html_dependencies.deps_class import DepKind
 from ..plugin.maestro_macros import MaestroMacros
 
@@ -61,7 +61,7 @@ def multi_qcm(env:MaestroMacros):
     @DEBUG=False:     If True, md output will be printed to the console
     """
 
-    MACROS_WITH_INDENTS.add('multi_qcm')
+    PmtCte.MACROS_WITH_INDENTS.add('multi_qcm')
 
     @wraps(multi_qcm)
     def wrapped(
@@ -175,7 +175,7 @@ def multi_qcm(env:MaestroMacros):
             encrypt_token = ()
             if env.encrypt_comments:
                 env.set_current_page_insertion_needs(DepKind.qcm_encrypt)
-                encrypt_token = ( indent_comment(IdeConstants.encryption_token)+"\n", )
+                encrypt_token = ( indent_comment(PmtCte.encryption_token)+"\n", )
 
             classes = ' '.join((
                 HtmlClass.py_mk_hidden,
@@ -266,7 +266,7 @@ def multi_qcm(env:MaestroMacros):
                 'admo_class': admo_class,
                 'qcm_title': qcm_title,
                 'tag_list_of_qs': tag_list_of_qs,
-                "reveal_rems": reveal_rems,
+                "reveal_rems": env.qcms_reveal_rems,
                 'DEBUG': DEBUG,
             }