Skip to content

Commit 3bff1f2

Browse files
committed
Merge branch 'macae-v3-dev-marktayl' into macae-v3-fr-dev-92
2 parents 78495c1 + bb466d4 commit 3bff1f2

File tree

16 files changed

+384
-94
lines changed

16 files changed

+384
-94
lines changed
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
{
2+
"id": "10",
3+
"team_id": "team-business-operations",
4+
"name": "Business Operations Team2",
5+
"status": "visible",
6+
"created": "2025-08-05T00:00:00.000Z",
7+
"created_by": "Admin",
8+
"agents": [
9+
{
10+
"input_key": "hr-agent-001",
11+
"type": "HR",
12+
"name": "HR Specialist",
13+
"deployment_name": "gpt-4o",
14+
"system_message": "You are an AI Agent. You have knowledge about HR (e.g., human resources), policies, procedures, and onboarding guidelines.",
15+
"description": "Handles employee onboarding, HR policies, and human resources management tasks.",
16+
"icon": "Person",
17+
"index_name": "",
18+
"use_rag": false,
19+
"use_mcp": false,
20+
"coding_tools": false,
21+
"use_bing": false
22+
},
23+
{
24+
"input_key": "tech-support-001",
25+
"type": "TechSupport",
26+
"name": "Tech Support Specialist",
27+
"deployment_name": "gpt-4o",
28+
"system_message": "You are a Product agent. You have knowledge about product management, development, and compliance guidelines. When asked to call a function, you should summarize back what was done.",
29+
"description": "Provides technical support for mobile plans, telecommunications, and IT services.",
30+
"icon": "Phone",
31+
"index_name": "",
32+
"use_rag": false,
33+
"use_mcp": false,
34+
"coding_tools": false,
35+
"use_bing": false
36+
},
37+
{
38+
"input_key": "procurement-001",
39+
"type": "Procurement",
40+
"name": "Procurement Specialist",
41+
"deployment_name": "gpt-4o",
42+
"system_message": "You are a Procurement agent. You specialize in purchasing, vendor management, supply chain operations, and inventory control. You help with creating purchase orders, managing vendors, tracking orders, and ensuring efficient procurement processes.",
43+
"description": "Manages purchasing decisions, add-ons, and procurement processes.",
44+
"icon": "ShoppingBag",
45+
"index_name": "",
46+
"use_rag": false,
47+
"use_mcp": false,
48+
"coding_tools": false,
49+
"use_bing": false
50+
},
51+
{
52+
"input_key": "marketing-001",
53+
"type": "Marketing",
54+
"name": "Marketing Specialist",
55+
"deployment_name": "gpt-4o",
56+
"system_message": "You are a Marketing agent. You specialize in marketing strategy, campaign development, content creation, and market analysis. You help create effective marketing campaigns, analyze market data, and develop promotional content for products and services.",
57+
"description": "Creates marketing content, press releases, and promotional materials.",
58+
"icon": "DocumentEdit",
59+
"index_name": "",
60+
"use_rag": false,
61+
"use_mcp": false,
62+
"coding_tools": false,
63+
"use_bing": false
64+
},
65+
{
66+
"input_key": "generic-001",
67+
"type": "Generic",
68+
"name": "General Assistant",
69+
"deployment_name": "gpt-4o",
70+
"system_message": "You are a Generic agent that can help with general questions and provide basic information. You can search for information and perform simple calculations.",
71+
"description": "Provides general assistance and handles miscellaneous tasks that don't require specialized expertise.",
72+
"icon": "Bot",
73+
"index_name": "",
74+
"use_rag": false,
75+
"use_mcp": false,
76+
"coding_tools": false,
77+
"use_bing": false
78+
}
79+
],
80+
"description": "Business Operations team handles employee onboarding, telecommunications support, procurement, and marketing tasks for comprehensive business operations management.",
81+
"logo": "Building",
82+
"plan": "Multi-agent business operations plan covering HR, tech support, procurement, and marketing activities",
83+
"starting_tasks": [
84+
{
85+
"id": "onboard",
86+
"name": "Onboard employee",
87+
"prompt": "Onboard a new employee, Jessica Smith.",
88+
"created": "2025-08-05T00:00:00.000Z",
89+
"creator": "system",
90+
"logo": "Person"
91+
},
92+
{
93+
"id": "mobile",
94+
"name": "Mobile plan query",
95+
"prompt": "Ask about roaming plans prior to heading overseas.",
96+
"created": "2025-08-05T00:00:00.000Z",
97+
"creator": "system",
98+
"logo": "Phone"
99+
},
100+
{
101+
"id": "addon",
102+
"name": "Buy add-on",
103+
"prompt": "Enable roaming on mobile plan, starting next week.",
104+
"created": "2025-08-05T00:00:00.000Z",
105+
"creator": "system",
106+
"logo": "ShoppingBag"
107+
},
108+
{
109+
"id": "press",
110+
"name": "Draft a press release",
111+
"prompt": "Write a press release about our current products.",
112+
"created": "2025-08-05T00:00:00.000Z",
113+
"creator": "system",
114+
"logo": "DocumentEdit"
115+
}
116+
]
117+
}

data/agent_teams/marketing.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"input_key": "",
4444
"type": "",
4545
"name": "ProxyAgent",
46-
"deployment_name": "gpt-4.1-mini",
46+
"deployment_name": "",
4747
"icon": "",
4848
"system_message": "",
4949
"description": "",
Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
{
2+
"id": "3",
3+
"team_id": "team-3",
4+
"name": "Retail Customer Success Team2",
5+
"status": "visible",
6+
"created": "",
7+
"created_by": "",
8+
"agents": [
9+
{
10+
"input_key": "",
11+
"type": "",
12+
"name": "CustomerDataAgent",
13+
"deployment_name": "gpt-4.1-mini",
14+
"icon": "",
15+
"system_message": "You have access to internal customer data through a secure index. Use this data to answer questions about customers, their interactions with customer service, satisfaction, etc. Be mindful of privacy and compliance regulations when handling customer data.",
16+
"description": "An agent that has access to internal customer data, ask this agent if you have questions about customers or their interactions with customer service, satisfaction, etc.",
17+
"use_rag": true,
18+
"use_mcp": false,
19+
"use_bing": false,
20+
"use_reasoning": false,
21+
"index_name": "macae-index",
22+
"index_foundry_name": "",
23+
"index_endpoint": "",
24+
"coding_tools": false
25+
},
26+
{
27+
"input_key": "",
28+
"type": "",
29+
"name": "OrderDataAgent",
30+
"deployment_name": "gpt-4.1-mini",
31+
"icon": "",
32+
"system_message": "You have access to internal order, inventory, product, and fulfillment data through a secure index. Use this data to answer questions about products, shipping delays, customer orders, warehouse management, etc. Be mindful of privacy and compliance regulations when handling customer data.",
33+
"description": "An agent that has access to internal order, inventory, product, and fulfillment data. Ask this agent if you have questions about products, shipping delays, customer orders, warehouse management, etc.",
34+
"use_rag": true,
35+
"use_mcp": false,
36+
"use_bing": false,
37+
"use_reasoning": false,
38+
"index_name": "macae-index",
39+
"index_foundry_name": "",
40+
"coding_tools": true
41+
},
42+
{
43+
"input_key": "",
44+
"type": "",
45+
"name": "AnalysisRecommendationAgent",
46+
"deployment_name": "o4-mini",
47+
"icon": "",
48+
"system_message": "You are a reasoning agent that can analyze customer data and provide recommendations for improving customer satisfaction and retention. You do not have access to any data sources, but you can reason based on the information provided to you by other agents. Use your reasoning skills to identify patterns, trends, and insights that can help improve customer satisfaction and retention. Provide actionable recommendations based on your analysis. You have access to other agents that can answer questions and provide data about customers, products, orders, inventory, and fulfilment. Use these agents to gather information as needed.",
49+
"description": "A reasoning agent that can analyze customer data and provide recommendations for improving customer satisfaction and retention.",
50+
"use_rag": false,
51+
"use_mcp": false,
52+
"use_bing": false,
53+
"use_reasoning": true,
54+
"index_name": "",
55+
"index_foundry_name": "",
56+
"coding_tools": false
57+
},
58+
{
59+
"input_key": "",
60+
"type": "",
61+
"name": "ProxyAgent",
62+
"deployment_name": "",
63+
"icon": "",
64+
"system_message": "",
65+
"description": "",
66+
"use_rag": false,
67+
"use_mcp": false,
68+
"use_bing": false,
69+
"use_reasoning": false,
70+
"index_name": "",
71+
"index_foundry_name": "",
72+
"coding_tools": false
73+
}
74+
],
75+
"protected": false,
76+
"description": "Team focused on individualized customer relationship management and overall customer satisfaction.",
77+
"logo": "",
78+
"plan": "",
79+
"starting_tasks": [
80+
{
81+
"id": "task-1",
82+
"name": "Satisfaction Plan",
83+
"prompt": "Analyze the satisfaction of Emily Thompson with Contoso. If needed, provide a plan to increase her satisfaction.",
84+
"created": "",
85+
"creator": "",
86+
"logo": ""
87+
}
88+
]
89+
}

data/agent_teams/retail.json

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"name": "OrderDataAgent",
3030
"deployment_name": "gpt-4.1-mini",
3131
"icon": "",
32-
"system_message": "You have access to internal order, inventory, product, and fulfilment data through a secure index. Use this data to answer questions about products, shipping delays, customer orders, warehouse management, etc. Be mindful of privacy and compliance regulations when handling customer data.",
33-
"description": "An agent that has access to internal order, inventory, product, and fulfilment data. Ask this agent if you have questions about products, shipping delays, customerr orders, warehouse management, etc.",
32+
"system_message": "You have access to internal order, inventory, product, and fulfillment data through a secure index. Use this data to answer questions about products, shipping delays, customer orders, warehouse management, etc. Be mindful of privacy and compliance regulations when handling customer data.",
33+
"description": "An agent that has access to internal order, inventory, product, and fulfillment data. Ask this agent if you have questions about products, shipping delays, customer orders, warehouse management, etc.",
3434
"use_rag": true,
3535
"use_mcp": false,
3636
"use_bing": false,
@@ -42,7 +42,7 @@
4242
{
4343
"input_key": "",
4444
"type": "",
45-
"name": "AnalysisRecomendationAgent",
45+
"name": "AnalysisRecommendationAgent",
4646
"deployment_name": "o4-mini",
4747
"icon": "",
4848
"system_message": "You are a reasoning agent that can analyze customer data and provide recommendations for improving customer satisfaction and retention. You do not have access to any data sources, but you can reason based on the information provided to you by other agents. Use your reasoning skills to identify patterns, trends, and insights that can help improve customer satisfaction and retention. Provide actionable recommendations based on your analysis. You have access to other agents that can answer questions and provide data about customers, products, orders, inventory, and fulfilment. Use these agents to gather information as needed.",
@@ -54,6 +54,22 @@
5454
"index_name": "",
5555
"index_foundry_name": "",
5656
"coding_tools": false
57+
},
58+
{
59+
"input_key": "",
60+
"type": "",
61+
"name": "ProxyAgent",
62+
"deployment_name": "",
63+
"icon": "",
64+
"system_message": "",
65+
"description": "",
66+
"use_rag": false,
67+
"use_mcp": false,
68+
"use_bing": false,
69+
"use_reasoning": false,
70+
"index_name": "",
71+
"index_foundry_name": "",
72+
"coding_tools": false
5773
}
5874
],
5975
"protected": false,
@@ -64,7 +80,7 @@
6480
{
6581
"id": "task-1",
6682
"name": "Satisfaction Plan",
67-
"prompt": "Create a plan to improve Emily Thompson's satisfaction.",
83+
"prompt": "Analyze the satisfaction of Emily Thompson with Contoso. If needed, provide a plan to increase her satisfaction.",
6884
"created": "",
6985
"creator": "",
7086
"logo": ""

src/backend/.env.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ APPLICATIONINSIGHTS_CONNECTION_STRING=
1717
AZURE_AI_AGENT_MODEL_DEPLOYMENT_NAME=gpt-4o
1818
AZURE_COGNITIVE_SERVICES="https://cognitiveservices.azure.com/.default"
1919
AZURE_AI_AGENT_ENDPOINT=
20-
AZURE_BING_CONNECTION_NAME=
20+
# AZURE_BING_CONNECTION_NAME=
2121
REASONING_MODEL_NAME=o3
2222
APP_ENV=dev
2323
MCP_SERVER_ENDPOINT=http://localhost:8080/mcp

src/backend/common/config/app_config.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
from typing import Optional
55

66
from azure.ai.projects.aio import AIProjectClient
7+
from azure.cosmos import CosmosClient
78
from azure.identity import DefaultAzureCredential, ManagedIdentityCredential
89
from dotenv import load_dotenv
10+
from semantic_kernel import Kernel
911

1012
# Load environment variables from .env file
1113
load_dotenv()
@@ -52,9 +54,9 @@ def __init__(self):
5254
)
5355
self.AZURE_OPENAI_ENDPOINT = self._get_required("AZURE_OPENAI_ENDPOINT")
5456
self.REASONING_MODEL_NAME = self._get_optional("REASONING_MODEL_NAME", "o3")
55-
self.AZURE_BING_CONNECTION_NAME = self._get_optional(
56-
"AZURE_BING_CONNECTION_NAME"
57-
)
57+
# self.AZURE_BING_CONNECTION_NAME = self._get_optional(
58+
# "AZURE_BING_CONNECTION_NAME"
59+
# )
5860
self.SUPPORTED_MODELS = self._get_optional("SUPPORTED_MODELS")
5961
# Frontend settings
6062
self.FRONTEND_SITE_NAME = self._get_optional(
@@ -82,7 +84,7 @@ def __init__(self):
8284
self.AZURE_AI_SEARCH_INDEX_NAME = self._get_optional("AZURE_AI_SEARCH_INDEX_NAME")
8385
self.AZURE_AI_SEARCH_ENDPOINT = self._get_optional("AZURE_AI_SEARCH_ENDPOINT")
8486
self.AZURE_AI_SEARCH_API_KEY = self._get_optional("AZURE_AI_SEARCH_API_KEY")
85-
self.BING_CONNECTION_NAME = self._get_optional("BING_CONNECTION_NAME")
87+
# self.BING_CONNECTION_NAME = self._get_optional("BING_CONNECTION_NAME")
8688

8789
test_team_json = self._get_optional("TEST_TEAM_JSON")
8890

@@ -125,7 +127,7 @@ def get_azure_credentials(self):
125127
async def get_access_token(self) -> str:
126128
"""Get Azure access token for API calls."""
127129
try:
128-
credential = self.get_azure_credentials(self.AZURE_CLIENT_ID)
130+
credential = self.get_azure_credentials()
129131
token = credential.get_token(self.AZURE_COGNITIVE_SERVICES)
130132
return token.token
131133
except Exception as e:
@@ -190,7 +192,7 @@ def get_cosmos_database_client(self):
190192
try:
191193
if self._cosmos_client is None:
192194
self._cosmos_client = CosmosClient(
193-
self.COSMOSDB_ENDPOINT, credential=get_azure_credential(self.AZURE_CLIENT_ID)
195+
self.COSMOSDB_ENDPOINT, credential=self.get_azure_credential(self.AZURE_CLIENT_ID)
194196
)
195197

196198
if self._cosmos_database is None:
@@ -227,7 +229,7 @@ def get_ai_project_client(self):
227229
return self._ai_project_client
228230

229231
try:
230-
credential = get_azure_credential(self.AZURE_CLIENT_ID)
232+
credential = self.get_azure_credential(self.AZURE_CLIENT_ID)
231233
if credential is None:
232234
raise RuntimeError(
233235
"Unable to acquire Azure credentials; ensure Managed Identity is configured"

src/backend/common/utils/utils_kernel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ async def create_RAI_agent() -> FoundryAgentTemplate:
4040
model_deployment_name=model_deployment_name,
4141
enable_code_interpreter=False,
4242
mcp_config=None,
43-
bing_config=None,
43+
#bing_config=None,
4444
search_config=None
4545
)
4646

0 commit comments

Comments
 (0)