jupyterlab 4.4.0a0__py3-none-any.whl → 4.4.0a2__py3-none-any.whl

jupyterlab/_version.py

@@ -6,7 +6,7 @@ from collections import namedtuple
 VersionInfo = namedtuple("VersionInfo", ["major", "minor", "micro", "releaselevel", "serial"])
 
 # DO NOT EDIT THIS DIRECTLY!  It is managed by bumpversion
-version_info = VersionInfo(4, 4, 0, "alpha", 0)
+version_info = VersionInfo(4, 4, 0, "alpha", 2)
 
 _specifier_ = {"alpha": "a", "beta": "b", "candidate": "rc", "final": ""}
 

jupyterlab/commands.py

@@ -23,7 +23,7 @@ from glob import glob
 from pathlib import Path
 from tempfile import TemporaryDirectory
 from threading import Event
-from typing import FrozenSet, Optional
+from typing import Optional
 from urllib.error import URLError
 from urllib.request import Request, quote, urljoin, urlopen
 
@@ -2348,14 +2348,10 @@ def _compare_ranges(spec1, spec2, drop_prerelease1=False, drop_prerelease2=False
 
         # Check for overlap.
         if (
-            gte(x1, y1, True)
-            and ly(x1, y2, True)
-            or gy(x2, y1, True)
-            and ly(x2, y2, True)
-            or gte(y1, x1, True)
-            and lx(y1, x2, True)
-            or gx(y2, x1, True)
-            and lx(y2, x2, True)
+            (gte(x1, y1, True) and ly(x1, y2, True))
+            or (gy(x2, y1, True) and ly(x2, y2, True))
+            or (gte(y1, x1, True) and lx(y1, x2, True))
+            or (gx(y2, x1, True) and lx(y2, x2, True))
         ):
             # if we ever find an overlap, we can return immediately
             return 0
@@ -2403,7 +2399,7 @@ def _is_disabled(name, disabled=None):
 class LockStatus:
     entire_extension_locked: bool
     # locked plugins are only given if extension is not locked as a whole
-    locked_plugins: Optional[FrozenSet[str]] = None
+    locked_plugins: Optional[frozenset[str]] = None
 
 
 def _is_locked(name, locked=None) -> LockStatus:

jupyterlab/extensions/manager.py

@@ -7,7 +7,7 @@ import json
 import re
 from dataclasses import dataclass, field, fields, replace
 from pathlib import Path
-from typing import Dict, FrozenSet, List, Optional, Set, Tuple, Union
+from typing import Optional, Union
 
 import tornado
 from jupyterlab_server.translation_utils import translator
@@ -115,7 +115,7 @@ class ActionResult:
     #       keeping str for simplicity
     status: str
     message: Optional[str] = None
-    needs_restart: List[str] = field(default_factory=list)
+    needs_restart: list[str] = field(default_factory=list)
 
 
 @dataclass(frozen=True)
@@ -129,7 +129,7 @@ class PluginManagerOptions:
             The plugin names need to follow colon-separated format of `extension:plugin`.
     """
 
-    lock_rules: FrozenSet[str] = field(default_factory=frozenset)
+    lock_rules: frozenset[str] = field(default_factory=frozenset)
     lock_all: bool = False
 
 
@@ -144,8 +144,8 @@ class ExtensionManagerOptions(PluginManagerOptions):
         listings_tornado_options: The optional kwargs to use for the listings HTTP requests as described on https://www.tornadoweb.org/en/stable/httpclient.html#tornado.httpclient.HTTPRequest
     """
 
-    allowed_extensions_uris: Set[str] = field(default_factory=set)
-    blocked_extensions_uris: Set[str] = field(default_factory=set)
+    allowed_extensions_uris: set[str] = field(default_factory=set)
+    blocked_extensions_uris: set[str] = field(default_factory=set)
     listings_refresh_seconds: int = 60 * 60
     listings_tornado_options: dict = field(default_factory=dict)
 
@@ -174,7 +174,7 @@ class ExtensionsCache:
         last_page: Last available page result
     """
 
-    cache: Dict[int, Optional[Dict[str, ExtensionPackage]]] = field(default_factory=dict)
+    cache: dict[int, Optional[dict[str, ExtensionPackage]]] = field(default_factory=dict)
     last_page: int = 1
 
 
@@ -225,7 +225,7 @@ class PluginManager(LoggingConfigurable):
             "allLocked": self.options.lock_all,
         }
 
-    def _find_locked(self, plugins_or_extensions: List[str]) -> FrozenSet[str]:
+    def _find_locked(self, plugins_or_extensions: list[str]) -> frozenset[str]:
         """Find a subset of plugins (or extensions) which are locked"""
         if self.options.lock_all:
             return set(plugins_or_extensions)
@@ -244,7 +244,7 @@ class PluginManager(LoggingConfigurable):
                 locked_subset.add(plugin)
         return locked_subset
 
-    async def disable(self, plugins: Union[str, List[str]]) -> ActionResult:
+    async def disable(self, plugins: Union[str, list[str]]) -> ActionResult:
         """Disable a set of plugins (or an extension).
 
         Args:
@@ -270,7 +270,7 @@ class PluginManager(LoggingConfigurable):
         except Exception as err:
             return ActionResult(status="error", message=repr(err))
 
-    async def enable(self, plugins: Union[str, List[str]]) -> ActionResult:
+    async def enable(self, plugins: Union[str, list[str]]) -> ActionResult:
         """Enable a set of plugins (or an extension).
 
         Args:
@@ -336,7 +336,7 @@ class ExtensionManager(PluginManager):
         self.app_dir = Path(self.app_options.app_dir)
         self.core_config = self.app_options.core_config
         self.options = ExtensionManagerOptions(**(ext_options or {}))
-        self._extensions_cache: Dict[Optional[str], ExtensionsCache] = {}
+        self._extensions_cache: dict[Optional[str], ExtensionsCache] = {}
         self._listings_cache: Optional[dict] = None
         self._listings_block_mode = True
         self._listing_fetch: Optional[tornado.ioloop.PeriodicCallback] = None
@@ -376,7 +376,7 @@ class ExtensionManager(PluginManager):
 
     async def list_packages(
         self, query: str, page: int, per_page: int
-    ) -> Tuple[Dict[str, ExtensionPackage], Optional[int]]:
+    ) -> tuple[dict[str, ExtensionPackage], Optional[int]]:
         """List the available extensions.
 
         Args:
@@ -457,7 +457,7 @@ class ExtensionManager(PluginManager):
 
     async def list_extensions(
         self, query: Optional[str] = None, page: int = 1, per_page: int = 30
-    ) -> Tuple[List[ExtensionPackage], Optional[int]]:
+    ) -> tuple[list[ExtensionPackage], Optional[int]]:
         """List extensions for a given ``query`` search term.
 
         This will return the extensions installed (if ``query`` is None) or
@@ -539,7 +539,7 @@ class ExtensionManager(PluginManager):
 
     async def _get_installed_extensions(
         self, get_latest_version=True
-    ) -> Dict[str, ExtensionPackage]:
+    ) -> dict[str, ExtensionPackage]:
         """Get the installed extensions.
 
         Args:

jupyterlab/extensions/pypi.py

@@ -19,13 +19,14 @@ from os import environ
 from pathlib import Path
 from subprocess import CalledProcessError, run
 from tarfile import TarFile
-from typing import Any, Callable, Dict, List, Optional, Tuple
+from typing import Any, Callable, Optional
 from urllib.parse import urlparse
 from zipfile import ZipFile
 
 import httpx
 import tornado
 from async_lru import alru_cache
+from packaging.version import Version
 from traitlets import CFloat, CInt, Unicode, config, observe
 
 from jupyterlab._version import __version__
@@ -49,8 +50,6 @@ class ProxiedTransport(xmlrpc.client.Transport):
         return connection
 
 
-xmlrpc_transport_override = None
-
 all_proxy_url = environ.get("ALL_PROXY")
 # For historical reasons, we also support the lowercase environment variables.
 # Info: https://about.gitlab.com/blog/2021/01/27/we-need-to-talk-no-proxy/
@@ -58,16 +57,31 @@ http_proxy_url = environ.get("http_proxy") or environ.get("HTTP_PROXY") or all_p
 https_proxy_url = (
     environ.get("https_proxy") or environ.get("HTTPS_PROXY") or http_proxy_url or all_proxy_url
 )
-proxies = None
+
+# sniff ``httpx`` version for version-sensitive API
+_httpx_version = Version(httpx.__version__)
+_httpx_client_args = {}
+
+xmlrpc_transport_override = None
 
 if http_proxy_url:
     http_proxy = urlparse(http_proxy_url)
     proxy_host, _, proxy_port = http_proxy.netloc.partition(":")
 
-    proxies = {
-        "http://": http_proxy_url,
-        "https://": https_proxy_url,
-    }
+    if _httpx_version >= Version("0.28.0"):
+        _httpx_client_args = {
+            "mounts": {
+                "http://": httpx.AsyncHTTPTransport(proxy=http_proxy_url),
+                "https://": httpx.AsyncHTTPTransport(proxy=https_proxy_url),
+            }
+        }
+    else:
+        _httpx_client_args = {
+            "proxies": {
+                "http://": http_proxy_url,
+                "https://": https_proxy_url,
+            }
+        }
 
     xmlrpc_transport_override = ProxiedTransport()
     xmlrpc_transport_override.set_proxy(proxy_host, proxy_port)
@@ -131,7 +145,7 @@ class PyPIExtensionManager(ExtensionManager):
         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(**_httpx_client_args)
         # 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})
@@ -239,7 +253,7 @@ class PyPIExtensionManager(ExtensionManager):
 
     async def list_packages(
         self, query: str, page: int, per_page: int
-    ) -> Tuple[Dict[str, ExtensionPackage], Optional[int]]:
+    ) -> tuple[dict[str, ExtensionPackage], Optional[int]]:
         """List the available extensions.
 
         Note:
@@ -307,7 +321,7 @@ class PyPIExtensionManager(ExtensionManager):
 
         return extensions, math.ceil((counter + 1) / per_page)
 
-    async def __get_all_extensions(self) -> List[Tuple[str, str]]:
+    async def __get_all_extensions(self) -> list[tuple[str, str]]:
         if self.__all_packages_cache is None or datetime.now(
             tz=timezone.utc
         ) > self.__last_all_packages_request_time + timedelta(seconds=self.cache_timeout):
@@ -336,9 +350,10 @@ class PyPIExtensionManager(ExtensionManager):
             The action result
         """
         current_loop = tornado.ioloop.IOLoop.current()
-        with tempfile.TemporaryDirectory() as ve_dir, tempfile.NamedTemporaryFile(
-            mode="w+", dir=ve_dir, delete=False
-        ) as fconstraint:
+        with (
+            tempfile.TemporaryDirectory() as ve_dir,
+            tempfile.NamedTemporaryFile(mode="w+", dir=ve_dir, delete=False) as fconstraint,
+        ):
             fconstraint.write(f"jupyterlab=={__version__}")
             fconstraint.flush()
 

jupyterlab/extensions/readonly.py

@@ -4,7 +4,7 @@
 # Distributed under the terms of the Modified BSD License.
 
 import sys
-from typing import Dict, Optional, Tuple
+from typing import Optional
 
 from jupyterlab_server.translation_utils import translator
 
@@ -31,7 +31,7 @@ class ReadOnlyExtensionManager(ExtensionManager):
 
     async def list_packages(
         self, query: str, page: int, per_page: int
-    ) -> Tuple[Dict[str, ExtensionPackage], Optional[int]]:
+    ) -> tuple[dict[str, ExtensionPackage], Optional[int]]:
         """List the available extensions.
 
         Args: