Skip to content

Commit 1331c8e

Browse files
marktayl1marktayl1
authored
Merge pull request #512 from microsoft/macae-v3-dev-marktayl
Macae v3 dev marktayl
2 parents cf22485 + 791b515 commit 1331c8e

File tree

8 files changed

+7
-137
lines changed

8 files changed

+7
-137
lines changed

‎README.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ The solution leverages Azure OpenAI Service, Azure Container Apps, Azure Cosmos
2929
|![image](./docs/images/readme/agent_flow.png)|
3030
|---|
3131

32-
### How to customize
33-
If you'd like to customize the solution accelerator, here are some common areas to start:
34-
35-
[Custom scenario](./docs/CustomizeSolution.md)
36-
3732
<br/>
3833

3934
### Additional resources

‎docs/SampleQuestions.md‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎docs/images/readme/application.png‎

31.1 KB
Loading

‎infra/main.bicep‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -674,14 +674,12 @@ module virtualNetwork 'br/public:avm/res/network/virtual-network:0.7.0' = if (en
674674
{
675675
name: 'backend'
676676
addressPrefix: '10.0.0.0/27'
677-
//defaultOutboundAccess: false TODO: check this configuration for a more restricted outbound access
678677
networkSecurityGroupResourceId: networkSecurityGroupBackend!.outputs.resourceId
679678
}
680679
{
681680
name: 'administration'
682681
addressPrefix: '10.0.0.32/27'
683682
networkSecurityGroupResourceId: networkSecurityGroupAdministration!.outputs.resourceId
684-
//defaultOutboundAccess: false TODO: check this configuration for a more restricted outbound access
685683
//natGatewayResourceId: natGateway.outputs.resourceId
686684
}
687685
{
@@ -1315,7 +1313,6 @@ var cosmosDbResourceName = 'cosmos-${solutionSuffix}'
13151313
var cosmosDbDatabaseName = 'macae'
13161314
var cosmosDbDatabaseMemoryContainerName = 'memory'
13171315

1318-
//TODO: update to latest version of AVM module
13191316
module cosmosDb 'br/public:avm/res/document-db/database-account:0.15.0' = {
13201317
name: take('avm.res.document-db.database-account.${cosmosDbResourceName}', 64)
13211318
params: {
@@ -1498,24 +1495,6 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
14981495
{
14991496
name: 'backend'
15001497
image: '${backendContainerRegistryHostname}/${backendContainerImageName}:${backendContainerImageTag}'
1501-
//TODO: configure probes for container app
1502-
// probes: [
1503-
// {
1504-
// httpGet: {
1505-
// httpHeaders: [
1506-
// {
1507-
// name: 'Custom-Header'
1508-
// value: 'Awesome'
1509-
// }
1510-
// ]
1511-
// path: '/health'
1512-
// port: 8080
1513-
// }
1514-
// initialDelaySeconds: 3
1515-
// periodSeconds: 3
1516-
// type: 'Liveness'
1517-
// }
1518-
// ]
15191498
resources: {
15201499
cpu: '2.0'
15211500
memory: '4.0Gi'
@@ -1708,25 +1687,6 @@ module containerAppMcp 'br/public:avm/res/app/container-app:0.18.1' = {
17081687
{
17091688
name: 'mcp'
17101689
image: '${MCPContainerRegistryHostname}/${MCPContainerImageName}:${MCPContainerImageTag}'
1711-
//image: 'macaemcpacrdk.azurecr.io/macae-mac-app:t9'
1712-
//TODO: configure probes for container app
1713-
// probes: [
1714-
// {
1715-
// httpGet: {
1716-
// httpHeaders: [
1717-
// {
1718-
// name: 'Custom-Header'
1719-
// value: 'Awesome'
1720-
// }
1721-
// ]
1722-
// path: '/health'
1723-
// port: 8080
1724-
// }
1725-
// initialDelaySeconds: 3
1726-
// periodSeconds: 3
1727-
// type: 'Liveness'
1728-
// }
1729-
// ]
17301690
resources: {
17311691
cpu: '2.0'
17321692
memory: '4.0Gi'

‎infra/main_custom.bicep‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -673,14 +673,12 @@ module virtualNetwork 'br/public:avm/res/network/virtual-network:0.7.0' = if (en
673673
{
674674
name: 'backend'
675675
addressPrefix: '10.0.0.0/27'
676-
//defaultOutboundAccess: false TODO: check this configuration for a more restricted outbound access
677676
networkSecurityGroupResourceId: networkSecurityGroupBackend!.outputs.resourceId
678677
}
679678
{
680679
name: 'administration'
681680
addressPrefix: '10.0.0.32/27'
682681
networkSecurityGroupResourceId: networkSecurityGroupAdministration!.outputs.resourceId
683-
//defaultOutboundAccess: false TODO: check this configuration for a more restricted outbound access
684682
//natGatewayResourceId: natGateway.outputs.resourceId
685683
}
686684
{
@@ -1314,7 +1312,6 @@ var cosmosDbResourceName = 'cosmos-${solutionSuffix}'
13141312
var cosmosDbDatabaseName = 'macae'
13151313
var cosmosDbDatabaseMemoryContainerName = 'memory'
13161314

1317-
//TODO: update to latest version of AVM module
13181315
module cosmosDb 'br/public:avm/res/document-db/database-account:0.15.0' = {
13191316
name: take('avm.res.document-db.database-account.${cosmosDbResourceName}', 64)
13201317
params: {
@@ -1530,24 +1527,6 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
15301527
name: 'backend'
15311528
//image: '${backendContainerRegistryHostname}/${backendContainerImageName}:${backendContainerImageTag}'
15321529
image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
1533-
//TODO: configure probes for container app
1534-
// probes: [
1535-
// {
1536-
// httpGet: {
1537-
// httpHeaders: [
1538-
// {
1539-
// name: 'Custom-Header'
1540-
// value: 'Awesome'
1541-
// }
1542-
// ]
1543-
// path: '/health'
1544-
// port: 8080
1545-
// }
1546-
// initialDelaySeconds: 3
1547-
// periodSeconds: 3
1548-
// type: 'Liveness'
1549-
// }
1550-
// ]
15511530
resources: {
15521531
cpu: '2.0'
15531532
memory: '4.0Gi'
@@ -1746,24 +1725,6 @@ module containerAppMcp 'br/public:avm/res/app/container-app:0.18.1' = {
17461725
name: 'mcp'
17471726
//image: '${backendContainerRegistryHostname}/${backendContainerImageName}:${backendContainerImageTag}'
17481727
image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
1749-
//TODO: configure probes for container app
1750-
// probes: [
1751-
// {
1752-
// httpGet: {
1753-
// httpHeaders: [
1754-
// {
1755-
// name: 'Custom-Header'
1756-
// value: 'Awesome'
1757-
// }
1758-
// ]
1759-
// path: '/health'
1760-
// port: 8080
1761-
// }
1762-
// initialDelaySeconds: 3
1763-
// periodSeconds: 3
1764-
// type: 'Liveness'
1765-
// }
1766-
// ]
17671728
resources: {
17681729
cpu: '2.0'
17691730
memory: '4.0Gi'

‎src/backend/v3/api/router.py‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,36 +9,18 @@
99
from auth.auth_utils import get_authenticated_user_details
1010
from common.config.app_config import config
1111
from common.database.database_factory import DatabaseFactory
12-
from common.models.messages_kernel import (
13-
InputTask,
14-
Plan,
15-
PlanStatus,
16-
PlanWithSteps,
17-
TeamSelectionRequest,
18-
)
12+
from common.models.messages_kernel import (InputTask, Plan, PlanStatus,
13+
PlanWithSteps, TeamSelectionRequest)
1914
from common.utils.event_utils import track_event_if_configured
2015
from common.utils.utils_date import format_dates_in_messages
2116
from common.utils.utils_kernel import rai_success, rai_validate_team_config
22-
from fastapi import (
23-
APIRouter,
24-
BackgroundTasks,
25-
File,
26-
HTTPException,
27-
Query,
28-
Request,
29-
UploadFile,
30-
WebSocket,
31-
WebSocketDisconnect,
32-
)
17+
from fastapi import (APIRouter, BackgroundTasks, File, HTTPException, Query,
18+
Request, UploadFile, WebSocket, WebSocketDisconnect)
3319
from semantic_kernel.agents.runtime import InProcessRuntime
3420
from v3.common.services.plan_service import PlanService
3521
from v3.common.services.team_service import TeamService
36-
from v3.config.settings import (
37-
connection_config,
38-
current_user_id,
39-
orchestration_config,
40-
team_config,
41-
)
22+
from v3.config.settings import (connection_config, current_user_id,
23+
orchestration_config, team_config)
4224
from v3.orchestration.orchestration_manager import OrchestrationManager
4325

4426
router = APIRouter()
@@ -287,7 +269,7 @@ async def process_request(
287269
"plan_id": plan.plan_id,
288270
"session_id": input_task.session_id,
289271
"user_id": user_id,
290-
"team_id": team_id, # TODO add current_team_id
272+
"team_id": team_id,
291273
"description": input_task.description,
292274
},
293275
)

‎src/frontend/src/api/apiService.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ export class APIService {
128128
async getPlans(sessionId?: string, useCache = true): Promise<Plan[]> {
129129
const cacheKey = `plans_${sessionId || 'all'}`;
130130
const params = sessionId ? { session_id: sessionId } : {};
131-
// TODO replace session for team_id
132131
const fetcher = async () => {
133132
const data = await apiClient.get(API_ENDPOINTS.PLANS, { params });
134133
if (useCache) {

‎src/frontend/src/pages/HomePage.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ const HomePage: React.FC = () => {
103103
if (team) {
104104

105105
try {
106-
// TODO REFRACTOR THIS CODE
107106
setIsLoadingTeam(true);
108107
const initResponse = await TeamService.initializeTeam(true);
109108

@@ -198,7 +197,6 @@ const HomePage: React.FC = () => {
198197
selectedTeam={selectedTeam}
199198
/>
200199
) : (
201-
// TODO MOVE THIS STYLE TO CSS
202200
<div style={{
203201
display: 'flex',
204202
justifyContent: 'center',

0 commit comments

Comments
 (0)