Merge branch 'main' into bugfix/12338

Author: cscheid

news/changelog-1.7.md

@@ -123,20 +123,27 @@ All changes included in 1.7:
 ### `jupyter`
 
 - ([#12114](https://github.com/quarto-dev/quarto-cli/issues/12114)): `JUPYTERCACHE` environment variable from [Jupyter cache CLI](https://jupyter-cache.readthedocs.io/en/latest/using/cli.html) is now respected by Quarto when `cache: true` is used. This environment variable allows to change the path of the cache directory.
+- ([#12374](https://github.com/quarto-dev/quarto-cli/issues/12374)): Detect language properly in Jupyter notebooks that lack the `language` field in their `kernelspec`s.
 
 ## Other Fixes and Improvements
 
+- A new folder `quarto-session-temp` can be created in `.quarto` to store temporary files created by Quarto during a rendering. Reminder: `.quarto` is for internal use of Quarto and should not be versioned (thus added to `.gitignore`).
+- ([fb38eb5](https://github.com/quarto-dev/quarto-cli/commit/fb38eb56c11e09f44cef58fd3b697ff24bb5a3f3)) Use the `latest` parser for Acorn when analyzing JS code imported from OJS blocks.
 - ([#7260](https://github.com/quarto-dev/quarto-cli/issues/7260)): Add support for `active` class in tabsets so the `.active` tab shows up by default.
 - ([#8613](https://github.com/quarto-dev/quarto-cli/issues/8613)): Fix `giscus` color on load to support dark mode (by @kv9898).
 - ([#11441](https://github.com/quarto-dev/quarto-cli/issues/11441)): Don't add newlines around shortcodes during processing.
 - ([#11643](https://github.com/quarto-dev/quarto-cli/issues/11643)): Improve highlighting of nested code block inside markdown code block, i.e. using ` ```{{python}} ` or ` ```python ` inside ` ````markdown` fenced code block.
-- ([fb38eb5](https://github.com/quarto-dev/quarto-cli/commit/fb38eb56c11e09f44cef58fd3b697ff24bb5a3f3)) Use the `latest` parser for Acorn when analyzing JS code imported from OJS blocks.
 - ([#10532](https://github.com/quarto-dev/quarto-cli/issues/10532)): Quarto changed default of `--headless=old` to `--headless` as [Chrome 132 has removed old headless mode](https://developer.chrome.com/blog/removing-headless-old-from-chrome) and only support new mode. For using old mode, `QUARTO_CHROMIUM` could be set to a [new `chrome-headless-shell` binary](https://developer.chrome.com/blog/chrome-headless-shell) or too an older chrome version (between 128 and 132) and `QUARTO_CHROMIUM_HEADLESS_MODE` set to `old` for using old headless mode with that compatabitle version.
 - ([#10961](https://github.com/quarto-dev/quarto-cli/issues/10961)): Add more information on which Chrome Headless will be used in `quarto check install`. This is helpful to help debug mermaid issues.
+- ([#11606](https://github.com/quarto-dev/quarto-cli/discussions/11606)): Added a new `QUARTO_DOCUMENT_FILE` env var available to computation engine to the name of the file currently being rendered.
+- ([#11803](https://github.com/quarto-dev/quarto-cli/pull/11803)): Added a new CLI command `quarto call`. First users of this interface are the new `quarto call engine julia ...` subcommands.
 - ([#11951](https://github.com/quarto-dev/quarto-cli/issues/11951)): Raw LaTeX table without `tbl-` prefix label for using Quarto crossref are now correctly passed through unmodified.
 - ([#12117](https://github.com/quarto-dev/quarto-cli/issues/12117)): Color output to stdout and stderr is now correctly rendered for `html` format in the Jupyter and Julia engines.
 - ([#12264](https://github.com/quarto-dev/quarto-cli/issues/12264)): Upgrade `dart-sass` to 1.85.1.
 - ([#11803](https://github.com/quarto-dev/quarto-cli/pull/11803)): Added a new CLI command `quarto call`. First users of this interface are the new `quarto call engine julia ...` subcommands.
-- A new folder `quarto-session-temp` can be created in `.quarto` to store temporary files created by Quarto during a rendering. Reminder: `.quarto` is for internal use of Quarto and should not be versioned (thus added to `.gitignore`).
-- ([#11606](https://github.com/quarto-dev/quarto-cli/discussions/11606)): Added a new `QUARTO_DOCUMENT_FILE` env var available to computation engine to the name of the file currently being rendered.
 - ([#12338](https://github.com/quarto-dev/quarto-cli/issues/12338)): Add an additional workaround for the SCSS parser used in color variable extraction.
+- ([#12369](https://github.com/quarto-dev/quarto-cli/pull/12369)): `quarto preview` correctly throws a YAML validation error when a `format` key does not conform.
+
+## Languages
+
+- ([#12366](https://github.com/quarto-dev/quarto-cli/pull/12366)): Added Bulgarian translation for Quarto UI text (credit: @sakelariev)

src/command/convert/jupyter.ts

@@ -47,7 +47,23 @@ export async function jupyterNotebookToMarkdown(
 ) {
   // read notebook & alias kernelspec
   const notebook = fixupFrontMatter(jupyterFromFile(file));
-  const kernelspec = notebook.metadata.kernelspec;
+  let kernelspec = notebook.metadata.kernelspec;
+
+  // https://github.com/quarto-dev/quarto-cli/issues/12374
+  // narrow fix for .ipynbs that have a language_info field but no kernelspec.language
+  if (
+    kernelspec.language === undefined && notebook.metadata.language_info?.name
+  ) {
+    kernelspec = {
+      ...kernelspec,
+      language: notebook.metadata.language_info?.name,
+    };
+  }
+  if (kernelspec.language === undefined) {
+    throw new Error(
+      "No language found in kernelspec for notebook " + file,
+    );
+  }
 
   // generate markdown
   const md: string[] = [];

src/command/render/render-contexts.ts

@@ -347,6 +347,11 @@ function mergeQuartoConfigs(
 
   // bibliography needs to always be an array so it can be merged
   const fixupMergeableScalars = (metadata: Metadata) => {
+    // see https://github.com/quarto-dev/quarto-cli/pull/12372
+    // and https://github.com/quarto-dev/quarto-cli/pull/12369
+    // for more details on why we need this check, as a consequence of an unintuitive
+    // ordering of YAML validation operations
+    if (metadata === null) return metadata;
     [
       kBibliography,
       kCss,

src/core/jupyter/types.ts

@@ -74,6 +74,16 @@ export interface JupyterCapabilitiesEx extends JupyterCapabilities {
   venv?: boolean;
 }
 
+// cf https://github.com/jupyter/nbformat/blob/main/nbformat/v4/nbformat.v4.schema.json
+// note that this doesn't directly define the kernelspec as used in kernel.json
+// but defines the kernelspec object used in .ipynb files
+//
+// note in addition that Quarto needs to know the language name which
+// might not come from the kernelspec itself but will exist in a language_info
+// field. When the kernelspec object in a jupyter notebook is missing the language field,
+// this object's language field will come from the language_info.name field
+//
+// see https://github.com/quarto-dev/quarto-cli/issues/12374
 export interface JupyterKernelspec {
   name: string;
   language: string;
@@ -88,10 +98,20 @@ export interface JupyterAssets {
   supporting_dir: string;
 }
 
+// cf https://github.com/jupyter/nbformat/blob/main/nbformat/v4/nbformat.v4.schema.json
+export type JupyterLanguageInfo = {
+  name: string;
+  codemirror_mode?: string | Record<string, unknown>;
+  file_extension?: string;
+  mimetype?: string;
+  pygments_lexer?: string;
+};
+
 export interface JupyterNotebook {
   metadata: {
     kernelspec: JupyterKernelspec;
     widgets?: Record<string, unknown>;
+    language_info?: JupyterLanguageInfo;
     [key: string]: unknown;
   };
   cells: JupyterCell[];

src/execute/jupyter/jupyter-kernel.ts

@@ -55,7 +55,8 @@ export async function executeKernelOneshot(
   }
 
   trace(options, "Executing notebook with oneshot kernel");
-  const debug = !!options.format.execute[kExecuteDebug];
+  const debug = !!options.format.execute[kExecuteDebug] ||
+    (!!Deno.env.get("QUARTO_JUPYTER_DEBUG"));
   const result = await execJupyter(
     "execute",
     { ...options, debug },

src/execute/jupyter/jupyter.ts

@@ -181,7 +181,20 @@ export const jupyterEngine: ExecutionEngine = {
     let nb: JupyterNotebook | undefined;
     if (isJupyterNotebook(file)) {
       const nbJSON = Deno.readTextFileSync(file);
-      nb = JSON.parse(nbJSON) as JupyterNotebook;
+      const nbRaw = JSON.parse(nbJSON);
+
+      // https://github.com/quarto-dev/quarto-cli/issues/12374
+      // kernelspecs are not guaranteed to have a language field
+      // so we need to check for it and if not present
+      // use the language_info.name field
+      if (
+        nbRaw.metadata.kernelspec &&
+        nbRaw.metadata.kernelspec.language === undefined &&
+        nbRaw.metadata.language_info?.name
+      ) {
+        nbRaw.metadata.kernelspec.language = nbRaw.metadata.language_info.name;
+      }
+      nb = nbRaw as JupyterNotebook;
     }
 
     // cache check for percent script

src/resources/jupyter/notebook.py

@@ -36,6 +36,14 @@
 
 NB_FORMAT_VERSION = 4
 
+def get_language_from_nb_metadata(metadata):
+   ks_lang = metadata.kernelspec.get("language", None)
+   li_name = None
+   li = metadata.get("language_info", None)
+   if li:
+      li_name = metadata.language_info.get("name", None)
+   return ks_lang or li_name
+
 # exception to indicate the kernel needs restarting
 class RestartKernel(Exception):
    pass
@@ -192,7 +200,7 @@ def notebook_execute(options, status):
       nb_parameterize(nb, quarto_kernel_setup_options["params"])
 
    # insert setup cell
-   setup_cell = nb_setup_cell(nb.metadata.kernelspec, quarto_kernel_setup_options)
+   setup_cell = nb_setup_cell(nb, quarto_kernel_setup_options)
    nb.cells.insert(0, setup_cell)
 
    nb_cache = retrieve_nb_from_cache(nb, status, **quarto_kernel_setup_options)
@@ -254,7 +262,8 @@ def handle_meta_object(obj):
       if cell.cell_type == 'code':
          total_code_cells += 1
       # map cells to their labels
-      label = nb_cell_yaml_options(client.nb.metadata.kernelspec.language, cell).get('label', '')
+      language = get_language_from_nb_metadata(client.nb.metadata)
+      label = nb_cell_yaml_options(language, cell).get('label', '')
       cell_labels.append(label)
       # find max label length
       max_label_len = max(max_label_len, len(label))
@@ -350,7 +359,7 @@ def handle_meta_object(obj):
    nb_write(client.nb, input)
 
    # execute cleanup cell
-   cleanup_cell = nb_cleanup_cell(nb.metadata.kernelspec, resource_dir)
+   cleanup_cell = nb_cleanup_cell(nb, resource_dir)
    if cleanup_cell:
       kernel_supports_daemonization = True
       nb.cells.append(cleanup_cell)
@@ -425,18 +434,20 @@ async def get_info():
 def nb_write(nb, input):
    nbformat.write(nb, input, version = NB_FORMAT_VERSION)
 
-def nb_setup_cell(kernelspec, options):
+def nb_setup_cell(nb, options):
    options = dict(options)
    options["allow_empty"] = True
-   return nb_language_cell('setup', kernelspec, **options)
+   return nb_language_cell('setup', nb, **options)
 
-def nb_cleanup_cell(kernelspec, resource_dir):
-   return nb_language_cell('cleanup', kernelspec, resource_dir, False)
+def nb_cleanup_cell(nb, resource_dir):
+   return nb_language_cell('cleanup', nb, resource_dir, False)
 
-def nb_language_cell(name, kernelspec, resource_dir, allow_empty, **args):
-   trace(json.dumps(kernelspec, indent=2))
+def nb_language_cell(name, nb, resource_dir, allow_empty, **args):
+   kernelspec = nb.metadata.kernelspec
+   language = get_language_from_nb_metadata(nb.metadata)
+   trace(json.dumps(nb.metadata, indent=2))
    source = ''
-   lang_dir = os.path.join(resource_dir, 'jupyter', 'lang',  kernelspec.language)
+   lang_dir = os.path.join(resource_dir, 'jupyter', 'lang', language)
    if os.path.isdir(lang_dir):
       cell_file = glob.glob(os.path.join(lang_dir, name + '.*'))
       # base64-encode the run_path given
@@ -445,7 +456,7 @@ def nb_language_cell(name, kernelspec, resource_dir, allow_empty, **args):
          with open(cell_file[0], 'r') as file:
             source = file.read().format(**args)
    else:
-      trace(f'No {kernelspec.language} directory found in {lang_dir}')
+      trace(f'No {language} directory found in {lang_dir}')
       trace(f'Will look for explicit quarto setup cell information in kernelspec dir')
       try:
          with open(os.path.join(kernelspec.path, f"quarto_{name}_cell"), 'r') as file:
@@ -500,8 +511,9 @@ def nb_kernel_dependencies(setup_cell):
 
 def cell_execute(client, cell, index, execution_count, eval_default, store_history):
 
+   language = get_language_from_nb_metadata(client.nb.metadata)
    # read cell options
-   cell_options = nb_cell_yaml_options(client.nb.metadata.kernelspec.language, cell)
+   cell_options = nb_cell_yaml_options(language, cell)
 
    # check options for eval and error
    eval = cell_options.get('eval', eval_default)
@@ -560,7 +572,7 @@ def clear_user_expressions():
             del metadata["user_expressions"]
 
    # find expressions in source
-   language = client.nb.metadata.kernelspec.language
+   language = get_language_from_nb_metadata(client.nb.metadata)
    source = ''.join(cell.source)
    expressions = re.findall(
       fr'(?:^|[^`])`{{{language}}}[ \t]([^`]+)`',
@@ -623,7 +635,7 @@ def nb_parameterize(nb, params):
 
    # alias kernel name and language
    kernel_name = nb.metadata.kernelspec.name
-   language = nb.metadata.kernelspec.language
+   language = get_language_from_nb_metadata(nb.metadata)
 
    # find params index and note any tags/yaml on it (exit if no params)
    params_index = find_first_tagged_cell_index(nb, "parameters")
@@ -701,7 +713,7 @@ def find_first_tagged_cell_index(nb, tag):
    return parameters_indices[0]
 
 def nb_strip_yaml_options(client, source):
-   yaml_lines = nb_cell_yaml_lines(client.nb.metadata.kernelspec.language, source)  
+   yaml_lines = nb_cell_yaml_lines(get_language_from_nb_metadata(client.nb.metadata), source)  
    num_yaml_lines = len(yaml_lines)
    if num_yaml_lines > 0:
       return "\n".join(source.splitlines()[num_yaml_lines:])

src/resources/language/_language-bg.yml

@@ -0,0 +1,131 @@
+toc-title-document: "Съдържание"
+toc-title-website: "На тази страница"
+
+related-formats-title: "Други формати"
+related-notebooks-title: "Тетрадки"
+source-notebooks-prefix: "Източник"
+other-links-title: "Други връзки"
+code-links-title: "Връзки към код"
+launch-dev-container-title: "Стартиране на контейнер за разработка"
+launch-binder-title: "Стартиране на Binder"
+
+article-notebook-label: "Статия - Тетрадка"
+notebook-preview-download: "Изтегли тетрадка"
+notebook-preview-download-src: "Изтегли източник"
+notebook-preview-back: "Обратно към статията"
+manuscript-meca-bundle: "MECA пакет"
+
+section-title-abstract: "Резюме"
+section-title-appendices: "Приложения"
+section-title-footnotes: "Бележки под линия"
+section-title-references: "Референции"
+section-title-reuse: "Повторна употреба"
+section-title-copyright: "Авторски права"
+section-title-citation: "Цитиране"
+
+appendix-attribution-cite-as: "За атрибуция, моля цитирайте това произведение като:"
+appendix-attribution-bibtex: "Цитиране в BibTeX:"
+appendix-view-license: "Преглед на лиценз"
+
+title-block-author-single: "Автор"
+title-block-author-plural: "Автори"
+title-block-affiliation-single: "Институция"
+title-block-affiliation-plural: "Институции"
+title-block-published: "Публикувано"
+title-block-modified: "Променено"
+title-block-keywords: "Ключови думи"
+
+callout-tip-title: "Съвет"
+callout-note-title: "Бележка"
+callout-warning-title: "Предупреждение"
+callout-important-title: "Важно"
+callout-caution-title: "Внимание"
+
+code-summary: "Код"
+
+code-tools-menu-caption: "Код"
+code-tools-show-all-code: "Покажи целия код"
+code-tools-hide-all-code: "Скрий целия код"
+code-tools-view-source: "Преглед на източника"
+code-tools-source-code: "Изходен код"
+
+tools-share: "Сподели"
+tools-download: "Изтегли"
+
+code-line: "Ред"
+code-lines: "Редове"
+
+copy-button-tooltip: "Копирай в клипборда"
+copy-button-tooltip-success: "Копирано!"
+
+repo-action-links-edit: "Редактирай тази страница"
+repo-action-links-source: "Преглед на източника"
+repo-action-links-issue: "Докладвай проблем"
+
+back-to-top: "Обратно в началото"
+
+search-no-results-text: "Няма резултати"
+search-matching-documents-text: "съвпадащи документи"
+search-copy-link-title: "Копирай връзката към търсенето"
+search-hide-matches-text: "Скрий допълнителните съвпадения"
+search-more-match-text: "още едно съвпадение в този документ"
+search-more-matches-text: "още съвпадения в този документ"
+search-clear-button-title: "Изчисти"
+search-text-placeholder: ""
+search-detached-cancel-button-title: "Отказ"
+search-submit-button-title: "Търси"
+search-label: "Търсене"
+
+toggle-section: "Превключи секцията"
+toggle-sidebar: "Превключи навигацията в страничната лента"
+toggle-dark-mode: "Превключи на тъмен режим"
+toggle-reader-mode: "Превключи на режим за четене"
+toggle-navigation: "Превключи навигацията"
+
+crossref-fig-title: "Фигура"
+crossref-tbl-title: "Таблица"
+crossref-lst-title: "Изброяване"
+crossref-thm-title: "Теорема"
+crossref-lem-title: "Лема"
+crossref-cor-title: "Следствие"
+crossref-prp-title: "Предложение"
+crossref-cnj-title: "Хипотеза"
+crossref-def-title: "Дефиниция"
+crossref-exm-title: "Пример"
+crossref-exr-title: "Упражнение"
+crossref-ch-prefix: "Глава"
+crossref-apx-prefix: "Приложение"
+crossref-sec-prefix: "Раздел"
+crossref-eq-prefix: "Уравнение"
+crossref-lof-title: "Списък на фигурите"
+crossref-lot-title: "Списък на таблиците"
+crossref-lol-title: "Списък на изброяванията"
+
+environment-proof-title: "Доказателство"
+environment-remark-title: "Забележка"
+environment-solution-title: "Решение"
+
+listing-page-order-by: "Подреди по"
+listing-page-order-by-default: "По подразбиране"
+listing-page-order-by-date-asc: "Най-старо"
+listing-page-order-by-date-desc: "Най-ново"
+listing-page-order-by-number-desc: "От високо към ниско"
+listing-page-order-by-number-asc: "От ниско към високо"
+listing-page-field-date: "Дата"
+listing-page-field-title: "Заглавие"
+listing-page-field-description: "Описание"
+listing-page-field-author: "Автор"
+listing-page-field-filename: "Име на файла"
+listing-page-field-filemodified: "Променено"
+listing-page-field-subtitle: "Подзаглавие"
+listing-page-field-readingtime: "Време за четене"
+listing-page-field-wordcount: "Брой думи"
+listing-page-field-categories: "Категории"
+listing-page-minutes-compact: "{0} мин"
+listing-page-category-all: "Всички"
+listing-page-no-matches: "Няма съвпадения"
+listing-page-words: "{0} думи"
+listing-page-filter: "Филтър"
+
+draft: "Чернова"
+