Skip to content

[Cognitive Services - Azure AI Content Safety] Update package print name.#26911

Merged
mengaims merged 3 commits intoAzure:mainfrom
mengaims:zhojie/python-1
Dec 1, 2023
Merged

[Cognitive Services - Azure AI Content Safety] Update package print name.#26911
mengaims merged 3 commits intoAzure:mainfrom
mengaims:zhojie/python-1

Conversation

@JieZhou000
Copy link
Copy Markdown
Contributor

Choose a PR Template

Switch to "Preview" on this description then select one of the choices below.

Click here to open a PR for a Data Plane API.

Click here to open a PR for a Control Plane (ARM) API.

@JieZhou000 JieZhou000 requested a review from yangyuan as a code owner December 1, 2023 05:38
@openapi-pipeline-app
Copy link
Copy Markdown

openapi-pipeline-app Bot commented Dec 1, 2023

Next Steps to Merge

✔️ All automated merging requirements have been met! Refer to step 4 in the PR workflow diagram (even if your PR is for data plane, not ARM).

@openapi-pipeline-app
Copy link
Copy Markdown

openapi-pipeline-app Bot commented Dec 1, 2023

Swagger Validation Report

️️✔️BreakingChange succeeded [Detail] [Expand]
There are no breaking changes.
️️✔️Breaking Change(Cross-Version) succeeded [Detail] [Expand]
There are no breaking changes.
️️✔️CredScan succeeded [Detail] [Expand]
There is no credential detected.
️️✔️LintDiff succeeded [Detail] [Expand]
Validation passes for LintDiff.
️️✔️Avocado succeeded [Detail] [Expand]
Validation passes for Avocado.
️️✔️SwaggerAPIView succeeded [Detail] [Expand]
️️✔️TypeSpecAPIView succeeded [Detail] [Expand]
️️✔️ModelValidation succeeded [Detail] [Expand]
Validation passes for ModelValidation.
️️✔️SemanticValidation succeeded [Detail] [Expand]
Validation passes for SemanticValidation.
️️✔️PoliCheck succeeded [Detail] [Expand]
Validation passed for PoliCheck.
️️✔️SpellCheck succeeded [Detail] [Expand]
Validation passes for SpellCheck.
️️✔️Lint(RPaaS) succeeded [Detail] [Expand]
Validation passes for Lint(RPaaS).
️️✔️PR Summary succeeded [Detail] [Expand]
Validation passes for Summary.
️️✔️Automated merging requirements met succeeded [Detail] [Expand]
Posted by Swagger Pipeline | How to fix these errors?

@openapi-pipeline-app
Copy link
Copy Markdown

openapi-pipeline-app Bot commented Dec 1, 2023

Swagger Generation Artifacts

️️✔️ApiDocPreview succeeded [Detail] [Expand]
️️✔️SDK Breaking Change Tracking succeeded [Detail] [Expand]

Breaking Changes Tracking


️⚠️ azure-sdk-for-python warning [Detail]
  • ⚠️Warning [Logs] Generate from 96809b2ae082df24ae0834f7bb08d9b030c4193b. SDK Automation 14.0.0
    command	sh scripts/automation_init.sh ../azure-sdk-for-python_tmp/initInput.json ../azure-sdk-for-python_tmp/initOutput.json
    cmderr	[automation_init.sh] WARNING: azure-devtools 1.2.1 does not provide the extra 'ci-tools'
    cmderr	[automation_init.sh] WARNING: azure-devtools 1.2.1 does not provide the extra 'ci-tools'
    cmderr	[automation_init.sh] WARNING: Skipping azure-nspkg as it is not installed.
    command	sh scripts/automation_generate.sh ../azure-sdk-for-python_tmp/generateInput.json ../azure-sdk-for-python_tmp/generateOutput.json
    cmderr	[automation_generate.sh]
    cmderr	[automation_generate.sh] npm notice New major version of npm available! 9.8.1 -> 10.2.4
    cmderr	[automation_generate.sh] npm notice Changelog: <https://github.com/npm/cli/releases/tag/v10.2.4>
    cmderr	[automation_generate.sh] npm notice Run `npm install -g npm@10.2.4` to update!
    cmderr	[automation_generate.sh] npm notice
  • ️✔️azure-ai-contentsafety [View full logs]  [Preview SDK Changes]
    info	[Changelog] data-plan skip changelog generation temporarily
️️✔️ azure-sdk-for-net-track2 succeeded [Detail] [Expand]
  • ️✔️Succeeded [Logs] Generate from 96809b2ae082df24ae0834f7bb08d9b030c4193b. SDK Automation 14.0.0
    command	pwsh ./eng/scripts/Automation-Sdk-Init.ps1 ../azure-sdk-for-net_tmp/initInput.json ../azure-sdk-for-net_tmp/initOutput.json
    command	pwsh ./eng/scripts/Invoke-GenerateAndBuildV2.ps1 ../azure-sdk-for-net_tmp/generateInput.json ../azure-sdk-for-net_tmp/generateOutput.json
  • ️✔️Azure.AI.ContentSafety [View full logs]  [Preview SDK Changes]
    info	[Changelog]
️️✔️ azure-sdk-for-js succeeded [Detail] [Expand]
  • ️✔️Succeeded [Logs] Generate from 96809b2ae082df24ae0834f7bb08d9b030c4193b. SDK Automation 14.0.0
    command	sh .scripts/automation_init.sh ../azure-sdk-for-js_tmp/initInput.json ../azure-sdk-for-js_tmp/initOutput.json
    warn	File azure-sdk-for-js_tmp/initOutput.json not found to read
    command	sh .scripts/automation_generate.sh ../azure-sdk-for-js_tmp/generateInput.json ../azure-sdk-for-js_tmp/generateOutput.json
    cmderr	[automation_generate.sh] [ERROR] Generate changelog failed: ENOENT: no such file or directory, open '/mnt/vss/_work/1/s/azure-sdk-for-js/sdk/contentsafety/ai-content-safety-rest/changelog-temp/package/CHANGELOG.md'
  • ️✔️@azure-rest/ai-content-safety [View full logs]  [Preview SDK Changes]
    info	[Changelog]
    error	breakingChangeTracking is enabled, but version or changelogItem is not found in output.
️⚠️ azure-sdk-for-java warning [Detail]
  • ⚠️Warning [Logs] Generate from 96809b2ae082df24ae0834f7bb08d9b030c4193b. SDK Automation 14.0.0
    command	./eng/mgmt/automation/init.sh ../azure-sdk-for-java_tmp/initInput.json ../azure-sdk-for-java_tmp/initOutput.json
    cmderr	[init.sh] [notice] A new release of pip is available: 23.0.1 -> 23.3.1
    cmderr	[init.sh] [notice] To update, run: pip install --upgrade pip
    cmderr	[init.sh] [notice] A new release of pip is available: 23.0.1 -> 23.3.1
    cmderr	[init.sh] [notice] To update, run: pip install --upgrade pip
    command	./eng/mgmt/automation/generate.py ../azure-sdk-for-java_tmp/generateInput.json ../azure-sdk-for-java_tmp/generateOutput.json
    cmderr	[generate.py] WARN EBADENGINE Unsupported engine {
    cmderr	[generate.py] npm WARN EBADENGINE   package: '@typespec/compiler@0.50.0',
    cmderr	[generate.py] npm WARN EBADENGINE   required: { node: '>=18.0.0' },
    cmderr	[generate.py] npm WARN EBADENGINE   current: { node: 'v16.20.2', npm: '8.19.4' }
    cmderr	[generate.py] npm WARN EBADENGINE }
    cmderr	[generate.py] npm WARN EBADENGINE Unsupported engine {
    cmderr	[generate.py] npm WARN EBADENGINE   package: '@typespec/rest@0.50.0',
    cmderr	[generate.py] npm WARN EBADENGINE   required: { node: '>=18.0.0' },
    cmderr	[generate.py] npm WARN EBADENGINE   current: { node: 'v16.20.2', npm: '8.19.4' }
    cmderr	[generate.py] npm WARN EBADENGINE }
    cmderr	[generate.py] npm WARN EBADENGINE Unsupported engine {
    cmderr	[generate.py] npm WARN EBADENGINE   package: '@typespec/http@0.50.0',
    cmderr	[generate.py] npm WARN EBADENGINE   required: { node: '>=18.0.0' },
    cmderr	[generate.py] npm WARN EBADENGINE   current: { node: 'v16.20.2', npm: '8.19.4' }
    cmderr	[generate.py] npm WARN EBADENGINE }
    cmderr	[generate.py] npm WARN EBADENGINE Unsupported engine {
    cmderr	[generate.py] npm WARN EBADENGINE   package: '@typespec/openapi@0.50.0',
    cmderr	[generate.py] npm WARN EBADENGINE   required: { node: '>=18.0.0' },
    cmderr	[generate.py] npm WARN EBADENGINE   current: { node: 'v16.20.2', npm: '8.19.4' }
    cmderr	[generate.py] npm WARN EBADENGINE }
    cmderr	[generate.py] npm WARN EBADENGINE Unsupported engine {
    cmderr	[generate.py] npm WARN EBADENGINE   package: '@typespec/versioning@0.50.0',
    cmderr	[generate.py] npm WARN EBADENGINE   required: { node: '>=18.0.0' },
    cmderr	[generate.py] npm WARN EBADENGINE   current: { node: 'v16.20.2', npm: '8.19.4' }
    cmderr	[generate.py] npm WARN EBADENGINE }
    cmderr	[generate.py] npm WARN EBADENGINE Unsupported engine {
    cmderr	[generate.py] npm WARN EBADENGINE   package: '@azure-tools/typespec-azure-core@0.36.0',
    cmderr	[generate.py] npm WARN EBADENGINE   required: { node: '>=18.0.0' },
    cmderr	[generate.py] npm WARN EBADENGINE   current: { node: 'v16.20.2', npm: '8.19.4' }
    cmderr	[generate.py] npm WARN EBADENGINE }
    cmderr	[generate.py] npm WARN EBADENGINE Unsupported engine {
    cmderr	[generate.py] npm WARN EBADENGINE   package: '@azure-tools/typespec-client-generator-core@0.36.1',
    cmderr	[generate.py] npm WARN EBADENGINE   required: { node: '>=18.0.0' },
    cmderr	[generate.py] npm WARN EBADENGINE   current: { node: 'v16.20.2', npm: '8.19.4' }
    cmderr	[generate.py] npm WARN EBADENGINE }
    cmderr	[generate.py] npm notice
    cmderr	[generate.py] npm notice New major version of npm available! 8.19.4 -> 10.2.4
    cmderr	[generate.py] npm notice Changelog: <https://github.com/npm/cli/releases/tag/v10.2.4>
    cmderr	[generate.py] npm notice Run `npm install -g npm@10.2.4` to update!
    cmderr	[generate.py] npm notice
  • ️✔️azure-ai-contentsafety [View full logs]  [Preview SDK Changes]
Posted by Swagger Pipeline | How to fix these errors?

@openapi-pipeline-app
Copy link
Copy Markdown

openapi-pipeline-app Bot commented Dec 1, 2023

Generated ApiView

Language Package Name ApiView Link
Python azure-ai-contentsafety Create ApiView failed. Please ask PR assignee for help
Java azure-ai-contentsafety There is no API change compared with the previous version
.Net Azure.AI.ContentSafety There is no API change compared with the previous version
JavaScript @azure-rest/ai-content-safety There is no API change compared with the previous version

@mengaims mengaims merged commit fb39d98 into Azure:main Dec 1, 2023
mssfang added a commit that referenced this pull request Dec 1, 2023
* Update spell checking instructions (#26874)

Having one custom-words.txt for the entire repo has been causing a number of merging issues so we are trying to move away from it and instead have teams use override in the cspell configuration file directly.

* Update readme.python.md (#26894)

* Update readme.python.md

* Update readme.python.md

* Update readme.python.md

* Update readme.python.md

---------

Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>

* [Cognitive Services - Azure AI Content Safety] Update package print name. (#26911)

* Update package print name.

* update.

* update name.

* Added TypeSpec customization support for Java

---------

Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>
Co-authored-by: ChenxiJiang333 <119990644+ChenxiJiang333@users.noreply.github.com>
Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
Co-authored-by: jiezhou_microsoft <94604058+JieZhou000@users.noreply.github.com>
package-dir: "azure-ai-contentsafety"
package-version: "1.0.0"
package-name: "{package-dir}"
package-pprint-name: "\"Azure AI Content Safety\""
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you including the quotes in the name?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I searched through other projects in this repository to see how they used package-pprint-name. I noticed that everyone included quotes, so I followed suit and used quotes as well.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@catalinaperalta Can you help me understand why we need this extra property? I don't think the escaped quotes should be needed either. Also the version property should be removed as it isn't needed.

Copy link
Copy Markdown
Member

@catalinaperalta catalinaperalta Dec 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The property is used in setup.py for python packages and is used as part of the display name for the package on PyPi. Here is Content Safety's setup.py: https://github.com/Azure/azure-sdk-for-python/blob/20423ff39c28318cd219f520709d9efea360faf6/sdk/contentsafety/azure-ai-contentsafety/setup.py#L16

How it looks on PyPi:
image

and yes the escaped quotes are not necessary.

lmazuel pushed a commit that referenced this pull request Dec 6, 2023
* baseline: add new label with no changes

* reapplication of changes from PR repository

* incremental: chat inputs, including tools

* incremental, in-progress: chat message rework

* incremental: chat completions updated (undoc'd/unverified)

* incremental: provisional completeness for chat

* Incremental: RAI updates

* RAI, data-plane, tsp compilation fixes

* minor updates after starting .NET integration

* small fix to structured text items for vision

* small but important function fix

* trial and error: OYD apiKey->key

* minor edit

* java emitter config merge

* some PR feedback + tool_calls role fix

* small but important: url is optional in protected_material_code

* add missing layer to image_url

* Add speculative finish_details for gpt-4-vision-preview

* Reorging files for extensions

* Using generics

* Removed generics approach

* Fixed various typos and added docs

* Removed super class parameters

* Removed LRO entries in client.tsp, since they are removed from spec anyway

* WIP

* removed LRO related definitions

* Added @client to hide the LRO op

* Moved visibility modifiers to their own source file

* Annotated Key as removed

* Restored LRO as private methods

* PR feedback

* Hid LROs (#26898)

* format, recompile, backport optional filename for whisper

* PR feedback: naming/docs updates

* Added TypeSpec customization support for Java (#26916)

* Update spell checking instructions (#26874)

Having one custom-words.txt for the entire repo has been causing a number of merging issues so we are trying to move away from it and instead have teams use override in the cspell configuration file directly.

* Update readme.python.md (#26894)

* Update readme.python.md

* Update readme.python.md

* Update readme.python.md

* Update readme.python.md

---------

Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>

* [Cognitive Services - Azure AI Content Safety] Update package print name. (#26911)

* Update package print name.

* update.

* update name.

* Added TypeSpec customization support for Java

---------

Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>
Co-authored-by: ChenxiJiang333 <119990644+ChenxiJiang333@users.noreply.github.com>
Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
Co-authored-by: jiezhou_microsoft <94604058+JieZhou000@users.noreply.github.com>

* Renamed customization class (#26919)

* Update specification/cognitiveservices/OpenAI.Inference/models/completions/chat_completions.tsp

Co-authored-by: Deyaaeldeen Almahallawi <dealmaha@microsoft.com>

* recompile after accepted/committed feedback fix

* PR feedback: non-optional content_filter_results on prompt model

* very minor change: one file fix via npx prettier

* missing second half of prettier fix: copied file to data-plane

---------

Co-authored-by: Jose Alvarez <jp.alvarezl@gmail.com>
Co-authored-by: Jose Alvarez <jpalvarezl@users.noreply.github.com>
Co-authored-by: Shawn Fang <45607042+mssfang@users.noreply.github.com>
Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>
Co-authored-by: ChenxiJiang333 <119990644+ChenxiJiang333@users.noreply.github.com>
Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
Co-authored-by: jiezhou_microsoft <94604058+JieZhou000@users.noreply.github.com>
Co-authored-by: Deyaaeldeen Almahallawi <dealmaha@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants