Skip to content

Commit

Permalink
Merge branch 'main' into contentunderdocx
Browse files Browse the repository at this point in the history
  • Loading branch information
pamelafox authored Jan 9, 2025
2 parents c3aeeab + e0c6e87 commit c3f156e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,7 @@ You can find extensive documentation in the [docs](docs/README.md) folder:

### Resources

- [📖 Docs: Get started using the chat with your data sample](https://learn.microsoft.com/azure/developer/python/get-started-app-chat-template?toc=%2Fazure%2Fdeveloper%2Fai%2Ftoc.json&bc=%2Fazure%2Fdeveloper%2Fai%2Fbreadcrumb%2Ftoc.json&tabs=github-codespaces)
- [📖 Blog: Revolutionize your Enterprise Data with ChatGPT: Next-gen Apps w/ Azure OpenAI and AI Search](https://techcommunity.microsoft.com/blog/azure-ai-services-blog/revolutionize-your-enterprise-data-with-chatgpt-next-gen-apps-w-azure-openai-and/3762087)
- [📖 Docs: Azure AI Search](https://learn.microsoft.com/azure/search/search-what-is-azure-search)
- [📖 Docs: Azure OpenAI Service](https://learn.microsoft.com/azure/cognitive-services/openai/overview)
Expand Down
2 changes: 1 addition & 1 deletion app/backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ msal==1.30.0
# msal-extensions
msal-extensions==1.2.0
# via azure-identity
msgraph-core==1.1.8
msgraph-core==1.1.7
# via msgraph-sdk
msgraph-sdk==1.16.0
# via -r requirements.in
Expand Down
9 changes: 4 additions & 5 deletions app/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"dompurify": "^3.2.0",
"i18next": "^24.2.0",
"i18next-browser-languagedetector": "^8.0.0",
"i18next-http-backend": "^2.5.2",
"i18next-http-backend": "^3.0.1",
"idb": "^8.0.0",
"ndjson-readablestream": "^1.2.0",
"react": "^18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion docs/azd.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The `azd up` command uses the `azure.yaml` file combined with the infrastructure

Next, it provisions the resources based on `main.bicep` and `main.parameters.json`. At that point, since there is no default value for the OpenAI resource location, it asks you to pick a location from a short list of available regions. Then it will send requests to Azure to provision all the required resources. With everything provisioned, it runs the `postprovision` hook to process the local data and add it to an Azure AI Search index.

Finally, it looks at `azure.yaml` to determine the Azure host (appservice, in this case) and uploads the zip to Azure App Service. The `azd up` command is now complete, but it may take another 5-10 minutes for the App Service app to be fully available and working, especially for the initial deploy.
Finally, it looks at `azure.yaml` to determine the Azure host and uploads the zip to Azure App Service. The `azd up` command is now complete, but it may take another 5-10 minutes for the App Service app to be fully available and working, especially for the initial deploy.

Related commands are `azd provision` for just provisioning (if infra files change) and `azd deploy` for just deploying updated app code.

Expand Down

0 comments on commit c3f156e

Please sign in to comment.