Revert "typescript bindings maintenance (#2363)"

As discussed on Discord, this PR was not ready to be merged. CI fails on
it.

This reverts commit a602f7f.

Signed-off-by: Jared Van Bortel <[email protected]>

Author: cebtenzzre

.circleci/continue_config.yml

@@ -570,27 +570,22 @@ jobs:
             wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb
             sudo dpkg -i cuda-keyring_1.1-1_all.deb
             sudo apt-get update
-            sudo apt-get install -y cmake build-essential g++-12-aarch64-linux-gnu gcc-12-aarch64-linux-gnu vulkan-sdk cuda-compiler-12-4 libcublas-dev-12-4 libnvidia-compute-550-server libmysqlclient21 libodbc2 libpq5
+            sudo apt-get install -y cmake build-essential vulkan-sdk cuda-compiler-12-4 libcublas-dev-12-4 libnvidia-compute-550-server libmysqlclient21 libodbc2 libpq5
       - run:
           name: Build Libraries
           command: |
             export PATH=$PATH:/usr/local/cuda/bin
             cd gpt4all-backend
             mkdir -p runtimes/build
             cd runtimes/build
-            cmake ../.. -DCMAKE_BUILD_TYPE=Release
-            cmake --build . --parallel
+            cmake ../..
+            cmake --build . --parallel --config Release
             mkdir ../linux-x64
             cp -L *.so ../linux-x64 # otherwise persist_to_workspace seems to mess symlinks
-            cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE="./toolchains/linux-arm64-toolchain.cmake"
-            cmake --build . --parallel
-            mkdir ../linux-arm64
-            cp -L *.so ../linux-arm64
       - persist_to_workspace:
           root: gpt4all-backend
           paths:
             - runtimes/linux-x64/*.so
-            - runtimes/linux-arm64/*.so
 
   build-bindings-backend-macos:
     macos:
@@ -901,11 +896,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: /tmp/gpt4all-backend
-      - run:
-          name: Install dependencies
-          command: |
-            sudo apt-get update
-            sudo apt-get install -y g++-12-aarch64-linux-gnu gcc-12-aarch64-linux-gnu
       - node/install:
           install-yarn: true
           node-version: "18.16"
@@ -918,24 +908,18 @@ jobs:
       - run:
           command: | 
             cd gpt4all-bindings/typescript
-            yarn build:prebuilds
+            yarn prebuildify -t 18.16.0 --napi
       - run: 
           command: |
             mkdir -p gpt4all-backend/prebuilds/linux-x64
             mkdir -p gpt4all-backend/runtimes/linux-x64
             cp /tmp/gpt4all-backend/runtimes/linux-x64/*-*.so gpt4all-backend/runtimes/linux-x64
             cp gpt4all-bindings/typescript/prebuilds/linux-x64/*.node gpt4all-backend/prebuilds/linux-x64
-            mkdir -p gpt4all-backend/prebuilds/linux-arm64
-            mkdir -p gpt4all-backend/runtimes/linux-arm64
-            cp /tmp/gpt4all-backend/runtimes/linux-arm64/*-*.so gpt4all-backend/runtimes/linux-arm64
-            cp gpt4all-bindings/typescript/prebuilds/linux-arm64/*.node gpt4all-backend/prebuilds/linux-arm64
       - persist_to_workspace:
           root: gpt4all-backend
           paths:
             - prebuilds/linux-x64/*.node 
             - runtimes/linux-x64/*-*.so
-            - prebuilds/linux-arm64/*.node
-            - runtimes/linux-arm64/*-*.so
   build-nodejs-macos: 
     macos:
       xcode: "14.0.0"
@@ -1045,11 +1029,13 @@ jobs:
             cp /tmp/gpt4all-backend/runtimes/darwin/*-*.* runtimes/darwin/native/
 
             cp /tmp/gpt4all-backend/prebuilds/darwin-x64/*.node prebuilds/darwin-x64/    
+            
+            # Fallback build if user is not on above prebuilds
+            mv -f binding.ci.gyp binding.gyp
 
-            # copy the backend source we depend on to make fallback builds work
-            mkdir backend
+            mkdir gpt4all-backend
             cd ../../gpt4all-backend
-            mv llmodel.h llmodel.cpp llmodel_c.cpp llmodel_c.h sysinfo.h dlhandle.h ../gpt4all-bindings/typescript/backend/
+            mv llmodel.h llmodel.cpp llmodel_c.cpp llmodel_c.h sysinfo.h dlhandle.h ../gpt4all-bindings/typescript/gpt4all-backend/
             
       # Test install
       - node/install-packages:
@@ -1059,7 +1045,7 @@ jobs:
       - run: 
           command: | 
             cd gpt4all-bindings/typescript
-            yarn run test:ci
+            yarn run test
       - run:
           command: |
             cd gpt4all-bindings/typescript

gpt4all-backend/CMakeLists.txt

@@ -79,7 +79,6 @@ if (LLMODEL_ROCM)
 endif()
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
-include(CheckCXXCompilerFlag)
 
 # Go through each build variant
 foreach(BUILD_VARIANT IN LISTS BUILD_VARIANTS)

gpt4all-backend/toolchains/linux-arm64-toolchain.cmake

@@ -8,5 +8,4 @@ prebuilds/
 !.yarn/sdks
 !.yarn/versions
 runtimes/
-backend/
 compile_flags.txt

gpt4all-bindings/typescript/.gitignore

@@ -1,5 +1,4 @@
 test/
 spec/
-scripts/*
-!scripts/assert-backend-sources.js
+scripts/
 build

gpt4all-bindings/typescript/.npmignore

@@ -188,8 +188,6 @@ model.dispose();
 *   python 3
 *   On Windows and Linux, building GPT4All requires the complete Vulkan SDK. You may download it from here: https://vulkan.lunarg.com/sdk/home
 *   macOS users do not need Vulkan, as GPT4All will use Metal instead.
-*   CUDA Toolkit >= 11.4  (you can bypass this with adding a custom flag to build step)
-    -  Windows: There is difficulty compiling with cuda if the Visual Studio IDE is NOT present.
 
 ### Build (from source)
 
@@ -198,29 +196,23 @@ git clone https://github.com/nomic-ai/gpt4all.git
 cd gpt4all-bindings/typescript
 ```
 
-llama.cpp git submodule for gpt4all can be possibly absent or outdated. Make sure to run
+*   The below shell commands assume the current working directory is `typescript`.
+
+*   To Build and Rebuild:
 
 ```sh
-git submodule update --init --recursive
+node scripts/prebuild.js
 ```
-
-The below shell commands assume the current working directory is `typescript`.
-
-Using yarn
+*   llama.cpp git submodule for gpt4all can be possibly absent. If this is the case, make sure to run in llama.cpp parent directory
 
 ```sh
-yarn install
-yarn build
+git submodule update --init --recursive
 ```
 
-Using npm
-
 ```sh
-npm install
-npm run build
+yarn build:backend
 ```
-
-The `build:runtimes` script will create runtime libraries for your platform in `runtimes` and `build:prebuilds` will create the bindings in `prebuilds`. `build` is a shortcut for both.
+This will build platform-dependent dynamic libraries, and will be located in runtimes/(platform)/native
 
 ### Test
 
@@ -267,7 +259,7 @@ yarn test
 
 This package has been stabilizing over time development, and breaking changes may happen until the api stabilizes. Here's what's the todo list:
 
-*   \[x] [Purely offline](#Offline-usage). Per the gui, which can be run completely offline, the bindings should be as well. 
+*   \[ ] Purely offline. Per the gui, which can be run completely offline, the bindings should be as well.
 *   \[ ] NPM bundle size reduction via optionalDependencies strategy (need help)
     *   Should include prebuilds to avoid painful node-gyp errors
 *   \[x] createChatSession ( the python equivalent to create\_chat\_session )
@@ -284,7 +276,7 @@ This package has been stabilizing over time development, and breaking changes ma
 This repository serves as the new bindings for nodejs users.
 - If you were a user of [these bindings](https://github.com/nomic-ai/gpt4all-ts), they are outdated.
 - Version 4 includes the follow breaking changes
-    * `createEmbedding` & `EmbeddingModel.embed()` returns an object, `EmbeddingResult`, instead of a Float32Array.
+    * `createEmbedding` & `EmbeddingModel.embed()` returns an object, `EmbeddingResult`, instead of a float32array.
     * Removed deprecated types `ModelType` and `ModelFile`
     * Removed deprecated initiation of model by string path only
 

gpt4all-bindings/typescript/README.md

@@ -0,0 +1,62 @@
+{
+  "targets": [
+    {
+      "target_name": "gpt4all", # gpt4all-ts will cause compile error
+      "include_dirs": [
+        "<!@(node -p \"require('node-addon-api').include\")",
+        "gpt4all-backend",
+      ],
+      "sources": [
+        # PREVIOUS VERSION: had to required the sources, but with newest changes do not need to
+        #"../../gpt4all-backend/llama.cpp/examples/common.cpp",
+        #"../../gpt4all-backend/llama.cpp/ggml.c",
+        #"../../gpt4all-backend/llama.cpp/llama.cpp",
+        # "../../gpt4all-backend/utils.cpp",
+        "gpt4all-backend/llmodel_c.cpp",
+        "gpt4all-backend/llmodel.cpp",
+        "prompt.cc",
+        "index.cc",
+       ],
+      "conditions": [
+        ['OS=="mac"', {
+            'xcode_settings': {
+                'GCC_ENABLE_CPP_EXCEPTIONS': 'YES'
+            },
+            'defines': [
+                'LIB_FILE_EXT=".dylib"',
+                'NAPI_CPP_EXCEPTIONS',
+            ],
+            'cflags_cc': [
+                "-fexceptions"
+            ]
+        }],
+        ['OS=="win"', {
+            'defines': [
+                'LIB_FILE_EXT=".dll"',
+                'NAPI_CPP_EXCEPTIONS',
+            ],
+            "msvs_settings": {
+                "VCCLCompilerTool": {
+                    "AdditionalOptions": [
+                        "/std:c++20",
+                        "/EHsc",
+                  ],
+                },
+            },
+        }],
+        ['OS=="linux"', {
+            'defines': [
+                'LIB_FILE_EXT=".so"',
+                'NAPI_CPP_EXCEPTIONS',
+            ],
+            'cflags_cc!': [
+                '-fno-rtti',
+            ],
+            'cflags_cc': [
+                '-std=c++2a',
+                '-fexceptions'
+            ]
+        }]
+      ]
+    }]
+}

gpt4all-bindings/typescript/binding.ci.gyp

@@ -1,15 +1,19 @@
 {
   "targets": [
     {
-      "target_name": "gpt4all",
+      "target_name": "gpt4all", # gpt4all-ts will cause compile error
       "include_dirs": [
         "<!@(node -p \"require('node-addon-api').include\")",
-        "backend",
+        "../../gpt4all-backend",
       ],
       "sources": [
-        "backend/llmodel_c.cpp",
-        "backend/llmodel.cpp",
-        "backend/dlhandle.cpp",
+        # PREVIOUS VERSION: had to required the sources, but with newest changes do not need to
+        #"../../gpt4all-backend/llama.cpp/examples/common.cpp",
+        #"../../gpt4all-backend/llama.cpp/ggml.c",
+        #"../../gpt4all-backend/llama.cpp/llama.cpp",
+        # "../../gpt4all-backend/utils.cpp",
+        "../../gpt4all-backend/llmodel_c.cpp",
+        "../../gpt4all-backend/llmodel.cpp",
         "prompt.cc",
         "index.cc",
        ],