Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Azure OpenAI: TypeSpec updates for 2023-12-01-preview #26737

Merged
merged 48 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
b335550
baseline: add new label with no changes
trrwilson Nov 16, 2023
459447a
reapplication of changes from PR repository
trrwilson Nov 16, 2023
9a583b6
incremental: chat inputs, including tools
trrwilson Nov 16, 2023
4d65865
incremental, in-progress: chat message rework
trrwilson Nov 16, 2023
4b0ddbc
incremental: chat completions updated (undoc'd/unverified)
trrwilson Nov 16, 2023
e7eef17
incremental: provisional completeness for chat
trrwilson Nov 16, 2023
5ac2c5c
Incremental: RAI updates
trrwilson Nov 17, 2023
b57ad7c
Merge branch 'main' into user/travisw/aoai-2023-12-01-preview-typespec
trrwilson Nov 17, 2023
9e19498
RAI, data-plane, tsp compilation fixes
trrwilson Nov 17, 2023
a1eef6f
minor updates after starting .NET integration
trrwilson Nov 17, 2023
db40893
small fix to structured text items for vision
trrwilson Nov 17, 2023
21a5fb5
small but important function fix
trrwilson Nov 17, 2023
969b0ef
trial and error: OYD apiKey->key
trrwilson Nov 17, 2023
87a2ac6
minor edit
trrwilson Nov 17, 2023
f11bb4c
java emitter config merge
trrwilson Nov 17, 2023
8723846
some PR feedback + tool_calls role fix
trrwilson Nov 17, 2023
65e0c5d
small but important: url is optional in protected_material_code
trrwilson Nov 17, 2023
3848178
add missing layer to image_url
trrwilson Nov 17, 2023
c8be3dc
Add speculative finish_details for gpt-4-vision-preview
trrwilson Nov 17, 2023
220c1d0
Reorging files for extensions
jpalvarezl Nov 21, 2023
0d94c71
Using generics
jpalvarezl Nov 21, 2023
7aa12e8
Removed generics approach
jpalvarezl Nov 21, 2023
de6f6d9
Fixed various typos and added docs
jpalvarezl Nov 21, 2023
777be6d
Removed super class parameters
jpalvarezl Nov 21, 2023
0f50f5b
Removed LRO entries in client.tsp, since they are removed from spec a…
jpalvarezl Nov 21, 2023
52da00d
WIP
jpalvarezl Nov 21, 2023
77f99e9
removed LRO related definitions
jpalvarezl Nov 22, 2023
9bfa712
Added @client to hide the LRO op
jpalvarezl Nov 24, 2023
02c814f
Moved visibility modifiers to their own source file
jpalvarezl Nov 24, 2023
1e121f7
Annotated Key as removed
jpalvarezl Nov 28, 2023
9489109
Restored LRO as private methods
jpalvarezl Nov 28, 2023
58da246
Merge branch 'main' into jpalvarezl/aoai_extensions_reorg
trrwilson Nov 29, 2023
62a564d
Merge branch 'main' into user/travisw/aoai-2023-12-01-preview-typespec
trrwilson Nov 29, 2023
4e096ae
Merge branch 'jpalvarezl/aoai_extensions_reorg' into user/travisw/aoa…
trrwilson Nov 29, 2023
5d3c90d
PR feedback
trrwilson Nov 29, 2023
1696732
Hid LROs (#26898)
jpalvarezl Nov 30, 2023
921a13c
Merge branch 'main' into user/travisw/aoai-2023-12-01-preview-typespec
trrwilson Nov 30, 2023
7ba16b2
format, recompile, backport optional filename for whisper
trrwilson Nov 30, 2023
faa4cce
Merge branch 'user/travisw/aoai-2023-12-01-preview-typespec' of https…
trrwilson Nov 30, 2023
024434b
PR feedback: naming/docs updates
trrwilson Nov 30, 2023
f1af967
Added TypeSpec customization support for Java (#26916)
mssfang Dec 1, 2023
3e2daf2
Renamed customization class (#26919)
jpalvarezl Dec 1, 2023
a6c6048
Update specification/cognitiveservices/OpenAI.Inference/models/comple…
trrwilson Dec 4, 2023
7ce9dbb
Merge branch 'main' into user/travisw/aoai-2023-12-01-preview-typespec
trrwilson Dec 4, 2023
e01c2cf
recompile after accepted/committed feedback fix
trrwilson Dec 4, 2023
397331c
PR feedback: non-optional content_filter_results on prompt model
trrwilson Dec 5, 2023
1933a46
very minor change: one file fix via npx prettier
trrwilson Dec 5, 2023
184593c
missing second half of prettier fix: copied file to data-plane
trrwilson Dec 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions specification/cognitiveservices/OpenAI.Inference/client.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,9 @@ using Azure.ClientGenerator.Core;
@@usage(Azure.OpenAI.AzureCognitiveSearchChatExtensionConfiguration,
Usage.input
);

// Remap "model" nomenclature to "DeploymentName" in appropriate containers; comments should clarify the dual use
@@projectedName(Azure.OpenAI.ImageGenerationOptions.`model`,
"csharp",
"DeploymentName"
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"operationId": "GetAudioTranscriptionAsResponseObject",
"title": "Gets transcribed text and associated metadata from provided spoken audio data.",
"parameters": {
"endpoint": "{endpoint}",
"api-version": "2023-12-01-preview",
"deploymentId": "<deployment-id>"
},
"responses": {
"200": {
"body": {
"text": "A structured object when requesting json or verbose_json"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"operationId": "GetAudioTranscriptionAsPlainText",
"title": "Gets transcribed text and associated metadata from provided spoken audio data.",
"parameters": {
"endpoint": "{endpoint}",
"api-version": "2023-12-01-preview",
"deploymentId": "<deployment-id>",
"body": "---multipart-boundary\nContent-Disposition: form-data; name=\"file\"; filename=\"file.wav\"\nContent-Type: application/octet-stream\n\nRIFF..audio.data.omitted\n---multipart-boundary--"
},
"responses": {
"200": {
"type": "string",
"example": "plain text when requesting text, srt, or vtt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"operationId": "GetAudioTranslationAsResponseObject",
"title": "Gets English language transcribed text and associated metadata from provided spoken audio data.",
"parameters": {
"endpoint": "{endpoint}",
"api-version": "2023-12-01-preview",
"deploymentId": "<deployment-id>",
"body": "---multipart-boundary\nContent-Disposition: form-data; name=\"file\"; filename=\"file.wav\"\nContent-Type: application/octet-stream\n\nRIFF..audio.data.omitted\n---multipart-boundary--"
},
"responses": {
"200": {
"body": {
"text": "A structured object when requesting json or verbose_json"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"operationId": "GetAudioTranslationAsPlainText",
"title": "Gets English language transcribed text and associated metadata from provided spoken audio data.",
"parameters": {
"endpoint": "{endpoint}",
"api-version": "2023-12-01-preview",
"deploymentId": "<deployment-id>",
"body": "---multipart-boundary\nContent-Disposition: form-data; name=\"file\"; filename=\"file.wav\"\nContent-Type: application/octet-stream\n\nRIFF..audio.data.omitted\n---multipart-boundary--"
},
"responses": {
"200": {
"type": "string",
"example": "plain text when requesting text, srt, or vtt"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"operationId": "GetChatCompletions",
"title": "Creates a completion for the provided prompt, parameters and chosen model.",
"parameters": {
"endpoint": "{endpoint}",
"api-version": "2023-12-01-preview",
"deploymentId": "<deployment-id>",
"body": {
"messages": [
{
"role": "system",
"content": "you are a helpful assistant that talks like a pirate"
},
{
"role": "user",
"content": "can you tell me how to care for a parrot?"
}
]
}
},
"responses": {
"200": {
"body": {
"id": "chatcmpl-7R1nGnsXO8n4oi9UPz2f3UHdgAYMn",
"created": 1686676106,
"choices": [
{
"index": 0,
"finish_reason": "stop",
"message": {
"role": "assistant",
"content": "Ahoy matey! So ye be wantin' to care for a fine squawkin' parrot, eh? Well, shiver me timbers, let ol' Cap'n Assistant share some wisdom with ye! Here be the steps to keepin' yer parrot happy 'n healthy:\n\n1. Secure a sturdy cage: Yer parrot be needin' a comfortable place to lay anchor! Be sure ye get a sturdy cage, at least double the size of the bird's wingspan, with enough space to spread their wings, yarrrr!\n\n2. Perches 'n toys: Aye, parrots need perches of different sizes, shapes, 'n textures to keep their feet healthy. Also, a few toys be helpin' to keep them entertained 'n their minds stimulated, arrrh!\n\n3. Proper grub: Feed yer feathered friend a balanced diet of high-quality pellets, fruits, 'n veggies to keep 'em strong 'n healthy. Give 'em fresh water every day, or ye’ll have a scurvy bird on yer hands!\n\n4. Cleanliness: Swab their cage deck! Clean their cage on a regular basis: fresh water 'n food daily, the floor every couple of days, 'n a thorough scrubbing ev'ry few weeks, so the bird be livin' in a tidy haven, arrhh!\n\n5. Socialize 'n train: Parrots be a sociable lot, arrr! Exercise 'n interact with 'em daily to create a bond 'n maintain their mental 'n physical health. Train 'em with positive reinforcement, treat 'em kindly, yarrr!\n\n6. Proper rest: Yer parrot be needin' ’bout 10-12 hours o' sleep each night. Cover their cage 'n let them slumber in a dim, quiet quarter for a proper night's rest, ye scallywag!\n\n7. Keep a weather eye open for illness: Birds be hidin' their ailments, arrr! Be watchful for signs of sickness, such as lethargy, loss of appetite, puffin' up, or change in droppings, and make haste to a vet if need be.\n\n8. Provide fresh air 'n avoid toxins: Parrots be sensitive to draft and pollutants. Keep yer quarters well ventilated, but no drafts, arrr! Be mindful of toxins like Teflon fumes, candles, or air fresheners.\n\nSo there ye have it, me hearty! With proper care 'n commitment, yer parrot will be squawkin' \"Yo-ho-ho\" for many years to come! Good luck, sailor, and may the wind be at yer back!"
}
}
],
"usage": {
"completion_tokens": 557,
"prompt_tokens": 33,
"total_tokens": 590
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"operationId": "GetCompletions",
"title": "Creates a completion for the provided prompt, parameters and chosen model.",
"parameters": {
"endpoint": "{endpoint}",
"api-version": "2023-12-01-preview",
"deploymentId": "<deployment-id>",
"body": {
"prompt": [
"tell me a joke about mango"
],
"max_tokens": 32,
"temperature": 1.0,
"n": 1
}
},
"responses": {
"200": {
"body": {
"id": "cmpl-7QmVI15qgYVllxK0FtxVGG6ywfzaq",
"created": 1686617332,
"choices": [
{
"text": "es\n\nWhat do you call a mango who's in charge?\n\nThe head mango.",
"index": 0,
"finish_reason": "stop",
"logprobs": null
}
],
"usage": {
"completion_tokens": 20,
"prompt_tokens": 6,
"total_tokens": 26
}
}
}
}
}
Loading
Loading