diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index d9f30db0..3a19de41 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -11,18 +11,16 @@ "8000": {"label": "Backend port", "onAutoForward": "openBrowser"}, "5173": {"label": "Frontend port", "onAutoForward": "openBrowser"} }, - "features": { - "ghcr.io/devcontainers/features/node:1": { - "version": "18", - "nodeGypDependencies": false - }, - "ghcr.io/azure/azure-dev/azd:latest": { - "version": "1.11.0" + "features": { + "ghcr.io/devcontainers/features/node:1": { + "version": "18", + "nodeGypDependencies": false }, + "ghcr.io/azure/azure-dev/azd:latest": {}, "ghcr.io/prulloac/devcontainer-features/ollama:1": {}, // az CLI is helpful for being able to login correctly with DefaultAzureCredential: "ghcr.io/devcontainers/features/azure-cli": {} - }, + }, // Configure tool-specific properties. "customizations": { // Configure properties specific to VS Code. diff --git a/src/backend/pyproject.toml b/src/backend/pyproject.toml index f34fba96..cdadc177 100644 --- a/src/backend/pyproject.toml +++ b/src/backend/pyproject.toml @@ -16,9 +16,9 @@ dependencies = [ "tiktoken>=0.7.0,<0.8.0", "openai-messages-token-helper>=0.1.8,<0.2.0", "azure-monitor-opentelemetry>=1.6.0,<2.0.0", - "opentelemetry-instrumentation-sqlalchemy==0.48b0", - "opentelemetry-instrumentation-aiohttp-client==0.48b0", - "opentelemetry-instrumentation-openai==0.33.9", + "opentelemetry-instrumentation-sqlalchemy", + "opentelemetry-instrumentation-aiohttp-client", + "opentelemetry-instrumentation-openai", ] [build-system] diff --git a/src/backend/requirements.txt b/src/backend/requirements.txt index 86b69225..c00d13af 100644 --- a/src/backend/requirements.txt +++ b/src/backend/requirements.txt @@ -34,7 +34,7 @@ azure-core-tracing-opentelemetry==1.0.0b11 # via azure-monitor-opentelemetry azure-identity==1.19.0 # via fastapi-app (pyproject.toml) -azure-monitor-opentelemetry==1.6.3 +azure-monitor-opentelemetry==1.6.5 # via fastapi-app (pyproject.toml) azure-monitor-opentelemetry-exporter==1.0.0b32 # via azure-monitor-opentelemetry @@ -121,7 +121,7 @@ openai==1.55.3 # openai-messages-token-helper openai-messages-token-helper==0.1.10 # via fastapi-app (pyproject.toml) -opentelemetry-api==1.27.0 +opentelemetry-api==1.30.0 # via # azure-core-tracing-opentelemetry # azure-monitor-opentelemetry-exporter @@ -141,7 +141,7 @@ opentelemetry-api==1.27.0 # opentelemetry-instrumentation-wsgi # opentelemetry-sdk # opentelemetry-semantic-conventions -opentelemetry-instrumentation==0.48b0 +opentelemetry-instrumentation==0.51b0 # via # opentelemetry-instrumentation-aiohttp-client # opentelemetry-instrumentation-asgi @@ -156,42 +156,42 @@ opentelemetry-instrumentation==0.48b0 # opentelemetry-instrumentation-urllib # opentelemetry-instrumentation-urllib3 # opentelemetry-instrumentation-wsgi -opentelemetry-instrumentation-aiohttp-client==0.48b0 +opentelemetry-instrumentation-aiohttp-client==0.51b0 # via fastapi-app (pyproject.toml) -opentelemetry-instrumentation-asgi==0.48b0 +opentelemetry-instrumentation-asgi==0.51b0 # via opentelemetry-instrumentation-fastapi -opentelemetry-instrumentation-dbapi==0.48b0 +opentelemetry-instrumentation-dbapi==0.51b0 # via opentelemetry-instrumentation-psycopg2 -opentelemetry-instrumentation-django==0.48b0 +opentelemetry-instrumentation-django==0.51b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-fastapi==0.48b0 +opentelemetry-instrumentation-fastapi==0.51b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-flask==0.48b0 +opentelemetry-instrumentation-flask==0.51b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-openai==0.33.9 +opentelemetry-instrumentation-openai==0.38.7 # via fastapi-app (pyproject.toml) -opentelemetry-instrumentation-psycopg2==0.48b0 +opentelemetry-instrumentation-psycopg2==0.51b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-requests==0.48b0 +opentelemetry-instrumentation-requests==0.51b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-sqlalchemy==0.48b0 +opentelemetry-instrumentation-sqlalchemy==0.51b0 # via fastapi-app (pyproject.toml) -opentelemetry-instrumentation-urllib==0.48b0 +opentelemetry-instrumentation-urllib==0.51b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-urllib3==0.48b0 +opentelemetry-instrumentation-urllib3==0.51b0 # via azure-monitor-opentelemetry -opentelemetry-instrumentation-wsgi==0.48b0 +opentelemetry-instrumentation-wsgi==0.51b0 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-flask opentelemetry-resource-detector-azure==0.1.5 # via azure-monitor-opentelemetry -opentelemetry-sdk==1.27.0 +opentelemetry-sdk==1.30.0 # via # azure-monitor-opentelemetry # azure-monitor-opentelemetry-exporter # opentelemetry-resource-detector-azure -opentelemetry-semantic-conventions==0.48b0 +opentelemetry-semantic-conventions==0.51b0 # via # opentelemetry-instrumentation-aiohttp-client # opentelemetry-instrumentation-asgi @@ -208,7 +208,7 @@ opentelemetry-semantic-conventions==0.48b0 # opentelemetry-sdk opentelemetry-semantic-conventions-ai==0.4.2 # via opentelemetry-instrumentation-openai -opentelemetry-util-http==0.48b0 +opentelemetry-util-http==0.51b0 # via # opentelemetry-instrumentation-aiohttp-client # opentelemetry-instrumentation-asgi diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json index f0aa6253..1e658cc2 100644 --- a/src/frontend/package-lock.json +++ b/src/frontend/package-lock.json @@ -15,7 +15,7 @@ "@fluentui/react-icons": "^2.0.221", "@microsoft/ai-chat-protocol": "1.0.0-beta.20240610.1", "@react-spring/web": "^9.7.3", - "dompurify": "^3.1.3", + "dompurify": "^3.2.4", "marked": "^9.1.6", "react": "^18.2.0", "react-dom": "^18.2.0", @@ -2637,8 +2637,10 @@ "license": "MIT" }, "node_modules/@types/trusted-types": { - "version": "2.0.3", - "dev": true, + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "devOptional": true, "license": "MIT" }, "node_modules/@types/unist": { @@ -2839,9 +2841,13 @@ } }, "node_modules/dompurify": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.3.tgz", - "integrity": "sha512-5sOWYSNPaxz6o2MUPvtyxTTqR4D3L77pr5rUQoWgD5ROQtVIZQgJkXbo1DLlK3vj11YGw5+LnF4SYti4gZmwng==" + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", + "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "license": "(MPL-2.0 OR Apache-2.0)", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } }, "node_modules/electron-to-chromium": { "version": "1.4.549", @@ -5378,8 +5384,10 @@ "version": "0.16.2" }, "@types/trusted-types": { - "version": "2.0.3", - "dev": true + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "devOptional": true }, "@types/unist": { "version": "2.0.7" @@ -5487,9 +5495,12 @@ } }, "dompurify": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.3.tgz", - "integrity": "sha512-5sOWYSNPaxz6o2MUPvtyxTTqR4D3L77pr5rUQoWgD5ROQtVIZQgJkXbo1DLlK3vj11YGw5+LnF4SYti4gZmwng==" + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz", + "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==", + "requires": { + "@types/trusted-types": "^2.0.7" + } }, "electron-to-chromium": { "version": "1.4.549", diff --git a/src/frontend/package.json b/src/frontend/package.json index 3d454de2..31507c54 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -19,7 +19,7 @@ "@fluentui/react-icons": "^2.0.221", "@react-spring/web": "^9.7.3", "marked": "^9.1.6", - "dompurify": "^3.1.3", + "dompurify": "^3.2.4", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.18.0",