Merge branch 'master' into features-to-readme

3 files changed, 41 insertions, 3 deletions

diff --git a/javascript/edit-attention.js b/javascript/edit-attention.js
index 67084e7a..c0d29a74 100644
--- a/javascript/edit-attention.js
+++ b/javascript/edit-attention.js
@@ -9,9 +9,38 @@ addEventListener('keydown', (event) => {
 	let minus = "ArrowDown"

 	if (event.key != plus && event.key != minus) return;

 

-	selectionStart = target.selectionStart;

-	selectionEnd = target.selectionEnd;

-	if(selectionStart == selectionEnd) return;

+	let selectionStart = target.selectionStart;

+	let selectionEnd = target.selectionEnd;

+	// If the user hasn't selected anything, let's select their current parenthesis block

+	if (selectionStart === selectionEnd) {

+		// Find opening parenthesis around current cursor

+		const before = target.value.substring(0, selectionStart);

+		let beforeParen = before.lastIndexOf("(");

+		if (beforeParen == -1) return;

+		let beforeParenClose = before.lastIndexOf(")");

+		while (beforeParenClose !== -1 && beforeParenClose > beforeParen) {

+			beforeParen = before.lastIndexOf("(", beforeParen - 1);

+			beforeParenClose = before.lastIndexOf(")", beforeParenClose - 1);

+		}

+

+		// Find closing parenthesis around current cursor

+		const after = target.value.substring(selectionStart);

+		let afterParen = after.indexOf(")");

+		if (afterParen == -1) return;

+		let afterParenOpen = after.indexOf("(");

+		while (afterParenOpen !== -1 && afterParen > afterParenOpen) {

+			afterParen = after.indexOf(")", afterParen + 1);

+			afterParenOpen = after.indexOf("(", afterParenOpen + 1);

+		}

+		if (beforeParen === -1 || afterParen === -1) return;

+

+		// Set the selection to the text between the parenthesis

+		const parenContent = target.value.substring(beforeParen + 1, selectionStart + afterParen);

+		const lastColon = parenContent.lastIndexOf(":");

+		selectionStart = beforeParen + 1;

+		selectionEnd = selectionStart + lastColon;

+		target.setSelectionRange(selectionStart, selectionEnd);

+	}

 

 	event.preventDefault();

 

diff --git a/javascript/hints.js b/javascript/hints.js
index b98012f5..a1fcc93b 100644
--- a/javascript/hints.js
+++ b/javascript/hints.js
@@ -91,6 +91,8 @@ titles = {
 
     "Weighted sum": "Result = A * (1 - M) + B * M",
     "Add difference": "Result = A + (B - C) * M",
+
+    "Learning rate": "how fast should the training go. Low values will take longer to train, high values may fail to converge (not generate accurate results) and/or may break the embedding (This has happened if you see Loss: nan in the training info textbox. If this happens, you need to manually restore your embedding from an older not-broken backup).\n\nYou can set a single numeric value, or multiple learning rates using the syntax:\n\n   rate_1:max_steps_1, rate_2:max_steps_2, ...\n\nEG:   0.005:100, 1e-3:1000, 1e-5\n\nWill train with rate of 0.005 for first 100 steps, then 1e-3 until 1000 steps, then 1e-5 for all remaining steps.",
 }
 
 
diff --git a/javascript/ui.js b/javascript/ui.js
index 9e1bed4c..cfd0dcd3 100644
--- a/javascript/ui.js
+++ b/javascript/ui.js
@@ -1,5 +1,12 @@
 // various functions for interation with ui.py not large enough to warrant putting them in separate files
 
+function set_theme(theme){
+    gradioURL = window.location.href
+    if (!gradioURL.includes('?__theme=')) {
+      window.location.replace(gradioURL + '?__theme=' + theme);
+    }
+}
+
 function selected_gallery_index(){
     var buttons = gradioApp().querySelectorAll('[style="display: block;"].tabitem .gallery-item')
     var button = gradioApp().querySelector('[style="display: block;"].tabitem .gallery-item.\\!ring-2')