Skip to content

Commit 8073a37

Browse files
committed
fixes issue with "getOwnedBy" for ListModel + ignoring example files with coverage
1 parent 4e257e4 commit 8073a37

20 files changed

+158
-89
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,16 @@ jobs:
3030
uses: codecov/codecov-action@v3.1.1
3131
with:
3232
token: ${{ secrets.CODECOV_TOKEN }}
33+
continue-on-error: true
3334
- name: Display test status badge
3435
uses: codecov/codecov-action@v3.1.1
3536
with:
3637
token: ${{ secrets.CODECOV_TOKEN }}
3738
flags: unittests
3839
fail_ci_if_error: true
3940
output: file
40-
file: build/reports/jacoco/test/jacocoTestReport.xml
41+
file: build/reports/jacoco/test/jacocoTestReport.xml
42+
ignore:
43+
- "**/examples/**"
44+
- "**/Example**"
45+
continue-on-error: true

src/main/java/io/github/jetkai/openai/api/data/audio/AudioData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* AudioData
1515
*
1616
* @author <a href="https://github.com/jetkai">Kai</a>
17-
* @version 1.1.0
17+
* @version 1.1.1
1818
* {@code - 07/03/2023}
1919
* @since 1.0.0
2020
* {@code - 02/03/2023}
@@ -28,10 +28,6 @@ public static AudioData.Builder builder() {
2828
return new AudioBuilderImpl();
2929
}
3030

31-
public static AudioData create() {
32-
return builder().build();
33-
}
34-
3531
public static AudioData create(Path filePath) {
3632
return builder().setFilePath(filePath)
3733
.setModel("whisper-1")

src/main/java/io/github/jetkai/openai/api/data/completion/CompletionData.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* CompletionData
1313
*
1414
* @author <a href="https://github.com/jetkai">Kai</a>
15-
* @version 1.1.0
15+
* @version 1.1.1
1616
* {@code - 07/03/2023}
1717
* @since 1.0.0
1818
* {@code - 02/03/2023}
@@ -23,9 +23,6 @@ public abstract class CompletionData {
2323

2424
public CompletionData() { }
2525

26-
public static CompletionData create() {
27-
return builder().build();
28-
}
2926
public static CompletionData.Builder builder() {
3027
return new CompletionBuilderImpl();
3128
}

src/main/java/io/github/jetkai/openai/api/data/completion/chat/ChatCompletionData.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,15 @@
1313
* ChatCompletionData
1414
*
1515
* @author <a href="https://github.com/jetkai">Kai</a>
16-
* @version 1.1.0
16+
* @version 1.1.1
1717
* {@code - 07/03/2023}
1818
* @since 1.0.0
1919
* {@code - 02/03/2023}
2020
*/
2121
@JsonSerialize
2222
public abstract class ChatCompletionData {
23-
public ChatCompletionData() { }
2423

25-
public static ChatCompletionData create() {
26-
return builder().build();
27-
}
24+
public ChatCompletionData() { }
2825

2926
public static ChatCompletionData.Builder builder() {
3027
return new ChatCompletionBuilderImpl();

src/main/java/io/github/jetkai/openai/api/data/completion/chat/message/ChatCompletionMessageData.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* ChatCompletionMessageData
1010
*
1111
* @author <a href="https://github.com/jetkai">Kai</a>
12-
* @version 1.1.0
12+
* @version 1.1.1
1313
* {@code - 07/03/2023}
1414
* @since 1.0.0
1515
* {@code - 02/03/2023}
@@ -19,9 +19,6 @@ public abstract class ChatCompletionMessageData {
1919

2020
public ChatCompletionMessageData() { }
2121

22-
public static ChatCompletionMessageData create() {
23-
return builder().build();
24-
}
2522
public static ChatCompletionMessageData.Builder builder() {
2623
return new ChatCompletionMessageBuilderImpl();
2724
}

src/main/java/io/github/jetkai/openai/api/data/completion/message/CompletionMessageData.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* CompletionMessageData
1212
*
1313
* @author <a href="https://github.com/jetkai">Kai</a>
14-
* @version 1.1.0
14+
* @version 1.1.1
1515
* {@code - 06/03/2023}
1616
* @since 1.0.0
1717
* {@code - 02/03/2023}
@@ -20,9 +20,7 @@
2020
public abstract class CompletionMessageData {
2121

2222
public CompletionMessageData() { }
23-
public static CompletionMessageData create() {
24-
return builder().build();
25-
}
23+
2624
public static CompletionMessageData.Builder builder() {
2725
return new CompletionMessageBuilderImpl();
2826
}

src/main/java/io/github/jetkai/openai/api/data/completion/usage/CompletionUsageImpl.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
package io.github.jetkai.openai.api.data.completion.usage;
22

3-
import com.fasterxml.jackson.annotation.JsonProperty;
4-
53
import java.util.Optional;
64

75
/**
86
* CompletionUsageImpl
97
*
108
* @author <a href="https://github.com/jetkai">Kai</a>
11-
* @version 1.1.0
9+
* @version 1.1.1
1210
* {@code - 07/03/2023}
1311
* @since 1.1.0
1412
* {@code - 07/03/2023}
1513
*/
1614
final class CompletionUsageImpl extends CompletionUsageData {
1715

18-
@JsonProperty("prompt_tokens")
1916
private final int promptTokens;
20-
@JsonProperty("completion_tokens")
2117
private final int completionTokens;
22-
@JsonProperty("total_tokens")
2318
private final int totalTokens;
2419

2520
static CompletionUsageImpl create(CompletionUsageBuilderImpl builder) {

src/main/java/io/github/jetkai/openai/api/data/edit/EditData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* EditData
1111
*
1212
* @author <a href="https://github.com/jetkai">Kai</a>
13-
* @version 1.1.0
13+
* @version 1.1.1
1414
* {@code - 07/03/2023}
1515
* @since 1.0.0
1616
* {@code - 02/03/2023}
@@ -24,10 +24,6 @@ public static EditData.Builder builder() {
2424
return new EditBuilderImpl();
2525
}
2626

27-
public static EditData create() {
28-
return builder().build();
29-
}
30-
3127
public static EditData create(String input, String instruction) {
3228
return builder().setModel("text-davinci-edit-001")
3329
.setInput(input)

src/main/java/io/github/jetkai/openai/api/data/embedding/EmbeddingData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* EmbeddingData
1212
*
1313
* @author <a href="https://github.com/jetkai">Kai</a>
14-
* @version 1.1.0
14+
* @version 1.1.1
1515
* {@code - 07/03/2023}
1616
* @since 1.0.0
1717
* {@code - 02/03/2023}
@@ -25,10 +25,6 @@ public static EmbeddingData.Builder builder() {
2525
return new EmbeddingBuilderImpl();
2626
}
2727

28-
public static EmbeddingData create() {
29-
return builder().build();
30-
}
31-
3228
public interface Builder {
3329
Builder setUser(String user);
3430
Builder setInput(String input);

src/main/java/io/github/jetkai/openai/api/data/embedding/response/usage/EmbeddingResponseUsageData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* EmbeddingResponseUsageData
1212
*
1313
* @author <a href="https://github.com/jetkai">Kai</a>
14-
* @version 1.1.0
14+
* @version 1.1.1
1515
* {@code - 07/03/2023}
1616
* @since 1.0.0
1717
* {@code - 02/03/2023}
@@ -25,10 +25,6 @@ public static EmbeddingResponseUsageData.Builder builder() {
2525
return new EmbeddingResponseUsageBuilderImpl();
2626
}
2727

28-
public static EmbeddingResponseUsageData create() {
29-
return builder().build();
30-
}
31-
3228
@JsonPOJOBuilder(withPrefix = "set")
3329
public interface Builder {
3430
@JsonProperty("total_tokens")

src/main/java/io/github/jetkai/openai/api/data/image/ImageData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* ImageData
1111
*
1212
* @author <a href="https://github.com/jetkai">Kai</a>
13-
* @version 1.1.0
13+
* @version 1.1.1
1414
* {@code - 07/03/2023}
1515
* @since 1.0.0
1616
* {@code - 02/03/2023}
@@ -24,10 +24,6 @@ public static ImageData.Builder builder() {
2424
return new ImageBuilderImpl();
2525
}
2626

27-
public static ImageData create() {
28-
return builder().build();
29-
}
30-
3127
public interface Builder {
3228
Builder setUser(String user);
3329
Builder setN(int n);

src/main/java/io/github/jetkai/openai/api/data/image/edit/ImageEditData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* ImageEditData
1212
*
1313
* @author <a href="https://github.com/jetkai">Kai</a>
14-
* @version 1.1.0
14+
* @version 1.1.1
1515
* {@code - 07/03/2023}
1616
* @since 1.0.0
1717
* {@code - 02/03/2023}
@@ -25,10 +25,6 @@ public static ImageEditData.Builder builder() {
2525
return new ImageEditBuilderImpl();
2626
}
2727

28-
public static ImageEditData create() {
29-
return builder().build();
30-
}
31-
3228
public interface Builder {
3329
Builder setResponseFormat(String responseFormat);
3430

src/main/java/io/github/jetkai/openai/api/data/image/response/ImageResponseData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* ImageResponseData
1414
*
1515
* @author <a href="https://github.com/jetkai">Kai</a>
16-
* @version 1.1.0
16+
* @version 1.1.1
1717
* {@code - 07/03/2023}
1818
* @since 1.0.0
1919
* {@code - 02/03/2023}
@@ -27,10 +27,6 @@ public static ImageResponseData.Builder builder() {
2727
return new ImageResponseBuilderImpl();
2828
}
2929

30-
public static ImageResponseData create() {
31-
return builder().build();
32-
}
33-
3430
@JsonPOJOBuilder(withPrefix = "set")
3531
public interface Builder {
3632
@JsonProperty("data")

src/main/java/io/github/jetkai/openai/api/data/image/variation/ImageVariationData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* ImageVariationData
1212
*
1313
* @author <a href="https://github.com/jetkai">Kai</a>
14-
* @version 1.1.0
14+
* @version 1.1.1
1515
* {@code - 07/03/2023}
1616
* @since 1.0.0
1717
* {@code - 02/03/2023}
@@ -25,10 +25,6 @@ public static ImageVariationData.Builder builder() {
2525
return new ImageVariationBuilderImpl();
2626
}
2727

28-
public static ImageVariationData create() {
29-
return builder().build();
30-
}
31-
3228
public interface Builder {
3329
Builder setResponseFormat(String responseFormat);
3430
Builder setImage(String image);

src/main/java/io/github/jetkai/openai/api/data/model/ModelData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* ModelData
1616
*
1717
* @author <a href="https://github.com/jetkai">Kai</a>
18-
* @version 1.1.0
18+
* @version 1.1.1
1919
* {@code - 07/03/2023}
2020
* @since 1.0.0
2121
* {@code - 02/03/2023}
@@ -26,10 +26,6 @@ public abstract class ModelData {
2626

2727
public ModelData() { }
2828

29-
public static ModelData create() {
30-
return builder().build();
31-
}
32-
3329
public static ModelData.Builder builder() {
3430
return new ModelBuilderImpl();
3531
}

src/main/java/io/github/jetkai/openai/api/data/model/ModelImpl.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,20 @@
99
* ModelImpl
1010
*
1111
* @author <a href="https://github.com/jetkai">Kai</a>
12-
* @version 1.1.0
12+
* @version 1.1.1
1313
* {@code - 07/03/2023}
1414
* @since 1.1.0
1515
* {@code - 07/03/2023}
1616
*/
1717
final class ModelImpl extends ModelData {
1818

19-
private String id; //text-babbage:001
20-
private String object; //model
21-
private int created; //1642018370
22-
private String ownedBy; //openai
23-
private String root; //text-babbage:001
24-
private String parent; //null
25-
private List<ModelPermissionsData> permission;
26-
27-
public ModelImpl() { }
19+
private final String id; //text-babbage:001
20+
private final String object; //model
21+
private final int created; //1642018370
22+
private final String ownedBy; //openai
23+
private final String root; //text-babbage:001
24+
private final String parent; //null
25+
private final List<ModelPermissionsData> permission;
2826

2927
static ModelImpl create(ModelBuilderImpl builder) {
3028
return new ModelImpl(builder);
@@ -37,6 +35,7 @@ private ModelImpl(ModelBuilderImpl builder) {
3735
this.root = builder.root;
3836
this.object = builder.object;
3937
this.parent = builder.parent;
38+
this.ownedBy = builder.ownedBy;
4039
}
4140

4241
@Override

src/main/java/io/github/jetkai/openai/api/data/model/permissions/ModelPermissionsData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* ModelPermissionsData
1313
*
1414
* @author <a href="https://github.com/jetkai">Kai</a>
15-
* @version 1.1.0
15+
* @version 1.1.1
1616
* {@code - 07/03/2023}
1717
* @since 1.0.0
1818
* {@code - 02/03/2023}
@@ -23,10 +23,6 @@ public abstract class ModelPermissionsData {
2323

2424
public ModelPermissionsData() { }
2525

26-
public static ModelPermissionsData create() {
27-
return builder().build();
28-
}
29-
3026
public static ModelPermissionsData.Builder builder() {
3127
return new ModelPermissionsBuilderImpl();
3228
}

src/main/java/io/github/jetkai/openai/api/data/models/ModelsResponseData.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* ModelsResponseData
1313
*
1414
* @author <a href="https://github.com/jetkai">Kai</a>
15-
* @version 1.1.0
15+
* @version 1.1.1
1616
* {@code - 07/03/2023}
1717
* @since 1.0.0
1818
* {@code - 02/03/2023}
@@ -26,10 +26,6 @@ public static ModelsResponseData.Builder builder() {
2626
return new ModelsResponseBuilderImpl();
2727
}
2828

29-
public static ModelsResponseData create() {
30-
return builder().build();
31-
}
32-
3329
@JsonPOJOBuilder(withPrefix = "set")
3430
public interface Builder {
3531
@JsonProperty("object")

0 commit comments

Comments
 (0)