Skip to main content

jupyterlab-diff

Github Actions Status version on npm version on PyPI version on conda-forge

A JupyterLab extension for showing cell diffs with multiple diffing strategies.

Requirements

  • JupyterLab >= 4.0.0

Installation

PyPI Installation

pip install jupyterlab_diff

Development Installation

# Clone the repository
git clone https://github.com/jupyter-ai-contrib/jupyterlab-diff.git
cd jupyterlab-diff

# Install the extension in development mode
pip install -e .
jupyter-builder develop . --overwrite

Usage

Commands

The extension provides commands to show diffs in multiple formats:

  • jupyterlab-diff:split-cell-diff - Show cell diff using split view (side-by-side comparison)
  • jupyterlab-diff:unified-cell-diff - Show cell diff using unified view
  • jupyterlab-diff:unified-file-diff - Show file diff using unified view for regular Python files and other text files

https://github.com/user-attachments/assets/0dacd7f0-5963-4ebe-81da-2958f0117071

Programmatic Usage

Split Cell Diff (Side-by-side View)

app.commands.execute('jupyterlab-diff:split-cell-diff', {
  cellId: 'cell-id',
  originalSource: 'print("Hello")',
  newSource: 'print("Hello, World!")',
  showActionButtons: true,
  openDiff: true
});

Unified Cell Diff

app.commands.execute('jupyterlab-diff:unified-cell-diff', {
  cellId: 'cell-id',
  originalSource: 'print("Hello")',
  newSource: 'print("Hello, World!")',
  showActionButtons: true
});

Unified File Diff

app.commands.execute('jupyterlab-diff:unified-file-diff', {
  filePath: '/path/to/file.py',
  originalSource: 'print("Hello")',
  newSource: 'print("Hello, World!")',
  showActionButtons: true
});

Browser console via window.jupyterapp

The commands can also be run from the browser console (for example during development) via the app object exposed as window.jupyterapp. The commands can be executed exactly the same way using window.jupyterapp.commands.execute(...).

First JupyterLab needs to be started with the --expose-app-in-browser flag to expose window.jupyterapp:

jupyter lab --expose-app-in-browser

Then, in the browser dev tools console:

window.jupyterapp.commands.execute('jupyterlab-diff:split-cell-diff', {
  originalSource: `def add():\n  return\n`,
  newSource: `def add(a, b):\n  return a + b\n`,
  showActionButtons: true
});

Command Arguments

jupyterlab-diff:split-cell-diff (Split View)

Argument Type Required Description
cellId string No ID of the cell to show diff for. If not provided, uses the active cell
originalSource string Yes Original source code to compare against
newSource string Yes New source code to compare with
showActionButtons boolean No Whether to show action buttons in the diff widget (default: true)
notebookPath string No Path to the notebook containing the cell. If not provided, uses the current notebook
openDiff boolean No Whether to open the diff widget automatically (default: true)

jupyterlab-diff:unified-cell-diff (Unified View)

Argument Type Required Description
cellId string No ID of the cell to show diff for. If not provided, uses the active cell
originalSource string Yes Original source code to compare against
newSource string Yes New source code to compare with
showActionButtons boolean No Whether to show action buttons for chunk acceptance (default: true)
allowInlineDiffs boolean No Whether to show inline diffs in the diff widget (default: false)
notebookPath string No Path to the notebook containing the cell. If not provided, uses the current notebook

jupyterlab-diff:unified-file-diff (File Diff)

Argument Type Required Description
filePath string No Path to the file to diff. Defaults to current file in editor.
originalSource string Yes Original source code to compare against
newSource string Yes New source code to compare with
showActionButtons boolean No Whether to show action buttons for chunk acceptance (default: true)
allowInlineDiffs boolean No Whether to show inline diffs in the diff widget (default: false)

Architecture

Diff Strategies

The extension provides two diff viewing strategies:

  • Split diff (split-cell-diff): Uses CodeMirror's two-pane view. Displays original and modified code side-by-side in separate panels with diff highlighting.

  • Unified diff (unified-cell-diff/unified-file-diff): Uses CodeMirror's unifiedMergeView. Displays changes in a single unified view with added/removed lines clearly marked. Can be used for both cell diffs and regular file diffs.

Contributing

We welcome contributions from the community! To contribute:

  • Fork the repository
  • Make a development install of jupyterlab-diff
  • Create a new branch
  • Make your changes
  • Submit a pull request For more details, check out our CONTRIBUTING.md.

Uninstall

To remove the extension, execute:

pip uninstall jupyterlab_diff

Troubleshoot

To check the frontend extension is installed:

jupyter labextension list

Download files

Download the file for your platform. If you're not sure which to choose, learn more about installing packages.

Source Distribution

jupyterlab_diff-0.7.1.tar.gz (260.5 kB view details)

Uploaded Source

Built Distribution

If you're not sure about the file name format, learn more about wheel file names.

jupyterlab_diff-0.7.1-py3-none-any.whl (123.6 kB view details)

Uploaded Python 3

File details

Details for the file jupyterlab_diff-0.7.1.tar.gz.

File metadata

  • Download URL: jupyterlab_diff-0.7.1.tar.gz
  • Upload date:
  • Size: 260.5 kB
  • Tags: Source
  • Uploaded using Trusted Publishing? Yes
  • Uploaded via: twine/7.0.0 CPython/3.12.13

File hashes

Hashes for jupyterlab_diff-0.7.1.tar.gz
Algorithm Hash digest
SHA256 12b3f055f0fccef0f89a31e1f9c60d322fe9a62e41bc3c564fd8a202c2e158dc
MD5 636d8ffd48099077c78041947dd64a6b
BLAKE2b-256 21ccb6e24ba97f6b73bfb3503baf0f86963f43024632004d61dcd54dcd1945d5

See more details on using hashes here.

File details

Details for the file jupyterlab_diff-0.7.1-py3-none-any.whl.

File metadata

  • Download URL: jupyterlab_diff-0.7.1-py3-none-any.whl
  • Upload date:
  • Size: 123.6 kB
  • Tags: Python 3
  • Uploaded using Trusted Publishing? Yes
  • Uploaded via: twine/7.0.0 CPython/3.12.13

File hashes

Hashes for jupyterlab_diff-0.7.1-py3-none-any.whl
Algorithm Hash digest
SHA256 07bb8703f621c0495d46b7ea250250d0adddfa7d262713fe1228a1024af3e1a8
MD5 589371fc2bc8476579747a60f8a25b09
BLAKE2b-256 bcc18c8d9031a148ecbfa24ed49f0acc4ea678b6dc012b9fd6398f227a4ca67a

See more details on using hashes here.

Release history Release notifications | RSS feed

This release

0.7.1 This release

2 files

0.7.0

2 files

0.6.1

2 files

0.6.0

2 files

Anthropic, PBC Visionary sponsor Bloomberg Visionary sponsor Hudson River Trading Visionary sponsor Meta Visionary sponsor NVIDIA Visionary sponsor Microsoft Sustainability sponsor Depot Continuous Integration AWS Cloud computing and Security Sponsor Datadog Monitoring Fastly CDN Google Download Analytics Sentry Error logging StatusPage Status page