Skip to content

Commit

Permalink
Renamed ai
Browse files Browse the repository at this point in the history
  • Loading branch information
@cjmalloy
cjmalloy committed Jan 19, 2024
1 parent fad224c commit 75012db
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 29 deletions.
47 changes: 24 additions & 23 deletions src/main/java/jasper/component/delta/Ai.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,20 @@ public class Ai implements Async.AsyncRunner {

@PostConstruct
void init() {
async.addAsyncResponse("plugin/inbox/ai", this);
async.addAsyncResponse("plugin/inbox/ai/openai", this);
}

@Override
public String signature() {
return "+plugin/openai";
return "+plugin/ai/openai";
}

@Override
public void run(Ref ref) throws JsonProcessingException {
logger.debug("AI replying to {} ({})", ref.getTitle(), ref.getUrl());
var author = ref.getTags().stream().filter(User::isUser).findFirst().orElse(null);
var aiPlugin = pluginRepository.findByTagAndOrigin("+plugin/openai", ref.getOrigin())
.orElseThrow(() -> new NotFoundException("+plugin/openai"));
var aiPlugin = pluginRepository.findByTagAndOrigin("+plugin/ai/openai", ref.getOrigin())
.orElseThrow(() -> new NotFoundException("+plugin/ai/openai"));
var config = objectMapper.convertValue(aiPlugin.getConfig(), OpenAi.AiConfig.class);
// TODO: compress pages if too long
var context = new HashMap<String, RefDto>();
Expand Down Expand Up @@ -200,19 +200,19 @@ public void run(Ref ref) throws JsonProcessingException {
logger.warn("Falling back: AI did not reply with JSON.");
logger.warn(reply, e);
response.setComment(reply);
response.setTags(new ArrayList<>(List.of("plugin/debug", "+plugin/openai")));
response.setTags(new ArrayList<>(List.of("plugin/debug", "+plugin/ai/openai")));
}
var responsePlugin = objectMapper.convertValue(res.getUsage(), ObjectNode.class);
responsePlugin.set("model", TextNode.valueOf(config.model));
response.setPlugin("+plugin/openai", responsePlugin);
response.setPlugin("+plugin/ai/openai", responsePlugin);
break;
} catch (Exception e) {
if (e instanceof OpenAiHttpException o) {
if (o.code.equals("rate_limit_exceeded")) continue;
if (o.code.equals("model_not_found")) continue;
}
response.setComment("Error invoking AI. " + e.getMessage());
response.setTags(new ArrayList<>(List.of("plugin/debug", "+plugin/openai")));
response.setTags(new ArrayList<>(List.of("plugin/debug", "+plugin/ai/openai")));
}
}
if (ref.getTags().contains("public")) response.addTag("public");
Expand All @@ -233,8 +233,9 @@ public void run(Ref ref) throws JsonProcessingException {
}
}
}
response.addTag("+plugin/openai");
response.addTag("+plugin/ai/openai");
response.getTags().remove("plugin/inbox/ai");
response.getTags().remove("plugin/inbox/ai/openai");
var sources = new ArrayList<>(List.of(ref.getUrl()));
if (ref.getTags().contains("plugin/thread") || ref.getTags().contains("plugin/comment")) {
// Add top comment source
Expand Down Expand Up @@ -263,7 +264,7 @@ public void run(Ref ref) throws JsonProcessingException {
aiReply.setOrigin(ref.getOrigin());
if (aiReply.getTags() != null) {
aiReply.setTags(aiReply.getTags().stream().distinct().filter(
t -> t.matches(Tag.REGEX) && (t.equals("+plugin/openai") || !t.startsWith("+") && !t.startsWith("_"))
t -> t.matches(Tag.REGEX) && (t.equals("+plugin/ai/openai") || !t.startsWith("+") && !t.startsWith("_"))
).collect(Collectors.toList()));
if (aiReply.getTags().contains("plugin/comment")) aiReply.addTag("internal");
if (aiReply.getTags().contains("plugin/thread")) aiReply.addTag("internal");
Expand Down Expand Up @@ -870,15 +871,15 @@ Jasper uses a combination of simple roles and Tag Based Access Control (TBAC). T
End of GitHub Readme.
You will reply when a notification is sent to you via your inbox tag, plugin/inbox/ai.
You will reply when a notification is sent to you via your inbox tag, plugin/inbox/ai/openai.
Include your response as the comment field of a Ref. Remember, the comment field is a string
which by default is intended to be parsed as markdown.
Only reply with pure JSON.
For example, in response to:
{
"url": "comment:1",
"title": "Say Hi!",
"tags": ["public", "+user/chris", "plugin/inbox/ai"]
"tags": ["public", "+user/chris", "plugin/inbox/ai/openai"]
}
You could respond:
Expand All @@ -887,7 +888,7 @@ Jasper uses a combination of simple roles and Tag Based Access Control (TBAC). T
"sources": ["comment:1"],
"title": "Re: Say Hi",
"comment":"Hi!",
"tags": ["public", "plugin/inbox/user/chris", "+plugin/openai"]
"tags": ["public", "plugin/inbox/user/chris", "+plugin/ai/openai"]
}],
"ext": []
}
Expand All @@ -902,15 +903,15 @@ Also include any other entities (refs, exts) in your response and they will be c
"url": "comment:2",
"title": "Chat with AI",
"comment": "Can you create an Ref pointing to the wikipedia article for weightlifting and tag it #cool?",
"tags": ["+user/chris","plugin/inbox/ai"]
"tags": ["+user/chris","plugin/inbox/ai/openai"]
}
You could respond:
{
"ref": [{
"sources": ["comment:2"],
"title": "Re: Chat with AI",
"comment": "Certainly! [Here](/ref/https://en.wikipedia.org/wiki/Weightlifting) it is.",
"tags": ["plugin/inbox/user/chris", "+plugin/openai"]
"tags": ["plugin/inbox/user/chris", "+plugin/ai/openai"]
}, {
"url": ["https://en.wikipedia.org/wiki/Weightlifting"],
"title": "Weightlifting",
Expand All @@ -933,7 +934,7 @@ the title of the source Ref (unless it is already prefixed, don't double prefix
"sources": ["comment:3"],
"title": "Re: Chat with AI",
"comment": "Tuesday",
"tags": ["public", "+plugin/openai", "chat/ai"]
"tags": ["public", "+plugin/ai/openai", "chat/ai"]
}],
"ext": []
}
Expand All @@ -945,15 +946,15 @@ the title of the source Ref (unless it is already prefixed, don't double prefix
"url": "comment:4",
"title":"Chat with AI",
"comment": "Create a poll for the best times of the day to go golfing in #golfing.",
"tags": ["+user/chris", "plugin/inbox/ai"]
"tags": ["+user/chris", "plugin/inbox/ai/openai"]
}
You could respond:
{
"ref": [{
"sources": ["comment:4"],
"title": "Re: Chat with AI",
"comment": "Sure! [Here](/ref/ai:1) is the poll.",
"tags": ["plugin/inbox/user/chris", "+plugin/openai"]
"tags": ["plugin/inbox/user/chris", "+plugin/ai/openai"]
}, {
"url": "ai:1"
"title": "Best time to golf?",
Expand All @@ -975,15 +976,15 @@ the title of the source Ref (unless it is already prefixed, don't double prefix
"url": "comment:5",
"title":"Chat with AI",
"comment": "Create a link to the Wikipedia entry for Sparkline and tag it #data.",
"tags": ["+user/chris", "plugin/inbox/ai"]
"tags": ["+user/chris", "plugin/inbox/ai/openai"]
}
You could respond:
{
"ref": [{
"sources": ["comment:4"],
"title": "Re: Chat with AI",
"comment": "Sure! [Here](/ref/https://en.wikipedia.org/wiki/Sparkline) it is.",
"tags": ["plugin/inbox/user/chris", "+plugin/openai"]
"tags": ["plugin/inbox/user/chris", "+plugin/ai/openai"]
}, {
"url": "https://en.wikipedia.org/wiki/Sparkline"
"title": "Sparkline - Wikipedia",
Expand All @@ -995,10 +996,10 @@ Also, when using a chat template, do not notifications (starting with plugin/inb
with the current chat (starting with chat/)
""" + modsPrompt + """
All date times are ISO format Zulu time like: "2023-04-22T20:38:19.480464Z"
Always add the "+plugin/openai" tag, as that is your signature.
Always add the "+plugin/ai/openai" tag, as that is your signature.
Never include a tag like "+user/chris", as that is impersonation.
You may only use public tags (starting with a lowercase letter or number) and your protected signature tag: +plugin/openai
Only add the "plugin/inbox/ai" tag to trigger an AI response to your comment as well (spawn an new
You may only use public tags (starting with a lowercase letter or number) and your protected signature tag: +plugin/ai/openai
Only add the "plugin/inbox/ai/openai" tag to trigger an AI response to your comment as well (spawn an new
agent with your Ref as the prompt).
Include your response as the comment field of a Ref.
Do not add metadata to a response, that is generated by Jasper.
Expand All @@ -1018,7 +1019,7 @@ You may only use public tags (starting with a lowercase letter or number) and yo
context.sort(Comparator.comparing(RefDto::getPublished));
for (var p : context) {
p.setMetadata(null);
if (p.getTags().contains("+plugin/openai")) {
if (p.getTags().contains("+plugin/ai/openai")) {
messages.add(cm("assistant", objectMapper.writeValueAsString(p)));
} else {
messages.add(cm("user", objectMapper.writeValueAsString(p)));
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/jasper/component/delta/Dalle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,20 +49,20 @@ public class Dalle implements Async.AsyncRunner {

@PostConstruct
void init() {
async.addAsyncResponse("plugin/inbox/dalle", this);
async.addAsyncResponse("plugin/inbox/ai/dalle", this);
}

@Override
public String signature() {
return "+plugin/dalle";
return "+plugin/ai/dalle";
}

@Override
public void run(Ref ref) throws JsonProcessingException {
logger.debug("AI replying to {} ({})", ref.getTitle(), ref.getUrl());
var author = ref.getTags().stream().filter(User::isUser).findFirst().orElse(null);
var dallePlugin = pluginRepository.findByTagAndOrigin("+plugin/dalle", ref.getOrigin())
.orElseThrow(() -> new NotFoundException("+plugin/dalle"));
var dallePlugin = pluginRepository.findByTagAndOrigin("+plugin/ai/dalle", ref.getOrigin())
.orElseThrow(() -> new NotFoundException("+plugin/ai/dalle"));
var config = objectMapper.convertValue(dallePlugin.getConfig(), OpenAi.DalleConfig.class);
var response = new Ref();
try {
Expand All @@ -88,8 +88,9 @@ public void run(Ref ref) throws JsonProcessingException {
}
}
}
response.addTag("+plugin/dalle");
response.getTags().remove("plugin/inbox/dalle");
response.addTag("+plugin/ai/dalle");
response.getTags().remove("plugin/inbox/ai");
response.getTags().remove("plugin/inbox/ai/dalle");
var sources = new ArrayList<>(List.of(ref.getUrl()));
if (ref.getTags().contains("plugin/thread") || ref.getTags().contains("plugin/comment")) {
// Add top comment source
Expand Down

0 comments on commit 75012db

Please sign in to comment.