Skip to content

Commit 868bd5d

Browse files
Merge pull request #273 from microsoft/dev
chore: Dev merge to Main
2 parents 5e7e467 + 268f922 commit 868bd5d

9 files changed

Lines changed: 22 additions & 19 deletions

File tree

.github/workflows/docker-build-and-push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
echo "DATE_TAG=${DATE_TAG}" >> $GITHUB_ENV
8787
echo "Base tag: $BASE_TAG, Date tag: $DATE_TAG"
8888
89-
- name: Build and Push ContentProcessorAPI Docker image
89+
- name: Build and Push Backend API Docker image
9090
uses: docker/build-push-action@v7
9191
with:
9292
context: ./src/backend-api
@@ -97,7 +97,7 @@ jobs:
9797
${{ steps.registry.outputs.ext_registry }}/backend-api:${{ env.BASE_TAG }}
9898
${{ steps.registry.outputs.ext_registry }}/backend-api:${{ env.DATE_TAG }}
9999
100-
- name: Build and Push ContentProcessor Docker image
100+
- name: Build and Push Processor Docker image
101101
uses: docker/build-push-action@v7
102102
with:
103103
context: ./src/processor
@@ -108,7 +108,7 @@ jobs:
108108
${{ steps.registry.outputs.ext_registry }}/processor:${{ env.BASE_TAG }}
109109
${{ steps.registry.outputs.ext_registry }}/processor:${{ env.DATE_TAG }}
110110
111-
- name: Build and Push ContentProcessorWeb Docker image
111+
- name: Build and Push Frontend Docker image
112112
uses: docker/build-push-action@v7
113113
with:
114114
context: ./src/frontend

src/backend-api/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ override-dependencies = [
3838
"azure-core==1.38.0",
3939
"urllib3==2.7.0",
4040
"requests==2.33.0",
41-
"werkzeug==3.1.4",
41+
"werkzeug==3.1.6",
4242
"pygments==2.20.0",
4343
"black==26.3.1",
4444
"cryptography==46.0.7",
4545
"pyjwt==2.12.0",
4646
"pyopenssl==26.0.0",
47+
"idna==3.15",
4748
]

src/backend-api/src/tests/base/test_sk_logic_base.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import importlib
1111
import sys
1212
import types
13-
from typing import Type
1413
from unittest.mock import MagicMock
1514

1615
import pytest

src/backend-api/uv.lock

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/frontend/src/components/batchHistoryPanel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useState, useEffect, useRef } from "react";
22

3-
import { useDispatch, useSelector } from 'react-redux';
3+
import { useDispatch } from 'react-redux';
44
import { Card, Spinner, Tooltip } from "@fluentui/react-components";
55
import { useNavigate } from "react-router-dom";
66
import ConfirmationDialog from "../commonComponents/ConfirmationDialog/confirmationDialogue";

src/processor/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,5 @@ prerelease = "allow"
6262
override-dependencies = [
6363
"urllib3==2.7.0",
6464
"authlib==1.7.1",
65+
"idna==3.15",
6566
]

src/processor/src/tests/unit/libs/application/test_application_context_extras.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ async def _run():
118118

119119
def test_create_async_instance_with_callable_factory():
120120
async def _run():
121-
ctx = AppContext().add_async_singleton(_AsyncSvc, lambda: _AsyncSvc())
121+
ctx = AppContext().add_async_singleton(_AsyncSvc, _AsyncSvc)
122122
a = await ctx.get_service_async(_AsyncSvc)
123123
assert isinstance(a, _AsyncSvc)
124124
assert a.entered is True
@@ -151,7 +151,7 @@ async def _run():
151151

152152

153153
def test_create_instance_with_factory_callable():
154-
ctx = AppContext().add_singleton(_S, lambda: _S())
154+
ctx = AppContext().add_singleton(_S, _S)
155155
a = ctx.get_service(_S)
156156
assert isinstance(a, _S)
157157

src/processor/src/tests/unit/services/test_queue_service_internals.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ async def _go():
189189
try:
190190
await task
191191
except (asyncio.CancelledError, Exception):
192-
pass
192+
pass # Expected during task cancellation cleanup
193193

194194
_run(_go())
195195

src/processor/uv.lock

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)