[PR #76] [CLOSED] fix: order of environment injection using config file #167

New issue

Closed

opened 2026-10-18 21:12:22 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-18 21:12:22 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/open-webui/mcpo/pull/76
Author: @alexhilgart
Created: 4/14/2025
Status: ❌ Closed

Base: dev ← Head: env_injection

📝 Commits (1)

3ad146e Change order of environment injection using config file

📊 Changes

1 file changed (+1 additions, -1 deletions)

View changed files

📝 src/mcpo/main.py (+1 -1)

📄 Description

Pull Request Checklist

Before submitting, make sure you've checked the following:

Target branch: Please verify that the pull request targets the dev branch.
Description: Provide a concise description of the changes made in this pull request.
Changelog: Ensure a changelog entry following the format of Keep a Changelog is added at the bottom of the PR description.
Dependencies: Are there any new dependencies? Have you updated the dependency versions in the documentation?
Testing: Have you written and run sufficient tests to validate the changes?
Code review: Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards?
Prefix: To clearly categorize this pull request, prefix the pull request title using one of the following:
- BREAKING CHANGE: Significant changes that may affect compatibility
- build: Changes that affect the build system or external dependencies
- ci: Changes to our continuous integration processes or workflows
- chore: Refactor, cleanup, or other non-functional code changes
- docs: Documentation update or addition
- feat: Introduces a new feature or enhancement to the codebase
- fix: Bug fix or error correction
- i18n: Internationalization or localization changes
- perf: Performance improvement
- refactor: Code restructuring for better maintainability, readability, or scalability
- style: Changes that do not affect the meaning of the code (white space, formatting, missing semi-colons, etc.)
- test: Adding missing tests or correcting existing tests
- WIP: Work in progress, a temporary label for incomplete or ongoing work

Changelog Entry

Description

This change updates the order of merging environment variables in sub_app.state.env, giving precedence to values from the system environment (os.environ) over those defined in the server configuration file (server_cfg["env"]).

The motivation for this change is:

It allows placeholder values (e.g., API keys) to be specified in the config file, which can then be safely committed to version control.
These placeholder values can be dynamically overridden at runtime using the --env or --env-path arguments, ensuring that secrets are not exposed in committed files while still enabling flexible configuration.

Fixed

Fixes the order of merging dictionaries in sub_app.state.env to prioritize environment variables from os.environ over those from server_cfg (closes #66)

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/open-webui/mcpo/pull/76 **Author:** [@alexhilgart](https://github.com/alexhilgart) **Created:** 4/14/2025 **Status:** ❌ Closed **Base:** `dev` ← **Head:** `env_injection` --- ### 📝 Commits (1) - [`3ad146e`](https://github.com/open-webui/mcpo/commit/3ad146e781eeb7d9f57418e5db6aad83fc1f7bc9) Change order of environment injection using config file ### 📊 Changes **1 file changed** (+1 additions, -1 deletions) <details> <summary>View changed files</summary> 📝 `src/mcpo/main.py` (+1 -1) </details> ### 📄 Description # Pull Request Checklist **Before submitting, make sure you've checked the following:** - [x] **Target branch:** Please verify that the pull request targets the `dev` branch. - [x] **Description:** Provide a concise description of the changes made in this pull request. - [x] **Changelog:** Ensure a changelog entry following the format of [Keep a Changelog](https://keepachangelog.com/) is added at the bottom of the PR description. - [ ] **Dependencies:** Are there any new dependencies? Have you updated the dependency versions in the documentation? - [ ] **Testing:** Have you written and run sufficient tests to validate the changes? - [x] **Code review:** Have you performed a self-review of your code, addressing any coding standard issues and ensuring adherence to the project's coding standards? - [x] **Prefix:** To clearly categorize this pull request, prefix the pull request title using one of the following: - **BREAKING CHANGE**: Significant changes that may affect compatibility - **build**: Changes that affect the build system or external dependencies - **ci**: Changes to our continuous integration processes or workflows - **chore**: Refactor, cleanup, or other non-functional code changes - **docs**: Documentation update or addition - **feat**: Introduces a new feature or enhancement to the codebase - **fix**: Bug fix or error correction - **i18n**: Internationalization or localization changes - **perf**: Performance improvement - **refactor**: Code restructuring for better maintainability, readability, or scalability - **style**: Changes that do not affect the meaning of the code (white space, formatting, missing semi-colons, etc.) - **test**: Adding missing tests or correcting existing tests - **WIP**: Work in progress, a temporary label for incomplete or ongoing work # Changelog Entry ### Description - This change updates the order of merging environment variables in sub_app.state.env, giving precedence to values from the system environment (`os.environ`) over those defined in the server configuration file (`server_cfg["env"]`). The motivation for this change is: - It allows placeholder values (e.g., API keys) to be specified in the config file, which can then be safely committed to version control. - These placeholder values can be dynamically overridden at runtime using the `--env` or `--env-path` arguments, ensuring that secrets are not exposed in committed files while still enabling flexible configuration. ### Fixed - Fixes the order of merging dictionaries in `sub_app.state.env` to prioritize environment variables from `os.environ` over those from `server_cfg` (closes #66) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-18 21:12:22 +00:00