Added an option to show/hide all tags. Fixing AI prompt bug.

frianasoa · Dec 19, 2023 · 046e5cd · 046e5cd
1 parent 3122ef9
commit 046e5cd
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 19 deletions.
diff --git a/content/notes/menus.js b/content/notes/menus.js
@@ -351,6 +351,13 @@ Menus = {
  {
  currentcomment = "";
  }
+
+ if(!annotation)
+ {
+ alert("Annotation text not found!"+annotationkey);
+ return;
+ }
+
  var tl = Zotero.ZeNotes.Prefs.get("target-language");
  Zotero.ZeNotes.Ai.Google.translate(annotation["annotationText"], tl, mode).then(r=>{
  var table = AiUi.createdialog(annotation, currentcomment, r, "g-translate");
@@ -435,12 +442,18 @@ Menus = {
  Zotero.ZeNotes.Ai.Bard.customprompt(JSON.stringify(data), target).then(r=>{
  var table = AiUi.createdialog(annotation, currentcomment, r, "bard");
  var model = Zotero.ZeNotes.Prefs.get("bard-model");
-
  var div = document.createElement("div");
  div.innerHTML = "<h2>Custom prompt</h2> "+customprompt+"<hr/>"+this.displayjson(data);
-
- TabbedDialog.open(table, div, function(){}, "Edit and choose a candidate [Bard: "+model+"]", "close");
+ try {
+ TabbedDialog.open(table, div, function(){}, "Edit and choose a candidate [Bard: "+model+"]", "close");
+ }
+ catch(e)
+ {
+ alert(e);
+ }
  }).catch(r=>{
+ var div = document.createElement("div");
+ div.innerHTML = "<h2>Custom prompt</h2> "+customprompt+"<hr/>"+this.displayjson(data);
  var html = "";
  if(Array.isArray(r))
  {

diff --git a/content/notes/notes.js b/content/notes/notes.js
@@ -185,12 +185,12 @@ Notes = {
 
  td.querySelectorAll(".annotation").forEach(a=>{
  a.addEventListener("mouseover", function(e){
- e.target.closest("td").dataset.annotationid = e.target.dataset.annotationid;
- e.target.closest("td").dataset.attachmentid = e.target.dataset.attachmentid;
- e.target.closest("td").dataset.attachmentkey = e.target.dataset.attachmentkey;
- e.target.closest("td").dataset.annotationpage = e.target.dataset.annotationpage;
- e.target.closest("td").dataset.annotationkey = e.target.dataset.annotationkey;
- e.target.closest("td").dataset.annotationdomid = e.target.id;
+ e.target.closest("td").dataset.annotationid = e.currentTarget.dataset.annotationid;
+ e.target.closest("td").dataset.attachmentid = e.currentTarget.dataset.attachmentid;
+ e.target.closest("td").dataset.attachmentkey = e.currentTarget.dataset.attachmentkey;
+ e.target.closest("td").dataset.annotationpage = e.currentTarget.dataset.annotationpage;
+ e.target.closest("td").dataset.annotationkey = e.currentTarget.dataset.annotationkey;
+ e.target.closest("td").dataset.annotationdomid = e.currentTarget.id;
  });
  });
 

diff --git a/core/ai.js b/core/ai.js
@@ -12,7 +12,7 @@ Ai={
  return Promise.resolve(data.candidates.map(function(v){return v.output}));
  }
  catch(e) {
- return Promise.resolve([data.error.message]);
+ return Promise.resolve([data.error.message, JSON.stringify(data)]);
  }
  }
  else if(mode=="gemini-pro")
@@ -24,7 +24,7 @@ Ai={
  try {
  if(data.candidates[0].finishReason=="OTHER")
  {
- return Promise.resolve(["Error: No results found!"]);
+ return Promise.resolve(["Error: No results found!", JSON.stringify(data)]);
  }
  else
  {
@@ -45,7 +45,7 @@ Ai={
  }
  catch(e)
  {
- return Promise.resolve(["Error: "+e]);
+ return Promise.resolve(["Error: "+e, JSON.stringify(data)]);
  }
  }
  else if(mode=="g-translate-free-0")
@@ -56,7 +56,7 @@ Ai={
  }
  catch(e)
  {
- return Promise.resolve(["Error: "+e]);
+ return Promise.resolve(["Error: "+e, JSON.stringify(data)]);
  }
  }
  else if(mode=="g-translate-free-1")
@@ -67,7 +67,7 @@ Ai={
  }
  catch(e)
  {
- return Promise.resolve(["Error: "+e]);
+ return Promise.resolve(["Error: "+e, JSON.stringify(data)]);
  }
  }
  else if(mode=="bing")
@@ -83,13 +83,13 @@ Ai={
  }
 
  }).catch(e=>{
- return Promise.reject(["Error: "+e]);
+ return Promise.reject(["Error: "+e, JSON.stringify(data)]);
  });
  },
  prompts: {
  cell: "Paraphrase and summarize 'Direct quotes'",
- row: "Paraphrase and summarize 'Direct quotes'",
- table: "Summarize all the data",
+ row: "Summarize the data below into a coherent literature review. Add source for each claim in the form (Author date). ",
+ table: "Summarize the data below into a coherent literature review. Add source for each claim in the form (Author date). ",
  }
 }
 
@@ -136,7 +136,7 @@ Ai.Bard = {
  async customprompt(sentence, target)
  {
  var model = Zotero.ZeNotes.Prefs.get("bard-model");
- var prompts = Zotero.ZeNotes.Prefs.get("cell-custom-prompt");
+ var prompts = Zotero.ZeNotes.Prefs.get(target+"-custom-prompt");
 
  if(prompts=="")
  {

diff --git a/zenote-update.json b/zenote-update.json
@@ -5,7 +5,7 @@
  {
  "version": "0.6.6",
  "update_link": "https://github.com/frianasoa/Ze-Notes/releases/download/v0.6.6/zenotes-v0.6.6.xpi",
- "update_hash": "sha256:c9bc7bb01d8b6daf534635de158392d1b6ca39a80f95e6ccc617aed3dae30787",
+ "update_hash": "sha256:095b1f38f3f1462acbc3db68508ad73ff9c24b321603531083d8ad04dd21cebe",
  "applications": {
  "gecko": {
  "strict_min_version": "60.0"