Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
91ce3ed
Merge pull request #579 from microsoft/dev
Roopan-Microsoft May 20, 2026
8033e01
Merge pull request #600 from microsoft/dev
Roopan-Microsoft May 25, 2026
4113db3
chore: dev to main merge
Avijit-Microsoft Jun 11, 2026
b47cec4
Merge pull request #623 from microsoft/dev
Roopan-Microsoft Jun 16, 2026
1ceafb4
Add swedencentral region, explicit dependsOn for private endpoint, im…
Ashwal-Microsoft Jun 16, 2026
0137481
Fix quota check to use effective deployment capacity and region fallback
Ashwal-Microsoft Jun 16, 2026
5c12ef5
Add swedencentral replica region pairing for Log Analytics workspace …
Ashwal-Microsoft Jun 16, 2026
6c6ad96
chore: upgrade vulnerable packages (Python + NPM)
Ayaz-Microsoft Jun 17, 2026
4fd854e
Revert non-Bicep changes from recent infra commits
Ashwal-Microsoft Jun 17, 2026
03c64a9
Regenerate main.json from main.bicep
Ashwal-Microsoft Jun 17, 2026
6fdac2e
Regenerate main.json using Bicep v0.44.1
Ashwal-Microsoft Jun 17, 2026
7f770ae
Merge pull request #628 from microsoft/Ash17-Bicep17-Changes17
Roopan-Microsoft Jun 17, 2026
e978828
Merge pull request #629 from microsoft/feature/dependabot-june2026-06…
Roopan-Microsoft Jun 18, 2026
0b81084
chore: update pydantic-settings to version 2.14.2 in pyproject.toml a…
Dhanushree-Microsoft Jun 25, 2026
5aeb4f7
Fix CI failures: cap @babel/core to v7 and upgrade agent-framework to…
Dhanushree-Microsoft Jun 25, 2026
cb9a6d5
Potential fix for pull request finding
Dhanushree-Microsoft Jun 25, 2026
e81586f
Refactor code structure for improved readability and maintainability
Dhanushree-Microsoft Jun 25, 2026
6cf123c
Merge branch 'psl-congen24' of https://github.com/microsoft/content-p…
Dhanushree-Microsoft Jun 25, 2026
5be9a47
Downgrade agent-framework dependency from 1.9.0 to 1.3.0 in pyproject…
Dhanushree-Microsoft Jun 25, 2026
4d882fd
Upgrade agent-framework dependency from 1.3.0 to 1.9.0 in pyproject.t…
Dhanushree-Microsoft Jun 25, 2026
a6e7ef7
Update package.json and pnpm-lock.yaml to use caret (^) versioning fo…
Dhanushree-Microsoft Jun 25, 2026
48c93af
fix: update pydantic-settings to version 2.14.2 in pyproject.toml
Avijit-Microsoft Jun 26, 2026
cdfab8b
commit
Tejasri-Microsoft Jun 26, 2026
00f8f86
Merge pull request #638 from microsoft/psl-ts-hp-secu
Jun 26, 2026
3ca0180
Merge pull request #639 from microsoft/main
Avijit-Microsoft Jun 27, 2026
8d7c18f
chore: update CODEOWNERS handles
Rafi-Mohammad-69 Jun 29, 2026
cd89282
fix: downgrade agent-framework to version 1.3.0 in pyproject.toml and…
Dhanushree-Microsoft Jun 29, 2026
49d1a89
fix: add agent-framework-orchestrations dependency in pyproject.toml …
Dhanushree-Microsoft Jun 29, 2026
3547feb
Merge pull request #641 from microsoft/psl-cpdhmoh29
Avijit-Microsoft Jun 29, 2026
7f519a2
chore: update CODEOWNERS handles
Avijit-Microsoft Jun 29, 2026
d99e090
chore: Dev to Main
Avijit-Microsoft Jun 29, 2026
d4264fd
Create script to build and push image
chaudhariniraj Jul 2, 2026
e9422c0
revert unnecessary change
chaudhariniraj Jul 2, 2026
e43b016
Update the script
chaudhariniraj Jul 2, 2026
318391b
Revert unnecessary changes from main.parametres.json
chaudhariniraj Jul 3, 2026
9f9ae02
bicep build changes
chaudhariniraj Jul 3, 2026
98dac8c
Update deployment guide
chaudhariniraj Jul 3, 2026
3f69b91
update scripts
chaudhariniraj Jul 3, 2026
82a7711
resolve copilot comment
chaudhariniraj Jul 3, 2026
60197dc
Update image
chaudhariniraj Jul 3, 2026
201fc45
Update bicep build version
chaudhariniraj Jul 3, 2026
5614b5f
Merge pull request #648 from chaudhariniraj/psl-add-acr
Roopan-Microsoft Jul 3, 2026
b86fbae
Update acr script to handle WAF deployment
chaudhariniraj Jul 6, 2026
dc9941e
resolve copilot comment
chaudhariniraj Jul 6, 2026
113ef2a
Update container registry code
chaudhariniraj Jul 8, 2026
88918f8
Resolve Copilot comment
chaudhariniraj Jul 8, 2026
591debf
Merge pull request #649 from chaudhariniraj/psl-add-acr
Roopan-Microsoft Jul 8, 2026
5e09c5c
Update deployment script and azure.yaml
chaudhariniraj Jul 9, 2026
deab07d
Merge pull request #650 from chaudhariniraj/psl-add-acr
Roopan-Microsoft Jul 9, 2026
5cd9f6b
update azure.yaml file to show github issue URL before provisioning
NirajC3-Microsoft Jul 14, 2026
902fddb
update azure.yaml to add posix 1
NirajC3-Microsoft Jul 14, 2026
6b3661e
Resolve indentation issue
NirajC3-Microsoft Jul 14, 2026
796d3a0
Merge pull request #653 from microsoft/main
Avijit-Microsoft Jul 14, 2026
fcac335
Merge branch 'dev' into dev
chaudhariniraj Jul 14, 2026
ffa3a1c
Merge pull request #651 from chaudhariniraj/dev
Roopan-Microsoft Jul 15, 2026
6006d74
Update Owners ID for Vinay and Prajwal
NirajC3-Microsoft Jul 16, 2026
a9a3957
Merge pull request #654 from chaudhariniraj/main
Roopan-Microsoft Jul 16, 2026
e630f44
remove local deployment related files
Priyanka2-Microsoft Jul 17, 2026
af2fba0
Add posix in azure.yaml file
NirajC3-Microsoft Jul 17, 2026
60f352a
Merge pull request #660 from chaudhariniraj/dev
Roopan-Microsoft Jul 19, 2026
d1aef3b
Merge pull request #658 from Priyanka2-Microsoft/remove-local-deploym…
Roopan-Microsoft Jul 20, 2026
125bd2d
Merge pull request #661 from microsoft/dev
Avijit-Microsoft Jul 20, 2026
b02e8b9
Upgrade NGINX base image to version 1.28.3-8-azl3.0.20260722 in Docke…
KanchanN-Microsoft Jul 28, 2026
974ea08
Merge pull request #664 from microsoft/upgrade-dockerimage
Roopan-Microsoft Jul 30, 2026
b4f3d01
Merge pull request #665 from microsoft/dev
Prajwal-Microsoft Jul 30, 2026
c358599
Merge pull request #666 from microsoft/main
Prajwal-Microsoft Jul 30, 2026
9224231
Merge remote-tracking branch 'origin/dev' into dependabotchanges
Ayaz-Microsoft Jul 30, 2026
d1974fd
fix: dependabot critical/high security upgrades
Ayaz-Microsoft Jul 30, 2026
02526de
fixed dependabot high alerts
Ayaz-Microsoft Aug 4, 2026
5dc8956
fix: test pipelines and broken dependencies
Ayaz-Microsoft Aug 4, 2026
3bdc512
build: merge dependabotchanges dependency updates
Ayaz-Microsoft Aug 4, 2026
0c5b85a
chore: update moduleResolution in tsconfig.json to use 'bundler'
Ayaz-Microsoft Aug 4, 2026
cb8a6cc
fix: align Python dependency versions
Ayaz-Microsoft Aug 5, 2026
2589409
fixed recent dependabot vulnerabilities
Ayaz-Microsoft Aug 7, 2026
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
64 changes: 0 additions & 64 deletions .github/workflows/create-release.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ jobs:
- name: Install Workflow Dependencies
run: |
python -m pip install --upgrade pip
pip install -e src/ContentProcessorWorkflow
pip install pytest==9.0.2 pytest-cov==7.0.0 pytest-mock==3.15.1 pytest-asyncio==1.3.0
pip install uv==0.12.1
uv sync --locked --project src/ContentProcessorWorkflow

- name: Set PYTHONPATH
run: echo "PYTHONPATH=$PWD" >> $GITHUB_ENV
Expand All @@ -170,7 +170,7 @@ jobs:
if: env.skip_workflow_tests == 'false'
run: |
cd src/tests/ContentProcessorWorkflow
python -m pytest utils/ libs/application/ libs/azure/ libs/base/ services/ -k "not test_service_scope_get_service_not_registered and not test_app_context_scoped_service_different_in_different_scopes and not test_get_azure_credential_with_all_env_vars and not test_app_context_create_instance_with_dependencies and not test_log_error_minimal_params and not test_get_async_bearer_token_provider and not test_prompt_template_rendering and not test_application_base_with_explicit_env_path and not test_app_context_async_scope_lifecycle and not test_app_context_async_singleton_lifecycle and not test_configure_logging_with_file_handler and not test_log_error_with_context_and_extra_data and not test_join_url_variations and not test_parse_retry_after_numeric and not test_parse_retry_after_invalid" --ignore=libs/agent_framework --cov-config=.coveragerc --cov=../../ContentProcessorWorkflow/src --cov-report=xml --cov-report=term --cov-fail-under=80
uv run --locked --project ../../ContentProcessorWorkflow python -m pytest utils/ libs/application/ libs/azure/ libs/base/ services/ -k "not test_service_scope_get_service_not_registered and not test_app_context_scoped_service_different_in_different_scopes and not test_get_azure_credential_with_all_env_vars and not test_app_context_create_instance_with_dependencies and not test_log_error_minimal_params and not test_get_async_bearer_token_provider and not test_prompt_template_rendering and not test_application_base_with_explicit_env_path and not test_app_context_async_scope_lifecycle and not test_app_context_async_singleton_lifecycle and not test_configure_logging_with_file_handler and not test_log_error_with_context_and_extra_data and not test_join_url_variations and not test_parse_retry_after_numeric and not test_parse_retry_after_invalid" --ignore=libs/agent_framework --cov-config=.coveragerc --cov=../../ContentProcessorWorkflow/src --cov-report=xml --cov-report=term --cov-fail-under=80

- name: Skip Workflow Tests
if: env.skip_workflow_tests == 'true'
Expand Down
24 changes: 18 additions & 6 deletions azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,24 @@ metadata:
name: content-processinge@1.0

hooks:
postprovision:
posix:
shell: sh
run: sed -i 's/\r$//' ./infra/scripts/post_deployment.sh; bash ./infra/scripts/post_deployment.sh
interactive: true
preprovision:
windows:
run: |
Write-Host ""
Write-Host " ---------------------------------------------------------------------------------------------------" -ForegroundColor Yellow
Write-Host " Note: If deployment fails or you encounter an issue, please open an issue with the deployment logs." -ForegroundColor Yellow
Write-Host " https://github.com/microsoft/content-processing-solution-accelerator/issues" -ForegroundColor Cyan
Write-Host " ---------------------------------------------------------------------------------------------------" -ForegroundColor Yellow
Write-Host ""
shell: pwsh
run: ./infra/scripts/post_deployment.ps1
interactive: true
posix:
run: |
printf '\n'
printf '\033[33m ---------------------------------------------------------------------------------------------------\033[0m\n'
printf '\033[33m Note: If deployment fails or you encounter an issue, please open an issue with the deployment logs.\033[0m\n'
printf '\033[36m https://github.com/microsoft/content-processing-solution-accelerator/issues\033[0m\n'
printf '\033[33m ---------------------------------------------------------------------------------------------------\033[0m\n'
printf '\n'
shell: sh
interactive: true
76 changes: 0 additions & 76 deletions azure_custom.yaml

This file was deleted.

61 changes: 31 additions & 30 deletions docs/DeploymentGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,37 @@ azd up

## Step 5: Post-Deployment Configuration

### 5.1 Schema Registration (Automatic)
### 5.1 Run Post Deployment Scripts

1. Run the ACR build and push script from the project root. Use the appropriate command for your shell:

- For Bash (Linux/macOS/WSL):

```bash
bash infra/scripts/acr_build_push.sh
```

- For PowerShell (Windows):

```powershell
infra\scripts\acr_build_push.ps1
```

2. After the ACR build and push completes, run the post-deployment script:

- For Bash (Linux/macOS/WSL):

```bash
bash infra/scripts/post_deployment.sh
```

- For PowerShell (Windows):

```powershell
.\infra\scripts\post_deployment.ps1
```

### 5.2 Schema Registration (Automatic)

> Want to customize the schemas for your own documents? [Learn more about adding your own schemas here.](./CustomizeSchemaData.md)

Expand Down Expand Up @@ -506,32 +536,3 @@ Now that your deployment is complete and tested, explore these resources:
- 🐛 **Issues:** Check [Troubleshooting Guide](./TroubleShootingSteps.md)
- 💬 **Support:** Review [Support Guidelines](../SUPPORT.md)
- 🔧 **Development:** See [Contributing Guide](../CONTRIBUTING.md)

---

## Advanced: Deploy Local Changes

If you've made local modifications to the code and want to deploy them to Azure, follow these steps to swap the configuration files:

> **Note:** To set up and run the application locally for development, see the [Local Development Setup Guide](./LocalDevelopmentSetup.md).

### Step 1: Rename Azure Configuration Files

**In the root directory:**
1. Rename `azure.yaml` to `azure_custom2.yaml`
2. Rename `azure_custom.yaml` to `azure.yaml`

### Step 2: Rename Infrastructure Files

**In the `infra` directory:**
1. Rename `main.bicep` to `main_custom2.bicep`
2. Rename `main_custom.bicep` to `main.bicep`

### Step 3: Deploy Changes

Run the deployment command:
```shell
azd up
```

> **Note:** These custom files are configured to deploy your local code changes instead of pulling from the GitHub repository.
Loading
Loading