bsherriff/siren
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.1.19 Added audio settings, tweaked chat completion

Browse Source
This commit is contained in:
Benjamin Sherriff
2023-04-16 11:56:27 -04:00
parent 9b605a3105
commit c226095b1a
7 changed files with 63 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.version
View File

@@ -1 +1 @@
export SIREN_VERSION=0.1.18
export SIREN_VERSION=0.1.19

2
src/main/java/com/bensherriff/siren/Listener.java
View File

@@ -133,7 +133,7 @@ public class Listener extends ListenerAdapter {
commands.put("resume", new ResumeCommand(this));
commands.put("image", new ImageCommand(this));
jda.getGuilds().forEach(guild -> executor.execute(() -> {
LOGGER.debug("Updating commands for {}", guild.getId());
LOGGER.debug("Updating commands for \"{}\" <{}>", guild.getName(), guild.getId());
guild.updateCommands().addCommands(
commands.values().stream().map(Command::getSlashCommandData).collect(Collectors.toList())
).queue();

5
src/main/java/com/bensherriff/siren/ai/OpenAIManager.java
View File

@@ -150,11 +150,16 @@ public class OpenAIManager {
.build();
List<MessageData> previousMessages = DatabaseManager.getMessages(
query, event.getGuild().getIdLong(), event.getChannel().getIdLong());
Set<String> potentialTopics = new HashSet<>();
for (MessageData previousMessage : previousMessages) {
ChatMessage previousChatMessage = createSystemMessage("For context, I previously sent you a message at " +
previousMessage.getTimestamp() + " which said \"" + previousMessage.getMessageText() +
"\". You replied with \"" + previousMessage.getMessageResponse() + "\".");
potentialTopics.addAll(NLP.getTopicKeywords(previousMessage.getMessageText()));
potentialTopics.addAll(NLP.getTopicKeywords(previousMessage.getMessageResponse()));
chatMessages.add(previousChatMessage);
LOGGER.trace("Potential topics: {}", potentialTopics);
// chatMessages.add(createSystemMessage("As an AI language model, only give replies that relate to " + topics));
}
}

6
src/main/java/com/bensherriff/siren/audio/AudioHandler.java
View File

@@ -41,7 +41,7 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
public void addTrack(AudioTrack track) {
if (player.getPlayingTrack() == null) {
player.playTrack(track);
manager.getListener().getExecutor().execute(() -> player.playTrack(track));
} else {
LOGGER.debug("Track '{}' has been queued", track.getInfo().title);
if (!queue.offer(track)) {
@@ -56,7 +56,7 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
}
public void setPaused(boolean paused) {
player.setPaused(paused);
manager.getListener().getExecutor().execute(() -> player.setPaused(paused));
}
public boolean isPaused() {
@@ -95,7 +95,7 @@ public class AudioHandler extends AudioEventAdapter implements AudioSendHandler
manager.getListener().closeAudioConnection(guildID);
manager.getListener().getJDA().getPresence().setActivity(Activity.playing("nothing"));
} else {
player.playTrack(queue.poll());
manager.getListener().getExecutor().execute(() -> player.playTrack(queue.poll()));
}
}

11
src/main/java/com/bensherriff/siren/settings/Settings.java
View File

@@ -1,6 +1,8 @@
package com.bensherriff.siren.settings;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class Settings {
@@ -10,6 +12,7 @@ public class Settings {
private int threadPool = 2;
private Map<Long, GuildSettings> guildSettings = new HashMap<>();
private OpenAISettings openAISettings = new OpenAISettings();
private List<TrackSettings> tracks = new ArrayList<>();
public String getToken() {
return token;
@@ -51,4 +54,12 @@ public class Settings {
public void setOpenAISettings(OpenAISettings openAISettings) {
this.openAISettings = openAISettings;
}
public List<TrackSettings> getTracks() {
return tracks;
}
public void setTracks(List<TrackSettings> tracks) {
this.tracks = tracks;
}
}

22
src/main/java/com/bensherriff/siren/settings/TrackSettings.java Normal file
View File

@@ -0,0 +1,22 @@
package com.bensherriff.siren.settings;
public class TrackSettings {
private String file;
private String[] tags;
public String getFile() {
return file;
}
public void setFile(String file) {
this.file = file;
}
public String[] getTags() {
return tags;
}
public void setTags(String[] tags) {
this.tags = tags;
}
}

30
src/main/resources/log4j2.xml
View File

@@ -9,25 +9,35 @@
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="${LOG_PATTERN}"/>
</Console>
<RollingFile name="rollingFile" fileName="${logPath}/${rollingFileName}-debug.log"
<RollingFile name="rollingFile" fileName="${logPath}/${rollingFileName}.log"
filePattern="${logPath}/${rollingFileName}-%d{yyyy-MM-dd}-%i.log">
<LevelRangeFilter minLevel="DEBUG" maxLevel="FATAL" onMatch="ACCEPT" onMismatch="DENY"/>
<PatternLayout pattern="%d{DEFAULT} | %-5level | %c{1}.%M() | %msg%n%throwable{short.lineNumber}"/>
<Policies>
<OnStartupTriggeringPolicy />
<TimeBasedTriggeringPolicy />
<SizeBasedTriggeringPolicy size="50 MB" />
<TimeBasedTriggeringPolicy interval="1" modulate="true"/>
<SizeBasedTriggeringPolicy size="10MB"/>
</Policies>
<DefaultRolloverStrategy max="10"/>
<DefaultRolloverStrategy max="30"/>
</RollingFile>
</Appenders>
<Loggers>
<Logger name="com.bensherriff" additivity="false">
<Root level="debug">
<AppenderRef ref="rollingFile"/>
</Root>
<Logger name="com" level="warn" additivity="false">
<AppenderRef ref="console"/>
</Logger>
<Logger name="net" level="warn" additivity="false">
<AppenderRef ref="console"/>
</Logger>
<Logger name="org" level="warn" additivity="false">
<AppenderRef ref="console"/>
</Logger>
<Logger name="edu" level="warn" additivity="false">
<AppenderRef ref="console"/>
</Logger>
<Logger name="com.bensherriff" level="trace" additivity="false">
<AppenderRef ref="console"/>
<AppenderRef ref="rollingFile"/>
</Logger>
<Root level="all" additivity="false">
<AppenderRef ref="rollingFile"/>
</Root>
</Loggers>
</Configuration>