Skip to content

Commit

Permalink
[Automation] Generate SDK based on TypeSpec 0.23.0 (#42842)
Browse files Browse the repository at this point in the history
* [Automation] Generate SDK based on TypeSpec 0.23.0

* update commit ID for azure-analytics-defender-easm and azure-analytics-purview-datamap

* no longer need to customize for BinaryData

---------

Co-authored-by: Weidong Xu <weidxu@microsoft.com>
  • Loading branch information
azure-sdk and weidongxu-microsoft authored Nov 7, 2024
1 parent 2b4e70f commit 24f9588
Show file tree
Hide file tree
Showing 115 changed files with 1,602 additions and 1,547 deletions.
22 changes: 11 additions & 11 deletions eng/emitter-package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion eng/emitter-package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"main": "dist/src/index.js",
"dependencies": {
"@azure-tools/typespec-java": "0.22.1"
"@azure-tools/typespec-java": "0.23.0"
},
"devDependencies": {
"@azure-tools/typespec-autorest": "0.47.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public final class EmbeddingsAsyncClient {
* input_type: String(text/query/document) (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public final class EmbeddingsClient {
* input_type: String(text/query/document) (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public final class ImageEmbeddingsAsyncClient {
* input_type: String(text/query/document) (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public final class ImageEmbeddingsClient {
* input_type: String(text/query/document) (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,15 @@ Response<BinaryData> getModelInfoSync(@HostParam("endpoint") String endpoint,
* function (Required): {
* name: String (Required)
* description: String (Optional)
* parameters: Object (Optional)
* parameters: BinaryData (Optional)
* }
* }
* ]
* tool_choice: BinaryData (Optional)
* seed: Long (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down Expand Up @@ -346,15 +346,15 @@ public Mono<Response<BinaryData>> completeWithResponseAsync(BinaryData completeR
* function (Required): {
* name: String (Required)
* description: String (Optional)
* parameters: Object (Optional)
* parameters: BinaryData (Optional)
* }
* }
* ]
* tool_choice: BinaryData (Optional)
* seed: Long (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ Response<BinaryData> getModelInfoSync(@HostParam("endpoint") String endpoint,
* input_type: String(text/query/document) (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down Expand Up @@ -286,7 +286,7 @@ public Mono<Response<BinaryData>> embedWithResponseAsync(BinaryData embedRequest
* input_type: String(text/query/document) (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Response<BinaryData> getModelInfoSync(@HostParam("endpoint") String endpoint,
* input_type: String(text/query/document) (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down Expand Up @@ -293,7 +293,7 @@ public Mono<Response<BinaryData>> embedWithResponseAsync(BinaryData embedRequest
* input_type: String(text/query/document) (Optional)
* model: String (Optional)
* (Optional): {
* String: Object (Required)
* String: BinaryData (Required)
* }
* }
* }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public final class CompleteRequest implements JsonSerializable<CompleteRequest>
* Additional properties
*/
@Generated
private Map<String, Object> additionalProperties;
private Map<String, BinaryData> additionalProperties;

/**
* Creates an instance of CompleteRequest class.
Expand Down Expand Up @@ -487,7 +487,7 @@ public CompleteRequest setModel(String model) {
* @return the additionalProperties value.
*/
@Generated
public Map<String, Object> getAdditionalProperties() {
public Map<String, BinaryData> getAdditionalProperties() {
return this.additionalProperties;
}

Expand All @@ -498,7 +498,7 @@ public Map<String, Object> getAdditionalProperties() {
* @return the CompleteRequest object itself.
*/
@Generated
public CompleteRequest setAdditionalProperties(Map<String, Object> additionalProperties) {
public CompleteRequest setAdditionalProperties(Map<String, BinaryData> additionalProperties) {
this.additionalProperties = additionalProperties;
return this;
}
Expand Down Expand Up @@ -526,8 +526,11 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeNumberField("seed", this.seed);
jsonWriter.writeStringField("model", this.model);
if (additionalProperties != null) {
for (Map.Entry<String, Object> additionalProperty : additionalProperties.entrySet()) {
jsonWriter.writeUntypedField(additionalProperty.getKey(), additionalProperty.getValue());
for (Map.Entry<String, BinaryData> additionalProperty : additionalProperties.entrySet()) {
jsonWriter.writeUntypedField(additionalProperty.getKey(),
additionalProperty.getValue() == null
? null
: additionalProperty.getValue().toObject(Object.class));
}
}
return jsonWriter.writeEndObject();
Expand Down Expand Up @@ -558,7 +561,7 @@ public static CompleteRequest fromJson(JsonReader jsonReader) throws IOException
BinaryData toolChoice = null;
Long seed = null;
String model = null;
Map<String, Object> additionalProperties = null;
Map<String, BinaryData> additionalProperties = null;
while (reader.nextToken() != JsonToken.END_OBJECT) {
String fieldName = reader.getFieldName();
reader.nextToken();
Expand Down Expand Up @@ -593,7 +596,8 @@ public static CompleteRequest fromJson(JsonReader jsonReader) throws IOException
if (additionalProperties == null) {
additionalProperties = new LinkedHashMap<>();
}
additionalProperties.put(fieldName, reader.readUntyped());
additionalProperties.put(fieldName,
reader.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())));
}
}
CompleteRequest deserializedCompleteRequest = new CompleteRequest(messages);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.azure.ai.inference.models.EmbeddingInputType;
import com.azure.core.annotation.Fluent;
import com.azure.core.annotation.Generated;
import com.azure.core.util.BinaryData;
import com.azure.json.JsonReader;
import com.azure.json.JsonSerializable;
import com.azure.json.JsonToken;
Expand Down Expand Up @@ -61,7 +62,7 @@ public final class EmbedRequest implements JsonSerializable<EmbedRequest> {
* Additional properties
*/
@Generated
private Map<String, Object> additionalProperties;
private Map<String, BinaryData> additionalProperties;

/**
* Creates an instance of EmbedRequest class.
Expand Down Expand Up @@ -185,7 +186,7 @@ public EmbedRequest setModel(String model) {
* @return the additionalProperties value.
*/
@Generated
public Map<String, Object> getAdditionalProperties() {
public Map<String, BinaryData> getAdditionalProperties() {
return this.additionalProperties;
}

Expand All @@ -196,7 +197,7 @@ public Map<String, Object> getAdditionalProperties() {
* @return the EmbedRequest object itself.
*/
@Generated
public EmbedRequest setAdditionalProperties(Map<String, Object> additionalProperties) {
public EmbedRequest setAdditionalProperties(Map<String, BinaryData> additionalProperties) {
this.additionalProperties = additionalProperties;
return this;
}
Expand All @@ -215,8 +216,11 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStringField("input_type", this.inputType == null ? null : this.inputType.toString());
jsonWriter.writeStringField("model", this.model);
if (additionalProperties != null) {
for (Map.Entry<String, Object> additionalProperty : additionalProperties.entrySet()) {
jsonWriter.writeUntypedField(additionalProperty.getKey(), additionalProperty.getValue());
for (Map.Entry<String, BinaryData> additionalProperty : additionalProperties.entrySet()) {
jsonWriter.writeUntypedField(additionalProperty.getKey(),
additionalProperty.getValue() == null
? null
: additionalProperty.getValue().toObject(Object.class));
}
}
return jsonWriter.writeEndObject();
Expand All @@ -239,7 +243,7 @@ public static EmbedRequest fromJson(JsonReader jsonReader) throws IOException {
EmbeddingEncodingFormat encodingFormat = null;
EmbeddingInputType inputType = null;
String model = null;
Map<String, Object> additionalProperties = null;
Map<String, BinaryData> additionalProperties = null;
while (reader.nextToken() != JsonToken.END_OBJECT) {
String fieldName = reader.getFieldName();
reader.nextToken();
Expand All @@ -257,7 +261,8 @@ public static EmbedRequest fromJson(JsonReader jsonReader) throws IOException {
if (additionalProperties == null) {
additionalProperties = new LinkedHashMap<>();
}
additionalProperties.put(fieldName, reader.readUntyped());
additionalProperties.put(fieldName,
reader.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())));
}
}
EmbedRequest deserializedEmbedRequest = new EmbedRequest(input);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.azure.ai.inference.models.EmbeddingInputType;
import com.azure.core.annotation.Fluent;
import com.azure.core.annotation.Generated;
import com.azure.core.util.BinaryData;
import com.azure.json.JsonReader;
import com.azure.json.JsonSerializable;
import com.azure.json.JsonToken;
Expand Down Expand Up @@ -63,7 +64,7 @@ public final class ImageEmbedRequest implements JsonSerializable<ImageEmbedReque
* Additional properties
*/
@Generated
private Map<String, Object> additionalProperties;
private Map<String, BinaryData> additionalProperties;

/**
* Creates an instance of EmbedRequest1 class.
Expand Down Expand Up @@ -190,7 +191,7 @@ public ImageEmbedRequest setModel(String model) {
* @return the additionalProperties value.
*/
@Generated
public Map<String, Object> getAdditionalProperties() {
public Map<String, BinaryData> getAdditionalProperties() {
return this.additionalProperties;
}

Expand All @@ -201,7 +202,7 @@ public Map<String, Object> getAdditionalProperties() {
* @return the EmbedRequest1 object itself.
*/
@Generated
public ImageEmbedRequest setAdditionalProperties(Map<String, Object> additionalProperties) {
public ImageEmbedRequest setAdditionalProperties(Map<String, BinaryData> additionalProperties) {
this.additionalProperties = additionalProperties;
return this;
}
Expand All @@ -220,8 +221,11 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
jsonWriter.writeStringField("input_type", this.inputType == null ? null : this.inputType.toString());
jsonWriter.writeStringField("model", this.model);
if (additionalProperties != null) {
for (Map.Entry<String, Object> additionalProperty : additionalProperties.entrySet()) {
jsonWriter.writeUntypedField(additionalProperty.getKey(), additionalProperty.getValue());
for (Map.Entry<String, BinaryData> additionalProperty : additionalProperties.entrySet()) {
jsonWriter.writeUntypedField(additionalProperty.getKey(),
additionalProperty.getValue() == null
? null
: additionalProperty.getValue().toObject(Object.class));
}
}
return jsonWriter.writeEndObject();
Expand All @@ -244,7 +248,7 @@ public static ImageEmbedRequest fromJson(JsonReader jsonReader) throws IOExcepti
EmbeddingEncodingFormat encodingFormat = null;
EmbeddingInputType inputType = null;
String model = null;
Map<String, Object> additionalProperties = null;
Map<String, BinaryData> additionalProperties = null;
while (reader.nextToken() != JsonToken.END_OBJECT) {
String fieldName = reader.getFieldName();
reader.nextToken();
Expand All @@ -262,7 +266,8 @@ public static ImageEmbedRequest fromJson(JsonReader jsonReader) throws IOExcepti
if (additionalProperties == null) {
additionalProperties = new LinkedHashMap<>();
}
additionalProperties.put(fieldName, reader.readUntyped());
additionalProperties.put(fieldName,
reader.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped())));
}
}
ImageEmbedRequest deserializedEmbedRequest1 = new ImageEmbedRequest(input);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,14 @@ private void customizeMessageTemplateLocation(PackageCustomization modelsPackage

private void updateWhatsAppMessageTemplateItemWithBinaryDataContent(PackageCustomization channelsModelsPackage) {
channelsModelsPackage.getClass("WhatsAppMessageTemplateItem").customizeAst(ast -> {
ast.addImport("com.azure.core.util.BinaryData");
// ast.addImport("com.azure.core.util.BinaryData");
ast.addImport(
"com.azure.communication.messages.implementation.accesshelpers.MessageTemplateItemAccessHelper");
ast.getClassByName("WhatsAppMessageTemplateItem").ifPresent(clazz -> {
clazz.getMethodsByName("getContent")
.get(0)
.setType("BinaryData")
.setBody(StaticJavaParser.parseBlock("{return BinaryData.fromObject(this.content);}"));
// clazz.getMethodsByName("getContent")
// .get(0)
// .setType("BinaryData")
// .setBody(StaticJavaParser.parseBlock("{return BinaryData.fromObject(this.content);}"));

String fromJson = clazz.getMethodsByName("fromJson").get(0).getBody().get().toString()
.replace("deserializedWhatsAppMessageTemplateItem.setName(name);",
Expand Down
Loading

0 comments on commit 24f9588

Please sign in to comment.