Skip to content

Macae v3 dev marktayl #512

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

Merged
merged 3 commits into from
Sep 17, 2025
Merged

Macae v3 dev marktayl #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd0b06c
Remove sample questions, change app image in readme
marktayl1 Sep 17, 2025
28dd6d8
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 17, 2025
791b515
remove TODOs
marktayl1 Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ The solution leverages Azure OpenAI Service, Azure Container Apps, Azure Cosmos
|![image](./docs/images/readme/agent_flow.png)|
|---|

### How to customize
If you'd like to customize the solution accelerator, here are some common areas to start:

[Custom scenario](./docs/CustomizeSolution.md)

<br/>

### Additional resources
Expand Down
25 changes: 0 additions & 25 deletions docs/SampleQuestions.md
View file
Open in desktop

This file was deleted.

Binary file modified docs/images/readme/application.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 0 additions & 40 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,14 +674,12 @@ module virtualNetwork 'br/public:avm/res/network/virtual-network:0.7.0' = if (en
{
name: 'backend'
addressPrefix: '10.0.0.0/27'
//defaultOutboundAccess: false TODO: check this configuration for a more restricted outbound access
networkSecurityGroupResourceId: networkSecurityGroupBackend!.outputs.resourceId
}
{
name: 'administration'
addressPrefix: '10.0.0.32/27'
networkSecurityGroupResourceId: networkSecurityGroupAdministration!.outputs.resourceId
//defaultOutboundAccess: false TODO: check this configuration for a more restricted outbound access
//natGatewayResourceId: natGateway.outputs.resourceId
}
{
Expand Down Expand Up @@ -1315,7 +1313,6 @@ var cosmosDbResourceName = 'cosmos-${solutionSuffix}'
var cosmosDbDatabaseName = 'macae'
var cosmosDbDatabaseMemoryContainerName = 'memory'

//TODO: update to latest version of AVM module
module cosmosDb 'br/public:avm/res/document-db/database-account:0.15.0' = {
name: take('avm.res.document-db.database-account.${cosmosDbResourceName}', 64)
params: {
Expand Down Expand Up @@ -1498,24 +1495,6 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
{
name: 'backend'
image: '${backendContainerRegistryHostname}/${backendContainerImageName}:${backendContainerImageTag}'
//TODO: configure probes for container app
// probes: [
// {
// httpGet: {
// httpHeaders: [
// {
// name: 'Custom-Header'
// value: 'Awesome'
// }
// ]
// path: '/health'
// port: 8080
// }
// initialDelaySeconds: 3
// periodSeconds: 3
// type: 'Liveness'
// }
// ]
resources: {
cpu: '2.0'
memory: '4.0Gi'
Expand Down Expand Up @@ -1708,25 +1687,6 @@ module containerAppMcp 'br/public:avm/res/app/container-app:0.18.1' = {
{
name: 'mcp'
image: '${MCPContainerRegistryHostname}/${MCPContainerImageName}:${MCPContainerImageTag}'
//image: 'macaemcpacrdk.azurecr.io/macae-mac-app:t9'
//TODO: configure probes for container app
// probes: [
// {
// httpGet: {
// httpHeaders: [
// {
// name: 'Custom-Header'
// value: 'Awesome'
// }
// ]
// path: '/health'
// port: 8080
// }
// initialDelaySeconds: 3
// periodSeconds: 3
// type: 'Liveness'
// }
// ]
resources: {
cpu: '2.0'
memory: '4.0Gi'
Expand Down
39 changes: 0 additions & 39 deletions infra/main_custom.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,14 +673,12 @@ module virtualNetwork 'br/public:avm/res/network/virtual-network:0.7.0' = if (en
{
name: 'backend'
addressPrefix: '10.0.0.0/27'
//defaultOutboundAccess: false TODO: check this configuration for a more restricted outbound access
networkSecurityGroupResourceId: networkSecurityGroupBackend!.outputs.resourceId
}
{
name: 'administration'
addressPrefix: '10.0.0.32/27'
networkSecurityGroupResourceId: networkSecurityGroupAdministration!.outputs.resourceId
//defaultOutboundAccess: false TODO: check this configuration for a more restricted outbound access
//natGatewayResourceId: natGateway.outputs.resourceId
}
{
Expand Down Expand Up @@ -1314,7 +1312,6 @@ var cosmosDbResourceName = 'cosmos-${solutionSuffix}'
var cosmosDbDatabaseName = 'macae'
var cosmosDbDatabaseMemoryContainerName = 'memory'

//TODO: update to latest version of AVM module
module cosmosDb 'br/public:avm/res/document-db/database-account:0.15.0' = {
name: take('avm.res.document-db.database-account.${cosmosDbResourceName}', 64)
params: {
Expand Down Expand Up @@ -1530,24 +1527,6 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
name: 'backend'
//image: '${backendContainerRegistryHostname}/${backendContainerImageName}:${backendContainerImageTag}'
image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
//TODO: configure probes for container app
// probes: [
// {
// httpGet: {
// httpHeaders: [
// {
// name: 'Custom-Header'
// value: 'Awesome'
// }
// ]
// path: '/health'
// port: 8080
// }
// initialDelaySeconds: 3
// periodSeconds: 3
// type: 'Liveness'
// }
// ]
resources: {
cpu: '2.0'
memory: '4.0Gi'
Expand Down Expand Up @@ -1746,24 +1725,6 @@ module containerAppMcp 'br/public:avm/res/app/container-app:0.18.1' = {
name: 'mcp'
//image: '${backendContainerRegistryHostname}/${backendContainerImageName}:${backendContainerImageTag}'
image: 'mcr.microsoft.com/azuredocs/containerapps-helloworld:latest'
//TODO: configure probes for container app
// probes: [
// {
// httpGet: {
// httpHeaders: [
// {
// name: 'Custom-Header'
// value: 'Awesome'
// }
// ]
// path: '/health'
// port: 8080
// }
// initialDelaySeconds: 3
// periodSeconds: 3
// type: 'Liveness'
// }
// ]
resources: {
cpu: '2.0'
memory: '4.0Gi'
Expand Down
32 changes: 7 additions & 25 deletions src/backend/v3/api/router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,18 @@
from auth.auth_utils import get_authenticated_user_details
from common.config.app_config import config
from common.database.database_factory import DatabaseFactory
from common.models.messages_kernel import (
InputTask,
Plan,
PlanStatus,
PlanWithSteps,
TeamSelectionRequest,
)
from common.models.messages_kernel import (InputTask, Plan, PlanStatus,
PlanWithSteps, TeamSelectionRequest)
from common.utils.event_utils import track_event_if_configured
from common.utils.utils_date import format_dates_in_messages
from common.utils.utils_kernel import rai_success, rai_validate_team_config
from fastapi import (
APIRouter,
BackgroundTasks,
File,
HTTPException,
Query,
Request,
UploadFile,
WebSocket,
WebSocketDisconnect,
)
from fastapi import (APIRouter, BackgroundTasks, File, HTTPException, Query,
Request, UploadFile, WebSocket, WebSocketDisconnect)
from semantic_kernel.agents.runtime import InProcessRuntime
from v3.common.services.plan_service import PlanService
from v3.common.services.team_service import TeamService
from v3.config.settings import (
connection_config,
current_user_id,
orchestration_config,
team_config,
)
from v3.config.settings import (connection_config, current_user_id,
orchestration_config, team_config)
from v3.orchestration.orchestration_manager import OrchestrationManager

router = APIRouter()
Expand Down Expand Up @@ -287,7 +269,7 @@ async def process_request(
"plan_id": plan.plan_id,
"session_id": input_task.session_id,
"user_id": user_id,
"team_id": team_id, # TODO add current_team_id
"team_id": team_id,
"description": input_task.description,
},
)
Expand Down
1 change: 0 additions & 1 deletion src/frontend/src/api/apiService.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ export class APIService {
async getPlans(sessionId?: string, useCache = true): Promise<Plan[]> {
const cacheKey = `plans_${sessionId || 'all'}`;
const params = sessionId ? { session_id: sessionId } : {};
// TODO replace session for team_id
const fetcher = async () => {
const data = await apiClient.get(API_ENDPOINTS.PLANS, { params });
if (useCache) {
Expand Down
2 changes: 0 additions & 2 deletions src/frontend/src/pages/HomePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ const HomePage: React.FC = () => {
if (team) {

try {
// TODO REFRACTOR THIS CODE
setIsLoadingTeam(true);
const initResponse = await TeamService.initializeTeam(true);

Expand Down Expand Up @@ -198,7 +197,6 @@ const HomePage: React.FC = () => {
selectedTeam={selectedTeam}
/>
) : (
// TODO MOVE THIS STYLE TO CSS
<div style={{
display: 'flex',
justifyContent: 'center',
Expand Down
Loading