Changes for Jupyter server

Author: N-Holzschuch

packages/iphone-osx.meson

@@ -6,7 +6,7 @@ endian='little'
 
 [constants]
 # Meson does not read environment variables. So we use sed.
-prefix = '/Users/holzschu/src/Xcode_iPad/a-Shell/cpython'
+prefix = '/Users/holzschu/src/Xcode_iPad/Carnets/cpython'
 pandas = prefix +  '/packages/pandas-2.0.3'
 toolchain = '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk'
 common_flags = ['-isysroot', toolchain, '-arch', 'arm64', '-miphoneos-version-min=14.0', '-I' + prefix, '-I' + prefix + '/Frameworks_iphoneos/include/', '-I' + pandas + '/pandas/_libs/src/', '-DCYTHON_PEP489_MULTI_PHASE_INIT=0', '-DCYTHON_USE_DICT_VERSIONS=0', '-falign-functions=8', '-F' + prefix + '/Frameworks_iphoneos']

packages/jupyter_server_nbconvert_handlers.py

@@ -12,7 +12,7 @@
 from tornado import web
 from tornado.log import app_log
 
-from jupyter_server.auth import authorized
+from jupyter_server.auth.decorator import authorized
 
 from ..base.handlers import FilesRedirectHandler, JupyterHandler, path_regex
 
@@ -188,6 +188,7 @@ async def post(self, format):
         exporter = get_exporter(format, config=self.config)
 
         model = self.get_json_body()
+        assert model is not None
         name = model.get("name", "notebook.ipynb")
         nbnode = from_dict(model["content"])
 

packages/jupyter_server_services_contents_filecheckpoints.py

@@ -43,10 +43,9 @@ class FileCheckpoints(FileManagerMixin, Checkpoints):
     root_dir = Unicode(config=True)
 
     def _root_dir_default(self):
-        try:
-            return self.parent.root_dir
-        except AttributeError:
+        if not self.parent:
             return os.getcwd()
+        return self.parent.root_dir
 
     # ContentsManager-dependent checkpoint API
     def create_checkpoint(self, contents_mgr, path):
@@ -108,11 +107,7 @@ def checkpoint_path(self, checkpoint_id, path):
         parent, name = ("/" + path).rsplit("/", 1)
         parent = parent.strip("/")
         basename, ext = os.path.splitext(name)
-        filename = "{name}-{checkpoint_id}{ext}".format(
-            name=basename,
-            checkpoint_id=checkpoint_id,
-            ext=ext,
-        )
+        filename = f"{basename}-{checkpoint_id}{ext}"
         os_path = self._get_os_path(path=parent)
         cp_dir = os.path.join(os_path, self.checkpoint_dir)
         # iOS, move checkpoint directory to ~/Documents if local dir is not writeable

packages/jupyter_server_services_contents_fileio.py

@@ -15,6 +15,7 @@
 from tornado.web import HTTPError
 from traitlets import Bool
 from traitlets.config import Configurable
+from traitlets.config.configurable import LoggingConfigurable
 
 from jupyter_server.utils import ApiPath, to_api_path, to_os_path
 
@@ -165,7 +166,7 @@ def _simple_writing(path, text=True, encoding="utf-8", log=None, **kwargs):
     fileobj.close()
 
 
-class FileManagerMixin(Configurable):
+class FileManagerMixin(LoggingConfigurable, Configurable):
     """
     Mixin for ContentsAPI classes that interact with the filesystem.
 
@@ -187,7 +188,7 @@ class FileManagerMixin(Configurable):
         True,
         config=True,
         help="""By default notebooks are saved on disk on a temporary file and then if succefully written, it replaces the old ones.
-      This procedure, namely 'atomic_writing', causes some bugs on file system whitout operation order enforcement (like some networked fs).
+      This procedure, namely 'atomic_writing', causes some bugs on file system without operation order enforcement (like some networked fs).
       If set to False, the new notebook is written directly on the old one which could fail (eg: full filesystem or quota )""",
     )
 
@@ -214,7 +215,7 @@ def atomic_writing(self, os_path, *args, **kwargs):
                 return
 
         with self.perm_to_403(os_path):
-            kwargs["log"] = self.log  # type:ignore
+            kwargs["log"] = self.log
             if self.use_atomic_writing:
                 with atomic_writing(os_path, *args, **kwargs) as f:
                     yield f
@@ -234,7 +235,7 @@ def perm_to_403(self, os_path=""):
                 # but nobody should be doing that anyway.
                 if not os_path:
                     os_path = e.filename or "unknown file"
-                path = to_api_path(os_path, root=self.root_dir)  # type:ignore
+                path = to_api_path(os_path, root=self.root_dir)  # type:ignore[attr-defined]
                 # iOS: better error message
                 import sys
                 if (sys.platform == "darwin" and os.uname().machine.startswith("iP")):
@@ -249,7 +250,7 @@ def _copy(self, src, dest):
 
         like shutil.copy2, but log errors in copystat
         """
-        copy2_safe(src, dest, log=self.log)  # type:ignore
+        copy2_safe(src, dest, log=self.log)
 
     def _get_os_path(self, path):
         """Given an API path, return its file system path.
@@ -268,7 +269,8 @@ def _get_os_path(self, path):
         ------
         404: if path is outside root
         """
-        root = os.path.abspath(self.root_dir)  # type:ignore
+        self.log.debug("Reading path from disk: %s", path)
+        root = os.path.abspath(self.root_dir)  # type:ignore[attr-defined]
         # to_os_path is not safe if path starts with a drive, since os.path.join discards first part
         if os.path.splitdrive(path)[0]:
             raise HTTPError(404, "%s is not a relative API path" % path)
@@ -375,7 +377,7 @@ async def _copy(self, src, dest):
 
         like shutil.copy2, but log errors in copystat
         """
-        await async_copy2_safe(src, dest, log=self.log)  # type:ignore
+        await async_copy2_safe(src, dest, log=self.log)
 
     async def _read_notebook(self, os_path, as_version=4, capture_validation_error=None):
         """Read a notebook from an os path."""