async-kernel

.github/workflows/deploy-github-page.yml

@@ -47,6 +47,11 @@ jobs:
 
           set -eux
 
+
+          URL=https://github.com/DerThorsten/xeus-python-shell/archive/refs/heads/akernel.zip 
+          curl -L $URL -o xeus-python-shell-akernel.zip
+          unzip xeus-python-shell-akernel.zip
+
           export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-python-wasm-host
           echo "PREFIX=$PREFIX" >> $GITHUB_ENV
 
@@ -63,10 +68,12 @@ jobs:
       - name: Jupyter Lite integration
         shell: bash -l {0}
         run: |
+          THIS_DIR=$(pwd)
           jupyter lite build \
               --XeusAddon.prefix=${{ env.PREFIX }} \
               --contents notebooks/ \
-              --output-dir dist
+              --output-dir dist 
+
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v4

.github/workflows/main.yml

@@ -32,6 +32,7 @@ jobs:
         uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: environment-dev.yml
+
 
       - name: Make build directory
         run: mkdir build

CMakeLists.txt

@@ -180,6 +180,8 @@ set(XEUS_PYTHON_SRC
     src/xstream.hpp
     src/xtraceback.cpp
     src/xutils.cpp
+    src/xasync_runner.cpp
+    src/xaserver.cpp
 )
 
 set(XEUS_PYTHON_HEADERS
@@ -190,6 +192,7 @@ set(XEUS_PYTHON_HEADERS
     include/xeus-python/xinterpreter_raw.hpp
     include/xeus-python/xtraceback.hpp
     include/xeus-python/xutils.hpp
+    include/xeus-python/xaserver.hpp
 )
 
 set(XPYTHON_SRC

environment-dev.yml

@@ -15,7 +15,8 @@ dependencies:
   # The debugger is not available with python 3.13 because
   # of a spurious bug in debugpy
   - python <3.13
-  - xeus-python-shell>=0.6.3,<0.7
+  - pip
+  - xeus-python-shell>=0.7.0,<0.8
   - debugpy>=1.6.5
   - ipython
   # Test dependencies

environment-wasm-build.yml

@@ -13,3 +13,5 @@ dependencies:
   - jupyterlite-core >0.6
   - jupyter_server
   - jupyterlite-xeus
+  - # widgets
+  - ipywidgets

environment-wasm-host.yml

@@ -12,9 +12,11 @@ dependencies:
   - numpy
   - xeus-lite
   - xeus
-  - xeus-python-shell>=0.6.3
   - pyjs >=4,<5
   - libpython
   - zstd
   - openssl
   - xz
+  - ipywidgets
+  - xeus-python-shell>=0.7.0,<0.8
+

include/xeus-python/xaserver.hpp

@@ -0,0 +1,22 @@
+/***************************************************************************
+* Copyright (c) 2024, Isabel Paredes                                       *
+* Copyright (c) 2024, QuantStack                                           *
+*                                                                          *
+* Distributed under the terms of the BSD 3-Clause License.                 *
+*                                                                          *
+* The full license is in the file LICENSE, distributed with this software. *
+****************************************************************************/
+
+#include "xeus_python_config.hpp"
+#include "xeus/xkernel.hpp"
+#include "pybind11/pybind11.h"
+
+namespace py = pybind11;
+namespace nl = nlohmann;
+
+namespace xpyt
+{
+
+    XEUS_PYTHON_API XPYT_FORCE_PYBIND11_EXPORT xeus::xkernel::server_builder make_async_server_factory(py::dict globals);
+
+} // namespace xeus

include/xeus-python/xdebugger.hpp

@@ -38,7 +38,9 @@ namespace xpyt
 
         using base_type = xeus::xdebugger_base;
 
-        debugger(xeus::xcontext& context,
+        debugger(
+                py::dict globals,
+                xeus::xcontext& context,
                  const xeus::xkernel_configuration& config,
                  const std::string& user_name,
                  const std::string& session_id,
@@ -63,6 +65,9 @@ namespace xpyt
         xeus::xdebugger_info get_debugger_info() const override;
         std::string get_cell_temporary_file(const std::string& code) const override;
 
+
+        py::dict m_global_dict;
+
         std::unique_ptr<xdebugpy_client> p_debugpy_client;
         std::string m_debugpy_host;
         std::string m_debugpy_port;
@@ -72,8 +77,10 @@ namespace xpyt
         bool m_copy_to_globals_available;
     };
 
-    XEUS_PYTHON_API
-    std::unique_ptr<xeus::xdebugger> make_python_debugger(xeus::xcontext& context,
+
+    XEUS_PYTHON_API XPYT_FORCE_PYBIND11_EXPORT
+    std::unique_ptr<xeus::xdebugger> make_python_debugger(py::dict globals,
+                                                          xeus::xcontext& context,
                                                           const xeus::xkernel_configuration& config,
                                                           const std::string& user_name,
                                                           const std::string& session_id,

include/xeus-python/xeus_python_config.hpp

@@ -46,3 +46,9 @@
     #define XPYT_FORCE_PYBIND11_EXPORT __attribute__ ((visibility ("default")))
 #endif
 #endif
+
+#ifdef _MSC_VER
+    #define XEUS_PYTHON_HIDDEN
+#else
+    #define XEUS_PYTHON_HIDDEN __attribute__ ((visibility ("hidden")))
+#endif

include/xeus-python/xinterpreter.hpp

@@ -32,7 +32,7 @@ namespace nl = nlohmann;
 
 namespace xpyt
 {
-    class XEUS_PYTHON_API interpreter : public xeus::xinterpreter
+    class XEUS_PYTHON_API XPYT_FORCE_PYBIND11_EXPORT interpreter : public xeus::xinterpreter
     {
     public:
 
@@ -44,7 +44,9 @@ namespace xpyt
         // If redirect_display_enabled is true (default) then this interpreter will
         // overwrite sys.displayhook and send execution results using publish_execution_result.
         // Disable this if your interpreter uses custom display hook.
-        interpreter(bool redirect_output_enabled=true, bool redirect_display_enabled = true);
+        interpreter(
+                py::dict globals,
+                bool redirect_output_enabled=true, bool redirect_display_enabled = true);
         virtual ~interpreter();
 
     protected:
@@ -78,6 +80,7 @@ namespace xpyt
 
         void redirect_output();
 
+        py::dict m_global_dict;
         py::object m_ipython_shell_app;
         py::object m_ipython_shell;
         py::object m_displayhook;
@@ -94,8 +97,7 @@ namespace xpyt
         // If an application has already released the GIL by the time the interpreter
         // is started, m_release_gil_at_startup has to be set to false to prevent
         // releasing it again in configure_impl().
-        //
-        bool m_release_gil_at_startup = true;
+        bool m_release_gil_at_startup = false;
         gil_scoped_release_ptr m_release_gil = nullptr;
 
         bool m_redirect_output_enabled;

include/xeus-python/xinterpreter_raw.hpp

@@ -30,7 +30,7 @@ namespace nl = nlohmann;
 
 namespace xpyt
 {
-    class XEUS_PYTHON_API raw_interpreter : public xeus::xinterpreter
+    class XEUS_PYTHON_API XPYT_FORCE_PYBIND11_EXPORT raw_interpreter : public xeus::xinterpreter
     {
     public:
 
@@ -42,7 +42,9 @@ namespace xpyt
         // If redirect_display_enabled is true (default) then this interpreter will
         // overwrite sys.displayhook and send execution results using publish_execution_result.
         // Disable this if your interpreter uses custom display hook.
-        raw_interpreter(bool redirect_output_enabled=true, bool redirect_display_enabled = true);
+        raw_interpreter(
+            py::dict globals,
+            bool redirect_output_enabled=true, bool redirect_display_enabled = true);
         virtual ~raw_interpreter();
 
     protected:
@@ -90,6 +92,7 @@ namespace xpyt
         bool m_release_gil_at_startup = true;
         gil_scoped_release_ptr m_release_gil = nullptr;
         bool m_redirect_display_enabled;
+        py::dict m_global_dict;
     };
 
 }

notebooks/xeus-python.ipynb

@@ -49,15 +49,6 @@
     "sq(b)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "print"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -653,15 +644,21 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.9 (XPython)",
+   "display_name": "Python 3.12 (XPython)",
    "language": "python",
    "name": "xpython"
   },
   "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
    "file_extension": ".py",
    "mimetype": "text/x-python",
    "name": "python",
-   "version": "3.9.1"
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.12.13"
   }
  },
  "nbformat": 4,

src/main.cpp

@@ -1,4 +1,5 @@
 /***************************************************************************
+* Copyright (c) 2026, Thorsten Beier                                       *
 * Copyright (c) 2018, Martin Renou, Johan Mabille, Sylvain Corlay, and     *
 * Wolf Vollprecht                                                          *
 * Copyright (c) 2018, QuantStack                                           *
@@ -26,7 +27,7 @@
 #include "xeus/xinterpreter.hpp"
 #include "xeus/xhelper.hpp"
 
-#include "xeus-zmq/xserver_zmq_split.hpp"
+#include "xeus-zmq/xserver_zmq.hpp"
 #include "xeus-zmq/xzmq_context.hpp"
 
 #include "pybind11/embed.h"
@@ -38,10 +39,10 @@
 #include "xeus-python/xpaths.hpp"
 #include "xeus-python/xeus_python_config.hpp"
 #include "xeus-python/xutils.hpp"
+#include "xeus-python/xaserver.hpp"
 
 namespace py = pybind11;
 
-
 int main(int argc, char* argv[])
 {
     if (xeus::should_print_version(argc, argv))
@@ -111,6 +112,10 @@ int main(int argc, char* argv[])
         std::cerr << "Error:" << status.err_msg << std::endl;
     }
 
+    // Instantiating the Python interpreter
+    py::scoped_interpreter guard{};
+    py::gil_scoped_acquire acquire;
+
     // Setting argv
     wchar_t** argw = new wchar_t*[size_t(argc)];
     for(auto i = 0; i < argc; ++i)
@@ -130,22 +135,23 @@ int main(int argc, char* argv[])
     }
     delete[] argw;
 
-    // Instantiating the Python interpreter
-    py::scoped_interpreter guard;
 
     std::unique_ptr<xeus::xcontext> context = xeus::make_zmq_context();
 
+    // we want to use **the same global dict everywhere**
+    py::dict globals = py::globals();    
+
     // Instantiating the xeus xinterpreter
     bool raw_mode = xpyt::extract_option("-r", "--raw", argc, argv);
     using interpreter_ptr = std::unique_ptr<xeus::xinterpreter>;
     interpreter_ptr interpreter;
     if (raw_mode)
     {
-        interpreter = interpreter_ptr(new xpyt::raw_interpreter());
+        interpreter = interpreter_ptr(new xpyt::raw_interpreter(globals));
     }
     else
     {
-        interpreter = interpreter_ptr(new xpyt::interpreter());
+        interpreter = interpreter_ptr(new xpyt::interpreter(globals));
     }
 
     using history_manager_ptr = std::unique_ptr<xeus::xhistory_manager>;
@@ -163,6 +169,24 @@ int main(int argc, char* argv[])
     nl::json debugger_config;
     debugger_config["python"] = executable;
 
+
+    // Factory to create the debugger with the global dict
+    auto make_the_debugger = [globals](
+                            xeus::xcontext& context,
+                            const xeus::xkernel_configuration& config,
+                            const std::string& user_name,
+                            const std::string& session_id,
+                            const nl::json& debugger_config) -> std::unique_ptr<xeus::xdebugger>
+    {
+        return xpyt::make_python_debugger(
+            globals,
+            context,
+            config,
+            user_name,
+            session_id,
+            debugger_config);
+    };
+
     if (!connection_filename.empty())
     {
         xeus::xconfiguration config = xeus::load_configuration(connection_filename);
@@ -171,31 +195,33 @@ int main(int argc, char* argv[])
                              xeus::get_user_name(),
                              std::move(context),
                              std::move(interpreter),
-                             xeus::make_xserver_shell_main,
+                             xpyt::make_async_server_factory(globals),
                              std::move(hist),
                              xeus::make_console_logger(xeus::xlogger::msg_type,
                                                        xeus::make_file_logger(xeus::xlogger::content, "xeus.log")),
-                             xpyt::make_python_debugger,
+                            make_the_debugger,
                              debugger_config);
 
         std::clog <<
             "Starting xeus-python kernel...\n\n"
             "If you want to connect to this kernel from an other client, you can use"
             " the " + connection_filename + " file."
             << std::endl;
-
+
+        std::cout << "Starting kernel..." << std::endl;
         kernel.start();
+        std::cout << "Kernel stopped." << std::endl;
     }
     else
     {
         std::clog << "Instantiating kernel" << std::endl;
         xeus::xkernel kernel(xeus::get_user_name(),
                              std::move(context),
                              std::move(interpreter),
-                             xeus::make_xserver_shell_main,
+                             xpyt::make_async_server_factory(globals),
                              std::move(hist),
                              nullptr,
-                             xpyt::make_python_debugger,
+                             make_the_debugger,
                              debugger_config);
 
         std::cout << "Getting config" << std::endl;