Changed parameter inspection to reuse utils funcs (#736)

nteract · Nov 2, 2023 · 8f16a9f · 8f16a9f
1 parent a9d2686
commit 8f16a9f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## Unreleased
+
+- Changed parameter inspection to raise the same error messages as other pathways for missing kernel name and language
+
 ## 2.5.0
 
 - Added support for python 3.11 and 3.12 [PR #733](https://github.com/nteract/papermill/pull/733)

diff --git a/papermill/execute.py b/papermill/execute.py
@@ -91,7 +91,7 @@ def execute_notebook(
 
         # Parameterize the Notebook.
         if parameters:
-            parameter_predefined = _infer_parameters(nb)
+            parameter_predefined = _infer_parameters(nb, name=kernel_name, language=language)
             parameter_predefined = {p.name for p in parameter_predefined}
             for p in parameters:
                 if p not in parameter_predefined:

diff --git a/papermill/inspection.py b/papermill/inspection.py
@@ -7,7 +7,7 @@
 from .log import logger
 from .parameterize import add_builtin_parameters, parameterize_path
 from .translators import papermill_translators
-from .utils import any_tagged_cell, find_first_tagged_cell_index
+from .utils import any_tagged_cell, find_first_tagged_cell_index, nb_kernel_name, nb_language
 
 
 def _open_notebook(notebook_path, parameters):
@@ -19,7 +19,7 @@ def _open_notebook(notebook_path, parameters):
         return load_notebook_node(input_path)
 
 
-def _infer_parameters(nb):
+def _infer_parameters(nb, name=None, language=None):
     """Infer the notebook parameters.
 
     Parameters
@@ -38,8 +38,9 @@ def _infer_parameters(nb):
     if parameter_cell_idx < 0:
         return params
     parameter_cell = nb.cells[parameter_cell_idx]
-    kernel_name = nb.metadata.kernelspec.name
-    language = nb.metadata.kernelspec.language
+
+    kernel_name = nb_kernel_name(nb, name)
+    language = nb_language(nb, language)
 
     translator = papermill_translators.find_translator(kernel_name, language)
     try: