Skip to content

Commit

Permalink
Upgrade openai, openai-messages-token-helper, for gpt-4o-mini support (
Browse files Browse the repository at this point in the history
…Azure-Samples#1893)

* Bump the python-requirements group across 1 directory with 43 updates

Bumps the python-requirements group with 43 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [aiohttp](https://github.com/aio-libs/aiohttp) | `3.9.5` | `3.10.1` |
| [attrs](https://github.com/sponsors/hynek) | `23.2.0` | `24.2.0` |
| [azure-monitor-opentelemetry](https://github.com/Azure/azure-sdk-for-python) | `1.6.0` | `1.6.1` |
| [azure-monitor-opentelemetry-exporter](https://github.com/Azure/azure-sdk-for-python) | `1.0.0b27` | `1.0.0b28` |
| [azure-storage-blob](https://github.com/Azure/azure-sdk-for-python) | `12.21.0` | `12.22.0` |
| [cffi](https://github.com/python-cffi/cffi) | `1.16.0` | `1.17.0` |
| [fixedint](https://github.com/nneonneo/fixedint) | `0.1.6` | `0.2.0` |
| [importlib-metadata](https://github.com/python/importlib_metadata) | `7.1.0` | `8.2.0` |
| [microsoft-kiota-serialization-json](https://github.com/microsoft/kiota) | `1.2.0` | `1.3.0` |
| [msgraph-sdk](https://github.com/microsoftgraph/msgraph-sdk-python) | `1.1.0` | `1.5.4` |
| [openai](https://github.com/openai/openai-python) | `1.37.0` | `1.40.1` |
| [openai-messages-token-helper](https://github.com/pamelafox/openai-messages-token-helper) | `0.1.5` | `0.1.8` |
| [opentelemetry-api](https://github.com/open-telemetry/opentelemetry-python) | `1.25.0` | `1.26.0` |
| [opentelemetry-instrumentation](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-aiohttp-client](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-asgi](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-dbapi](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-django](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-fastapi](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-flask](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-httpx](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-openai](https://github.com/traceloop/openllmetry) | `0.25.5` | `0.26.5` |
| [opentelemetry-instrumentation-psycopg2](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-requests](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-urllib](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-urllib3](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-instrumentation-wsgi](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [opentelemetry-sdk](https://github.com/open-telemetry/opentelemetry-python) | `1.25.0` | `1.26.0` |
| [opentelemetry-semantic-conventions](https://github.com/open-telemetry/opentelemetry-python) | `0.46b0` | `0.47b0` |
| opentelemetry-semantic-conventions-ai | `0.3.4` | `0.4.1` |
| [opentelemetry-util-http](https://github.com/open-telemetry/opentelemetry-python-contrib) | `0.46b0` | `0.47b0` |
| [psutil](https://github.com/giampaolo/psutil) | `5.9.8` | `6.0.0` |
| [pydantic-core](https://github.com/pydantic/pydantic-core) | `2.20.1` | `2.21.0` |
| [pyjwt[crypto]](https://github.com/jpadilla/pyjwt) | `2.8.0` | `2.9.0` |
| [pymupdf](https://github.com/pymupdf/pymupdf) | `1.24.7` | `1.24.9` |
| [pymupdfb](https://github.com/pymupdf/pymupdf) | `1.24.6` | `1.24.9` |
| [regex](https://github.com/mrabarnett/mrab-regex) | `2024.5.15` | `2024.7.24` |
| [std-uritemplate](https://github.com/std-uritemplate/std-uritemplate) | `1.0.3` | `1.0.5` |
| [tenacity](https://github.com/jd/tenacity) | `8.5.0` | `9.0.0` |
| [time-machine](https://github.com/adamchainz/time-machine) | `2.14.2` | `2.15.0` |
| [tqdm](https://github.com/tqdm/tqdm) | `4.66.4` | `4.66.5` |
| [types-html5lib](https://github.com/python/typeshed) | `1.1.11.20240228` | `1.1.11.20240806` |
| [uvicorn](https://github.com/encode/uvicorn) | `0.30.3` | `0.30.5` |



Updates `aiohttp` from 3.9.5 to 3.10.1
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v3.9.5...v3.10.1)

Updates `attrs` from 23.2.0 to 24.2.0
- [Commits](https://github.com/sponsors/hynek/commits)

Updates `azure-monitor-opentelemetry` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/Azure/azure-sdk-for-python/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md)
- [Commits](Azure/azure-sdk-for-python@azure-monitor-opentelemetry_1.6.0...azure-monitor-opentelemetry_1.6.1)

Updates `azure-monitor-opentelemetry-exporter` from 1.0.0b27 to 1.0.0b28
- [Release notes](https://github.com/Azure/azure-sdk-for-python/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md)
- [Commits](Azure/azure-sdk-for-python@azure-monitor-opentelemetry-exporter_1.0.0b27...azure-monitor-opentelemetry-exporter_1.0.0b28)

Updates `azure-storage-blob` from 12.21.0 to 12.22.0
- [Release notes](https://github.com/Azure/azure-sdk-for-python/releases)
- [Changelog](https://github.com/Azure/azure-sdk-for-python/blob/main/doc/esrp_release.md)
- [Commits](Azure/azure-sdk-for-python@azure-storage-blob_12.21.0...azure-storage-blob_12.22.0)

Updates `cffi` from 1.16.0 to 1.17.0
- [Release notes](https://github.com/python-cffi/cffi/releases)
- [Commits](python-cffi/cffi@v1.16.0...v1.17.0)

Updates `fixedint` from 0.1.6 to 0.2.0
- [Changelog](https://github.com/nneonneo/fixedint/blob/master/CHANGES)
- [Commits](nneonneo/fixedint@v0.1.6...v0.2.0)

Updates `importlib-metadata` from 7.1.0 to 8.2.0
- [Release notes](https://github.com/python/importlib_metadata/releases)
- [Changelog](https://github.com/python/importlib_metadata/blob/main/NEWS.rst)
- [Commits](python/importlib_metadata@v7.1.0...v8.2.0)

Updates `microsoft-kiota-serialization-json` from 1.2.0 to 1.3.0
- [Release notes](https://github.com/microsoft/kiota/releases)
- [Changelog](https://github.com/microsoft/kiota/blob/main/CHANGELOG.md)
- [Commits](microsoft/kiota@v1.2.0...v1.3.0)

Updates `msgraph-sdk` from 1.1.0 to 1.5.4
- [Release notes](https://github.com/microsoftgraph/msgraph-sdk-python/releases)
- [Changelog](https://github.com/microsoftgraph/msgraph-sdk-python/blob/main/CHANGELOG.md)
- [Commits](microsoftgraph/msgraph-sdk-python@v1.1.0...v1.5.4)

Updates `openai` from 1.37.0 to 1.40.1
- [Release notes](https://github.com/openai/openai-python/releases)
- [Changelog](https://github.com/openai/openai-python/blob/main/CHANGELOG.md)
- [Commits](openai/openai-python@v1.37.0...v1.40.1)

Updates `openai-messages-token-helper` from 0.1.5 to 0.1.8
- [Changelog](https://github.com/pamelafox/openai-messages-token-helper/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pamelafox/openai-messages-token-helper/commits)

Updates `opentelemetry-api` from 1.25.0 to 1.26.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-python@v1.25.0...v1.26.0)

Updates `opentelemetry-instrumentation` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-aiohttp-client` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-asgi` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-dbapi` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-django` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-fastapi` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-flask` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-httpx` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-openai` from 0.25.5 to 0.26.5
- [Release notes](https://github.com/traceloop/openllmetry/releases)
- [Changelog](https://github.com/traceloop/openllmetry/blob/main/CHANGELOG.md)
- [Commits](traceloop/openllmetry@0.25.5...0.26.5)

Updates `opentelemetry-instrumentation-psycopg2` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-requests` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-urllib` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-urllib3` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-instrumentation-wsgi` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `opentelemetry-sdk` from 1.25.0 to 1.26.0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](open-telemetry/opentelemetry-python@v1.25.0...v1.26.0)

Updates `opentelemetry-semantic-conventions` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python/commits)

Updates `opentelemetry-semantic-conventions-ai` from 0.3.4 to 0.4.1

Updates `opentelemetry-util-http` from 0.46b0 to 0.47b0
- [Release notes](https://github.com/open-telemetry/opentelemetry-python-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-python-contrib/commits)

Updates `psutil` from 5.9.8 to 6.0.0
- [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst)
- [Commits](giampaolo/psutil@release-5.9.8...release-6.0.0)

Updates `pydantic-core` from 2.20.1 to 2.21.0
- [Release notes](https://github.com/pydantic/pydantic-core/releases)
- [Commits](pydantic/pydantic-core@v2.20.1...v2.21.0)

Updates `pyjwt[crypto]` from 2.8.0 to 2.9.0
- [Release notes](https://github.com/jpadilla/pyjwt/releases)
- [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst)
- [Commits](jpadilla/pyjwt@2.8.0...2.9.0)

Updates `pymupdf` from 1.24.7 to 1.24.9
- [Release notes](https://github.com/pymupdf/pymupdf/releases)
- [Changelog](https://github.com/pymupdf/PyMuPDF/blob/main/changes.txt)
- [Commits](pymupdf/PyMuPDF@1.24.7...1.24.9)

Updates `pymupdfb` from 1.24.6 to 1.24.9
- [Release notes](https://github.com/pymupdf/pymupdf/releases)
- [Changelog](https://github.com/pymupdf/PyMuPDF/blob/main/changes.txt)
- [Commits](pymupdf/PyMuPDF@1.24.6...1.24.9)

Updates `regex` from 2024.5.15 to 2024.7.24
- [Changelog](https://github.com/mrabarnett/mrab-regex/blob/hg/changelog.txt)
- [Commits](mrabarnett/mrab-regex@2024.5.15...2024.7.24)

Updates `std-uritemplate` from 1.0.3 to 1.0.5
- [Release notes](https://github.com/std-uritemplate/std-uritemplate/releases)
- [Commits](std-uritemplate/std-uritemplate@1.0.3...1.0.5)

Updates `tenacity` from 8.5.0 to 9.0.0
- [Release notes](https://github.com/jd/tenacity/releases)
- [Commits](jd/tenacity@8.5.0...9.0.0)

Updates `time-machine` from 2.14.2 to 2.15.0
- [Changelog](https://github.com/adamchainz/time-machine/blob/main/CHANGELOG.rst)
- [Commits](adamchainz/time-machine@2.14.2...2.15.0)

Updates `tqdm` from 4.66.4 to 4.66.5
- [Release notes](https://github.com/tqdm/tqdm/releases)
- [Commits](tqdm/tqdm@v4.66.4...v4.66.5)

Updates `types-html5lib` from 1.1.11.20240228 to 1.1.11.20240806
- [Commits](https://github.com/python/typeshed/commits)

Updates `uvicorn` from 0.30.3 to 0.30.5
- [Release notes](https://github.com/encode/uvicorn/releases)
- [Changelog](https://github.com/encode/uvicorn/blob/master/CHANGELOG.md)
- [Commits](encode/uvicorn@0.30.3...0.30.5)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: attrs
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: python-requirements
- dependency-name: azure-monitor-opentelemetry
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: python-requirements
- dependency-name: azure-monitor-opentelemetry-exporter
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: python-requirements
- dependency-name: azure-storage-blob
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: cffi
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: fixedint
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: importlib-metadata
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: python-requirements
- dependency-name: microsoft-kiota-serialization-json
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: msgraph-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: openai
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: openai-messages-token-helper
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: python-requirements
- dependency-name: opentelemetry-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-aiohttp-client
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-asgi
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-dbapi
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-django
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-fastapi
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-flask
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-httpx
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-openai
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-psycopg2
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-requests
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-urllib
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-urllib3
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-instrumentation-wsgi
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: opentelemetry-semantic-conventions
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: opentelemetry-semantic-conventions-ai
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: opentelemetry-util-http
  dependency-type: direct:production
  dependency-group: python-requirements
- dependency-name: psutil
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: python-requirements
- dependency-name: pydantic-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: pyjwt[crypto]
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: pymupdf
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: python-requirements
- dependency-name: pymupdfb
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: python-requirements
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: std-uritemplate
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: python-requirements
- dependency-name: tenacity
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: python-requirements
- dependency-name: time-machine
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: python-requirements
- dependency-name: tqdm
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: python-requirements
- dependency-name: types-html5lib
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: python-requirements
- dependency-name: uvicorn
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: python-requirements
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update requirements

* Update for latest OpenAI SDK, dont pass down unneeded bits

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pamela Fox <pamela.fox@gmail.com>
  • Loading branch information
dependabot[bot] and pamelafox authored Aug 8, 2024
1 parent a8b1202 commit 55b0961
Show file tree
Hide file tree
Showing 63 changed files with 167 additions and 365 deletions.
29 changes: 19 additions & 10 deletions app/backend/approaches/chatapproach.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ def get_search_query(self, chat_completion: ChatCompletion, user_query: str):
return query_text
return user_query

def extract_followup_questions(self, content: str):
def extract_followup_questions(self, content: Optional[str]):
if content is None:
return content, []
return content.split("<<")[0], re.findall(r"<<([^>>]+)>>", content)

async def run_without_streaming(
Expand All @@ -89,15 +91,17 @@ async def run_without_streaming(
messages, overrides, auth_claims, should_stream=False
)
chat_completion_response: ChatCompletion = await chat_coroutine
chat_resp = chat_completion_response.model_dump() # Convert to dict to make it JSON serializable
chat_resp = chat_resp["choices"][0]
chat_resp["context"] = extra_info
content = chat_completion_response.choices[0].message.content
role = chat_completion_response.choices[0].message.role
if overrides.get("suggest_followup_questions"):
content, followup_questions = self.extract_followup_questions(chat_resp["message"]["content"])
chat_resp["message"]["content"] = content
chat_resp["context"]["followup_questions"] = followup_questions
chat_resp["session_state"] = session_state
return chat_resp
content, followup_questions = self.extract_followup_questions(content)
extra_info["followup_questions"] = followup_questions
chat_app_response = {
"message": {"content": content, "role": role},
"context": extra_info,
"session_state": session_state,
}
return chat_app_response

async def run_with_streaming(
self,
Expand All @@ -117,7 +121,12 @@ async def run_with_streaming(
# "2023-07-01-preview" API version has a bug where first response has empty choices
event = event_chunk.model_dump() # Convert pydantic model to dict
if event["choices"]:
completion = {"delta": event["choices"][0]["delta"]}
completion = {
"delta": {
"content": event["choices"][0]["delta"].get("content"),
"role": event["choices"][0]["delta"]["role"],
}
}
# if event contains << and not >>, it is start of follow-up question, truncate
content = completion["delta"].get("content")
content = content or "" # content may either not exist in delta, or explicitly be None
Expand Down
33 changes: 17 additions & 16 deletions app/backend/approaches/retrievethenread.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,15 @@ async def run(
max_tokens=self.chatgpt_token_limit - response_token_limit,
)

chat_completion = (
await self.openai_client.chat.completions.create(
# Azure OpenAI takes the deployment name as the model name
model=self.chatgpt_deployment if self.chatgpt_deployment else self.chatgpt_model,
messages=updated_messages,
temperature=overrides.get("temperature", 0.3),
max_tokens=response_token_limit,
n=1,
seed=seed,
)
).model_dump()
chat_completion = await self.openai_client.chat.completions.create(
# Azure OpenAI takes the deployment name as the model name
model=self.chatgpt_deployment if self.chatgpt_deployment else self.chatgpt_model,
messages=updated_messages,
temperature=overrides.get("temperature", 0.3),
max_tokens=response_token_limit,
n=1,
seed=seed,
)

data_points = {"text": sources_content}
extra_info = {
Expand Down Expand Up @@ -168,8 +166,11 @@ async def run(
],
}

completion = {}
completion["message"] = chat_completion["choices"][0]["message"]
completion["context"] = extra_info
completion["session_state"] = session_state
return completion
return {
"message": {
"content": chat_completion.choices[0].message.content,
"role": chat_completion.choices[0].message.role,
},
"context": extra_info,
"session_state": session_state,
}
31 changes: 16 additions & 15 deletions app/backend/approaches/retrievethenreadvision.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,14 @@ async def run(
new_user_content=user_content,
max_tokens=self.gpt4v_token_limit - response_token_limit,
)
chat_completion = (
await self.openai_client.chat.completions.create(
model=self.gpt4v_deployment if self.gpt4v_deployment else self.gpt4v_model,
messages=updated_messages,
temperature=overrides.get("temperature", 0.3),
max_tokens=response_token_limit,
n=1,
seed=seed,
)
).model_dump()
chat_completion = await self.openai_client.chat.completions.create(
model=self.gpt4v_deployment if self.gpt4v_deployment else self.gpt4v_model,
messages=updated_messages,
temperature=overrides.get("temperature", 0.3),
max_tokens=response_token_limit,
n=1,
seed=seed,
)

data_points = {
"text": sources_content,
Expand Down Expand Up @@ -190,8 +188,11 @@ async def run(
],
}

completion = {}
completion["message"] = chat_completion["choices"][0]["message"]
completion["context"] = extra_info
completion["session_state"] = session_state
return completion
return {
"message": {
"content": chat_completion.choices[0].message.content,
"role": chat_completion.choices[0].message.role,
},
"context": extra_info,
"session_state": session_state,
}
89 changes: 47 additions & 42 deletions app/backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
#
aiofiles==24.1.0
# via quart
aiohttp==3.9.5
aiohappyeyeballs==2.3.5
# via aiohttp
aiohttp==3.10.1
# via
# -r requirements.in
# microsoft-kiota-authentication-azure
Expand All @@ -20,7 +22,7 @@ anyio==4.4.0
# openai
asgiref==3.8.1
# via opentelemetry-instrumentation-asgi
attrs==23.2.0
attrs==24.2.0
# via aiohttp
azure-ai-documentintelligence==1.0.0b3
# via -r requirements.in
Expand All @@ -46,13 +48,13 @@ azure-identity==1.17.1
# via
# -r requirements.in
# msgraph-sdk
azure-monitor-opentelemetry==1.6.0
azure-monitor-opentelemetry==1.6.1
# via -r requirements.in
azure-monitor-opentelemetry-exporter==1.0.0b27
azure-monitor-opentelemetry-exporter==1.0.0b28
# via azure-monitor-opentelemetry
azure-search-documents==11.6.0b1
# via -r requirements.in
azure-storage-blob==12.21.0
azure-storage-blob==12.22.0
# via
# -r requirements.in
# azure-storage-file-datalake
Expand All @@ -70,7 +72,7 @@ certifi==2024.7.4
# httpx
# msrest
# requests
cffi==1.16.0
cffi==1.17.0
# via cryptography
charset-normalizer==3.3.2
# via requests
Expand All @@ -87,7 +89,9 @@ cryptography==43.0.0
# msal
# pyjwt
deprecated==1.2.14
# via opentelemetry-api
# via
# opentelemetry-api
# opentelemetry-semantic-conventions
distro==1.9.0
# via openai
fixedint==0.1.6
Expand Down Expand Up @@ -127,7 +131,7 @@ idna==3.7
# httpx
# requests
# yarl
importlib-metadata==7.1.0
importlib-metadata==8.0.0
# via
# opentelemetry-api
# opentelemetry-instrumentation-flask
Expand All @@ -146,6 +150,8 @@ jinja2==3.1.4
# via
# flask
# quart
jiter==0.5.0
# via openai
markupsafe==2.1.5
# via
# jinja2
Expand All @@ -167,7 +173,7 @@ microsoft-kiota-http==1.3.2
# via
# msgraph-core
# msgraph-sdk
microsoft-kiota-serialization-json==1.2.0
microsoft-kiota-serialization-json==1.3.0
# via msgraph-sdk
microsoft-kiota-serialization-text==1.0.0
# via msgraph-sdk
Expand All @@ -192,13 +198,13 @@ numpy==2.0.1
# via -r requirements.in
oauthlib==3.2.2
# via requests-oauthlib
openai==1.37.0
openai==1.40.1
# via
# -r requirements.in
# openai-messages-token-helper
openai-messages-token-helper==0.1.5
openai-messages-token-helper==0.1.9
# via -r requirements.in
opentelemetry-api==1.25.0
opentelemetry-api==1.26.0
# via
# azure-core-tracing-opentelemetry
# azure-monitor-opentelemetry-exporter
Expand All @@ -221,7 +227,7 @@ opentelemetry-api==1.25.0
# opentelemetry-instrumentation-wsgi
# opentelemetry-sdk
# opentelemetry-semantic-conventions
opentelemetry-instrumentation==0.46b0
opentelemetry-instrumentation==0.47b0
# via
# opentelemetry-instrumentation-aiohttp-client
# opentelemetry-instrumentation-asgi
Expand All @@ -236,49 +242,49 @@ opentelemetry-instrumentation==0.46b0
# opentelemetry-instrumentation-urllib
# opentelemetry-instrumentation-urllib3
# opentelemetry-instrumentation-wsgi
opentelemetry-instrumentation-aiohttp-client==0.46b0
opentelemetry-instrumentation-aiohttp-client==0.47b0
# via -r requirements.in
opentelemetry-instrumentation-asgi==0.46b0
opentelemetry-instrumentation-asgi==0.47b0
# via
# -r requirements.in
# opentelemetry-instrumentation-fastapi
opentelemetry-instrumentation-dbapi==0.46b0
opentelemetry-instrumentation-dbapi==0.47b0
# via opentelemetry-instrumentation-psycopg2
opentelemetry-instrumentation-django==0.46b0
opentelemetry-instrumentation-django==0.47b0
# via azure-monitor-opentelemetry
opentelemetry-instrumentation-fastapi==0.46b0
opentelemetry-instrumentation-fastapi==0.47b0
# via azure-monitor-opentelemetry
opentelemetry-instrumentation-flask==0.46b0
opentelemetry-instrumentation-flask==0.47b0
# via azure-monitor-opentelemetry
opentelemetry-instrumentation-httpx==0.46b0
opentelemetry-instrumentation-httpx==0.47b0
# via -r requirements.in
opentelemetry-instrumentation-openai==0.25.5
opentelemetry-instrumentation-openai==0.26.5
# via -r requirements.in
opentelemetry-instrumentation-psycopg2==0.46b0
opentelemetry-instrumentation-psycopg2==0.47b0
# via azure-monitor-opentelemetry
opentelemetry-instrumentation-requests==0.46b0
opentelemetry-instrumentation-requests==0.47b0
# via
# -r requirements.in
# azure-monitor-opentelemetry
opentelemetry-instrumentation-urllib==0.46b0
opentelemetry-instrumentation-urllib==0.47b0
# via azure-monitor-opentelemetry
opentelemetry-instrumentation-urllib3==0.46b0
opentelemetry-instrumentation-urllib3==0.47b0
# via azure-monitor-opentelemetry
opentelemetry-instrumentation-wsgi==0.46b0
opentelemetry-instrumentation-wsgi==0.47b0
# via
# opentelemetry-instrumentation-django
# opentelemetry-instrumentation-flask
opentelemetry-resource-detector-azure==0.1.5
# via azure-monitor-opentelemetry
opentelemetry-sdk==1.25.0
opentelemetry-sdk==1.26.0
# via
# azure-monitor-opentelemetry
# azure-monitor-opentelemetry-exporter
# microsoft-kiota-abstractions
# microsoft-kiota-authentication-azure
# microsoft-kiota-http
# opentelemetry-resource-detector-azure
opentelemetry-semantic-conventions==0.46b0
opentelemetry-semantic-conventions==0.47b0
# via
# opentelemetry-instrumentation-aiohttp-client
# opentelemetry-instrumentation-asgi
Expand All @@ -293,9 +299,9 @@ opentelemetry-semantic-conventions==0.46b0
# opentelemetry-instrumentation-urllib3
# opentelemetry-instrumentation-wsgi
# opentelemetry-sdk
opentelemetry-semantic-conventions-ai==0.3.4
opentelemetry-semantic-conventions-ai==0.4.1
# via opentelemetry-instrumentation-openai
opentelemetry-util-http==0.46b0
opentelemetry-util-http==0.47b0
# via
# opentelemetry-instrumentation-aiohttp-client
# opentelemetry-instrumentation-asgi
Expand Down Expand Up @@ -327,13 +333,13 @@ pydantic==2.8.2
# via openai
pydantic-core==2.20.1
# via pydantic
pyjwt[crypto]==2.8.0
pyjwt[crypto]==2.9.0
# via
# -r requirements.in
# msal
# pyjwt
pymupdf==1.24.7
pymupdf==1.24.9
# via -r requirements.in
pymupdfb==1.24.6
pymupdfb==1.24.9
# via pymupdf
pypdf==4.3.1
# via -r requirements.in
Expand All @@ -348,7 +354,7 @@ quart==0.19.6
# quart-cors
quart-cors==0.7.0
# via -r requirements.in
regex==2024.5.15
regex==2024.7.24
# via tiktoken
requests==2.32.3
# via
Expand All @@ -362,7 +368,6 @@ requests-oauthlib==2.0.0
six==1.16.0
# via
# azure-core
# ecdsa
# isodate
# python-dateutil
sniffio==1.3.1
Expand All @@ -372,22 +377,22 @@ sniffio==1.3.1
# openai
soupsieve==2.5
# via beautifulsoup4
std-uritemplate==1.0.3
std-uritemplate==1.0.5
# via microsoft-kiota-abstractions
tenacity==8.5.0
tenacity==9.0.0
# via -r requirements.in
tiktoken==0.7.0
# via
# -r requirements.in
# openai-messages-token-helper
# opentelemetry-instrumentation-openai
time-machine==2.14.2
time-machine==2.15.0
# via pendulum
tqdm==4.66.4
tqdm==4.66.5
# via openai
types-beautifulsoup4==4.12.0.20240511
# via -r requirements.in
types-html5lib==1.1.11.20240228
types-html5lib==1.1.11.20240806
# via types-beautifulsoup4
types-pillow==10.2.0.20240520
# via -r requirements.in
Expand All @@ -406,7 +411,7 @@ tzdata==2024.1
# via pendulum
urllib3==2.2.2
# via requests
uvicorn==0.30.3
uvicorn==0.30.5
# via -r requirements.in
werkzeug==3.0.3
# via
Expand Down
Loading

0 comments on commit 55b0961

Please sign in to comment.