Merge pull request #12 from Andrewcpu/Andrewcpu-patch-1

Update README.md

README.md

@@ -3,10 +3,9 @@
 
 ## Getting Started
 So you wanna make custom voices, huh? Well you've come to the right place.
-
-### Note: This repo is undergoing an upgrade to v2.0
-If any of the documentation is out of place or issues occur, please submit a PR or create an issue.
-I downgraded the repo from JDK 17 to JDK 11 as well.
+This library should cover all the ElevenLabs API endpoints as of 11/15/23.
+**Update**
+It seems I jumped the gun (or happened to bump into an accidental push of the speech to speech API docs),  but the original documentation that my implementation was based on has now been removed or hidden. It may reappear as is, or will require changes.
 
 ### Installation
 **Maven**
@@ -16,12 +15,9 @@ 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.7</version>
 </dependency>
 ```
-The most up-to date package information can be found on the [Packages tab](https://github.com/AndrewCPU/elevenlabs-api/packages/)
-
-
 **JAR**
 
 Compiled JARs are available via the [Releases tab](https://github.com/AndrewCPU/elevenlabs-api/releases)

pom.xml

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

src/main/java/net/andrewcpu/elevenlabs/model/history/HistoryItem.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import net.andrewcpu.elevenlabs.ElevenLabs;
 import net.andrewcpu.elevenlabs.model.ElevenModel;
+import net.andrewcpu.elevenlabs.util.ElevenNetworkUtil;
 
 import java.io.File;
 import java.util.Map;
@@ -131,6 +132,10 @@ public class HistoryItem extends ElevenModel {
 		return ElevenLabs.getHistoryAPI().getHistoryItemAudio(historyItemId);
 	}
 
+	public String getDownloadUrl() {
+		return ElevenNetworkUtil.getHistoryItemUrl(historyItemId);
+	}
+
 	@JsonIgnore
 	@Override
 	public String toString() {

src/main/java/net/andrewcpu/elevenlabs/requests/DeleteRequest.java

@@ -6,4 +6,9 @@ public abstract class DeleteRequest<T> extends ElevenLabsRequest<T> {
 	public DeleteRequest(String endpoint, Class<T> clazz) {
 		super(HttpRequestType.DELETE, endpoint, clazz);
 	}
+
+	@Override
+	public Object getPayload() {
+		return null;
+	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/ElevenLabsRequest.java

@@ -37,6 +37,4 @@ public abstract class ElevenLabsRequest<T> {
 	}
 
 	public abstract Object getPayload();
-
-
 }

src/main/java/net/andrewcpu/elevenlabs/requests/GetRequest.java

@@ -6,4 +6,9 @@ public abstract class GetRequest<T> extends ElevenLabsRequest<T> {
 	public GetRequest(String endpoint, Class<T> clazz) {
 		super(HttpRequestType.GET, endpoint, clazz);
 	}
+
+	@Override
+	public Object getPayload() {
+		return null;
+	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/PostMultipartRequest.java

@@ -0,0 +1,18 @@
+package net.andrewcpu.elevenlabs.requests;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class PostMultipartRequest<T> extends PostRequest<T> {
+	public PostMultipartRequest(String endpoint, Class<T> clazz) {
+		super(endpoint, clazz);
+	}
+
+
+	public abstract Map<String, Object> getMultipartParts(Map<String, Object> map);
+
+	@Override
+	public Object getPayload() {
+		return getMultipartParts(new HashMap<>());
+	}
+}

src/main/java/net/andrewcpu/elevenlabs/requests/PostRequest.java

@@ -6,4 +6,9 @@ public abstract class PostRequest<T> extends ElevenLabsRequest<T> {
 	public PostRequest(String endpoint, Class<T> clazz) {
 		super(HttpRequestType.POST, endpoint, clazz);
 	}
+
+	@Override
+	public Object getPayload() {
+		return null;
+	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/audionative/PostCreateAudioNativeProjectRequest.java

@@ -2,12 +2,13 @@ package net.andrewcpu.elevenlabs.requests.audionative;
 
 import net.andrewcpu.elevenlabs.model.request.CreateAudioNativeProjectRequest;
 import net.andrewcpu.elevenlabs.model.response.CreateAudioEnabledProjectModelResponse;
+import net.andrewcpu.elevenlabs.requests.PostMultipartRequest;
 import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class PostCreateAudioNativeProjectRequest extends PostRequest<CreateAudioEnabledProjectModelResponse> {
+public class PostCreateAudioNativeProjectRequest extends PostMultipartRequest<CreateAudioEnabledProjectModelResponse> {
 	private final CreateAudioNativeProjectRequest request;
 	public PostCreateAudioNativeProjectRequest(CreateAudioNativeProjectRequest request) {
 		super("v1/audio-native", CreateAudioEnabledProjectModelResponse.class);
@@ -15,8 +16,7 @@ public class PostCreateAudioNativeProjectRequest extends PostRequest<CreateAudio
 	}
 
 	@Override
-	public Object getPayload() {
-		Map<String, Object> payload = new HashMap<>();
+	public Map<String, Object> getMultipartParts(Map<String, Object> payload) {
 		payload.put("name", request.getName());
 		payload.put("image", request.getImage());
 		payload.put("author", request.getAuthor());

src/main/java/net/andrewcpu/elevenlabs/requests/history/DeleteHistoryItemRequest.java

@@ -6,9 +6,4 @@ public class DeleteHistoryItemRequest extends DeleteRequest<String> {
 	public DeleteHistoryItemRequest(String historyItemId) {
 		super("v1/history/" + historyItemId, String.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/history/GetHistoryItemAudioRequest.java

@@ -8,9 +8,4 @@ public class GetHistoryItemAudioRequest extends GetRequest<File> {
 	public GetHistoryItemAudioRequest(String historyItemId) {
 		super("v1/history/" + historyItemId + "/audio", File.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/history/GetHistoryItemByIdRequest.java

@@ -7,9 +7,4 @@ public class GetHistoryItemByIdRequest extends GetRequest<HistoryItem> {
 	public GetHistoryItemByIdRequest(String historyId) {
 		super("v1/history/" + historyId, HistoryItem.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/history/GetHistoryRequest.java

@@ -7,9 +7,4 @@ public class GetHistoryRequest extends GetRequest<History> {
 	public GetHistoryRequest() {
 		super("v1/history", History.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/models/GetModelsRequest.java

@@ -7,9 +7,4 @@ public class GetModelsRequest extends GetRequest<GenerationTypeModel[]> {
 	public GetModelsRequest() {
 		super("v1/models", GenerationTypeModel[].class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/DeleteChapterByIdRequest.java

@@ -3,13 +3,7 @@ package net.andrewcpu.elevenlabs.requests.projects;
 import net.andrewcpu.elevenlabs.requests.DeleteRequest;
 
 public class DeleteChapterByIdRequest extends DeleteRequest<String> {
-
 	public DeleteChapterByIdRequest(String projectId, String chapterId) {
 		super("v1/projects/" + projectId + "/chapters/" + chapterId, String.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/DeleteProjectByIdRequest.java

@@ -6,9 +6,4 @@ public class DeleteProjectByIdRequest extends DeleteRequest<String> {
 	public DeleteProjectByIdRequest(String projectId) {
 		super("v1/projects/" + projectId, String.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/GetChapterByIdRequest.java

@@ -7,9 +7,4 @@ public class GetChapterByIdRequest extends GetRequest<Chapter> {
 	public GetChapterByIdRequest(String projectId, String chapterId) {
 		super("v1/projects/" + projectId + "/chapters/" + chapterId, Chapter.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/GetChapterSnapshotsRequest.java

@@ -7,9 +7,4 @@ public class GetChapterSnapshotsRequest extends GetRequest<ChapterSnapshotsModel
 	public GetChapterSnapshotsRequest(String projectId, String chapterId) {
 		super("v1/projects/" + projectId + "/chapters/" + chapterId + "/snapshots", ChapterSnapshotsModelResponse.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/GetProjectByIdRequest.java

@@ -7,9 +7,4 @@ public class GetProjectByIdRequest extends GetRequest<Project> {
 	public GetProjectByIdRequest(String projectId) {
 		super("v1/projects/" + projectId, Project.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/GetProjectChaptersRequest.java

@@ -7,9 +7,4 @@ public class GetProjectChaptersRequest extends GetRequest<ChaptersModelResponse>
 	public GetProjectChaptersRequest(String projectId) {
 		super("v1/projects/" + projectId + "/chapters", ChaptersModelResponse.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/GetProjectSnapshotsRequest.java

@@ -7,9 +7,4 @@ public class GetProjectSnapshotsRequest extends GetRequest<ProjectSnapshotsModel
 	public GetProjectSnapshotsRequest(String projectId) {
 		super("v1/projects/" + projectId + "/snapshots", ProjectSnapshotsModelResponse.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/GetProjectsRequest.java

@@ -7,9 +7,4 @@ public class GetProjectsRequest extends GetRequest<ProjectsModelResponse> {
 	public GetProjectsRequest() {
 		super("v1/projects", ProjectsModelResponse.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/PostAddProjectRequest.java

@@ -2,12 +2,13 @@ package net.andrewcpu.elevenlabs.requests.projects;
 
 import net.andrewcpu.elevenlabs.model.request.AddProjectRequest;
 import net.andrewcpu.elevenlabs.model.response.ProjectModelResponse;
+import net.andrewcpu.elevenlabs.requests.PostMultipartRequest;
 import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 import java.util.HashMap;
 import java.util.Map;
 
-public class PostAddProjectRequest extends PostRequest<ProjectModelResponse> {
+public class PostAddProjectRequest extends PostMultipartRequest<ProjectModelResponse> {
 	private final AddProjectRequest request;
 	public PostAddProjectRequest(AddProjectRequest request) {
 		super("v1/projects/add", ProjectModelResponse.class);
@@ -15,8 +16,7 @@ public class PostAddProjectRequest extends PostRequest<ProjectModelResponse> {
 	}
 
 	@Override
-	public Object getPayload() {
-		Map<String, Object> payload = new HashMap<>();
+	public Map<String, Object> getMultipartParts(Map<String, Object> payload) {
 		payload.put("name",request.getName());
 		payload.put("from_url", request.getFromUrl());
 		payload.put("from_document", request.getFromDocument());

src/main/java/net/andrewcpu/elevenlabs/requests/projects/PostConvertChapterRequest.java

@@ -6,9 +6,4 @@ public class PostConvertChapterRequest extends PostRequest<String> {
 	public PostConvertChapterRequest(String projectId, String chapterId) {
 		super("v1/projects/" + projectId + "/chapters/" + chapterId + "/convert", String.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/PostConvertProjectRequest.java

@@ -6,9 +6,4 @@ public class PostConvertProjectRequest extends PostRequest<String> {
 	public PostConvertProjectRequest(String projectId) {
 		super("v1/projects/" + projectId + "/convert", String.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/PostStreamChapterSnapshotAudioRequest.java

@@ -8,9 +8,4 @@ public class PostStreamChapterSnapshotAudioRequest extends PostRequest<InputStre
 	public PostStreamChapterSnapshotAudioRequest(String projectId, String chapterId, String chapterSnapshotId) {
 		super("v1/projects/" + projectId + "/chapters/" + chapterId + "/snapshots/" + chapterSnapshotId + "/stream", InputStream.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/projects/PostStreamProjectSnapshotAudioRequest.java

@@ -8,9 +8,4 @@ public class PostStreamProjectSnapshotAudioRequest extends PostRequest<InputStre
 	public PostStreamProjectSnapshotAudioRequest(String projectId, String snapshotId) {
 		super("v1/projects/" + projectId + "/snapshots/" + snapshotId + "/stream", InputStream.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/samples/DeleteSampleRequest.java

@@ -6,9 +6,4 @@ public class DeleteSampleRequest extends DeleteRequest<String> {
 	public DeleteSampleRequest(String voiceId, String sampleId) {
 		super("v1/voices/" + voiceId + "/samples/" + sampleId, String.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/samples/GetSampleRequest.java

@@ -8,9 +8,4 @@ public class GetSampleRequest extends GetRequest<File> {
 	public GetSampleRequest(String voiceId, String sampleId) {
 		super("v1/voices/" + voiceId + "/samples/" + sampleId + "/audio", File.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/sts/PostSpeechToSpeechRequest.java

@@ -1,5 +1,7 @@
 package net.andrewcpu.elevenlabs.requests.sts;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
 import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
 import net.andrewcpu.elevenlabs.requests.PostRequest;
@@ -31,9 +33,15 @@ public class PostSpeechToSpeechRequest extends PostRequest<File> {
 	@Override
 	public Object getPayload() {
 		Map<String, Object> body = new HashMap<>();
+		String voiceSettingsString;
+		try {
+			voiceSettingsString = new ObjectMapper().writeValueAsString(voiceSettings);
+		} catch (JsonProcessingException e) {
+			throw new RuntimeException(e);
+		}
 		body.put("audio", audio);
 		body.put("model_id", modelId);
-		body.put("voice_settings", voiceSettings);
+		body.put("voice_settings", voiceSettingsString);
 		return body;
 	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/sts/PostSpeechToSpeechStreamedRequest.java

@@ -1,5 +1,7 @@
 package net.andrewcpu.elevenlabs.requests.sts;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import net.andrewcpu.elevenlabs.enums.StreamLatencyOptimization;
 import net.andrewcpu.elevenlabs.model.voice.VoiceSettings;
 import net.andrewcpu.elevenlabs.requests.PostRequest;
@@ -32,9 +34,15 @@ public class PostSpeechToSpeechStreamedRequest extends PostRequest<InputStream>
 	@Override
 	public Object getPayload() {
 		Map<String, Object> body = new HashMap<>();
+		String voiceSettingsString;
+		try {
+			voiceSettingsString = new ObjectMapper().writeValueAsString(voiceSettings);
+		} catch (JsonProcessingException e) {
+			throw new RuntimeException(e);
+		}
 		body.put("audio", audio);
 		body.put("model_id", modelId);
-		body.put("voice_settings", voiceSettings);
+		body.put("voice_settings", voiceSettingsString);
 		return body;
 	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/user/GetSubscriptionRequest.java

@@ -8,9 +8,4 @@ public class GetSubscriptionRequest extends GetRequest<Subscription> {
 	public GetSubscriptionRequest() {
 		super("v1/user/subscription", Subscription.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/user/GetUserRequest.java

@@ -7,9 +7,4 @@ public class GetUserRequest extends GetRequest<User> {
 	public GetUserRequest() {
 		super("v1/user", User.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/voices/DeleteVoiceRequest.java

@@ -6,9 +6,4 @@ public class DeleteVoiceRequest extends DeleteRequest<String> {
 	public DeleteVoiceRequest(String voiceId) {
 		super("v1/voices/" + voiceId, String.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/voices/GetDefaultVoiceSettingsRequest.java

@@ -7,9 +7,4 @@ public class GetDefaultVoiceSettingsRequest extends GetRequest<VoiceSettings> {
 	public GetDefaultVoiceSettingsRequest() {
 		super("v1/voices/settings/default", VoiceSettings.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/voices/GetVoiceRequest.java

@@ -25,9 +25,4 @@ public class GetVoiceRequest extends GetRequest<Voice> {
 		payload.put("with_settings", String.valueOf(withSettings));
 		return payload;
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/voices/GetVoiceSettingsRequest.java

@@ -7,9 +7,4 @@ public class GetVoiceSettingsRequest extends GetRequest<VoiceSettings> {
 	public GetVoiceSettingsRequest(String voiceId) {
 		super("v1/voices/" + voiceId + "/settings", VoiceSettings.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/voices/GetVoicesRequest.java

@@ -7,9 +7,4 @@ public class GetVoicesRequest extends GetRequest<VoiceModelResponse> {
 	public GetVoicesRequest() {
 		super("v1/voices", VoiceModelResponse.class);
 	}
-
-	@Override
-	public Object getPayload() {
-		return null;
-	}
 }

src/main/java/net/andrewcpu/elevenlabs/requests/voices/PostAddVoiceRequest.java

@@ -1,13 +1,14 @@
 package net.andrewcpu.elevenlabs.requests.voices;
 
 import net.andrewcpu.elevenlabs.model.response.CreateVoiceResponse;
+import net.andrewcpu.elevenlabs.requests.PostMultipartRequest;
 import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-public class PostAddVoiceRequest extends PostRequest<CreateVoiceResponse> {
+public class PostAddVoiceRequest extends PostMultipartRequest<CreateVoiceResponse> {
 	private final String name;
 	private final File[] samples;
 	private final String description;
@@ -37,8 +38,7 @@ public class PostAddVoiceRequest extends PostRequest<CreateVoiceResponse> {
 	}
 
 	@Override
-	public Object getPayload() {
-		Map<String, Object> map = new HashMap<String, Object>();
+	public Map<String, Object> getMultipartParts(Map<String, Object> map) {
 		map.put("name", this.name);
 		map.put("files", this.samples);
 		map.put("description", this.description);

src/main/java/net/andrewcpu/elevenlabs/requests/voices/PostEditVoiceRequest.java

@@ -1,12 +1,13 @@
 package net.andrewcpu.elevenlabs.requests.voices;
 
+import net.andrewcpu.elevenlabs.requests.PostMultipartRequest;
 import net.andrewcpu.elevenlabs.requests.PostRequest;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-public class PostEditVoiceRequest extends PostRequest<String> {
+public class PostEditVoiceRequest extends PostMultipartRequest<String> {
 	private final String name;
 	private final File[] samples;
 	private final String description;
@@ -36,8 +37,7 @@ public class PostEditVoiceRequest extends PostRequest<String> {
 	}
 
 	@Override
-	public Object getPayload() {
-		Map<String, Object> map = new HashMap<String, Object>();
+	public Map<String, Object> getMultipartParts(Map<String, Object> map) {
 		map.put("name", this.name);
 		map.put("files", this.samples);
 		map.put("description", this.description);

src/main/java/net/andrewcpu/elevenlabs/util/ElevenNetworkUtil.java

@@ -137,6 +137,10 @@ public class ElevenNetworkUtil {
 		return request;
 	}
 
+	public static String getHistoryItemUrl(String historyItemId) {
+		return BASE_URL + "v1/history/" + historyItemId + "/audio";
+	}
+
 	public static <T> T sendRequest(HttpRequestType method, String path, Object payload, Class<T> responseType) {
 		ObjectMapper objectMapper = new ObjectMapper();
 		path = BASE_URL + path;