MindWorkAI/AI-Studio
MindWorkAI/AI-Studio
1
0
Fork 0
mirror of https://github.com/MindWorkAI/AI-Studio.git synced 2026-08-24 20:52:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved readability

Browse Source
This commit is contained in:
Thorsten Sommer 2026-05-28 21:44:48 +02:00
parent 34657b4820
commit c32ecfcc1b
Signed by untrusted user who does not match committer: tsommer
GPG Key ID: 371BBA77A02C0108
3 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/MindWork AI Studio/wwwroot/changelog/v26.6.1.md
View File

@ -1,2 +1,2 @@
# v26.6.1, build 241 (2026-06-xx xx:xx UTC) # v26.6.1, build 241 (2026-06-xx xx:xx UTC)
- Added support for up to 100,000 enterprise configuration slots, using fixed-width slot names such as `config00000` while keeping the existing first ten slot names compatible. - Added support for up to 100,000 enterprise configuration slots, using fixed-width slot names such as `config_00000` while keeping the existing first ten slot names compatible.

30
documentation/Enterprise IT.md
View File

@ -39,15 +39,15 @@ AI Studio supports loading multiple enterprise configurations simultaneously. Th
The preferred format is a fixed set of indexed pairs: The preferred format is a fixed set of indexed pairs:
- Registry values `config_id00000` to `config_id99999` together with `config_server_url00000` to `config_server_url99999` - Registry values `config_id_00000` to `config_id_99999` together with `config_server_url_00000` to `config_server_url_99999`
- Environment variables `MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID00000` to `MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID99999` together with `MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL00000` to `MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL99999` - Environment variables `MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID_00000` to `MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID_99999` together with `MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL_00000` to `MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL_99999`
- Policy files `config00000.yaml` to `config99999.yaml` - Policy files `config_00000.yaml` to `config_99999.yaml`
Each configuration ID must be a valid [GUID](https://en.wikipedia.org/wiki/Universally_unique_identifier#Globally_unique_identifier). Up to 100,000 indexed configuration slots are supported per device. Each configuration ID must be a valid [GUID](https://en.wikipedia.org/wiki/Universally_unique_identifier#Globally_unique_identifier). Up to 100,000 indexed configuration slots are supported per device.
If multiple configurations define the same setting, the first definition wins. For indexed pairs and policy files, the order is slot `00000`, then `00001`, and so on up to `99999`. If multiple configurations define the same setting, the first definition wins. For indexed pairs and policy files, the order is slot `00000`, then `00001`, and so on up to `99999`.
For backwards compatibility, the older slot names `0` to `9` are still supported. AI Studio also accepts other numeric slot suffixes with up to five digits. Slot suffixes are matched exactly, so `config_id1`, `config_id01`, and `config_id00001` are treated as separate slots. Use the five-digit format for new deployments. For backwards compatibility, the older slot names `0` to `9` without an underscore are still supported. AI Studio also accepts other numeric slot suffixes with up to five digits. Slot suffixes are matched exactly, so `config_id_1`, `config_id_01`, and `config_id_00001` are treated as separate slots. Use the five-digit format with an underscore for new deployments.
### Windows registry example ### Windows registry example
@ -57,10 +57,10 @@ The Windows registry path is:
Example values: Example values:
- `config_id00000` = `9072b77d-ca81-40da-be6a-861da525ef7b` - `config_id_00000` = `9072b77d-ca81-40da-be6a-861da525ef7b`
- `config_server_url00000` = `https://intranet.example.org/ai-studio/configuration` - `config_server_url_00000` = `https://intranet.example.org/ai-studio/configuration`
- `config_id10503` = `a1b2c3d4-e5f6-7890-abcd-ef1234567890` - `config_id_10503` = `a1b2c3d4-e5f6-7890-abcd-ef1234567890`
- `config_server_url10503` = `https://intranet.example.org/ai-studio/department-config` - `config_server_url_10503` = `https://intranet.example.org/ai-studio/department-config`
- `config_encryption_secret` = `BASE64...` - `config_encryption_secret` = `BASE64...`
This approach works well with GPOs because each slot can be managed independently without rewriting a shared combined string. This approach works well with GPOs because each slot can be managed independently without rewriting a shared combined string.
@ -87,10 +87,10 @@ The directories from `$XDG_CONFIG_DIRS` are processed in order.
Configuration files: Configuration files:
- `config00000.yaml` - `config_00000.yaml`
- `config00001.yaml` - `config_00001.yaml`
- ... - ...
- `config99999.yaml` - `config_99999.yaml`
Each configuration file contains one configuration ID and one server URL: Each configuration file contains one configuration ID and one server URL:
@ -112,10 +112,10 @@ config_encryption_secret: "BASE64..."
If you need the fallback environment-variable format, configure the values like this: If you need the fallback environment-variable format, configure the values like this:
```bash ```bash
MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID00000=9072b77d-ca81-40da-be6a-861da525ef7b MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID_00000=9072b77d-ca81-40da-be6a-861da525ef7b
MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL00000=https://intranet.example.org/ai-studio/configuration MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL_00000=https://intranet.example.org/ai-studio/configuration
MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID10503=a1b2c3d4-e5f6-7890-abcd-ef1234567890 MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID_10503=a1b2c3d4-e5f6-7890-abcd-ef1234567890
MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL10503=https://intranet.example.org/ai-studio/department-config MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL_10503=https://intranet.example.org/ai-studio/department-config
MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ENCRYPTION_SECRET=BASE64... MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ENCRYPTION_SECRET=BASE64...
``` ```

99
runtime/src/environment.rs
View File

@ -386,13 +386,11 @@ fn enterprise_environment_key_name(env_name: &str) -> Option<String> {
return Some(String::from("config_encryption_secret")); return Some(String::from("config_encryption_secret"));
} }
if let Some(suffix) = enterprise_env_key_suffix(env_name, ENTERPRISE_ENV_CONFIG_ID_PREFIX) if let Some(suffix) = enterprise_env_key_suffix(env_name, ENTERPRISE_ENV_CONFIG_ID_PREFIX) {
&& is_enterprise_slot_suffix(suffix) {
return Some(format!("config_id{suffix}")); return Some(format!("config_id{suffix}"));
} }
if let Some(suffix) = enterprise_env_key_suffix(env_name, ENTERPRISE_ENV_CONFIG_SERVER_URL_PREFIX) if let Some(suffix) = enterprise_env_key_suffix(env_name, ENTERPRISE_ENV_CONFIG_SERVER_URL_PREFIX) {
&& is_enterprise_slot_suffix(suffix) {
return Some(format!("config_server_url{suffix}")); return Some(format!("config_server_url{suffix}"));
} }
@ -417,7 +415,7 @@ fn enterprise_env_key_suffix<'a>(env_name: &'a str, prefix: &str) -> Option<&'a
let (raw_prefix, suffix) = env_name.split_at(prefix.len()); let (raw_prefix, suffix) = env_name.split_at(prefix.len());
if raw_prefix.eq_ignore_ascii_case(prefix) { if raw_prefix.eq_ignore_ascii_case(prefix) {
Some(suffix) normalize_enterprise_slot_suffix(suffix)
} else { } else {
None None
} }
@ -425,7 +423,9 @@ fn enterprise_env_key_suffix<'a>(env_name: &'a str, prefix: &str) -> Option<&'a
#[cfg(not(target_os = "windows"))] #[cfg(not(target_os = "windows"))]
fn enterprise_env_key_suffix<'a>(env_name: &'a str, prefix: &str) -> Option<&'a str> { fn enterprise_env_key_suffix<'a>(env_name: &'a str, prefix: &str) -> Option<&'a str> {
env_name.strip_prefix(prefix) env_name
.strip_prefix(prefix)
.and_then(normalize_enterprise_slot_suffix)
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
@ -529,11 +529,7 @@ fn enterprise_policy_file_slot_suffix(file_name: &str) -> Option<&str> {
.strip_prefix("config")? .strip_prefix("config")?
.strip_suffix(".yaml")?; .strip_suffix(".yaml")?;
if is_enterprise_slot_suffix(suffix) { normalize_enterprise_slot_suffix(suffix)
Some(suffix)
} else {
None
}
} }
fn read_policy_yaml_mapping(path: &Path) -> Option<HashMap<String, String>> { fn read_policy_yaml_mapping(path: &Path) -> Option<HashMap<String, String>> {
@ -635,13 +631,11 @@ fn is_legacy_enterprise_source_key(key_name: &str) -> bool {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
fn enterprise_indexed_source_key_name(key_name: &str) -> Option<String> { fn enterprise_indexed_source_key_name(key_name: &str) -> Option<String> {
if let Some(suffix) = enterprise_source_key_suffix(key_name, ENTERPRISE_CONFIG_ID_KEY_PREFIX) if let Some(suffix) = enterprise_source_key_suffix(key_name, ENTERPRISE_CONFIG_ID_KEY_PREFIX) {
&& is_enterprise_slot_suffix(suffix) {
return Some(format!("config_id{suffix}")); return Some(format!("config_id{suffix}"));
} }
if let Some(suffix) = enterprise_source_key_suffix(key_name, ENTERPRISE_CONFIG_SERVER_URL_KEY_PREFIX) if let Some(suffix) = enterprise_source_key_suffix(key_name, ENTERPRISE_CONFIG_SERVER_URL_KEY_PREFIX) {
&& is_enterprise_slot_suffix(suffix) {
return Some(format!("config_server_url{suffix}")); return Some(format!("config_server_url{suffix}"));
} }
@ -649,7 +643,18 @@ fn enterprise_indexed_source_key_name(key_name: &str) -> Option<String> {
} }
fn enterprise_source_key_suffix<'a>(key_name: &'a str, prefix: &str) -> Option<&'a str> { fn enterprise_source_key_suffix<'a>(key_name: &'a str, prefix: &str) -> Option<&'a str> {
key_name.strip_prefix(prefix) key_name
.strip_prefix(prefix)
.and_then(normalize_enterprise_slot_suffix)
}
fn normalize_enterprise_slot_suffix(raw_suffix: &str) -> Option<&str> {
let suffix = raw_suffix.strip_prefix('_').unwrap_or(raw_suffix);
if is_enterprise_slot_suffix(suffix) {
Some(suffix)
} else {
None
}
} }
fn is_enterprise_slot_suffix(suffix: &str) -> bool { fn is_enterprise_slot_suffix(suffix: &str) -> bool {
@ -696,6 +701,18 @@ fn enterprise_slot_width_rank(suffix: &str) -> u8 {
} }
} }
fn indexed_enterprise_source_value<'a>(
values: &'a HashMap<String, String>,
prefix: &str,
suffix: &str,
) -> Option<&'a str> {
let separated_key = format!("{prefix}_{suffix}");
values
.get(&separated_key)
.or_else(|| values.get(&format!("{prefix}{suffix}")))
.map(String::as_str)
}
fn parse_enterprise_source_values( fn parse_enterprise_source_values(
source_name: &str, source_name: &str,
values: &HashMap<String, String>, values: &HashMap<String, String>,
@ -704,13 +721,11 @@ fn parse_enterprise_source_values(
let mut seen_ids = HashSet::new(); let mut seen_ids = HashSet::new();
for suffix in collect_enterprise_config_slots(values) { for suffix in collect_enterprise_config_slots(values) {
let id_key = format!("config_id{suffix}");
let server_url_key = format!("config_server_url{suffix}");
add_enterprise_config_pair( add_enterprise_config_pair(
source_name, source_name,
&format!("indexed slot {suffix}"), &format!("indexed slot {suffix}"),
values.get(&id_key).map(String::as_str), indexed_enterprise_source_value(values, ENTERPRISE_CONFIG_ID_KEY_PREFIX, &suffix),
values.get(&server_url_key).map(String::as_str), indexed_enterprise_source_value(values, ENTERPRISE_CONFIG_SERVER_URL_KEY_PREFIX, &suffix),
&mut configs, &mut configs,
&mut seen_ids, &mut seen_ids,
); );
@ -933,14 +948,14 @@ mod tests {
#[test] #[test]
fn parse_enterprise_source_values_supports_padded_and_high_indexed_slots() { fn parse_enterprise_source_values_supports_padded_and_high_indexed_slots() {
let mut values = HashMap::new(); let mut values = HashMap::new();
values.insert(String::from("config_id00000"), String::from(TEST_ID_A)); values.insert(String::from("config_id_00000"), String::from(TEST_ID_A));
values.insert( values.insert(
String::from("config_server_url00000"), String::from("config_server_url_00000"),
String::from("https://slot0.example.org"), String::from("https://slot0.example.org"),
); );
values.insert(String::from("config_id10503"), String::from(TEST_ID_B)); values.insert(String::from("config_id_10503"), String::from(TEST_ID_B));
values.insert( values.insert(
String::from("config_server_url10503"), String::from("config_server_url_10503"),
String::from("https://slot10503.example.org"), String::from("https://slot10503.example.org"),
); );
@ -964,9 +979,9 @@ mod tests {
#[test] #[test]
fn parse_enterprise_source_values_treats_slot_widths_as_distinct_slots() { fn parse_enterprise_source_values_treats_slot_widths_as_distinct_slots() {
let mut values = HashMap::new(); let mut values = HashMap::new();
values.insert(String::from("config_id00001"), String::from(TEST_ID_A)); values.insert(String::from("config_id_00001"), String::from(TEST_ID_A));
values.insert( values.insert(
String::from("config_server_url00001"), String::from("config_server_url_00001"),
String::from("https://padded.example.org"), String::from("https://padded.example.org"),
); );
values.insert(String::from("config_id1"), String::from(TEST_ID_B)); values.insert(String::from("config_id1"), String::from(TEST_ID_B));
@ -995,19 +1010,19 @@ mod tests {
#[test] #[test]
fn parse_enterprise_source_values_ignores_invalid_slot_suffixes() { fn parse_enterprise_source_values_ignores_invalid_slot_suffixes() {
let mut values = HashMap::new(); let mut values = HashMap::new();
values.insert(String::from("config_id99999"), String::from(TEST_ID_A)); values.insert(String::from("config_id_99999"), String::from(TEST_ID_A));
values.insert( values.insert(
String::from("config_server_url99999"), String::from("config_server_url_99999"),
String::from("https://valid.example.org"), String::from("https://valid.example.org"),
); );
values.insert(String::from("config_id100000"), String::from(TEST_ID_B)); values.insert(String::from("config_id_100000"), String::from(TEST_ID_B));
values.insert( values.insert(
String::from("config_server_url100000"), String::from("config_server_url_100000"),
String::from("https://too-high.example.org"), String::from("https://too-high.example.org"),
); );
values.insert(String::from("config_idabc"), String::from(TEST_ID_C)); values.insert(String::from("config_id_abc"), String::from(TEST_ID_C));
values.insert( values.insert(
String::from("config_server_urlabc"), String::from("config_server_url_abc"),
String::from("https://letters.example.org"), String::from("https://letters.example.org"),
); );
@ -1025,11 +1040,11 @@ mod tests {
#[test] #[test]
fn enterprise_environment_key_name_maps_indexed_and_legacy_names() { fn enterprise_environment_key_name_maps_indexed_and_legacy_names() {
assert_eq!( assert_eq!(
enterprise_environment_key_name("MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID10503"), enterprise_environment_key_name("MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID_10503"),
Some(String::from("config_id10503")) Some(String::from("config_id10503"))
); );
assert_eq!( assert_eq!(
enterprise_environment_key_name("MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL00000"), enterprise_environment_key_name("MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_SERVER_URL_00000"),
Some(String::from("config_server_url00000")) Some(String::from("config_server_url00000"))
); );
assert_eq!( assert_eq!(
@ -1037,7 +1052,7 @@ mod tests {
Some(String::from("configs")) Some(String::from("configs"))
); );
assert_eq!( assert_eq!(
enterprise_environment_key_name("MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID100000"), enterprise_environment_key_name("MINDWORK_AI_STUDIO_ENTERPRISE_CONFIG_ID_100000"),
None None
); );
} }
@ -1046,15 +1061,15 @@ mod tests {
fn enterprise_policy_file_slot_suffix_accepts_valid_slot_file_names() { fn enterprise_policy_file_slot_suffix_accepts_valid_slot_file_names() {
assert_eq!(enterprise_policy_file_slot_suffix("config0.yaml"), Some("0")); assert_eq!(enterprise_policy_file_slot_suffix("config0.yaml"), Some("0"));
assert_eq!( assert_eq!(
enterprise_policy_file_slot_suffix("config00000.yaml"), enterprise_policy_file_slot_suffix("config_00000.yaml"),
Some("00000") Some("00000")
); );
assert_eq!( assert_eq!(
enterprise_policy_file_slot_suffix("config10503.yaml"), enterprise_policy_file_slot_suffix("config_10503.yaml"),
Some("10503") Some("10503")
); );
assert_eq!(enterprise_policy_file_slot_suffix("config100000.yaml"), None); assert_eq!(enterprise_policy_file_slot_suffix("config_100000.yaml"), None);
assert_eq!(enterprise_policy_file_slot_suffix("configabc.yaml"), None); assert_eq!(enterprise_policy_file_slot_suffix("config_abc.yaml"), None);
} }
#[test] #[test]
@ -1275,17 +1290,17 @@ mod tests {
let directory = tempdir().unwrap(); let directory = tempdir().unwrap();
fs::write( fs::write(
directory.path().join("config00000.yaml"), directory.path().join("config_00000.yaml"),
"id: \"9072b77d-ca81-40da-be6a-861da525ef7b\"\nserver_url: \"https://slot0.example.org\"", "id: \"9072b77d-ca81-40da-be6a-861da525ef7b\"\nserver_url: \"https://slot0.example.org\"",
) )
.unwrap(); .unwrap();
fs::write( fs::write(
directory.path().join("config10503.yaml"), directory.path().join("config_10503.yaml"),
"id: \"a1b2c3d4-e5f6-7890-abcd-ef1234567890\"\nserver_url: \"https://slot10503.example.org\"", "id: \"a1b2c3d4-e5f6-7890-abcd-ef1234567890\"\nserver_url: \"https://slot10503.example.org\"",
) )
.unwrap(); .unwrap();
fs::write( fs::write(
directory.path().join("config100000.yaml"), directory.path().join("config_100000.yaml"),
"id: \"11111111-2222-3333-4444-555555555555\"\nserver_url: \"https://ignored.example.org\"", "id: \"11111111-2222-3333-4444-555555555555\"\nserver_url: \"https://ignored.example.org\"",
) )
.unwrap(); .unwrap();