Rename libbinding to libpsppy, fix JS tests, merge gha scripts

Author: texodus

.github/workflows/build.yml

@@ -1033,6 +1033,56 @@ jobs:
                   path: python/perspective/dist/*.tar.gz
               if: ${{ matrix.os == 'macos-11' }}
 
+    build-pyodide:
+        runs-on: ubuntu-22.04
+        needs: [initialize]
+        env:
+            PYODIDE_VERSION: 0.23.2
+            # PYTHON_VERSION and EMSCRIPTEN_VERSION are determined by PYODIDE_VERSION.
+            # The appropriate versions can be found in the Pyodide repodata.json
+            # "info" field, or in Makefile.envs:
+            # https://github.com/pyodide/pyodide/blob/main/Makefile.envs#L2
+            PYTHON_VERSION: 3.11.2
+            EMSCRIPTEN_VERSION: 3.1.32
+        steps:
+            - name: Checkout perspective
+              uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+            - name: set up python
+              id: setup-python
+              uses: actions/setup-python@57ded4d7d5e986d7296eab16560982c6dd7c923b # v4.6.0
+              with:
+                  python-version: ${{ env.PYTHON_VERSION }}
+
+            - uses: mymindstorm/setup-emsdk@ab889da2abbcbb280f91ec4c215d3bb4f3a8f775 # v12
+              with:
+                  version: ${{ env.EMSCRIPTEN_VERSION }}
+                  actions-cache-folder: emsdk-cache
+
+            - name: copy files
+              run: |
+                  npm install -g yarn
+                  yarn --frozen-lockfile
+                  yarn build_python --setup-only
+
+            - name: Linux init steps
+              run: sudo node scripts/install_tools.js
+
+            - name: Install pyodide-build
+              run: pip install pyodide-build==$PYODIDE_VERSION
+
+            - name: Build
+              # Without --exports=pyinit, pyodide-build tries to export all symbols from every .o,
+              # which causes the em++ linker command line invocation to be so long
+              # that the command fails.
+              run: pyodide build python/perspective --exports=pyinit
+
+            - name: Upload pyodide wheel
+              uses: actions/upload-artifact@v3
+              with:
+                  name: perspective-python-dist-pyodide
+                  path: dist/*.whl
+
     ##########################################################################################################################
     ##########################################################################################################################
 

.github/workflows/pyodide.yml

@@ -541,7 +541,6 @@ set(PSP_WASM_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
     -s EXPORT_NAME=\"load_perspective\" \
     -s MAXIMUM_MEMORY=4gb \
     -s ERROR_ON_UNDEFINED_SYMBOLS=1 \
-    -s ENVIRONMENT=worker \
 ")
 
 if(PSP_WASM_BUILD)
@@ -592,51 +591,50 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
         # Python extra targets #
         # #######################
         add_library(psp STATIC ${PYTHON_SOURCE_FILES})
-        add_library(binding SHARED ${PYTHON_BINDING_SOURCE_FILES})
+        add_library(psppy SHARED ${PYTHON_BINDING_SOURCE_FILES})
         if(PSP_PYODIDE)
-            set(CMAKE_EXE_LINKER_FLAGS "${PSP_WASM_LINKER_FLAGS}")
             set(PSP_PYTHON_DEFS PSP_ENABLE_WASM=1)
         else()
             set(PSP_PYTHON_DEFS PSP_ENABLE_PYTHON_THREADING=1)
         endif()
         target_compile_definitions(psp PRIVATE ${PSP_PYTHON_DEFS})
-        target_compile_definitions(binding PRIVATE ${PSP_PYTHON_DEFS})
+        target_compile_definitions(psppy PRIVATE ${PSP_PYTHON_DEFS})
 
         include_directories(${PSP_PYTHON_SRC}/include)
 
         target_compile_definitions(psp PRIVATE PSP_ENABLE_PYTHON=1)
-        target_compile_definitions(binding PRIVATE PSP_ENABLE_PYTHON=1)
+        target_compile_definitions(psppy PRIVATE PSP_ENABLE_PYTHON=1)
 
         if(WIN32)
-            target_compile_definitions(binding PRIVATE WIN32=1)
-            target_compile_definitions(binding PRIVATE _WIN32=1)
+            target_compile_definitions(psppy PRIVATE WIN32=1)
+            target_compile_definitions(psppy PRIVATE _WIN32=1)
 
             # .dll not importable
-            set_property(TARGET binding PROPERTY SUFFIX .pyd)
+            set_property(TARGET psppy PROPERTY SUFFIX .pyd)
         elseif(PSP_PYODIDE)
             target_compile_options(psp PRIVATE -fvisibility=hidden)
-            target_compile_options(binding PRIVATE -fvisibility=hidden)
+            target_compile_options(psppy PRIVATE -fvisibility=hidden)
         elseif(MACOS OR NOT MANYLINUX)
-            target_compile_options(binding PRIVATE -Wdeprecated-declarations)
+            target_compile_options(psppy PRIVATE -Wdeprecated-declarations)
             set_property(TARGET psp PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${module_origin_path})
-            set_property(TARGET binding PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${module_origin_path})
+            set_property(TARGET psppy PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${module_origin_path})
 
             target_compile_options(psp PRIVATE -fvisibility=hidden)
-            target_compile_options(binding PRIVATE -fvisibility=hidden)
+            target_compile_options(psppy PRIVATE -fvisibility=hidden)
         else()
-            target_compile_options(binding PRIVATE -Wdeprecated-declarations)
+            target_compile_options(psppy PRIVATE -Wdeprecated-declarations)
         endif()
 
         # Link against minimal arrow static library
         target_link_libraries(psp arrow re2)
-        target_link_libraries(binding psp)
+        target_link_libraries(psppy psp)
 
         # The compiled libraries will be put in CMAKE_LIBRARY_OUTPUT_DIRECTORY by default. In the
         # setup.py file, we designate this to be in the build/lib.<platform> directory. However,
         # since we want to be able to test perspective in-source, we also copy the libraries into
         # the source folder. These two commands do that.
         add_custom_command(TARGET psp POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:psp> ${PSP_PYTHON_SRC}/table/)
-        add_custom_command(TARGET binding POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:binding> ${PSP_PYTHON_SRC}/table/)
+        add_custom_command(TARGET psppy POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:psppy> ${PSP_PYTHON_SRC}/table/)
 
     # #######################
     else()
@@ -649,7 +647,7 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
         target_compile_options(psp PRIVATE $<$<CONFIG:DEBUG>:-fPIC -O0>)
 
         if(PSP_PYTHON_BUILD AND NOT PSP_PYODIDE)
-            target_compile_options(binding PRIVATE $<$<CONFIG:DEBUG>:-fPIC -O0>)
+            target_compile_options(psppy PRIVATE $<$<CONFIG:DEBUG>:-fPIC -O0>)
         endif()
     elseif(WIN32)
         target_compile_definitions(psp PRIVATE PERSPECTIVE_EXPORTS=1)

cpp/perspective/CMakeLists.txt

@@ -2023,7 +2023,7 @@ namespace computed_function {
             number = val.to_double();
         }
 
-#if defined(PSP_ENABLE_WASM) && defined(PSP_ENABLE_PYTHON)
+#if defined(PSP_ENABLE_WASM) && !defined(PSP_ENABLE_PYTHON)
         // check for overflow
         if (number > std::numeric_limits<std::int32_t>::max()
             || number < std::numeric_limits<std::int32_t>::min()) {

cpp/perspective/src/cpp/computed_function.cpp

@@ -371,13 +371,18 @@ export class Server {
     }
 
     /**
-     * Send an error to the client.
+     * Send an error to the client. If this method fails, we need to consume it
+     * as this method is frequently called itself from a `catch` block.
      */
     process_error(msg, error) {
-        this.post({
-            id: msg.id,
-            error: error_to_json(error),
-        });
+        try {
+            this.post({
+                id: msg.id,
+                error: error_to_json(error),
+            });
+        } catch (e) {
+            console.error("Error handler failed: {}", error);
+        }
     }
 
     /**

packages/perspective/src/js/api/server.js

@@ -50,7 +50,7 @@ namespace binding {}
  */
 using namespace perspective::binding;
 
-PYBIND11_MODULE(libbinding, m) {
+PYBIND11_MODULE(libpsppy, m) {
     /******************************************************************************
      *
      * PerspectiveCppError

python/perspective/perspective/include/perspective/python.h

@@ -11,19 +11,19 @@
 
 
 def is_libpsp():
-    """Was libbinding successfully loaded in this module?"""
+    """Was libpsppy successfully loaded in this module?"""
     return __is_libpsp__
 
 
 __is_libpsp__ = True
 
 try:
-    # Load all `libbinding` depending modules in one go, otherwise nothing
-    # dependent on `libbinding` is exposed.
+    # Load all `libpsppy` depending modules in one go, otherwise nothing
+    # dependent on `libpsppy` is exposed.
     from .table import *
     from .manager import *
     from .viewer import *
-    from .table.libbinding import (
+    from .table.libpsppy import (
         init_expression_parser,
     )
 

python/perspective/perspective/libpsp.py

@@ -8,6 +8,6 @@
 
 from .table import Table
 from .view import View
-from .libbinding import PerspectiveCppError
+from .libpsppy import PerspectiveCppError
 
 __all__ = ["Table", "View", "PerspectiveCppError"]

python/perspective/perspective/table/__init__.py

@@ -16,7 +16,7 @@
 from ..core.data.pd import _parse_datetime_index
 from ..core.exception import PerspectiveError
 from ._date_validator import _PerspectiveDateValidator
-from .libbinding import t_dtype
+from .libpsppy import t_dtype
 
 
 def _flatten_structure(array):
@@ -189,7 +189,7 @@ def marshal(self, cidx, ridx, dtype):
         Args:
             cidx (:obj:`int`)
             ridx (:obj:`int`)
-            dtype (:obj:`.libbinding.t_dtype`)
+            dtype (:obj:`.libpsppy.t_dtype`)
 
         Returns:
             object or None

python/perspective/perspective/table/_accessor.py

@@ -9,7 +9,7 @@
 import numpy as np
 from math import floor, ceil, trunc
 from ._constants import COLUMN_SEPARATOR_STRING
-from .libbinding import (
+from .libpsppy import (
     get_data_slice_unit,
     get_data_slice_zero,
     get_data_slice_one,