Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
db8eabf
Migrate rag function to api
Pavan-Microsoft Mar 17, 2025
9158a44
Migrate chart function to api
Pavan-Microsoft Mar 18, 2025
228ec00
requirement.txt for backend
Pavan-Microsoft Mar 18, 2025
6ba6f97
backend user for sql db
Pavan-Microsoft Mar 19, 2025
99e0da7
backend deploy to app service
Pavan-Microsoft Mar 20, 2025
e91c061
move frontend folder
Pavan-Microsoft Mar 20, 2025
958da3f
Restructure folderstructure
Pavan-Microsoft Mar 21, 2025
bcd0f4d
fix await issue
Pavan-Microsoft Mar 21, 2025
1a95261
layout api
Pavan-Microsoft Mar 21, 2025
3bad50c
bicep changes for frontend
Pavan-Microsoft Mar 21, 2025
d9e0706
restructure folder
Pavan-Microsoft Mar 21, 2025
ffe326b
remove unused files
Pavan-Microsoft Mar 21, 2025
931158f
main.json file
Pavan-Microsoft Mar 21, 2025
f5b5b34
fix userassigned identity issue fix
Pavan-Microsoft Mar 21, 2025
6f12065
chat history migration
Pavan-Microsoft Mar 24, 2025
f159e42
logger
Pavan-Microsoft Mar 24, 2025
98c8886
change path in pylint.yml
Pavan-Microsoft Mar 24, 2025
8def8c6
frontend mirgration fixed
Rohini-Microsoft Mar 25, 2025
7b42976
Merge branch 'psl-pk-dev-api-migration' of https://github.com/microso…
Rohini-Microsoft Mar 25, 2025
c277c98
fixed typo
Rohini-Microsoft Mar 25, 2025
c8f2f26
Update main.bicep
Pavan-Microsoft Mar 25, 2025
9596f77
Update main.json
Pavan-Microsoft Mar 25, 2025
b357653
Update App.tsx
Pavan-Microsoft Mar 25, 2025
363043f
Update cosmosdb_service.py
Pavan-Microsoft Mar 25, 2025
ec179e9
Update history_service.py
Pavan-Microsoft Mar 25, 2025
6669354
webapp docker related changes
Pavan-Microsoft Mar 25, 2025
b795f1b
correct env path
Pavan-Microsoft Mar 25, 2025
b59b65c
Fix pylint issues
Pavan-Microsoft Mar 26, 2025
a478a15
pylint issues
Pavan-Microsoft Mar 26, 2025
3fb4e07
fix pylint in chatservice
Pavan-Microsoft Mar 26, 2025
13f9407
bicep name correction
Pavan-Microsoft Mar 26, 2025
95827f7
fixed layout config json parsing issue
Rohini-Microsoft Mar 26, 2025
719a255
removed base url from auth
Rohini-Microsoft Mar 26, 2025
cfd0790
Fix authentication issue
Pavan-Microsoft Mar 26, 2025
1a35805
caching for threadid
Pavan-Microsoft Mar 27, 2025
ebaad54
fix pylint issue
Pavan-Microsoft Mar 27, 2025
7fe00ec
restructure frontendcode
Pavan-Microsoft Mar 27, 2025
ded992b
update image tag for testing
Pavan-Microsoft Mar 27, 2025
234eb02
fix streaming issue
Pavan-Microsoft Mar 28, 2025
fffeed0
update gitignore
Pavan-Microsoft Mar 28, 2025
d306b58
start.cmd changes
Pavan-Microsoft Mar 28, 2025
aa938c0
Updated start.cmd and start.sh
Pavan-Microsoft Mar 28, 2025
fcac902
Merge pull request #328 from microsoft/main
Pavan-Microsoft Apr 1, 2025
6ffcab4
Merge branch 'psl-pk-dev-api-migration' of https://github.com/microso…
Pavan-Microsoft Apr 1, 2025
7ee7df0
Use keyvault for secrets
Pavan-Microsoft Apr 1, 2025
dbf4cc1
fix APP_API_BASE_URL
Pavan-Microsoft Apr 1, 2025
6215c5a
Merge pull request #329 from microsoft/psl-pk-migra-km
Avijit-Microsoft Apr 1, 2025
2c1adb2
Update Tag in Validate Deployment - KM Generic
Pavan-Microsoft Apr 1, 2025
56147fb
fix: Update Tag in Validate Deployment - KM Generic
Avijit-Microsoft Apr 2, 2025
a297572
handle rate limit from backend
Pavan-Microsoft Apr 3, 2025
2560762
HostingPlanSku
Pavan-Microsoft Apr 3, 2025
294159c
handled rate limit error frontend
Rohini-Microsoft Apr 4, 2025
3a733f6
Merge branch 'psl-pk-ratelimit' of https://github.com/microsoft/Conve…
Rohini-Microsoft Apr 4, 2025
78f334d
Add files via upload
Thanusree-Microsoft Apr 4, 2025
27d232f
Add files via upload
Thanusree-Microsoft Apr 4, 2025
9d12bb9
fix pylint issue
Pavan-Microsoft Apr 4, 2025
d90a7df
fixed rate limit error
Rohini-Microsoft Apr 4, 2025
3e2a688
docs: Updated architecture image
Avijit-Microsoft Apr 4, 2025
92afdc8
hosting plan changes in main.json
Pavan-Microsoft Apr 4, 2025
a97e3d2
Merge pull request #351 from microsoft/psl-pk-ratelimit
Avijit-Microsoft Apr 4, 2025
3d68c5f
fix Test Workflow
Pavan-Microsoft Apr 4, 2025
9c397cd
Merge pull request #352 from microsoft/psl-pk-ratelimit
Avijit-Microsoft Apr 4, 2025
7ca4ce9
Update azure.yaml - remove deployment section
Pavan-Microsoft Apr 7, 2025
49a9fb0
fix: Remove parameters and deployment configuration in azure.yaml
Avijit-Microsoft Apr 7, 2025
a7c3f37
fixed question typed in chatbox is getting removed automatically
Rohini-Microsoft Apr 10, 2025
83c5cdc
fix: While the response is getting generated, question typed in chat…
Avijit-Microsoft Apr 10, 2025
184e63d
truncate sql message
Pavan-Microsoft Apr 15, 2025
9f3c92d
updated main.json
Pavan-Microsoft Apr 15, 2025
e74a88b
fix: Removing the dependency on Azure Key Vault & Truncate SQL response
Avijit-Microsoft Apr 15, 2025
2680ad8
AI Agent with plugins
Pavan-Microsoft Apr 15, 2025
8131697
truncation_strategy
Pavan-Microsoft Apr 16, 2025
367f233
ai developer role for api
Pavan-Microsoft Apr 16, 2025
a4d2031
remove print statement
Pavan-Microsoft Apr 16, 2025
4cc4ef7
Fix pylint
Pavan-Microsoft Apr 16, 2025
b3a7e46
Fix ratelimit error
Pavan-Microsoft Apr 16, 2025
41b80ff
fix pylint issue
Pavan-Microsoft Apr 16, 2025
00423e9
DISPLAY_CHART_DEFAULT set to false
Pavan-Microsoft Apr 16, 2025
8b19e39
Merge branch 'dev' of https://github.com/microsoft/Conversation-Knowl…
Pavan-Microsoft Apr 16, 2025
6cf9d74
feat: Use AI agent with plugins
Avijit-Microsoft Apr 16, 2025
293d83f
Merge branch 'main' of https://github.com/microsoft/Conversation-Know…
Pavan-Microsoft Apr 16, 2025
c339a5a
Merge pull request #365 from microsoft/psl-pk-downmergedevfrommain
Avijit-Microsoft Apr 16, 2025
08bdd09
fix codeQL issue
Pavan-Microsoft Apr 16, 2025
46000c3
Merge branch 'dev' of https://github.com/microsoft/Conversation-Knowl…
Pavan-Microsoft Apr 16, 2025
aafbe22
Merge pull request #367 from microsoft/psl-pk-aiagentPlugin
Avijit-Microsoft Apr 16, 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
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ updates:
open-pull-requests-limit: 100

- package-ecosystem: "pip"
directory: "/src/App"
directory: "/src/api"
schedule:
interval: "monthly"
commit-message:
Expand All @@ -20,7 +20,7 @@ updates:
open-pull-requests-limit: 100

- package-ecosystem: "npm"
directory: "/src/App/frontend"
directory: "/src/App"
schedule:
interval: "monthly"
commit-message:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-KMGeneric.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:

- name: Determine Tag Name Based on Branch
id: determine_tag
run: echo "tagname=${{ github.ref_name == 'main' && 'latest' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || 'default' }}" >> $GITHUB_OUTPUT
run: echo "tagname=${{ github.ref_name == 'main' && 'latest_migrated' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || 'default' }}" >> $GITHUB_OUTPUT

- name: Deploy Bicep Template
id: deploy
Expand Down
22 changes: 6 additions & 16 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
id: determine_tag
run: |
if [[ "${{ github.ref_name }}" == "main" ]]; then
echo "tagname=latest" >> $GITHUB_OUTPUT
echo "tagname=latest_migrated" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "dev" ]]; then
echo "tagname=dev" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "demo" ]]; then
Expand All @@ -70,22 +70,12 @@ jobs:
${{ secrets.ACR_LOGIN_SERVER }}/km-app:${{ steps.determine_tag.outputs.tagname }}
${{ secrets.ACR_LOGIN_SERVER }}/km-app:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}

- name: Build and Push Docker Image for km-rag-function
- name: Build and Push Docker Image for api
uses: docker/build-push-action@v6
with:
context: ./src/api/km-rag-function
file: ./src/api/km-rag-function/Dockerfile
context: ./src/api
file: ./src/api/ApiApp.Dockerfile
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
tags: |
${{ secrets.ACR_LOGIN_SERVER }}/km-rag-function:${{ steps.determine_tag.outputs.tagname }}
${{ secrets.ACR_LOGIN_SERVER }}/km-rag-function:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}

- name: Build and Push Docker Image for km-charts-function
uses: docker/build-push-action@v6
with:
context: ./src/api/km-charts-function
file: ./src/api/km-charts-function/Dockerfile
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
tags: |
${{ secrets.ACR_LOGIN_SERVER }}/km-charts-function:${{ steps.determine_tag.outputs.tagname }}
${{ secrets.ACR_LOGIN_SERVER }}/km-charts-function:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
${{ secrets.ACR_LOGIN_SERVER }}/km-api:${{ steps.determine_tag.outputs.tagname }}
${{ secrets.ACR_LOGIN_SERVER }}/km-api:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
4 changes: 2 additions & 2 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r src/App/requirements.txt
pip install -r src/api/requirements.txt
pip install flake8 # Ensure flake8 is installed explicitly

- name: Run flake8 and pylint
run: |
flake8 --config=.flake8 src/App/backend # Specify the directory to lint
flake8 --config=.flake8 src/api # Specify the directory to lint
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ jobs:
- name: Install Backend Dependencies
run: |
python -m pip install --upgrade pip
pip install -r src/App/requirements.txt
pip install -r src/api/requirements.txt
pip install pytest-cov
pip install pytest-asyncio

- name: Check if Backend Test Files Exist
id: check_backend_tests
run: |
if [ -z "$(find src/App/backend -type f -name 'test_*.py')" ]; then
if [ -z "$(find src/api -type f -name 'test_*.py')" ]; then
echo "No backend test files found, skipping backend tests."
echo "skip_backend_tests=true" >> $GITHUB_ENV
else
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
################################################################################
# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
################################################################################
*.env
*.venv
*.vscode
*.vs
Expand All @@ -10,3 +9,4 @@
/LUISSchemaSerializationTool/LUISSchemaSerializationTool/obj
.fake
.azure
.idea
Binary file modified docs/Images/ReadMe/ckm-sol-arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions infra/deploy_ai_foundry.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -701,3 +701,5 @@ output aiProjectName string = aiHubProject.name
output applicationInsightsId string = applicationInsights.id
output logAnalyticsWorkspaceResourceName string = logAnalytics.name
output storageAccountName string = storageNameCleaned

output azureOpenAIKeyName string = azureOpenAIApiKeyEntry.name
Loading
Loading