Skip to content

Commit 16f5ce3

Browse files
marktayl1marktayl1
committed
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator into macae-v3-dev-marktayl
2 parents 96dba92 + 8062682 commit 16f5ce3

File tree

16 files changed

+231
-236
lines changed

16 files changed

+231
-236
lines changed

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,13 @@
5151

5252

5353
@app_v3.websocket("/socket/{process_id}")
54-
async def start_comms(websocket: WebSocket, process_id: str):
54+
async def start_comms(websocket: WebSocket, process_id: str, user_id: str = Query(None)):
5555
"""Web-Socket endpoint for real-time process status updates."""
5656

5757
# Always accept the WebSocket connection first
5858
await websocket.accept()
5959

60-
user_id = None
61-
try:
62-
# WebSocket headers are different, try to get user info
63-
headers = dict(websocket.headers)
64-
authenticated_user = get_authenticated_user_details(request_headers=headers)
65-
user_id = authenticated_user.get("user_principal_id")
66-
if not user_id:
67-
user_id = "00000000-0000-0000-0000-000000000000"
68-
except Exception as e:
69-
logging.warning(f"Could not extract user from WebSocket headers: {e}")
70-
user_id = "00000000-0000-0000-0000-000000000000"
60+
user_id = user_id or "00000000-0000-0000-0000-000000000000"
7161

7262
current_user_id.set(user_id)
7363

‎src/frontend/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
content="MACAE - Multi-Agent Custom Automation Engine"
1111
/>
1212
<link rel="apple-touch-icon" href="/contosoLogo.svg" />
13-
<link rel="manifest" href="/manifest.json" />
13+
<!-- <link rel="manifest" href="/manifest.json" /> -->
1414
<title>Multi-Agent - Custom Automation Engine</title>
1515
</head>
1616
<body>

‎src/frontend/public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
content="MACAE - Multi-Agent Custom Automation Engine"
1111
/>
1212
<link rel="apple-touch-icon" href="/contosoLogo.svg" />
13-
<link rel="manifest" href="/manifest.json" />
13+
<!-- <link rel="manifest" href="/manifest.json" /> -->
1414
<title>MACAE</title>
1515
</head>
1616
<body>

‎src/frontend/src/components/content/HomeInput.tsx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ const HomeInput: React.FC<HomeInputProps> = ({
237237
</div>
238238

239239
<div className="home-input-quick-tasks">
240+
<div>
240241
{tasksToDisplay.map((task) => (
241242
<PromptCard
242243
key={task.id}
@@ -245,9 +246,11 @@ const HomeInput: React.FC<HomeInputProps> = ({
245246
description={task.description}
246247
onClick={() => handleQuickTaskClick(task)}
247248
disabled={submitting}
249+
248250
/>
249251
))}
250252
</div>
253+
</div>
251254
</>
252255
)}
253256
{tasksToDisplay.length === 0 && selectedTeam && (

‎src/frontend/src/components/content/PlanChat.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const PlanChat: React.FC<SimplifiedPlanChatProps> = ({
9292
display: 'flex',
9393
flexDirection: 'column',
9494
height: '100vh',
95-
backgroundColor: 'var(--colorNeutralBackground1)'
95+
9696
}}>
9797
{/* Messages Container */}
9898
<InlineToaster />
@@ -132,6 +132,7 @@ const PlanChat: React.FC<SimplifiedPlanChatProps> = ({
132132
OnChatSubmit={OnChatSubmit}
133133
waitingForPlan={waitingForPlan}
134134
loading={false} />
135+
135136
</div>
136137
);
137138
};

‎src/frontend/src/components/content/PlanChatBody.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ const PlanChatBody: React.FC<SimplifiedPlanChatProps> = ({
2323
return (
2424
<div
2525
style={{
26-
position: 'sticky',
26+
// position: 'sticky',
2727
bottom: 0,
28-
backgroundColor: 'var(--colorNeutralBackground1)',
28+
// backgroundColor: 'var(--colorNeutralBackground1)',
2929
// borderTop: '1px solid var(--colorNeutralStroke2)',
3030
padding: '16px 24px',
3131
maxWidth: '800px',
3232
margin: '0 auto',
33+
marginBottom: '40px',
3334
width: '100%',
3435
boxSizing: 'border-box',
35-
zIndex: 10,
36+
zIndex: 10
3637
}}
3738
>
3839
<ChatInput
@@ -49,7 +50,7 @@ const PlanChatBody: React.FC<SimplifiedPlanChatProps> = ({
4950
fontSize: '16px',
5051
borderRadius: '8px',
5152
// border: '1px solid var(--colorNeutralStroke1)',
52-
backgroundColor: 'var(--colorNeutralBackground1)',
53+
// backgroundColor: 'var(--colorNeutralBackground1)',
5354
width: '100%',
5455
boxSizing: 'border-box',
5556
}}

‎src/frontend/src/components/content/PlanPanelRight.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ const PlanPanelRight: React.FC<PlanDetailsProps> = ({
187187
fontWeight: 600,
188188
color: 'var(--colorNeutralForeground1)'
189189
}}>
190-
Agents
190+
Agent Team
191191
</Body1>
192192

193193
{agents.length === 0 ? (
@@ -250,7 +250,8 @@ const PlanPanelRight: React.FC<PlanDetailsProps> = ({
250250
display: 'flex',
251251
flexDirection: 'column',
252252
overflow: 'hidden',
253-
backgroundColor: 'var(--colorNeutralBackground1)'
253+
borderLeft: '1px solid var(--colorNeutralStroke1)',
254+
// backgroundColor: 'var(--colorNeutralBackground1)'
254255
}}>
255256
{/* Plan section on top */}
256257
{renderPlanSection()}

‎src/frontend/src/components/content/streaming/StreamingAgentMessage.tsx‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,6 @@ const useStyles = makeStyles({
5959
color: 'var(--colorNeutralForeground1)',
6060
lineHeight: '20px'
6161
},
62-
botBadge: {
63-
fontSize: '11px',
64-
fontWeight: '600',
65-
textTransform: 'uppercase',
66-
letterSpacing: '0.5px',
67-
backgroundColor: 'var(--colorNeutralBackground3)',
68-
color: 'var(--colorNeutralForeground1)',
69-
border: '1px solid var(--colorNeutralStroke2)',
70-
padding: '2px 8px',
71-
borderRadius: '4px'
72-
},
7362
messageBubble: {
7463
padding: '12px 16px',
7564
borderRadius: '8px',
@@ -200,10 +189,7 @@ const renderAgentMessages = (agentMessages: AgentMessageData[]) => {
200189
{TaskService.cleanTextToSpaces(msg.agent)}
201190
</Body1>
202191
<Tag
203-
size="extra-small"
204-
shape="rounded"
205-
appearance="filled"
206-
className={styles.botBadge}
192+
appearance="brand"
207193
>
208194
AI Agent
209195
</Tag>
@@ -243,9 +229,9 @@ const renderAgentMessages = (agentMessages: AgentMessageData[]) => {
243229
</ReactMarkdown>
244230

245231
{/* Action buttons for bot messages */}
246-
{!isHuman && (
247-
<div className={styles.actionContainer}>
248-
<Button
232+
{/* {!isHuman && (
233+
<div className={styles.actionContainer}> */}
234+
{/* <Button
249235
onClick={() =>
250236
msg.content &&
251237
navigator.clipboard.writeText(msg.content)
@@ -255,17 +241,17 @@ const renderAgentMessages = (agentMessages: AgentMessageData[]) => {
255241
size="small"
256242
icon={<Copy />}
257243
className={styles.copyButton}
258-
/>
244+
/> */}
259245

260-
<Tag
246+
{/* <Tag
261247
appearance="filled"
262248
size="extra-small"
263249
className={styles.sampleTag}
264250
>
265251
Sample data for demonstration purposes only.
266-
</Tag>
267-
</div>
268-
)}
252+
</Tag> */}
253+
{/* </div>
254+
)} */}
269255
</div>
270256
</div>
271257
</div>

0 commit comments

Comments
 (0)