Commit Graph

474 Commits

Author SHA1 Message Date
Gnome Ann 5d13339a52 Allow the retry button to call the Lua scripts properly 2021-12-12 20:48:10 -05:00
Gnome Ann 39bfb0862a Allow user input to be modified from Lua
Also adds some handlers in the Lua code for when the game is not started
yet
2021-12-12 20:44:03 -05:00
Gnome Ann fbf3e7615b Add API for generated tokens and output text 2021-12-12 19:27:20 -05:00
Gnome Ann ceabd2ef7b Add Lua API for editing logits during generation
TPU backend not supported yet.
2021-12-12 16:18:45 -05:00
Gnome Ann e2c3ac041b Complete the Lua generation halting API 2021-12-12 12:52:03 -05:00
Gnome Ann e06861bb0b Rename `v` to `wrapped_func` in `metawrapper.__newindex()` 2021-12-12 12:20:01 -05:00
Gnome Ann d76dd35791 Add Lua API for reading model information 2021-12-12 12:09:59 -05:00
Gnome Ann 09df371d99 Handle nested wrapped functions in bridge.lua properly 2021-12-12 11:30:04 -05:00
Gnome Ann 00eb125ad0 Allow Lua API to toggle dynamic scan 2021-12-12 01:55:46 -05:00
Gnome Ann 5692a7dfe2 Add Lua API for reading the text the user submitted to the AI 2021-12-12 01:52:42 -05:00
Gnome Ann 2a752c073e Changing story chunks in Lua API should require regeneration 2021-12-12 01:43:40 -05:00
Gnome Ann 3b87c58de9 Make `KoboldStory` iterators methods instead of static functions 2021-12-12 01:33:49 -05:00
Gnome Ann 03453c4e27 Change script directory tree
Userscripts have been moved from /scripts/userscripts to /userscripts.

Core scripts have been moved from /scripts/corescripts to /cores.
2021-12-11 23:46:30 -05:00
Gnome Ann 36209bfe69 Add Lua API for story chunks 2021-12-11 23:44:07 -05:00
Gnome Ann 8e6a62259e Fix the Lua tokenizer API 2021-12-11 21:24:34 -05:00
Gnome Ann 67974947b2 Fix numerous problems in the Lua world info API 2021-12-11 19:11:38 -05:00
Gnome Ann 3327f1b471 Fix Lua settings API 2021-12-11 17:01:41 -05:00
Gnome Ann f8aa578f41 Enable generation modifiers for transformers backend only 2021-12-11 16:28:25 -05:00
Gnome Ann 1111408cc2 Switch default userscript order for inmods and outmods 2021-12-11 16:27:16 -05:00
Gnome Ann e289a0d360 Connect bridge.lua to aiserver.py
Also enables the use of input modifiers and output modifiers, but not
generation modifiers.
2021-12-11 12:45:45 -05:00
Gnome Ann 68685698a4 Fix parts of bridge.lua where `t` is used instead of `k` or `v` 2021-12-11 12:13:56 -05:00
Gnome Ann 4710ea3949 Restructure the `execute` API in bridge.lua 2021-12-11 02:42:40 -05:00
Gnome Ann 68c2cb3b98 Fix a few problems in bridge.lua
* Use `python.iter` instead of `pairs` to iterate through `_bridged`
* Use `old_loadfile` instead of `safe_require_with_env` to load scripts
  in order to handle unusual file names
* Prevent modules imported by scripts from accessing bridge.lua's
  environment
* Fix behaviour of `KoboldWorldInfoEntry_mt._kobold_next(t, k)`
* New `next` implementation now has more safety checks
2021-12-11 01:21:18 -05:00
Gnome Ann 35966b2007 Upload bridge.lua, default.lua and some Lua libs
base64
inspect
json.lua
Lua-hashings
Lua-nums
Moses
mt19937ar-lua
Penlight
Serpent
2021-12-10 19:45:57 -05:00
Gnome Ann cb384ce25b Merge branch 'united' into world-info 2021-12-10 16:09:43 -05:00
henk717 64ca337c5d Update colabkobold.sh 2021-12-10 21:34:41 +01:00
henk717 47f2544630 Location Fix
Fix the extraction location for zstd
2021-12-10 21:24:23 +01:00
henk717 bc1c0c4fa7 pip requirements
For Colab
2021-12-09 23:50:21 +01:00
henk717 d546cbd8c6 Update dependencies
Updates dependencies, play.sh didn't work properly so removing that for now since manually running aiserver.py is superior on Linux until I can get conda to init inside the script
2021-12-09 23:49:35 +01:00
henk717 9054c71515
zstd path fix 2021-12-09 18:06:54 +01:00
Gnome Ann 8212fb701b Merge branch 'united' into world-info 2021-12-08 22:54:12 -05:00
henk717 d15b50f334 Conda based Play
For people who want to use Conda instead of Docker.
2021-12-08 18:44:13 +01:00
henk717 20e0b59fb9
Migrate to official transformers
No longer using VE's fork since its obsolete, in line with what we already did for the CUDA varient.
2021-12-07 23:35:28 +01:00
Gnome Ann 683bcb824f Merge branch 'united' into world-info 2021-12-05 13:06:32 -05:00
henk717 c36bc376c0
Revert typo fix
Wasn't a typo (Testing on git again since its easier with the colabs)
2021-12-05 18:36:54 +01:00
henk717 337941e356
Typo fix
Accidentally had a negative which should have been a positive, this should fix repo downloads.
2021-12-05 18:34:20 +01:00
henk717 a442a2a67e
Merge pull request #41 from VE-FORBRYDERNE/jax21
TPU backend improvements
2021-12-05 18:10:52 +01:00
Gnome Ann 6d8517e224 Fix some minor coding errors 2021-12-05 11:39:59 -05:00
Gnome Ann 1393eac882 Add indentation to WI folder contents 2021-12-05 03:29:13 -05:00
Gnome Ann d46ef8550b Fix WI sortable handle events not being bound correctly
This fixes a problem where WI entries/folders are sometimes able to be
dragged into places they shouldn't be. Steps to reproduce:

1. Start a blank story
2. Refresh the browser
3. Open the W Info screen
4. Add a world info folder
5. Add a world info entry into that folder
6. Drag that world info entry
2021-12-05 03:04:45 -05:00
Gnome Ann 85aa180a90 Put safeguards on dragging and dropping into invalid positions 2021-12-05 02:50:42 -05:00
Gnome Ann 150ce033c9 TPU backend no longer needs to recompile after changing softprompt 2021-12-05 02:49:15 -05:00
Gnome Ann 3e0b1a9e63 Fix scrolling problems with WI entries with long names/comments 2021-12-05 01:39:42 -05:00
Gnome Ann 08992dec7e Use a green horizontal line as the drag-and-drop placeholder 2021-12-05 00:34:44 -05:00
Gnome Ann b99ac92a52 WI folders and WI drag-and-drop 2021-12-04 23:59:28 -05:00
Gnome Ann d2d338d314 Improve TPU backend compilation times with `numseqs > 1`
A Python `for` loop was replaced with a `jax.lax.scan` call so that JAX
only compiles the `transformer.generate_initial` function one time
instead of `numseqs` times. This is because JAX unrolls Python built-in
loops like `for`. The compilation times should now be about the same as
they were before the upgrade to JAX 0.2.21.
2021-11-30 19:22:40 -05:00
Gnome Ann c1e7c1643f Fix unbound axis error in tpu_mtj_backend.py when `numseqs > 1` 2021-11-30 14:06:46 -05:00
Gnome Ann 3c349e6aaf Modify TPU backend code to support JAX 0.2.21
The original one supported versions of JAX up to 0.2.12, and possibly also some
earlier versions. This new code supports exclusively JAX 0.2.21 and does not
work with any earlier or later versions of JAX. However, this new code benefits
from not needing to recompile when changing "Amount To Generate" and also from
supporting stopping generation early, which makes an implementation of Dynamic
World Info Scan finally possible.
2021-11-30 10:13:02 -05:00
henk717 9e3318c696 Update colabkobold.sh
Bugfix
2021-11-29 18:42:40 +01:00
henk717 4244b588cb Ngrok requirements
Adds ngrok to the requirements.txt files
2021-11-29 18:13:30 +01:00