experiment: apply #685 over async branch/pr

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

@@ -33,7 +33,6 @@ jobs:
           environment-file: environment-wasm-build.yml
           init-shell: bash
           environment-name: xeus-python-wasm-build
-
       - name: Set ncpus
         run: echo "ncpus=$(nproc --all)" >> $GITHUB_ENV
 
@@ -47,6 +46,11 @@ jobs:
 
           set -eux
 
+
+          URL=https://github.com/DerThorsten/xeus-python-shell/archive/refs/heads/libuv.zip 
+          curl -L $URL -o xeus-python-shell-libuv.zip
+          unzip xeus-python-shell-libuv.zip
+
           export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-python-wasm-host
           echo "PREFIX=$PREFIX" >> $GITHUB_ENV
 
@@ -63,10 +67,13 @@ 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 \
+              --XeusAddon.mounts=$THIS_DIR/xeus-python-shell-libuv/xeus_python_shell/:/lib/python3.13/site-packages/xeus_python_shell/
+
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v4

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14]
+        os: [ubuntu-22.04, ubuntu-24.04, macos-14]
         build_type: [static_build, shared_build]
 
     steps:
@@ -32,6 +32,10 @@ jobs:
         uses: mamba-org/setup-micromamba@v2
         with:
           environment-file: environment-dev.yml
+
+      - name: Install xeus-python-shell from GitHub
+        run: pip install git+https://github.com/DerThorsten/xeus-python-shell.git@libuv 
+
 
       - name: Make build directory
         run: mkdir build
@@ -47,7 +51,8 @@ jobs:
         run: |
           CMAKE_EXTRA_ARGS="$CMAKE_EXTRA_ARGS -DXPYT_BUILD_STATIC=OFF"
           echo "CMAKE_EXTRA_ARGS=$CMAKE_EXTRA_ARGS" >> $GITHUB_ENV
-
+
+
       - name: Configure cmake
         run: |
           cmake .. \
@@ -61,8 +66,12 @@ jobs:
             ${{ env.CMAKE_EXTRA_ARGS }}
         working-directory: build
 
+      - name: Build all targets
+        run: cmake --build . --verbose -j ${{ runner.os == 'macOS' && 3 || 4 }}
+        working-directory: build
+
       - name: Install
-        run: make -j ${{ runner.os == 'macOS' && 3 || 4 }} install
+        run: cmake --install .
         working-directory: build
 
       - name: Print version
@@ -97,6 +106,10 @@ jobs:
 
       - name: Make build directory
         run: mkdir build
+
+      - name: Install xeus-python-shell from GitHub
+        shell: cmd /C call {0}
+        run: pip install git+https://github.com/DerThorsten/xeus-python-shell.git@libuv
 
       - name: Static build option
         if: matrix.build_type == 'static_build'
@@ -134,13 +147,12 @@ jobs:
 
       - name: Test xeus-python Python
         shell: cmd /C call {0}
-        run: pytest . -vvv
+        run: pytest . -s -vvv
+
 
       - name: Test xeus-python C++
         shell: cmd /C call {0}
         run: |
-          micromamba activate xeus-python
           test_xeus_python
         timeout-minutes: 4
-        working-directory: build\test
-
+        working-directory: build\test

.gitignore

@@ -44,6 +44,7 @@ docs/build/
 
 # Build directory
 build/
+/build-*/
 
 # generated kernel specs
 /share/jupyter/kernels/xpython/kernel.json

CMakeLists.txt

@@ -79,7 +79,7 @@ set(pybind11_REQUIRED_VERSION 2.6.1)
 set(pybind11_json_REQUIRED_VERSION 0.2.8)
 set(pyjs_REQUIRED_VERSION 2.0.0)
 
-find_package(Python COMPONENTS Interpreter REQUIRED)
+# find_package(Python COMPONENTS Interpreter REQUIRED)
 
 if (NOT TARGET pybind11::headers)
     # Defaults to ON for cmake >= 3.18
@@ -105,8 +105,11 @@ else ()
     if (NOT TARGET xeus-zmq AND NOT TARGET xeus-zmq-static)
         find_package(xeus-zmq ${xeus-zmq_REQUIRED_VERSION} REQUIRED)
     endif ()
+
 endif()
 
+
+
 # Configuration
 # =============
 
@@ -178,6 +181,10 @@ set(XEUS_PYTHON_SRC
     src/xstream.hpp
     src/xtraceback.cpp
     src/xutils.cpp
+    src/xasync_runner.cpp
+    src/xaserver.cpp
+    src/xacontrol_default_runner.cpp
+
 )
 
 set(XEUS_PYTHON_HEADERS
@@ -188,6 +195,8 @@ 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
+    include/xeus-python/xacontrol_default_runner.hpp
 )
 
 set(XPYTHON_SRC
@@ -317,7 +326,10 @@ macro(xpyt_create_target target_name src headers linkage output_name)
         set(XPYT_XEUS_TARGET xeus-zmq-static)
     endif ()
 
-    target_link_libraries(${target_name} PUBLIC ${XPYT_XEUS_TARGET} PRIVATE pybind11::pybind11 pybind11_json)
+    target_link_libraries(${target_name}
+        PUBLIC ${XPYT_XEUS_TARGET}  ${UVW_LIBRARY}
+        PRIVATE pybind11::pybind11 pybind11_json
+    )
     if (WIN32 OR CYGWIN)
         target_link_libraries(${target_name} PRIVATE ${PYTHON_LIBRARIES})
     elseif (APPLE)
@@ -371,11 +383,18 @@ endif ()
 
 if (XPYT_BUILD_XPYTHON_EXECUTABLE)
     add_executable(xpython ${XPYTHON_SRC})
-    target_link_libraries(xpython PRIVATE pybind11::embed)
+    target_link_libraries(xpython PRIVATE pybind11::embed )
 
     xpyt_set_common_options(xpython)
     xpyt_set_kernel_options(xpython)
     xpyt_target_link_libraries(xpython)
+
+    get_target_property(_libs xpython LINK_LIBRARIES)
+    message(STATUS "xpython LINK_LIBRARIES = ${_libs}")
+
+    message(STATUS "xeus-python file = $<TARGET_FILE:xeus-python>")
+
+
 endif()
 
 # xpython_extension

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.6.3,<0.7 # we need an unreleased version
   - debugpy>=1.6.5
   - ipython
   # Test dependencies
@@ -25,3 +26,7 @@ dependencies:
   - jupyter_kernel_test<0.8
   - doctest
   - pluggy=1.3
+  - libboost
+  - libboost-devel
+  - libboost-headers
+

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 >=2,<3
   - libpython
   - zstd
   - openssl
   - xz
+  - ipywidgets
+  # - xeus-python-shell>=0.6.3
+

include/xeus-python/xacontrol_default_runner.hpp

@@ -0,0 +1,35 @@
+/***************************************************************************
+* Copyright (c) 2016, Johan Mabille, Sylvain Corlay, Martin Renou          *
+* Copyright (c) 2016, QuantStack                                           *
+*                                                                          *
+* Distributed under the terms of the BSD 3-Clause License.                 *
+*                                                                          *
+* The full license is in the file LICENSE, distributed with this software. *
+****************************************************************************/
+
+#ifndef XEUS_PYTHON_ACONTROL_DEFAULT_RUNNER_HPP
+#define XEUS_PYTHON_ACONTROL_DEFAULT_RUNNER_HPP
+
+#include "xeus_python_config.hpp"
+#include "xeus-zmq/xcontrol_runner.hpp"
+
+namespace xpyt
+{
+    class XEUS_PYTHON_API xacontrol_default_runner final : public xeus::xcontrol_runner
+    {
+    public:
+
+        xacontrol_default_runner() = default;
+        ~xacontrol_default_runner() override = default;
+
+    private:
+
+        void run_impl() override;
+        void stop_impl() override;
+
+        bool m_request_stop;
+    };
+}
+
+#endif
+

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_xaserver_factory(py::dict globals);
+
+} // namespace xeus

include/xeus-python/xdebugger.hpp

@@ -40,7 +40,9 @@ namespace xpyt
 
         using base_type = xeus::xdebugger_base;
 
-        debugger(xeus::xcontext& context,
+        debugger(
+                py::dict globals,
+                xeus::xcontext& context,
                  const xeus::xconfiguration& config,
                  const std::string& user_name,
                  const std::string& session_id,
@@ -65,6 +67,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;
@@ -74,8 +79,9 @@ 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::xconfiguration& config,
                                                           const std::string& user_name,
                                                           const std::string& session_id,

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:
@@ -76,6 +78,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;
@@ -92,14 +95,13 @@ 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;
         bool m_redirect_display_enabled;
 
-    private:
+    private:                    
 
         virtual void instanciate_ipython_shell();
         virtual bool use_jedi_for_completion() const;

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:
@@ -88,6 +90,10 @@ namespace xpyt
         bool m_release_gil_at_startup = true;
         gil_scoped_release_ptr m_release_gil = nullptr;
         bool m_redirect_display_enabled;
+
+        std::string _i,_ii,_iii;
+
+        py::dict m_global_dict;
     };
 
 }