AOAI: fix CompletionsUsage model #22439
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi, @trrwilson Thanks for your PR. I am workflow bot for review process. Here are some small tips. Any feedback about review process or workflow bot, pls contact swagger and tools team. vscswagger@microsoft.com |
Swagger Validation Report
|
| Rule | Message |
|---|---|
| "How to fix":"Check the readme file and make sure the readme file format is valid and the tag is defined. Use the provided readme template" |
️❌CadlAPIView: 0 Errors, 1 Warnings failed [Detail]
| Rule | Message |
|---|---|
| "How to fix":"Check the detailed log and update cadl version to latest." |
️️✔️ModelValidation succeeded [Detail] [Expand]
Validation passes for ModelValidation.
️️✔️SemanticValidation succeeded [Detail] [Expand]
Validation passes for SemanticValidation.
️️✔️PrettierCheck succeeded [Detail] [Expand]
Validation passes for PrettierCheck.
️️✔️SpellCheck succeeded [Detail] [Expand]
Validation passes for SpellCheck.
️❌CadlValidation: 5 Errors, 93 Warnings failed [Detail]
Only 30 items are listed, please refer to log for more details.
| Rule | Message |
|---|---|
|
"details":"The 'examples' directory is missing in the cadl folder specification/cognitiveservices/OpenAI.Authoring, please ensure the 'examples' is added in the PR." |
|
"details":"The generated swagger file 2022-06-01-preview/openapi.json from cadl specification/cognitiveservices/OpenAI.Authoring is not the same as the '/mnt/vss/_work/1/azure-rest-api-specs/specification/cognitiveservices/data-plane/AzureOpenAI/authoring/preview/2022-06-01-preview/azureopenai.json' in PR, please make sure the swagger is consistent with the generated swagger. You can find the difference in the pipeline log." |
|
"details":"The 'examples' directory is missing in the cadl folder specification/cognitiveservices/OpenAI.Inference, please ensure the 'examples' is added in the PR." |
|
"details":"The generated swagger file 2022-06-01-preview/openapi.json from cadl specification/cognitiveservices/OpenAI.Inference is not the same as the '/mnt/vss/_work/1/azure-rest-api-specs/specification/cognitiveservices/data-plane/AzureOpenAI/authoring/preview/2022-06-01-preview/azureopenai.json' in PR, please make sure the swagger is consistent with the generated swagger. You can find the difference in the pipeline log." |
|
"details":"The generated swagger file specification/cognitiveservices/OpenAI.Inference/@azure-tools/cadl-autorest/2022-12-01/openapi.json from cadl specification/cognitiveservices/OpenAI.Inference is not in the PR, please make sure it presents into the PR." |
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/model.models.cadl#L58 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/model.models.cadl#L74 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/model.models.cadl#L88 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L21 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L25 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L37 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L46 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/file.models.cadl#L23 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/file.models.cadl#L27 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L49 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L52 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L91 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L67 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L74 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L109 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L120 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L131 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L137 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L149 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L163 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L170 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/finetune.models.cadl#L177 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/model.models.cadl#L21 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/model.models.cadl#L25 |
|
| The names of Property types must use camelCase Location: cognitiveservices/OpenAI.Authoring/models/model.models.cadl#L38 |
️️✔️PR Summary succeeded [Detail] [Expand]
Validation passes for Summary.
Swagger Generation Artifacts
|
|
Swagger pipeline started successfully. If there is ApiView generated, it will be updated in this comment. |
ghost
added
the
|
@jpalvarezl @m-nash FYI -- came across this in the course of ad hoc testing. I'll add less ad hoc test coverage for it once it makes its way over. |
jpalvarezl
approved these changes
Feb 3, 2023
jpalvarezl
approved these changes
Feb 3, 2023
lmazuel
added a commit
that referenced
this pull request
Feb 3, 2023
* Initial commit. * Commit OpenAI inference cadl files. * use non-deprecated service decorator * Fixes to main * Reverted changes * use latest cadl to sync with vs code properly * cadl compilation works for authoring (but it is correct?) * Cleaned up routes and model for Inference REST CADL spec * Added cadl-output to .gitignore file and removed error response * Implemented polymorphic return for endpoint * enable Files_Import as non-standard operation, use standard operation names * Authoring CADL now emits openAPI schema almost identical to current Authoring schema * Empty model used for polymorphic expectation in embedding endpoint * Renamed models to match convention * Renamed completions related models * Adjusted comment for embeddings body types * Split up models.cadl into completions and embeddings files * Renamed models * Refactored model names * Removed redundants bits of model names * added headers * Added header to correct model * break up monolithic routes and model cadl files * add namespace to all models * Removed gitIgnore file and changed files to not have domain related namespaces * Finished embeddings endpoint and verified against source json * Verified round trip for swagger * Almost done with security types * Configured correctly OAth2 * Add Auth and OAuth2 to service (thanks Jose!) * Add auth and OAuth to openapi json * Review comments * Review comments * camel casing * add versionedDependency * better versioning * Added the apiview emitter to OpenAI.Inference endpoints * PR feedback for Inference endpoints * Feature/cognitiveservices/openai cadl (#21574) * Added openai specific list API op template. * Simplified OAI authoring cadl * update package versions, correct camelCase warning in common * remove commented out models, changed AcceptedResponse to CreatedResponse * Reverted completion to use snake_casing and removed the Response and Request namespaces * reverted to snake_casing and removed Request namespace for embeddings * Added missing namespace declaration in embeddings * Updated dependencies and enabled csharp emitter for Inference * use string literals for now as enum value types (TypeDiscriminatorKnownValues) not supported in csharp emitter * Add TODO to TypeDiscriminatorKnownValues def * More specific route operation names, use snake casing for all model fields * Added more options to csharp emitter * Simplify OpenAI inferrence models and use core (#21609) * Simplify OpenAI inferrence models and use core * Simplified and corrected Cadl type usage for OpenAI.Inference * Fix camel case issues. Co-authored-by: tjprescott <trpresco@microsoft.com> * Upgrade Cadl file to 0.38 for OpenAI.Authoring service (#22104) * Upgrade Cadl file to 0.38 * Upgrade the package.json file and relevant cadl decorator * Embedding in Azure do not support integer (#22091) * Fix auth in OpenAI CADL (#22191) * Change aliases to models, renamed model Embedding to EmbeddingItem to avoid conflicts, and Completion types * Changed prompt into string[][] * update package name (#22312) * Archboard feedback (#22315) * Archboard feedback * Disable stream for now * Rename to options * Fix operation name (#22319) * Feature/openai add missing usage (#22337) * add new API version and usage field on completions and embeddings * typo * Added docs for Usage classes in completions and embeddings * Added versioning mark for new usage model * Added disambiguation for names and removed unnecessary versioning decorator * Removed unused version bump * Removed unused version from enum * Removed wrong annotation --------- Co-authored-by: Jose Alvarez <josealvar@microsoft.com> * Update main.cadl (#22362) * Embeddings model and field documentation and fix to models (#22368) * Moved usage to the response object of embeddings and added some basic documentation to models and fields * Fixed typo * Update specification/cognitiveservices/OpenAI.Inference/models/embeddings.create.cadl --------- Co-authored-by: Laurent Mazuel <laurent.mazuel@gmail.com> * Removing Model from model name and removing unnecessary aliases (#22390) * updated deps and added visibility decorator to deploymentId (#22417) * Made CompletionsOptions.model optional again * Removing ...Models namespace in the C# classes (#22449) * AOAI: fix CompletionsUsage model (#22439) --------- Co-authored-by: tjprescott <trpresco@microsoft.com> Co-authored-by: Glenn Harper <glharper@microsoft.com> Co-authored-by: Jose Alvarez <josealvar@microsoft.com> Co-authored-by: Glenn Harper <64209257+glharper@users.noreply.github.com> Co-authored-by: Johan Stenberg (MSFT) <johan.stenberg@microsoft.com> Co-authored-by: Mary Gao <yanmeigao1210@gmail.com> Co-authored-by: m-nash <64171366+m-nash@users.noreply.github.com> Co-authored-by: Jose Alvarez <jpalvarezl@users.noreply.github.com> Co-authored-by: Travis Wilson <35748617+trrwilson@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
<<Skipping template for topic-to-topic PR>>
This addresses an error/inconsistency in the model definition for
CompletionsUsagein Azure.AI.OpenAI's Inference area.Specifically, a live service interaction demonstrates that a JSON key we want to process is named
completion_tokens:The model, meanwhile, expresses
completion_token(no terminating 's') and the emitted projection code thus fails to deserialize the data.In lieu of correcting a typo in the model comment, I replaced it with my own verbiage that I think adds a small amount of value.