Merge branch 'main' into fix/faster-std-rendering

Author: krassowski

.github/workflows/galata.yml

@@ -23,6 +23,8 @@ jobs:
 
       - name: Base Setup
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+        with:
+          python_version: "3.11"
 
       - name: Set up browser cache
         uses: actions/cache@v4

docs/source/extension/extension_points.rst

@@ -74,6 +74,7 @@ Here is a sample block of code that adds a command to the application (given by
       execute: () => {
         console.log(`Executed ${commandID}`);
         toggled = !toggled;
+      }
     });
 
 This example adds a new command, which, when triggered, calls the ``execute`` function.

jupyterlab/extensions/pypi.py

@@ -65,8 +65,8 @@ def make_connection(self, host):
     proxy_host, _, proxy_port = http_proxy.netloc.partition(":")
 
     proxies = {
-        "http://": http_proxy_url,
-        "https://": https_proxy_url,
+        "http://": httpx.HTTPTransport(proxy=http_proxy_url),
+        "https://": httpx.HTTPTransport(proxy=https_proxy_url),
     }
 
     xmlrpc_transport_override = ProxiedTransport()
@@ -131,7 +131,7 @@ def __init__(
         parent: Optional[config.Configurable] = None,
     ) -> None:
         super().__init__(app_options, ext_options, parent)
-        self._httpx_client = httpx.AsyncClient(proxies=proxies)
+        self._httpx_client = httpx.AsyncClient(mounts=proxies)
         # Set configurable cache size to fetch function
         self._fetch_package_metadata = partial(_fetch_package_metadata, self._httpx_client)
         self._observe_package_metadata_cache_size({"new": self.package_metadata_cache_size})

packages/filebrowser/src/model.ts

@@ -609,10 +609,15 @@ export class FileBrowserModel implements IDisposable {
     const path = this._model.path;
     const { sessions } = this.manager.services;
     const { oldValue, newValue } = change;
+    const prefix = this.driveName.length > 0 ? this.driveName + ':' : '';
     const value =
-      oldValue && oldValue.path && PathExt.dirname(oldValue.path) === path
+      oldValue &&
+      oldValue.path &&
+      prefix + PathExt.dirname(oldValue.path) === path
         ? oldValue
-        : newValue && newValue.path && PathExt.dirname(newValue.path) === path
+        : newValue &&
+          newValue.path &&
+          prefix + PathExt.dirname(newValue.path) === path
         ? newValue
         : undefined;
 

packages/filebrowser/test/model.spec.ts

@@ -152,6 +152,28 @@ describe('filebrowser/model', () => {
         expect(called).toBe(true);
       });
 
+      it('should be emitted when a file is created in a drive with a name', async () => {
+        await state.clear();
+        const driveName = 'RTC';
+        const modelWithName = new FileBrowserModel({
+          manager,
+          state,
+          driveName
+        });
+
+        let called = false;
+        modelWithName.fileChanged.connect((sender, args) => {
+          expect(sender).toBe(modelWithName);
+          expect(args.type).toBe('new');
+          expect(args.oldValue).toBeNull();
+          expect(args.newValue!.type).toBe('file');
+          called = true;
+        });
+        await manager.newUntitled({ type: 'file' });
+        expect(called).toBe(true);
+        modelWithName.dispose();
+      });
+
       it('should be emitted when a file is renamed', async () => {
         let called = false;
         model.fileChanged.connect((sender, args) => {

packages/notebook/style/base.css

@@ -204,6 +204,7 @@
   flex: 0 0 auto;
   min-width: 36px;
   color: var(--jp-cell-inprompt-font-color);
+  opacity: 0.5;
   padding: var(--jp-code-padding);
   padding-left: 12px;
   font-family: var(--jp-cell-prompt-font-family);
@@ -221,7 +222,13 @@
   top: 8px;
   left: 8px;
   background: var(--jp-layout-color2);
-  border: var(--jp-border-width) solid var(--jp-input-border-color);
+  border-width: var(--jp-border-width);
+  border-style: solid;
+  border-color: color-mix(
+    in srgb,
+    var(--jp-input-border-color) 20%,
+    transparent
+  );
   box-shadow: 2px 2px 4px 0 rgba(0, 0, 0, 0.12);
 }
 

packages/outputarea/src/model.ts

@@ -358,15 +358,20 @@ export class OutputAreaModel implements IOutputAreaModel {
       const curText = prev.streamText!;
       const newText =
         typeof value.text === 'string' ? value.text : value.text.join('');
-      Private.addText(curText, newText);
+      this._streamIndex = Private.addText(this._streamIndex, curText, newText);
       return this.length;
     }
 
     if (nbformat.isStream(value)) {
       if (typeof value.text !== 'string') {
         value.text = value.text.join('');
       }
-      value.text = Private.processText(value.text);
+      const { text, index } = Private.processText(
+        this._streamIndex,
+        value.text
+      );
+      this._streamIndex = index;
+      value.text = text;
     }
 
     // Create the new item.
@@ -480,6 +485,7 @@ export class OutputAreaModel implements IOutputAreaModel {
   private _changed = new Signal<OutputAreaModel, IOutputAreaModel.ChangedArgs>(
     this
   );
+  private _streamIndex = 0;
 }
 
 /**
@@ -530,14 +536,20 @@ namespace Private {
   /*
    * Handle backspaces in `newText` and concatenates to `text`, if any.
    */
-  export function processText(newText: string, text?: string): string {
+  export function processText(
+    index: number,
+    newText: string,
+    text?: string
+  ): { text: string; index: number } {
     if (text === undefined) {
       text = '';
     }
     if (!(newText.includes('\b') || newText.includes('\r'))) {
-      return text + newText;
+      text =
+        text.slice(0, index) + newText + text.slice(index + newText.length);
+      return { text, index: index + newText.length };
     }
-    let idx0 = text.length;
+    let idx0 = index;
     let idx1: number = -1;
     let lastEnd: number = 0;
     const regex = /[\n\b\r]/;
@@ -587,14 +599,18 @@ namespace Private {
         throw Error(`This should not happen`);
       }
     }
-    return text;
+    return { text, index: idx0 };
   }
 
   /*
    * Concatenate a string to an observable string, handling backspaces.
    */
-  export function addText(curText: IObservableString, newText: string): void {
-    const text = processText(newText, curText.text);
+  export function addText(
+    prevIndex: number,
+    curText: IObservableString,
+    newText: string
+  ): number {
+    const { text, index } = processText(prevIndex, newText, curText.text);
     // Compute the difference between current text and new text.
     let done = false;
     let idx = 0;
@@ -619,5 +635,6 @@ namespace Private {
         idx++;
       }
     }
+    return index;
   }
 }

packages/ui-components/src/components/windowedlist.ts

@@ -1315,6 +1315,7 @@ export class WindowedList<
   private _applyNoWindowingStyles() {
     this._viewport.style.position = 'relative';
     this._viewport.style.top = '0px';
+    this._viewport.style.minHeight = '';
     this._innerElement.style.height = '';
   }
   /**

pyproject.toml

@@ -36,7 +36,7 @@ classifiers = [
 ]
 dependencies = [
     "async_lru>=1.0.0",
-    "httpx>=0.25.0",
+    "httpx~=0.28.0",
     "importlib-metadata>=4.8.3;python_version<\"3.10\"",
     "importlib-resources>=1.4;python_version<\"3.9\"",
     "ipykernel>=6.5.0",