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.

Sign up for GitHub

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

Jump to bottom

[Cognitive Services - Azure AI Content Safety] - [Private Preview] - Add Image Batch Detection #27353

Merged
merged 15 commits into from
Feb 12, 2024
Merged

[Cognitive Services - Azure AI Content Safety] - [Private Preview] - Add Image Batch Detection #27353

merged 15 commits into from
Feb 12, 2024

Commits on Jan 11, 2024

  1. Add private preview versions to feature branch (#43) 

    * Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* Add incident response API in 2023-10-30-preview

* compiled

* Adaptive annotation service contract

* Remove operations

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* add

* add

* remove labelName

* Fix route and minor errors

* Change typo

* update

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Update incident contract

* Update contract

* Update

* scenarios to enumerations (#19)

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Merge 1015 (#22)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>

* Add list API for Annotation Service (#23)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Add list category APIs

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>

* Update contract for incident response (#24)

Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>

* scenarios to enumerations (#25)

* [Cognitive Services - Azure AI Content Safety] - 2023-11-30-preview Private Preview

* update doc

* resolve comments.

* Merge main and recompile swagger

* add explanation for 2023-11-30-preview

* format

* generate swagger

* Optimize contract (#36)

* add 12-30-preview, add explanation spec

* update

* renamed reason -> harmful chunks

* update.

* remove new version enum from GA version

* Remove examples from 1015

* restore examples

* Add examples for jailbreak and protected material

* run prettier for example

* commit add enum to stable

* Add omit-unreachable-types: true to typespec

* compile preview

* Fix readme

* renamed to citation

* UPDATE: add reasoning column and update some docs.

* update doc.

* update api version.

* Fix some typo issues. (#40)

* Update data plane.

* Remove unused versions

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>
Co-authored-by: YUTONG_ZHAI <32332316+zhaiyutong@users.noreply.github.com>
Co-authored-by: Jie Zhou <zhojie@microsoft.com>
Co-authored-by: Yuxiao Wang <yuxiaowang@microsoft.com>
Co-authored-by: Yuxiao Wang <58904990+Sayaka-4987@users.noreply.github.com>
Co-authored-by: jiezhou_microsoft <94604058+JieZhou000@users.noreply.github.com>
    @mengaims @suxi-ms
    @liulixiang1988 @zhaiyutong @JieZhou000 @Sayaka-4987
    10 people authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    8775b51 View commit details
    Browse the repository at this point in the history

  2. Customized category / customized model related spec changes (#45) 

    * Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* Add incident response API in 2023-10-30-preview

* compiled

* Adaptive annotation service contract

* Remove operations

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* add

* add

* remove labelName

* Fix route and minor errors

* Change typo

* update

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Update incident contract

* Update contract

* Update

* scenarios to enumerations (#19)

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Merge 1015 (#22)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>

* Add list API for Annotation Service (#23)

* Add ga contract for Content Safety

* Update examples for 2023-10-01

* Resolve ModelValidation SpellCheck and Avocado

* Fix typo

* Fix minor errors in example and readme

* Fix example

* remove the 0430 content

* update readme

* re-format markdowm

* Fix example

* init content safety 2023-10-15-preview

* init content safety 2023-10-15-previwe

* update

* format example

* update read me file

* update

* update

* update contract

* update

* update

* update threshold

* update new contract by add judgement kind enum

* update description

* u

* update

* updat length

* update

* update

* update description for accept severity threshodl

* update

* merge with acs-ga

* Add snippy contract

* remove 8 sev levels for image

* update contentsafety.json

* Update snippy path

* add type spec for jailbreak

* compiled

* update

* update

* refine

* update

* make 0,1,2,3,4,5,6,7 to 0, 1, 2, 3, ... and add comman in last enum value

* update path

* Update NL Snippy path

* Resolve conflict

* Update protected material API

* update project sample

* Change path name

* Update protect material contract

* update jailbreak

* Remove project related contract (#20)

* Remove project related things

* Remove accepted

* Remove examples

* Add list category APIs

---------

Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>

* Update contract for incident response (#24)

Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>

* scenarios to enumerations (#25)

* [Cognitive Services - Azure AI Content Safety] - 2023-11-30-preview Private Preview

* update doc

* resolve comments.

* Merge main and recompile swagger

* add explanation for 2023-11-30-preview

* format

* generate swagger

* Optimize contract (#36)

* add 12-30-preview, add explanation spec

* update

* renamed reason -> harmful chunks

* update.

* remove new version enum from GA version

* Remove examples from 1015

* restore examples

* Add examples for jailbreak and protected material

* run prettier for example

* commit add enum to stable

* Add omit-unreachable-types: true to typespec

* compile preview

* Fix readme

* renamed to citation

* UPDATE: add reasoning column and update some docs.

* update doc.

* update api version.

* Fix some typo issues. (#40)

* Update data plane.

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* draft

* update bd draft

* update spec draft

* update spec draft

* update spec draft

---------

Co-authored-by: mengaims <mengai@microsoft.com>
Co-authored-by: FAREAST\suxi <suxi@microsoft.com>
Co-authored-by: Lixiang Liu <lixiangliu@microsoft.com>
Co-authored-by: Lixiang Liu <liulixiang1988@gmail.com>
Co-authored-by: zhaiyutong <mo.huainian@163.com>
Co-authored-by: mengaims <50131889+mengaims@users.noreply.github.com>
Co-authored-by: YUTONG_ZHAI <32332316+zhaiyutong@users.noreply.github.com>
Co-authored-by: Jie Zhou <zhojie@microsoft.com>
Co-authored-by: Yuxiao Wang <yuxiaowang@microsoft.com>
Co-authored-by: Yuxiao Wang <58904990+Sayaka-4987@users.noreply.github.com>
Co-authored-by: jiezhou_microsoft <94604058+JieZhou000@users.noreply.github.com>
Co-authored-by: David Liang <liangze@microsoft.com>
    @DavidZeLiang @mengaims
    @suxi-ms @liulixiang1988 @zhaiyutong @JieZhou000 @Sayaka-4987
    13 people authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    f76e444 View commit details
    Browse the repository at this point in the history

  3. Add async batch image APIs in 2024-01-30-preview (#44) 

    * Add async batch image APIs in 2024-01-30-preview

* Update

* Update

* Add error message in GET resonse
    @lemonicetea
    lemonicetea authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    cd1c274 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/feature/azure-ai-content-safet… 

    …y' into acs-0130-private
    @mengaims
    mengaims committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    f6d9bb4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'acs-0130-private' of https://github.com/mengaims/azure-… 

    …rest-api-specs into acs-0130-private
    @mengaims
    mengaims committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    429adca View commit details
    Browse the repository at this point in the history

  6. Mengai/acs customization (#47) 

    * Change annotation API

* Add prompt generation APIs
    @mengaims
    mengaims authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    f2dc0f5 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. fix explanation version (#52) 

    * fix explanation version

* delete 0130 version
    @Sayaka-4987
    Sayaka-4987 authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    4681f0b View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2024

  1. Update async batch image APIs in 2023-10-30-preview (#54) 

    * Add async batch image APIs in 2024-01-30-preview

* Update

* Update

* Add error message in GET resonse

* Update async batch image APIs in 2023-10-30-preview
    @lemonicetea
    lemonicetea authored Jan 29, 2024
    Configuration menu
    Copy the full SHA
    10b3271 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. remove customized category (#59)

    @mengaims
    mengaims authored Feb 5, 2024
    Configuration menu
    Copy the full SHA
    5766d32 View commit details
    Browse the repository at this point in the history

  2. Update batch image API contract (#60)

    @lemonicetea
    lemonicetea authored Feb 5, 2024
    Configuration menu
    Copy the full SHA
    9a375d4 View commit details
    Browse the repository at this point in the history

  3. Mengai/0130 private fix (#61) 

    * remove customized category

* remove useless definition
    @mengaims
    mengaims authored Feb 5, 2024
    Configuration menu
    Copy the full SHA
    5757924 View commit details
    Browse the repository at this point in the history

  4. Mengai/0130 private fix (#62) 

    * remove customized category

* remove useless definition

* change progressPercentage to int32
    @mengaims
    mengaims authored Feb 5, 2024
    Configuration menu
    Copy the full SHA
    12d34b1 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Resolve warnings

    @mengaims
    mengaims committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    967700a View commit details
    Browse the repository at this point in the history

  2. Suppress spell check

    @mengaims
    mengaims committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    835312a View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Renaming

    @mengaims
    mengaims committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    e54dd6e View commit details
    Browse the repository at this point in the history