rollback change to env vars until extension ready, fix bing grounding (#367)

Author: jfomhover

samples/microsoft/python/getting-started-agents/hosted-agents/calculator-agent/agent.yaml

@@ -21,7 +21,8 @@ template:
     - name: APPLICATIONINSIGHTS_CONNECTION_STRING
       value: ${APPLICATIONINSIGHTS_CONNECTION_STRING}
     - name: AZURE_AI_MODEL_DEPLOYMENT_NAME
-      value: "{{chat}}"
+      value: "gpt-4o-mini"
+      # value: "{{chat}}"
 resources:
   - kind: model
     id: gpt-4o-mini

samples/microsoft/python/getting-started-agents/hosted-agents/msft-docs-agent/agent.yaml

@@ -16,7 +16,8 @@ template:
     - name: AZURE_AI_PROJECT_ENDPOINT
       value: ${AZURE_AI_PROJECT_ENDPOINT}
     - name: AZURE_AI_MODEL_DEPLOYMENT_NAME
-      value: "{{chat}}"
+      value: "gpt-4o-mini"
+      # value: "{{chat}}"
 resources:
   - kind: model
     id: gpt-4o-mini

samples/microsoft/python/getting-started-agents/hosted-agents/web-search-agent/agent.yaml

@@ -19,12 +19,11 @@ template:
   environment_variables:
     - name: AZURE_AI_PROJECT_ENDPOINT
       value: ${AZURE_AI_PROJECT_ENDPOINT}
-    - name: AI_FOUNDRY_PROJECT_RESOURCE_ID
-      value: ${AI_FOUNDRY_PROJECT_RESOURCE_ID}
-    - name: BING_GROUNDING_CONNECTION_NAME
-      value: ${BING_GROUNDING_CONNECTION_NAME}
+    - name: BING_GROUNDING_CONNECTION_ID
+      value: ${BING_GROUNDING_CONNECTION_ID}
     - name: AZURE_AI_MODEL_DEPLOYMENT_NAME
-      value: "{{chat}}"
+      value: "gpt-4o-mini"
+    # value: "{{chat}}"
 resources:
   - kind: model
     id: gpt-4o-mini

samples/microsoft/python/getting-started-agents/hosted-agents/web-search-agent/main.py

@@ -10,14 +10,11 @@ def get_agent() -> ChatAgent:
     assert "AZURE_AI_PROJECT_ENDPOINT" in os.environ, (
         "AZURE_AI_PROJECT_ENDPOINT environment variable must be set."
     )
-    assert "AI_FOUNDRY_PROJECT_RESOURCE_ID" in os.environ, (
-        "AI_FOUNDRY_PROJECT_RESOURCE_ID environment variable must be set."
-    )
     assert "AZURE_AI_MODEL_DEPLOYMENT_NAME" in os.environ, (
         "AZURE_AI_MODEL_DEPLOYMENT_NAME environment variable must be set."
     )
-    assert "BING_GROUNDING_CONNECTION_NAME" in os.environ, (
-        "BING_GROUNDING_CONNECTION_NAME environment variable must be set to use HostedWebSearchTool."
+    assert "BING_GROUNDING_CONNECTION_ID" in os.environ, (
+        "BING_GROUNDING_CONNECTION_ID environment variable must be set to use HostedWebSearchTool."
     )
 
     chat_client = AzureAIAgentClient(
@@ -30,7 +27,7 @@ def get_agent() -> ChatAgent:
     bing_search_tool = HostedWebSearchTool(
         name="Bing Grounding Search",
         description="Search the web for current information using Bing",
-        connection_id=os.environ["AI_FOUNDRY_PROJECT_RESOURCE_ID"]+"/connections/" + os.environ["BING_GROUNDING_CONNECTION_NAME"],
+        connection_id=os.environ["BING_GROUNDING_CONNECTION_ID"],
     )
 
     # Create ChatAgent with the Bing search tool