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

Add scheduler package #822

Merged
merged 2 commits into from
Oct 18, 2023
Merged

Add scheduler package #822

merged 2 commits into from
Oct 18, 2023

Conversation

mattgotteiner
Copy link
Collaborator

@mattgotteiner mattgotteiner commented Oct 18, 2023 •
edited
Loading

Purpose

Does this introduce a breaking change?

[ ] Yes
[X] No

Pull Request Type

What kind of change does this Pull Request introduce?

[X] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Documentation content changes
[ ] Other... Please describe:

@pamelafox
Copy link
Collaborator

The tests failed after the last merge just due to an API difference, the code isn't broken. So you could fix that or wait for me to PR a fix (later tonight).

It'd be great if we could enable the setting where GitHub offers to merge in the latest from main, I miss having that on this repo. (I don't have the admin permission to change that, you may not either).

@mattgotteiner
Copy link
Collaborator Author

The tests failed after the last merge just due to an API difference, the code isn't broken. So you could fix that or wait for me to PR a fix (later tonight).

It'd be great if we could enable the setting where GitHub offers to merge in the latest from main, I miss having that on this repo. (I don't have the admin permission to change that, you may not either).

Odd - i have merged and it's not working.

@mattgotteiner
Copy link
Collaborator Author

The tests failed after the last merge just due to an API difference, the code isn't broken. So you could fix that or wait for me to PR a fix (later tonight).
It'd be great if we could enable the setting where GitHub offers to merge in the latest from main, I miss having that on this repo. (I don't have the admin permission to change that, you may not either).

Odd - i have merged and it's not working.

Yes i have checked out main and it's still failing the tests

@pamelafox
Copy link
Collaborator

Sorry, what I mean is this:

  • I had a messagebuilder branch where all the tests passed
  • Once I merged the branch with main, the tests stopped passing due to a change that had happened in the interim that my branch didnt account for with its new tests. So, tests now fail on main.
  • One way to prevent this is to enable GitHub option "Always suggest updating pull request branches " since then I would have merged from main before merging my PR and seen the test breakage.

So yeah they're broken now. Fix should just be to change the constructor in the new test to have query_speller and query_language.

@pamelafox pamelafox merged commit 1844b00 into Azure-Samples:main Oct 18, 2023
vishalgtingre added a commit to vishalgtingre/azure-search-openai-demo that referenced this pull request Oct 22, 2023
@vishalgtingre
Squashed commit of the following:
a656624 
commit ba88bd6
Author: Pamela Fox <[email protected]>
Date:   Thu Oct 19 17:37:00 2023 -0700

    Add front-matter needed for Sample browser (Azure-Samples#816)

    * Sample markup

    * Sample browser

    * Sample browser

    * Move less interesting things to the end

    * Move less interesting things to the end

    * Less descrip

    * Add ACS

commit d53fdb1
Author: Pamela Fox <[email protected]>
Date:   Thu Oct 19 16:26:17 2023 -0700

    Run prettier on files and add to precommit/CI (Azure-Samples#834)

    * Lint the frontend

    * Revert repo changes

    * Use prettier config in app/frontend

    * Use prettier config in app/frontend

    * Update comment

commit 1dd756f
Author: Pamela Fox <[email protected]>
Date:   Thu Oct 19 15:00:27 2023 -0700

    Fix if for tests running (Azure-Samples#833)

commit 97433c1
Author: Chris Harris <[email protected]>
Date:   Wed Oct 18 20:42:30 2023 -0700

    Update README.md - Dev Containers (Azure-Samples#829)

    Replace Remote Containers with Dev Containers
    Add instructions for using Dev Containers

commit a4801f9
Author: Pamela Fox <[email protected]>
Date:   Wed Oct 18 15:27:35 2023 -0700

    Support windows by using uvicorn without extras (Azure-Samples#815)

    * Support windows by using no extras

    * Try tests on Windows

    * jsonlines endings

    * debugging win

    * Try retry

    * Try retry

    * Warmup test

    * Warmup test

    * Warmup test

    * Add conditional to only run in Ubuntu

    * Revert other changes

    * Revert other changes

    * Revert other changes

    ---------

    Co-authored-by: Anthony Shaw <[email protected]>

commit 3475bb6
Author: Tim <[email protected]>
Date:   Wed Oct 18 06:47:48 2023 -0700

    Change role from bot to assistant to fix bug when asking follow-up question in chat (Azure-Samples#823)

commit f50db74
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Oct 17 22:06:09 2023 -0700

    Bump urllib3 from 2.0.6 to 2.0.7 in /app/backend (Azure-Samples#820)

    * Bump urllib3 from 2.0.6 to 2.0.7 in /app/backend

    Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.0.6 to 2.0.7.
    - [Release notes](https://github.com/urllib3/urllib3/releases)
    - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
    - [Commits](urllib3/urllib3@2.0.6...2.0.7)

    ---
    updated-dependencies:
    - dependency-name: urllib3
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    * Update scripts too

    ---------

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Pamela Fox <[email protected]>
    Co-authored-by: Pamela Fox <[email protected]>

commit 1844b00
Author: Matt <[email protected]>
Date:   Tue Oct 17 21:51:32 2023 -0700

    Add scheduler package (Azure-Samples#822)

    * add scheduler package

    * Fix new test

    ---------

    Co-authored-by: Pamela Fox <[email protected]>

commit 07c2afa
Author: Pamela Fox <[email protected]>
Date:   Tue Oct 17 12:35:54 2023 -0700

    Message builder fixes for history format and token count (Azure-Samples#778)

    * Message builder fixes

    * Fix types

    * Address Sri's comments

    * Update logic per Sris feedback

    * Test and log

commit 69c4147
Author: Kesavaraja Krishnan <[email protected]>
Date:   Mon Oct 16 22:57:07 2023 +0530

    Increased maxtoken to avoid malformed JSON in chatreadretrieveread.py (Azure-Samples#681)

    * Increased maxtoken to chatgpt_token_limit in chatreadretrieveread.

    * Modified to 1024 characters.

    * Change to 100

    ---------

    Co-authored-by: Pamela Fox <[email protected]>

commit 774c47c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Oct 16 09:34:03 2023 -0700

    Bump @babel/traverse from 7.23.0 to 7.23.2 in /app/frontend (Azure-Samples#812)

    Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.23.0 to 7.23.2.
    - [Release notes](https://github.com/babel/babel/releases)
    - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

    ---
    updated-dependencies:
    - dependency-name: "@babel/traverse"
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit e02b347
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Oct 16 09:27:11 2023 -0700

    Bump the node-packages group in /app/frontend with 5 updates (Azure-Samples#800)

    Bumps the node-packages group in /app/frontend with 5 updates:

    | Package | From | To |
    | --- | --- | --- |
    | [@fluentui/react](https://github.com/microsoft/fluentui) | `8.112.2` | `8.112.3` |
    | [@fluentui/react-components](https://github.com/microsoft/fluentui) | `9.34.2` | `9.35.0` |
    | [@fluentui/react-icons](https://github.com/microsoft/fluentui-system-icons) | `2.0.219` | `2.0.220` |
    | [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) | `18.2.27` | `18.2.28` |
    | [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) | `18.2.12` | `18.2.13` |

    Updates `@fluentui/react` from 8.112.2 to 8.112.3
    - [Release notes](https://github.com/microsoft/fluentui/releases)
    - [Changelog](https://github.com/microsoft/fluentui/blob/master/azure-pipelines.release-fluentui.yml)
    - [Commits](https://github.com/microsoft/fluentui/compare/@fluentui/react_v8.112.2...@fluentui/react_v8.112.3)

    Updates `@fluentui/react-components` from 9.34.2 to 9.35.0
    - [Release notes](https://github.com/microsoft/fluentui/releases)
    - [Changelog](https://github.com/microsoft/fluentui/blob/master/azure-pipelines.release-fluentui.yml)
    - [Commits](https://github.com/microsoft/fluentui/compare/@fluentui/react-components_v9.34.2...@fluentui/react-components_v9.35.0)

    Updates `@fluentui/react-icons` from 2.0.219 to 2.0.220
    - [Commits](https://github.com/microsoft/fluentui-system-icons/commits)

    Updates `@types/react` from 18.2.27 to 18.2.28
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

    Updates `@types/react-dom` from 18.2.12 to 18.2.13
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom)

    ---
    updated-dependencies:
    - dependency-name: "@fluentui/react"
      dependency-type: direct:production
      update-type: version-update:semver-patch
      dependency-group: node-packages
    - dependency-name: "@fluentui/react-components"
      dependency-type: direct:production
      update-type: version-update:semver-minor
      dependency-group: node-packages
    - dependency-name: "@fluentui/react-icons"
      dependency-type: direct:production
      update-type: version-update:semver-patch
      dependency-group: node-packages
    - dependency-name: "@types/react"
      dependency-type: direct:development
      update-type: version-update:semver-patch
      dependency-group: node-packages
    - dependency-name: "@types/react-dom"
      dependency-type: direct:development
      update-type: version-update:semver-patch
      dependency-group: node-packages
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 8c83284
Author: Will Fox <[email protected]>
Date:   Sat Oct 14 12:37:12 2023 -0500

    Add arguments required for OpenAI connection (Azure-Samples#796)

    * Add arguments required for OpenAI connection

    * Remove unnecessary args

commit 5300bb5
Author: ks6088ts <[email protected]>
Date:   Sat Oct 14 09:01:32 2023 +0900

    support non English languages (Azure-Samples#780)

    * add search analyzer name option to prepdocs script

    * parameterize search query language and search query speller

    * update IaC codes to inject environment variables to app service

    * apply formatter via `black .`

    * update reference links

    * update descriptions to reflect review comments

commit 08fdbd1
Author: Pamela Fox <[email protected]>
Date:   Fri Oct 13 13:58:21 2023 -0700

    Improvements to VS Code and Vite debug experience (Azure-Samples#786)

    * Initial launch improvements

    * Fix up extensions

commit 475885e
Author: Pamela Fox <[email protected]>
Date:   Fri Oct 13 13:54:56 2023 -0700

    Daily tests (Azure-Samples#787)

commit ca09627
Author: Matt <[email protected]>
Date:   Thu Oct 12 11:04:00 2023 -0700

    Use absolute redirect uris for login and fetching tokens (Azure-Samples#784)

commit 7c614bb
Author: Pamela Fox <[email protected]>
Date:   Thu Oct 12 09:12:33 2023 -0700

    Adding session_state to conform to ChatApp protocol (Azure-Samples#773)

    * Adding session_state

    * Pass null vs undef

commit ff273c2
Author: Pamela Fox <[email protected]>
Date:   Tue Oct 10 14:51:24 2023 -0700

    Rm print statements (Azure-Samples#772)

commit 3324bdb
Author: Pamela Fox <[email protected]>
Date:   Tue Oct 10 14:22:45 2023 -0700

    Chat response (Azure-Samples#748)

    * Adding anchors

    * Prelim change to support chatresponse schema

    * Update test data to use role properly

    * Change log level back

    * Remove debugging

    * Remove debugging

    * Fix role location

    * Use chat response protocol

    * Updates e2e tests per response change

commit 7b2e887
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Oct 10 11:17:14 2023 -0700

    Bump the node-packages group in /app/frontend with 7 updates (Azure-Samples#771)

    Bumps the node-packages group in /app/frontend with 7 updates:

    | Package | From | To |
    | --- | --- | --- |
    | [@fluentui/react-components](https://github.com/microsoft/fluentui) | `9.33.0` | `9.34.2` |
    | [@fluentui/react-icons](https://github.com/microsoft/fluentui-system-icons) | `2.0.218` | `2.0.219` |
    | [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) | `18.2.14` | `18.2.27` |
    | [@types/react-dom](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-dom) | `18.2.8` | `18.2.12` |
    | [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/tree/HEAD/packages/plugin-react) | `4.0.2` | `4.1.0` |
    | [typescript](https://github.com/Microsoft/TypeScript) | `5.1.6` | `5.2.2` |
    | [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `4.4.2` | `4.4.11` |

    Updates `@fluentui/react-components` from 9.33.0 to 9.34.2
    - [Release notes](https://github.com/microsoft/fluentui/releases)
    - [Changelog](https://github.com/microsoft/fluentui/blob/master/azure-pipelines.release-fluentui.yml)
    - [Commits](https://github.com/microsoft/fluentui/compare/@fluentui/react-components_v9.33.0...@fluentui/react-components_v9.34.2)

    Updates `@fluentui/react-icons` from 2.0.218 to 2.0.219
    - [Commits](https://github.com/microsoft/fluentui-system-icons/commits)

    Updates `@types/react` from 18.2.14 to 18.2.27
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

    Updates `@types/react-dom` from 18.2.8 to 18.2.12
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-dom)

    Updates `@vitejs/plugin-react` from 4.0.2 to 4.1.0
    - [Release notes](https://github.com/vitejs/vite-plugin-react/releases)
    - [Changelog](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/CHANGELOG.md)
    - [Commits](https://github.com/vitejs/vite-plugin-react/commits/v4.1.0/packages/plugin-react)

    Updates `typescript` from 5.1.6 to 5.2.2
    - [Release notes](https://github.com/Microsoft/TypeScript/releases)
    - [Commits](microsoft/TypeScript@v5.1.6...v5.2.2)

    Updates `vite` from 4.4.2 to 4.4.11
    - [Release notes](https://github.com/vitejs/vite/releases)
    - [Changelog](https://github.com/vitejs/vite/blob/v4.4.11/packages/vite/CHANGELOG.md)
    - [Commits](https://github.com/vitejs/vite/commits/v4.4.11/packages/vite)

    ---
    updated-dependencies:
    - dependency-name: "@fluentui/react-components"
      dependency-type: direct:production
      update-type: version-update:semver-minor
      dependency-group: node-packages
    - dependency-name: "@fluentui/react-icons"
      dependency-type: direct:production
      update-type: version-update:semver-patch
      dependency-group: node-packages
    - dependency-name: "@types/react"
      dependency-type: direct:development
      update-type: version-update:semver-patch
      dependency-group: node-packages
    - dependency-name: "@types/react-dom"
      dependency-type: direct:development
      update-type: version-update:semver-patch
      dependency-group: node-packages
    - dependency-name: "@vitejs/plugin-react"
      dependency-type: direct:development
      update-type: version-update:semver-minor
      dependency-group: node-packages
    - dependency-name: typescript
      dependency-type: direct:development
      update-type: version-update:semver-minor
      dependency-group: node-packages
    - dependency-name: vite
      dependency-type: direct:development
      update-type: version-update:semver-patch
      dependency-group: node-packages
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 2b9119a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Oct 10 11:06:31 2023 -0700

    Bump @fluentui/react from 8.110.7 to 8.112.2 in /app/frontend (Azure-Samples#759)

    Bumps [@fluentui/react](https://github.com/microsoft/fluentui) from 8.110.7 to 8.112.2.
    - [Release notes](https://github.com/microsoft/fluentui/releases)
    - [Changelog](https://github.com/microsoft/fluentui/blob/master/azure-pipelines.release-fluentui.yml)
    - [Commits](https://github.com/microsoft/fluentui/compare/@fluentui/react_v8.110.7...@fluentui/react_v8.112.2)

    ---
    updated-dependencies:
    - dependency-name: "@fluentui/react"
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 79bfb0f
Author: Pamela Fox <[email protected]>
Date:   Tue Oct 10 10:54:06 2023 -0700

    Add more Playwright tests to check all routes and buttons (Azure-Samples#743)

    * Adding anchors

    * E2E tests

commit e69e884
Author: Pamela Fox <[email protected]>
Date:   Mon Oct 9 17:32:42 2023 -0700

    Urllib3 update for security issue (Azure-Samples#728)

    * Adding anchors

    * update urllib3

commit 25a2e0e
Author: Pamela Fox <[email protected]>
Date:   Mon Oct 9 17:32:07 2023 -0700

    Fixed type annotations per mypy and added mypy to CICD (Azure-Samples#749)

    * Adding anchors

    * Fix mypy types

commit dd5dcea
Author: Pamela Fox <[email protected]>
Date:   Mon Oct 9 14:37:53 2023 -0700

    Grouped updates (Azure-Samples#729)

    * Adding anchors

    * Grouped updates

commit 0c31808
Author: Pamela Fox <[email protected]>
Date:   Mon Oct 9 14:32:25 2023 -0700

    Python version updates (Azure-Samples#761)

    * Adding anchors

    * Python version changes
HughRunyan pushed a commit to RMI/RMI_chatbot that referenced this pull request Mar 26, 2024
@mattgotteiner @pamelafox
Add scheduler package (Azure-Samples#822)
2c8951d 
* add scheduler package

* Fix new test

---------

Co-authored-by: Pamela Fox <[email protected]>
vuculescu pushed a commit to vuculescu/azure-search-openai-demo that referenced this pull request Jan 27, 2025
@mattgotteiner @pamelafox
Add scheduler package (Azure-Samples#822)
27801aa 
* add scheduler package

* Fix new test

---------

Co-authored-by: Pamela Fox <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pamelafox pamelafox pamelafox approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@mattgotteiner @pamelafox