mirror of
https://github.com/jupyter/notebook.git
synced 2025-02-17 12:39:54 +08:00
This adds a new extra package dependency on `json-logging` and an environment variable, which when set to "true" regardless of case, will try to use the json-logging non-web app log formatter. If the `json-logging` package is not installed but the environment variable is True, something like this will be logged but it will not crash the application: ``` $ ENABLE_JSON_LOGGING=true jupyter notebook Unable to use json logging due to missing packages. Run "pip install notebook[json-logging]" to fix. Traceback (most recent call last): File "/home/osboxes/jupyter/notebook/notebook/notebookapp.py", line 144, in <module> import json_logging ModuleNotFoundError: No module named 'json_logging' ``` Initially I tried to add a new Bool config option to toggle this but the problem is (from my limited understanding of traitlets and tornado) is that `_log_formatter_cls` needs to be set early and trying to se the log formatter later in `init_logging` is too late - or at least I couldn't figure out a way to reset the log formatter dynamically (I tried calling `_log_format_changed` [1] but that didn't work). With this working you get logs like this: ``` {"written_at": "2020-10-07T21:10:51.606Z", "written_ts": 1602105051606265000, "msg": "404 GET /nbextensions/widgets/notebook/js/extension.js (127.0.0.1) 9.26ms referer=http://localhost:8888/notebooks/Untitled.ipynb", "type": "log", "logger": "NotebookApp", "thread": "MainThread", "level": "WARNING", "module": "log", "line_no": 49} {"written_at": "2020-10-07T21:10:54.443Z", "written_ts": 1602105054443309000, "msg": "Starting buffering for f260ddd7-938c-42d0-ac3b-455bea76694f:49f30b53fc4b4ec6a8f2fb748a171613", "type": "log", "logger": "NotebookApp", "thread": "MainThread", "level": "INFO", "module": "kernelmanager", "line_no": 222} {"written_at": "2020-10-07T21:10:54.446Z", "written_ts": 1602105054446264000, "msg": "Kernel shutdown: f260ddd7-938c-42d0-ac3b-455bea76694f", "type": "log", "logger": "NotebookApp", "thread": "MainThread", "level": "INFO", "module": "multikernelmanager", "line_no": 201} ``` An obvious improvement here would to be able to split the `msg` fields apart so that we can log things like response status code, request method, request URL, response_time_ms etc. That should be possible with the `JSONLogWebFormatter` from `json-logging` but when I tried using that I was getting errors from the library about a correlation id (which is based on a request header we don't use). The `json-logging` library supports several web frameworks like Flask but unfortunately does not have built in support for Tornado, but it does support custom formatters so that might be a follow up option to improve on this. [1] https://github.com/ipython/traitlets/blob/4.3.3/traitlets/config/application.py#L195 Closes #5798
177 lines
5.7 KiB
Python
Executable File
177 lines
5.7 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# -*- coding: utf-8 -*-
|
|
"""Setup script for Jupyter Notebook"""
|
|
|
|
#-----------------------------------------------------------------------------
|
|
# Copyright (c) 2015-, Jupyter Development Team.
|
|
# Copyright (c) 2008-2015, IPython Development Team.
|
|
#
|
|
# Distributed under the terms of the Modified BSD License.
|
|
#
|
|
# The full license is in the file LICENSE, distributed with this software.
|
|
#-----------------------------------------------------------------------------
|
|
|
|
import os
|
|
import sys
|
|
|
|
name = "notebook"
|
|
|
|
if sys.version_info < (3, 5):
|
|
pip_message = 'This may be due to an out of date pip. Make sure you have pip >= 9.0.1.'
|
|
try:
|
|
import pip
|
|
pip_version = tuple([int(x) for x in pip.__version__.split('.')[:3]])
|
|
if pip_version < (9, 0, 1) :
|
|
pip_message = 'Your pip version is out of date, please install pip >= 9.0.1. '\
|
|
'pip {} detected.'.format(pip.__version__)
|
|
else:
|
|
# pip is new enough - it must be something else
|
|
pip_message = ''
|
|
except Exception:
|
|
pass
|
|
|
|
|
|
error = """
|
|
Notebook 6.0+ supports Python 3.5 and above.
|
|
When using Python 3.4 or earlier (including 2.7), please install Notebook 5.x.
|
|
|
|
Python {py} detected.
|
|
{pip}
|
|
""".format(py=sys.version_info, pip=pip_message )
|
|
|
|
print(error, file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
# At least we're on the python version we need, move on.
|
|
|
|
# BEFORE importing distutils, remove MANIFEST. distutils doesn't properly
|
|
# update it when the contents of directories change.
|
|
if os.path.exists('MANIFEST'): os.remove('MANIFEST')
|
|
|
|
from setuptools import setup
|
|
|
|
from setupbase import (
|
|
version,
|
|
find_packages,
|
|
find_package_data,
|
|
check_package_data_first,
|
|
CompileCSS,
|
|
CompileJS,
|
|
CompileBackendTranslation,
|
|
Bower,
|
|
JavascriptVersion,
|
|
css_js_prerelease,
|
|
)
|
|
|
|
setup_args = dict(
|
|
name = name,
|
|
description = "A web-based notebook environment for interactive computing",
|
|
long_description = """
|
|
The Jupyter Notebook is a web application that allows you to create and
|
|
share documents that contain live code, equations, visualizations, and
|
|
explanatory text. The Notebook has support for multiple programming
|
|
languages, sharing, and interactive widgets.
|
|
|
|
Read `the documentation <https://jupyter-notebook.readthedocs.io>`_
|
|
for more information.
|
|
""",
|
|
version = version,
|
|
packages = find_packages(),
|
|
package_data = find_package_data(),
|
|
author = 'Jupyter Development Team',
|
|
author_email = 'jupyter@googlegroups.com',
|
|
url = 'http://jupyter.org',
|
|
license = 'BSD',
|
|
platforms = "Linux, Mac OS X, Windows",
|
|
keywords = ['Interactive', 'Interpreter', 'Shell', 'Web'],
|
|
classifiers = [
|
|
'Intended Audience :: Developers',
|
|
'Intended Audience :: System Administrators',
|
|
'Intended Audience :: Science/Research',
|
|
'License :: OSI Approved :: BSD License',
|
|
'Programming Language :: Python',
|
|
'Programming Language :: Python :: 3',
|
|
'Programming Language :: Python :: 3.5',
|
|
'Programming Language :: Python :: 3.6',
|
|
'Programming Language :: Python :: 3.7',
|
|
'Programming Language :: Python :: 3.8'
|
|
],
|
|
zip_safe = False,
|
|
install_requires = [
|
|
'jinja2',
|
|
'tornado>=5.0',
|
|
# pyzmq>=17 is not technically necessary,
|
|
# but hopefully avoids incompatibilities with Tornado 5. April 2018
|
|
'pyzmq>=17',
|
|
'argon2-cffi',
|
|
'ipython_genutils',
|
|
'traitlets>=4.2.1',
|
|
'jupyter_core>=4.6.1',
|
|
'jupyter_client>=5.3.4',
|
|
'nbformat',
|
|
'nbconvert',
|
|
'ipykernel', # bless IPython kernel for now
|
|
'Send2Trash',
|
|
'terminado>=0.8.3',
|
|
'prometheus_client'
|
|
],
|
|
extras_require = {
|
|
'test': ['nose', 'coverage', 'requests', 'nose_warnings_filters',
|
|
'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'],
|
|
'docs': ['sphinx', 'nbsphinx', 'sphinxcontrib_github_alt', 'sphinx_rtd_theme'],
|
|
'test:sys_platform != "win32"': ['requests-unixsocket'],
|
|
'json-logging': ['json-logging']
|
|
},
|
|
python_requires = '>=3.5',
|
|
entry_points = {
|
|
'console_scripts': [
|
|
'jupyter-notebook = notebook.notebookapp:main',
|
|
'jupyter-nbextension = notebook.nbextensions:main',
|
|
'jupyter-serverextension = notebook.serverextensions:main',
|
|
'jupyter-bundlerextension = notebook.bundler.bundlerextensions:main',
|
|
]
|
|
},
|
|
)
|
|
|
|
# Custom distutils/setuptools commands ----------
|
|
from distutils.command.build_py import build_py
|
|
from distutils.command.sdist import sdist
|
|
from setuptools.command.bdist_egg import bdist_egg
|
|
from setuptools.command.develop import develop
|
|
|
|
class bdist_egg_disabled(bdist_egg):
|
|
"""Disabled version of bdist_egg
|
|
|
|
Prevents setup.py install from performing setuptools' default easy_install,
|
|
which it should never ever do.
|
|
"""
|
|
def run(self):
|
|
sys.exit("Aborting implicit building of eggs. Use `pip install .` to install from source.")
|
|
|
|
setup_args['cmdclass'] = {
|
|
'build_py': css_js_prerelease(
|
|
check_package_data_first(build_py)),
|
|
'sdist' : css_js_prerelease(sdist, strict=True),
|
|
'develop': css_js_prerelease(develop),
|
|
'css' : CompileCSS,
|
|
'backendtranslations': CompileBackendTranslation,
|
|
'js' : CompileJS,
|
|
'jsdeps' : Bower,
|
|
'jsversion' : JavascriptVersion,
|
|
'bdist_egg': bdist_egg if 'bdist_egg' in sys.argv else bdist_egg_disabled,
|
|
}
|
|
|
|
try:
|
|
from wheel.bdist_wheel import bdist_wheel
|
|
except ImportError:
|
|
pass
|
|
else:
|
|
setup_args['cmdclass']['bdist_wheel'] = css_js_prerelease(bdist_wheel)
|
|
|
|
# Run setup --------------------
|
|
def main():
|
|
setup(**setup_args)
|
|
|
|
if __name__ == '__main__':
|
|
main()
|