GitLab

* guix-jupyter-kernel.scm (heartbeat-handler, start-kernel): Remove.
(general-handler): Adjust prototype to match what 'serve-kernels'
expects.
<top level>: Use 'serve-kernels'.

* guix-kernel/jupyter-client.scm: Rename to...
* jupyter/servers.scm: ... this.
(KERNEL-INFO, guile-version): Remove.
(json->kernel): Rename to...
(connection-file->kernel): ... this.
* guix-jupyter-container.scm: Adjust accordingly.
* guix-jupyter-kernel.scm (KERNEL-INFO): New variable.
(kernel): Use new 'connection-file->kernel' name.
* Makefile.am (SOURCES): Adjust file list accordingly.

Guile-JSON 3.x is incompatible with Guile-JSON 1.x, which we relied on
until now: it maps JSON dictionaries to alists (instead of hash tables),
and JSON arrays to vectors (instead of lists).  This commit is about
adjusting all the existing code to this new mapping.

* jupyter/kernels.scm (kernel-arguments): Use 'assoc-ref' instead of
'hash-ref'; pass JSON array through 'vector->list'.
(relay-message, reply-html): Likewise.
* jupyter/messages.scm (string->header): Likewise.
* guix-jupyter-container.scm (local-eval, reply-execute-request): Likewise.
* guix-jupyter-kernel.scm (reply-execute-request): Likewise.
* guix-kernel/jupyter-client.scm (json->kernel): Likewise.
* tests/kernels.scm: Likewise.
* environment.scm (propagated-inputs): Replace GUILE-JSON with
GUILE-JSON-3.

* guix-kernel/jupyter-server.scm: Rename to...
* jupyter/kernels.scm: ... this.
* guix-jupyter-container.scm, guix-jupyter-kernel.scm,
guix-kernel/jupyter-client.scm: Adjust accordingly.
* Makefile.am (SOURCES): Likewise.

* guix-kernel/jupyter-client.scm (<header>, <message>, message)
(make-message, message-parts, reply, message-type, message-sender)
(string->header, header->string, parts->message, DELIM): Move to...
* jupyter/messages.scm: ... here.  New file.
(get-signature, make-id): New procedures.
* guix-kernel/hmac.msc, guix-kernel/tools.scm, tests/tools.scm: Remove.
* Makefile.am (SOURCES, SCM_TESTS): Adjust accordingly.
* guix-jupyter-container.scm, guix-jupyter-kernel.scm,
guix-kernel/jupyter-client.scm: Adjust import list accordingly.
* tests/hmac.scm (get-signature): New variable.

* guix-jupyter-kernel.scm (<proxy>): Remove.
(register-proxy): Add docstring.
(new-container-connect): Return a <kernel> object.
(reply-execute-request, kill-containers): Adjust accordingly.

* guix-kernel/jupyter-client.scm (<notebook>, notebook): Remove.
(json->notebook): Rename to...
(json->kernel): ... this, and adjust accordingly.
(read-message, send-message, relay-message, pub, pub-busy)
(pub-idle, reply-html): Adjust accordingly.
* guix-kernel/jupyter-server.scm (<kernel>)[key]: New field.
(kernel-iopub): New macro.
(kernel): Add #:key.
(close-kernel): New procedure.
* guix-jupyter-kernel.scm: Adjust, replacing "notebook" with "kernel".
* guix-jupyter-container.scm: Likewise.

Introduce <message> and <header> record that map directly to the Jupyter
specs.

This is a breaking change.

* guix-jupyter-kernel.scm (send-to-container): Remove unused
'containers' parameter.
(proxy-exec-container, kill-containers): Adjust accordingly.

* guix-jupyter-kernel.scm: Use SRFI-19.
(session-id): Adjust accordingly.
(<proxy>): New record type.
(register-container, container-by-name, container-socket-by-name):
Remove.
(register-proxy, proxy-by-name): New procedures.
(reply-execute-request): Adjust accordingly.
(kill-containers): Rewrite using 'vlist-for-each'.
(new-container-connect): Return a proxy record.

* guix-kernel/jupyter-client.scm (pub, pub-busy, pub-idle): Remove
'socket' and 'key' parameters, add 'notebook' parameter instead.

* guix-jupyter-kernel.scm (%notebook): Remove.
(reply-kernel-info-request): Remove 'socket' parameter; add 'notebook'
parameter and adjust accordingly.
(reply-execute-request): Likewise.
(shutdown): Likewise.
(start-container): Add 'notebook' parameter and use it.
(start-kernel): Likewise.
(run-new-container): Remove.
<top level>: Adjust 'sigaction' and 'start-kernel' calls accordingly.

* guix-kernel/jupyter-client.scm (<notebook>): New record type.
(json->notebook, close-notebook): New procedures.
* guix-jupyter-kernel.scm (%notebook): New variable.
(notebook-info, get-notebook-info-atom)
(notebook-info-control-port, notebook-info-shell-port)
(notebook-info-transport, notebook-info-signature-scheme)
(notebook-info-stdin-port, notebook-info-heartbeat-port)
(notebook-info-ip, notebook-info-iopub-port)
(notebook-info-key, create-address, context)
(addr-heartbeat, addr-shell, addr-control, addr-iopub)
(addr-stdin, socket-heartbeat, socket-shell, socket-control)
(socket-iopub, socket-stdin, addresses, sockets): Remove.
Remove top-level calls to 'zmq-set-socket-option' and
'zmq-bind-socket'.
(proxy-exec-container, heartbeat-handler, general-handler)
(reply-kernel-info-request, reply-execute-request)
(start-container, start-kernel): Refer to %NOTEBOOK instead of referring
to the individual variables.
(atexit, sig-exit-handler): Remove.
(shutdown): Remove call to 'atexit'.
(exit-handler): New procedure.
Use it in top-level 'sigaction' calls.

This avoids the occasional string decoding error for byte streams that
were not actual UTF-8 strings.

This is based on commit fbab29d738b46d8637579ccec93be49520a4606f ("Fixed
a bug when the kernel could not send kernel_info (1 minute pause after
notebook starts)") of <https://github.com/jerry40/guile-kernel

>.

* guix-jupyter-container.scm (reply-execute-request): Turn UUID into a
bytevector.
* guix-jupyter-kernel.scm (send-to-container): Turn NAME into a
bytevector and use 'zmq-send-msg-parts-bytevector'.
(heartbeat-handler): Use '-bytevector' send and receive procedures.
(general-handler): Likewise.  Add calls to 'utf8->string' as needed.
* guix-kernel/jupyter-client.scm (send-to-jupyter)
(pub): Likewise.
* guix-kernel/jupyter-server.scm (run-kernel): Likewise.
Co-authored-by: jerry40 <epanfilov@gmail.com>

* guix-jupyter-kernel.scm (socket-shell): Set options ZMQ_RCVTIMEO to 50.
  (socket-control): Set options ZMQ_RCVTIMEO to 50.
* guix-jupyter-container.scm (shutdown): Modify 'quit' to 'exit'.

* guix-jupyter-kernel.scm (error->shtml, error->html): New procedures.
  (reply-execute-request): Catch 'guix-kernel' exception.
* guix-kernel/environ.scm (make-profile): Catch all exception and throw
  'guix-kernel' exception.

* guix-jupyter-kernel.scm: Get magic command 'html'.
* guix-jupyter-container.scm (reply-html-to-kernel): Add
  'guix-end-of-eval' message.
* guix-kernel/jupyter-client.scm (reply-html): Remove
  'guix-end-of-eval' message.

* guix-jupyter-kernel.scm (general-handler): Simplify 'let' with
  'match'.
* guix-jupyter-container.scm (general-handler): Simplify 'let' with
  'match'.

Ludovic Courtès authored Jul 12, 2018 and ROUBY Pierre-Antoine committed Jul 17, 2018

* guix-jupyter-kernel.scm (%network-file-systems): New variable.
(start-container)[network-file-system]: Remove.
Use %NETWORK-FILE-SYSTEMS instead.

* guix-jupyter-container.scm (proxy-exec-kernel): Get streams message
  type.
  (local-eval): Send 'guix-end-of-eval' message.
* guix-jupyter-kernel.scm (proxy-exec-container): Get streams message
  type.
* guix-kernel/jupyter-client.scm (reply-html): Send 'guix-end-of-eval'
  message.
* guix-kernel/jupyter-server.scm (exec-kernel): Add IPython.

* guix-jupyter-container.scm (kernel-info->html): Add warning at
  envrionment creation.
  (reply-execute-request): Update list ref.
* guix-jupyter-kernel.scm: Update list ref.
* guix-kernel/magic.scm (magic-env?): Test separator.
* tests/magic.scm (magic-no-code): Update string.
* README.org (How to use it): Update 'environment'.
* guix-kernel-demo.ipynb: Update with new syntax.

* guix-kernel/magic.scm (magic-html?): New procedure.
* guix-jupyter-container.scm (reply-html-to-kernel,
  kernel-info->html): New procedures.
* guix-jupyter-kernel.scm: Minor change.
* guix-kernel/html.scm: New file.
* guix-kernel/jupyter-client.scm (reply-html): New procedure.
* Makefile.am: Add 'guix-kernel/html.scm'.
* guix-kernel-demo.ipynb: Add example for new features.

* guix-jupyter-container.scm: Use 'session-id' for unique id.
* guix-jupyter-kernel.scm: Use GNU Guix procedure 'run-container'.

* guix-jupyter-kernel.scm (container-path): Use 'command-line' to get file name.

* guix-jupyter-container.scm: Add magic kernel command.
* guix-jupyter-kernel.scm: Add magic kernel command.
* guix-kernel/jupyter-server.scm: New file.
* Makefile.am: Add jupyter-server to SOURCE.
* guix-kernel/magic.scm (magic-kernel?,
  magic-get-kernel-name): Add procedure.
  (magic?): Change '%%' by ';;'.
* guix-kernel-demo.ipynb: Add new guix-kernel features.
* logo.png: New file.

* guix-kernel/jupyter-client.scm: New file.
* guix-jupyter-container.scm: Use module 'guix-kernel jupyter-client'.
* guix-jupyter-kernel.scm: Use module 'guix-kernel jupyter-client'.
* Makefile.am: Add 'guix-kernel/jupyter-client.scm' to SOURCE.

* guix-jupyter-subkernel.scm: Rename to guix-jupyter-container.scm.
* guix-jupyter-kernel.scm: Substitute all 'subkernel' to 'container'.
* Makefile.am: Update SOURCE path.

* guix-jupyter-kernel.scm (new-subkernel-connect): Delete sub-socket-iosub.
* guix-jupyter-subkernel.scm: Delete socket-iopub.
* guix-kernel/environ.scm: Minor chance on environment creation.

* Makefile.am (kernel.json): Delete rule.
* environment.scm (arguments): substitute openssl, guile, guile-load-path,
  guile-load-compiled-path and kernel path.
  (source): Use local file.
* guix-kernel/environ.scm (guile-current-load-path->args-list,
  guix-current-load-compiled-path->args-list): New procedures.
* kernel.json: Rename 'kernel.json.in' to 'kernel.json'.
  (argv) Add '@guile@', '@LOAD_PATH@', '@LOAD_COMPILED_PATH@' and
  '@guix-jupyter-kernerl.scm@' for subsitution.
* guix-jupyter-kernel.scm (start-sub-kernel): Propagated guile load path
  and load compiled path.

* Makefile.am: Add GPLv3+ header.
* configure.ac: Add GPLv3+ header.
* guix-jupyter-kernel.scm: Add GPLv3+ header.
* guix-jupyter-subkernel.scm: Add GPLv3+ header.
* guix-kernel/environ.scm: Add GPLv3+ header.
* guix-kernel/hmac.scm: Add GPLv3+ header.
* guix-kernel/magic.scm: Add GPLv3+ header.
* guix-kernel/tools.scm: Add GPLv3+ header.

* guix-jupyter-kernel.scm: Move from 'src/'.
* guix-jupyter-subkernel.scm: Move from 'src/'.
* guix-kernel/environ.scm: Move from 'src/'.
* guix-kernel/hmac.scm: Move from 'src/'.
* guix-kernel/magic.scm: Move from 'src/'.
* guix-kernel/tools.scm: Move from 'src/'.
* kernel.json.in: Move from 'src/kernel.json'.
  (argv): Add '@guilemoduledir@'.
* env.in: New file.
* bootstrap: New file.
* configure.ac: New file.
* guile.am: New file.
* Makefile.am: New file.
* environment.scm: New file.
* VERSION: New file.

* src/guix-jupyter-kernel.scm (reply-execute-request): Add magic 'run'.

* src/guix-kernel/magic.scm (magic-attr?, magic-env?, magic-exec?,
  magic-run?): New functions.
* src/guix-jupyter-kernel.scm: Use magic-env on 'repy-execute-request'.
* src/guix-jupyter-subkernel.scm: Minor change.

* src/guix-kernel/magic.scm: New file.
* src/guix-jupyter-subkernel.scm (reply-execution-request):
  Delete magic for code execution.
* src/guix-jupyter-kernel.scm (reply-execution-request): Get magic.

* src/guix-jupyter-kernel.scm (subkernel-path): New variable.
  (start-sub-kernel): Use 'subkernel-path'.

* src/guix-jupyter-kernel.scm: Subkernels parameter.
* src/guix-jupyter-subkernel.scm: Update sockets address.

* src/guix-jupyter-kernel.scm: Subkernels parameter.
* src/guix-jupyter-subkernel.scm: Update sockets address.

* src/guix-kernel/environ.scm: New file.
  (all-packages): New variable.
  (store): New variable.
  (find-package): New procedure.
  (get-package-path): New procedure.
  (guile-current-version-path): New procedure.
* src/guix-jupyter-kernel.scm (start-sub-kernel): Dynamic guile path.

* src/guix-jupyter-kernel.scm (sig-exit-handler): Add signal handler.
  (atexit): New procedure.
* src/guix-jupyter-subkerne.scm: Minor change.

* src/guix-jupyter-kernel.scm: Add subkernel execution and communication.
* src/guix-jupyter-subkernel.scm: New file.