Updated README, added new builders for generations.

Author: Andrewcpu

README.md

@@ -13,7 +13,7 @@ To add `elevenlabs-api` to your Maven project, use:
 <dependency>
     <groupId>net.andrewcpu</groupId>
     <artifactId>elevenlabs-api</artifactId>
-    <version>2.7.2</version>
+    <version>2.7.8</version>
 </dependency>
 ```
 **JAR**
@@ -38,6 +38,68 @@ ElevenLabs.setDefaultModel("eleven_monolingual_v1"); // Optional, defaults to: "
 ### **ElevenLabs API Documentation**: https://api.elevenlabs.io/docs
 
 - - -
+
+## Simplified Generation Handling with Builders
+### v2.7.8 now includes SpeechGenerationBuilder.java
+
+### Speech to Speech
+```java
+//File output
+SpeechGenerationBuilder.speechToSpeech()
+        .file() // output type of file (or use .streamed() for an InputStream)
+        .setInputFile(File)
+        .setGeneratedAudioOutputFormat(GeneratedAudioOutputFormat.MP3_44100_128)
+        .setVoiceId("voiceIdString")
+        .setVoiceSettings(VoiceSettings)
+        .setVoice(Voice) // or use a voice object, which will pull settings / ID out of the Voice
+        .setModelId("modelIdString")
+        .setModel(ElevenLabsVoiceModel.ELEVEN_ENGLISH_STS_V2)
+        .setLatencyOptimization(StreamLatencyOptimization.NONE)
+        .build();
+//Streamed output
+SpeechGenerationBuilder.speechToSpeech()
+        .streamed()
+        .setInputFile(File)
+        .setGeneratedAudioOutputFormat(GeneratedAudioOutputFormat.MP3_44100_128)
+        .setVoiceId("voiceIdString")
+        .setVoiceSettings(VoiceSettings)
+        .setVoice(Voice) // or use a voice object, which will pull settings / ID out of the Voice
+        .setModelId("modelIdString")
+        .setModel(ElevenLabsVoiceModel.ELEVEN_ENGLISH_STS_V2)
+        .setLatencyOptimization(StreamLatencyOptimization.NONE)
+        .build();
+```
+
+### Text to Speech
+```java
+//File output
+SpeechGenerationBuilder.textToSpeech()
+        .file() // output type of file (or use .streamed() for an InputStream)
+        .setText(String text)
+        .setGeneratedAudioOutputFormat(GeneratedAudioOutputFormat.MP3_44100_128)
+        .setVoiceId("voiceIdString")
+        .setVoiceSettings(VoiceSettings)
+        .setVoice(Voice) // or use a voice object, which will pull settings / ID out of the Voice
+        .setModelId("modelIdString")
+        .setModel(ElevenLabsVoiceModel.ELEVEN_ENGLISH_STS_V2)
+        .setLatencyOptimization(StreamLatencyOptimization.NONE)
+        .build();
+//Streamed output
+SpeechGenerationBuilder.textToSpeech()
+        .streamed()
+        .setText(String text)
+        .setGeneratedAudioOutputFormat(GeneratedAudioOutputFormat.MP3_44100_128)
+        .setVoiceId("voiceIdString")
+        .setVoiceSettings(VoiceSettings)
+        .setVoice(Voice) // or use a voice object, which will pull settings / ID out of the Voice
+        .setModelId("modelIdString")
+        .setModel(ElevenLabsVoiceModel.ELEVEN_ENGLISH_STS_V2)
+        .setLatencyOptimization(StreamLatencyOptimization.NONE)
+        .build();
+```
+
+- - -
+
 ## Voices
 ### Accessing your List of Available Voices
 To retrieve your list of accessible Voices, you can statically utilize `Voice#getVoices()`. This will return both ElevenLab's pregenerated `Voice` models, as well as any personal `Voices` you have generated.
@@ -347,6 +409,19 @@ To get your ElevenLabs generation `History`, you can utilize `History#get()`. (Y
 History history = History.get();
 ```
 
+
+### Getting all History Items
+The History endpoint accepts page size parameters and a start-after-history-id parameter. We can use this to fetch all of our HistoryItems.
+```java
+    History history = History.get(); // the latest history object
+    Optional<History> hist = Optional.of(history);
+    List<HistoryItem> items = new ArrayList();
+    do {
+        items.addAll(hist.get().getHistoryItems());
+        hist = hist.get().next();
+    } while(hist.isPresent() && hist.hasMore());
+```
+
 ### Getting a History Item
 To retrieve a `HistoryItem` from your `History`, you can use `History#getHistoryItem(String itemId)`.
 ```java

pom.xml

@@ -60,7 +60,7 @@
 
     <groupId>net.andrewcpu</groupId>
     <artifactId>elevenlabs-api</artifactId>
-    <version>2.7.7-SNAPSHOT</version>
+    <version>2.7.8</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

src/main/java/net/andrewcpu/elevenlabs/api/impl/SpeechToSpeechAPI.java

@@ -1,6 +1,7 @@
 package net.andrewcpu.elevenlabs.api.impl;
 
 import net.andrewcpu.elevenlabs.api.ElevenLabsAPI;
+import net.andrewcpu.elevenlabs.enums.ElevenLabsVoiceModel;
 import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
 import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
 import net.andrewcpu.elevenlabs.requests.sts.PostSpeechToSpeechRequest;
@@ -25,4 +26,22 @@ public InputStream generateSpeechToSpeechStream(String voiceId, VoiceSettings vo
 	public InputStream generateSpeechToSpeechStream(String voiceId, VoiceSettings voiceSettings, String modelId, File audio) {
 		return generateSpeechToSpeechStream(voiceId, voiceSettings, modelId, audio, StreamLatencyOptimization.getDefault());
 	}
+
+
+
+	public File generateSpeechToSpeech(String voiceId, VoiceSettings voiceSettings, ElevenLabsVoiceModel model, File audio) {
+		return generateSpeechToSpeech(voiceId, voiceSettings, model.getModelId(), audio, StreamLatencyOptimization.getDefault());
+	}
+
+	public File generateSpeechToSpeech(String voiceId, VoiceSettings voiceSettings, ElevenLabsVoiceModel model, File audio, StreamLatencyOptimization latencyOptimization) {
+		return sendRequest(new PostSpeechToSpeechRequest(voiceId, voiceSettings,audio, model.getModelId(), latencyOptimization));
+	}
+
+	public InputStream generateSpeechToSpeechStream(String voiceId, VoiceSettings voiceSettings, ElevenLabsVoiceModel model, File audio, StreamLatencyOptimization streamLatencyOptimization) {
+		return sendRequest(new PostSpeechToSpeechStreamedRequest(voiceId, voiceSettings, audio, model.getModelId(), streamLatencyOptimization));
+	}
+
+	public InputStream generateSpeechToSpeechStream(String voiceId, VoiceSettings voiceSettings, ElevenLabsVoiceModel model, File audio) {
+		return generateSpeechToSpeechStream(voiceId, voiceSettings, model.getModelId(), audio, StreamLatencyOptimization.getDefault());
+	}
 }

src/main/java/net/andrewcpu/elevenlabs/builders/SpeechGenerationBuilder.java

@@ -0,0 +1,11 @@
+package net.andrewcpu.elevenlabs.builders;
+
+public class SpeechGenerationBuilder {
+	public static SpeechToSpeechBuilder speechToSpeech() {
+		return new SpeechToSpeechBuilder();
+	}
+
+	public static TextToSpeechBuilder textToSpeech() {
+		return new TextToSpeechBuilder();
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/builders/SpeechToSpeechBuilder.java

@@ -0,0 +1,15 @@
+package net.andrewcpu.elevenlabs.builders;
+
+import net.andrewcpu.elevenlabs.builders.impl.s2s.SpeechToSpeechFileBuilder;
+import net.andrewcpu.elevenlabs.builders.impl.s2s.SpeechToSpeechStreamedBuilder;
+
+public class SpeechToSpeechBuilder  {
+
+	public SpeechToSpeechStreamedBuilder streamed() {
+		return new SpeechToSpeechStreamedBuilder();
+	}
+
+	public SpeechToSpeechFileBuilder file() {
+		return new SpeechToSpeechFileBuilder();
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/builders/TextToSpeechBuilder.java

@@ -0,0 +1,15 @@
+package net.andrewcpu.elevenlabs.builders;
+
+
+import net.andrewcpu.elevenlabs.builders.impl.tts.TextToSpeechFileBuilder;
+import net.andrewcpu.elevenlabs.builders.impl.tts.TextToSpeechStreamedBuilder;
+
+public class TextToSpeechBuilder  {
+	public TextToSpeechStreamedBuilder streamed() {
+		return new TextToSpeechStreamedBuilder();
+	}
+
+	public TextToSpeechFileBuilder file() {
+		return new TextToSpeechFileBuilder();
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/builders/abstracts/AbstractSpeechGenerationBuilder.java

@@ -0,0 +1,79 @@
+package net.andrewcpu.elevenlabs.builders.abstracts;
+
+import net.andrewcpu.elevenlabs.ElevenLabs;
+import net.andrewcpu.elevenlabs.builders.SpeechToSpeechBuilder;
+import net.andrewcpu.elevenlabs.builders.TextToSpeechBuilder;
+import net.andrewcpu.elevenlabs.enums.ElevenLabsVoiceModel;
+import net.andrewcpu.elevenlabs.enums.GeneratedAudioOutputFormat;
+import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
+import net.andrewcpu.elevenlabs.model.voice.Voice;
+import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
+
+public abstract class AbstractSpeechGenerationBuilder<T, F> {
+	private String voiceId;
+	private VoiceSettings voiceSettings;
+	private String modelId = ElevenLabs.getDefaultModel();
+	private StreamLatencyOptimization latencyOptimization = StreamLatencyOptimization.getDefault();
+	private GeneratedAudioOutputFormat generatedAudioOutputFormat = GeneratedAudioOutputFormat.getDefault();
+	public abstract T self();
+
+	public abstract F build();
+
+
+	public GeneratedAudioOutputFormat getGeneratedAudioOutputFormat() {
+		return generatedAudioOutputFormat;
+	}
+
+	public T setGeneratedAudioOutputFormat(GeneratedAudioOutputFormat generatedAudioOutputFormat) {
+		this.generatedAudioOutputFormat = generatedAudioOutputFormat;
+		return self();
+	}
+
+	public String getVoiceId() {
+		return voiceId;
+	}
+
+	public T setVoiceId(String voiceId) {
+		this.voiceId = voiceId;
+		return self();
+	}
+
+	public VoiceSettings getVoiceSettings() {
+		return voiceSettings;
+	}
+
+	public T setVoiceSettings(VoiceSettings voiceSettings) {
+		this.voiceSettings = voiceSettings;
+		return self();
+	}
+
+	public String getModelId() {
+		return modelId;
+	}
+
+	public T setModelId(String modelId) {
+		this.modelId = modelId;
+		return self();
+	}
+
+	public StreamLatencyOptimization getLatencyOptimization() {
+		return latencyOptimization;
+	}
+
+	public T setLatencyOptimization(StreamLatencyOptimization latencyOptimization) {
+		this.latencyOptimization = latencyOptimization;
+		return self();
+	}
+
+	public T setVoice(Voice voice) {
+		this.voiceId = voice.getVoiceId();
+		if(voice.getSettings() == null) voice.fetchSettings();
+		this.voiceSettings = voice.getSettings();
+		return self();
+	}
+
+	public T setModel(ElevenLabsVoiceModel voiceModel) {
+		this.modelId = voiceModel.getModelId();
+		return self();
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/builders/impl/s2s/SpeechToSpeechFileBuilder.java

@@ -0,0 +1,32 @@
+package net.andrewcpu.elevenlabs.builders.impl.s2s;
+
+import net.andrewcpu.elevenlabs.ElevenLabs;
+import net.andrewcpu.elevenlabs.builders.abstracts.AbstractSpeechGenerationBuilder;
+
+import java.io.File;
+
+public class SpeechToSpeechFileBuilder extends AbstractSpeechGenerationBuilder<SpeechToSpeechFileBuilder, File> {
+	private File inputFile;
+
+	public File getInputFile() {
+		return inputFile;
+	}
+
+	public SpeechToSpeechFileBuilder setInputFile(File inputFile) {
+		this.inputFile = inputFile;
+		return this;
+	}
+
+	@Override
+	public SpeechToSpeechFileBuilder self() {
+		return this;
+	}
+
+	@Override
+	public File build() {
+		return ElevenLabs
+				.getSpeechToSpeechAPI()
+				.generateSpeechToSpeech(getVoiceId(), getVoiceSettings(),getModelId(),getInputFile(),getLatencyOptimization());
+	}
+
+}

src/main/java/net/andrewcpu/elevenlabs/builders/impl/s2s/SpeechToSpeechStreamedBuilder.java

@@ -0,0 +1,32 @@
+package net.andrewcpu.elevenlabs.builders.impl.s2s;
+
+import net.andrewcpu.elevenlabs.ElevenLabs;
+import net.andrewcpu.elevenlabs.builders.abstracts.AbstractSpeechGenerationBuilder;
+
+import java.io.File;
+import java.io.InputStream;
+
+public class SpeechToSpeechStreamedBuilder extends AbstractSpeechGenerationBuilder<SpeechToSpeechStreamedBuilder, InputStream> {
+	private File inputFile;
+
+	public File getInputFile() {
+		return inputFile;
+	}
+
+	public SpeechToSpeechStreamedBuilder setInputFile(File inputFile) {
+		this.inputFile = inputFile;
+		return this;
+	}
+
+	@Override
+	public SpeechToSpeechStreamedBuilder self() {
+		return this;
+	}
+
+	@Override
+	public InputStream build() {
+		return ElevenLabs
+				.getSpeechToSpeechAPI()
+				.generateSpeechToSpeechStream(getVoiceId(), getVoiceSettings(),getModelId(),getInputFile(),getLatencyOptimization());
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/builders/impl/tts/TextToSpeechFileBuilder.java

@@ -0,0 +1,31 @@
+package net.andrewcpu.elevenlabs.builders.impl.tts;
+
+import net.andrewcpu.elevenlabs.ElevenLabs;
+import net.andrewcpu.elevenlabs.builders.abstracts.AbstractSpeechGenerationBuilder;
+
+import java.io.File;
+
+public class TextToSpeechFileBuilder extends AbstractSpeechGenerationBuilder<TextToSpeechFileBuilder, File> {
+	private String text;
+
+	public String getText() {
+		return text;
+	}
+
+	public TextToSpeechFileBuilder setText(String text) {
+		this.text = text;
+		return this;
+	}
+
+	@Override
+	public TextToSpeechFileBuilder self() {
+		return this;
+	}
+
+	@Override
+	public File build() {
+		return ElevenLabs
+				.getTextToSpeechAPI()
+				.generateTextToSpeech(getVoiceId(), getText(),getModelId(), getGeneratedAudioOutputFormat(),getLatencyOptimization(), getVoiceSettings());
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/builders/impl/tts/TextToSpeechStreamedBuilder.java

@@ -0,0 +1,31 @@
+package net.andrewcpu.elevenlabs.builders.impl.tts;
+
+import net.andrewcpu.elevenlabs.ElevenLabs;
+import net.andrewcpu.elevenlabs.builders.abstracts.AbstractSpeechGenerationBuilder;
+
+import java.io.InputStream;
+
+public class TextToSpeechStreamedBuilder extends AbstractSpeechGenerationBuilder<TextToSpeechStreamedBuilder, InputStream> {
+	private String text;
+
+	public String getText() {
+		return text;
+	}
+
+	public TextToSpeechStreamedBuilder setText(String text) {
+		this.text = text;
+		return this;
+	}
+
+	@Override
+	public TextToSpeechStreamedBuilder self() {
+		return this;
+	}
+
+	@Override
+	public InputStream build() {
+		return ElevenLabs
+				.getTextToSpeechAPI()
+				.generateTextToSpeechStreamed(getVoiceId(), getText(),getModelId(), getGeneratedAudioOutputFormat(),getLatencyOptimization(), getVoiceSettings());
+	}
+}