Skip to content

Updating to support latest ai projects module and add additional locations #7

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
eamonoreilly merged 3 commits into from
Apr 21, 2025
Merged

Updating to support latest ai projects module and add additional locations #7

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
54794e1
Updating location options and also using queue output binding
eamonoreilly Apr 17, 2025
8ea978a
Updating code for breaking changes in latest azure-ai-projects module
eamonoreilly Apr 17, 2025
51203a5
Updating readme to reflect breaking changes in lastest ai projects mo…
eamonoreilly Apr 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
18 changes: 11 additions & 7 deletions app/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,9 @@ message = project_client.agents.create_message(
print(f"Created message, message ID: {message.id}")

# Run the agent
run = project_client.agents.create_run(thread_id=thread.id, assistant_id=agent.id)
# Monitor and process the run status. The function call should be placed on the input queue by the Agent service for the Azure Function to pick up when requires_action is returned
run = project_client.agents.create_run(thread_id=thread.id, agent_id=agent.id)
# Monitor and process the run status. The function call will be placed on the input queue by the Agent service for the Azure Function to pick up when requires_action is returned
# The agent will then pick up the message that the queue trigger function returned in the output queue and complete
while run.status in ["queued", "in_progress", "requires_action"]:
time.sleep(1)
run = project_client.agents.get_run(thread_id=thread.id, run_id=run.id)
Expand All @@ -144,13 +145,16 @@ print(f"Run finished with status: {run.status}")

```python
# Get messages from the assistant thread
messages = project_client.agents.get_messages(thread_id=thread.id)
messages = project_client.agents.list_messages(thread_id=thread.id)
print(f"Messages: {messages}")

# Get the last message from the assistant
last_msg = messages.get_last_text_message_by_sender("assistant")
if last_msg:
print(f"Last Message: {last_msg.text.value}")
# Get the last message from the agent
last_msg = None
for data_point in messages.data:
if data_point.role == "assistant":
last_msg = data_point.content[-1]
print(f"Last Message: {last_msg.text.value}")
break

# Delete the agent once done
project_client.agents.delete_agent(agent.id)
Expand Down
35 changes: 15 additions & 20 deletions app/function_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def prompt(req: func.HttpRequest) -> func.HttpResponse:
logging.info(f"Created message, message ID: {message.id}")

# Run the agent
run = project_client.agents.create_run(thread_id=thread.id, assistant_id=agent.id)
run = project_client.agents.create_run(thread_id=thread.id, agent_id=agent.id)
# Monitor and process the run status
while run.status in ["queued", "in_progress", "requires_action"]:
time.sleep(1)
Expand All @@ -106,15 +106,18 @@ def prompt(req: func.HttpRequest) -> func.HttpResponse:
if run.status == "failed":
logging.error(f"Run failed: {run.last_error}")

# Get messages from the assistant thread
messages = project_client.agents.get_messages(thread_id=thread.id)
logging.info(f"Messages: {messages}")

# Get the last message from the assistant
last_msg = messages.get_last_text_message_by_sender("assistant")
if last_msg:
logging.info(f"Last Message: {last_msg.text.value}")
messages = project_client.agents.list_messages(thread_id=thread.id)
logging.info(f"Messages: {messages}")

# Get the last message from the agent
last_msg = None
for data_point in messages.data:
if data_point.role == "assistant":
last_msg = data_point.content[-1]
logging.info(f"Last Message: {last_msg.text.value}")
break

# Delete the agent once done
project_client.agents.delete_agent(agent.id)
print("Deleted agent")
Expand All @@ -123,19 +126,11 @@ def prompt(req: func.HttpRequest) -> func.HttpResponse:

# Function to get the weather
@app.function_name(name="GetWeather")
@app.queue_trigger(arg_name="msg", queue_name="input", connection="STORAGE_CONNECTION")
def process_queue_message(msg: func.QueueMessage) -> None:
@app.queue_output(arg_name="outputQueueItem", queue_name=output_queue_name, connection="STORAGE_CONNECTION")
@app.queue_trigger(arg_name="msg", queue_name=input_queue_name, connection="STORAGE_CONNECTION")
def process_queue_message(msg: func.QueueMessage, outputQueueItem: func.Out[str]) -> None:
logging.info('Python queue trigger function processed a queue item')

# Queue to send message to
queue_client = QueueClient(
os.environ["STORAGE_CONNECTION__queueServiceUri"],
queue_name="output",
credential=DefaultAzureCredential(),
message_encode_policy=BinaryBase64EncodePolicy(),
message_decode_policy=BinaryBase64DecodePolicy()
)

messagepayload = json.loads(msg.get_body().decode('utf-8'))
location = messagepayload['location']
correlation_id = messagepayload['CorrelationId']
Expand All @@ -145,6 +140,6 @@ def process_queue_message(msg: func.QueueMessage) -> None:
'Value': 'Weather is 74 degrees and sunny in ' + location,
'CorrelationId': correlation_id
}
queue_client.send_message(json.dumps(result_message).encode('utf-8'))
outputQueueItem.set(json.dumps(result_message).encode('utf-8'))

logging.info(f"Sent message to queue: {input_queue_name} with message {result_message}")
10 changes: 4 additions & 6 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ param environmentName string

@minLength(1)
@description('Primary location for all resources')
@allowed(['eastus', 'westus2'])
@allowed(['australiaeast', 'eastus', 'eastus2', 'southcentralus', 'southeastasia', 'uksouth'])
@metadata({
azd: {
type: 'location'
}
})
param location string = 'eastus'

param location string

@description('Skip the creation of the virtual network and private endpoint')
param skipVnet bool = true
Expand Down Expand Up @@ -89,9 +90,6 @@ param modelSkuName string = 'GlobalStandard'
@description('Model deployment capacity')
param modelCapacity int = 50

@description('Model deployment location. If you want to deploy an Azure AI resource/model in different location than the rest of the resources created.')
param modelLocation string = 'eastus'

@description('The AI Service Account full ARM Resource ID. This is an optional field, and if not provided, the resource will be created.')
param aiServiceAccountResourceId string = ''

Expand Down Expand Up @@ -193,7 +191,7 @@ module aiDependencies './agent/standard-dependent-resources.bicep' = {
modelVersion: modelVersion
modelSkuName: modelSkuName
modelCapacity: modelCapacity
modelLocation: modelLocation
modelLocation: location

aiServiceAccountResourceId: aiServiceAccountResourceId
aiSearchServiceResourceId: aiSearchServiceResourceId
Expand Down