Skip to content

Supports AI Controls for GK Organizations#4338

Merged
sergeibbb merged 5 commits intomainfrom
4300-ai-controls-gkdev
Jun 12, 2025
Merged

Supports AI Controls for GK Organizations#4338
sergeibbb merged 5 commits intomainfrom
4300-ai-controls-gkdev

Conversation

@sergeibbb
Copy link
Member

@sergeibbb sergeibbb commented May 29, 2025 •
edited
Loading

Description

Support AI Controls for GK Organizations. Fixes #4300

  1. Supports GK Organization AI config:
    1. Disables non-configured AI providers
    2. Uses configured URLs and API keys
  2. Caches GK Organization settings, so it can be used after window reload
  3. When all Organizations are disabled it's treated as AI feature is disabled

Checklist

  • I have followed the guidelines in the Contributing document
  • My changes follow the coding style of this project
  • My changes build without any errors or warnings
  • My changes have been formatted and linted
  • My changes include any required corresponding changes to the documentation (including CHANGELOG.md and README.md)
  • My changes have been rebased and squashed to the minimal number (typically 1) of relevant commits
  • My changes have a descriptive commit message with a short title, including a Fixes $XXX - or Closes #XXX - prefix to auto-close the issue that your PR addresses

sergeibbb added a commit that referenced this pull request May 29, 2025
@sergeibbb
Uses organization AI configuration from GKDev
f4ca9b8 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request May 29, 2025
@sergeibbb
Falls to AI provider selection when the selected provider becomes dis…
15b0453 
…abled

(#4300, #4338)
sergeibbb added a commit that referenced this pull request May 29, 2025
@sergeibbb
Ignores malformed Org AI settings
4716d96 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request May 29, 2025
@sergeibbb
Caches Org AI settings in local storage
244da41 
(#4300, #4338)
@sergeibbb sergeibbb force-pushed the 4300-ai-controls-gkdev branch from 7939a2c to c383877 Compare May 29, 2025 17:18
sergeibbb added a commit that referenced this pull request May 29, 2025
@sergeibbb
Treats all disabled providers as AI features disabled
c383877 
(#4300, #4338)
@sergeibbb sergeibbb requested a review from eamodio May 29, 2025 17:32
@sergeibbb sergeibbb force-pushed the 4300-ai-controls-gkdev branch from c383877 to 5659804 Compare May 30, 2025 11:40
sergeibbb added a commit that referenced this pull request May 30, 2025
@sergeibbb
Uses organization AI configuration from GKDev
ed365bf 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request May 30, 2025
@sergeibbb
Falls to AI provider selection when the selected provider becomes dis…
7f51bed 
…abled

(#4300, #4338)
sergeibbb added a commit that referenced this pull request May 30, 2025
@sergeibbb
Ignores malformed Org AI settings
999a73e 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request May 30, 2025
@sergeibbb
Caches Org AI settings in local storage
3b9e4b9 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request May 30, 2025
@sergeibbb
Treats all disabled providers as AI features disabled
5659804 
(#4300, #4338)
@sergeibbb sergeibbb requested a review from d13 May 30, 2025 15:11
sergeibbb added a commit that referenced this pull request Jun 2, 2025
@sergeibbb
Uses organization AI configuration from GKDev
1c1c28b 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 2, 2025
@sergeibbb
Falls to AI provider selection when the selected provider becomes dis…
9da263f 
…abled

(#4300, #4338)
@sergeibbb sergeibbb force-pushed the 4300-ai-controls-gkdev branch from 5659804 to 4c0d9f0 Compare June 2, 2025 10:49
sergeibbb added a commit that referenced this pull request Jun 2, 2025
@sergeibbb
Ignores malformed Org AI settings
4dd4249 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 2, 2025
@sergeibbb
Caches Org AI settings in local storage
b27c2e8 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 2, 2025
@sergeibbb
Treats all disabled providers as AI features disabled
4c0d9f0 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Uses organization AI configuration from GKDev
b3af31b 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Falls to AI provider selection when the selected provider becomes dis…
cff4bca 
…abled

(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Ignores malformed Org AI settings
ca398e2 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Caches Org AI settings in local storage
375bb9d 
(#4300, #4338)
@sergeibbb sergeibbb force-pushed the 4300-ai-controls-gkdev branch from 4c0d9f0 to 427fe47 Compare June 3, 2025 11:03
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Treats all disabled providers as AI features disabled
1fc8f13 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Displays a message in AI provider picker when org configuration is en…
427fe47 
…forced

(#4300, #4338)
@sergeibbb sergeibbb requested a review from ramin-t June 3, 2025 15:13
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Uses organization AI configuration from GKDev
ebc163d 
(#4300, #4338)
@sergeibbb sergeibbb force-pushed the 4300-ai-controls-gkdev branch from 427fe47 to c0b330f Compare June 3, 2025 16:16
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Falls to AI provider selection when the selected provider becomes dis…
278de01 
…abled

(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Ignores malformed Org AI settings
4dd9f9c 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Caches Org AI settings in local storage
f70dfa4 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 3, 2025
@sergeibbb
Treats all disabled providers as AI features disabled
c0b330f 
(#4300, #4338)
@sergeibbb sergeibbb force-pushed the 4300-ai-controls-gkdev branch from c0b330f to f3ba0b2 Compare June 10, 2025 17:01
sergeibbb added a commit that referenced this pull request Jun 10, 2025
@sergeibbb
Falls to AI provider selection when the selected provider becomes dis…
1e770ae 
…abled

(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 10, 2025
@sergeibbb
Ignores malformed Org AI settings
48ef2bf 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 10, 2025
@sergeibbb
Caches Org AI settings in local storage
a05c34b 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 10, 2025
@sergeibbb
Treats all disabled providers as AI features disabled
f3ba0b2 
(#4300, #4338)
ramin-t
ramin-t requested changes Jun 11, 2025
View reviewed changes
Copy link
Contributor

@ramin-t ramin-t left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks good, just one issue I noticed. This will need heavy testing once merged.

src/plus/ai/aiProviderService.ts Outdated
Comment on lines +331 to +334
if (isProviderEnabledByOrg('vscode', orgAiConf)) {
const vsCodeModels = await this.getModels('vscode');
if (vsCodeModels.length !== 0) {
chosenProviderId = 'vscode';
}
} else if (
Copy link
Contributor

@ramin-t ramin-t Jun 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This nested if statement changes the previous logic such that if we do not find a vscode model, it does not move to the else block and therefore does not choose the GK model. I suggest moving the existing vscode models check into the if statement to make sure that the original flow is preserved.

i.e.

Suggested change
if (isProviderEnabledByOrg('vscode', orgAiConf)) {
const vsCodeModels = await this.getModels('vscode');
if (vsCodeModels.length !== 0) {
chosenProviderId = 'vscode';
}
} else if (
const vsCodeModels = await this.getModels('vscode');
if (isProviderEnabledByOrg('vscode', orgAiConf) && vsCodeModels.length !== 0) {
chosenProviderId = 'vscode';
} else if (

Copy link
Member Author

@sergeibbb sergeibbb Jun 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@axosoft-ramint
Agree. Fixed.

@sergeibbb sergeibbb force-pushed the 4300-ai-controls-gkdev branch from f3ba0b2 to 1e7655d Compare June 12, 2025 13:48
@sergeibbb sergeibbb requested a review from ramin-t June 12, 2025 13:49
@sergeibbb sergeibbb merged commit 83e97d8 into main Jun 12, 2025
3 checks passed
sergeibbb added a commit that referenced this pull request Jun 12, 2025
@sergeibbb
Uses organization AI configuration from GKDev
94bce75 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 12, 2025
@sergeibbb
Falls to AI provider selection when the selected provider becomes dis…
bcf7277 
…abled

(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 12, 2025
@sergeibbb
Ignores malformed Org AI settings
9466212 
(#4300, #4338)
sergeibbb added a commit that referenced this pull request Jun 12, 2025
@sergeibbb
Caches Org AI settings in local storage
ae1a110 
(#4300, #4338)
@sergeibbb sergeibbb deleted the 4300-ai-controls-gkdev branch June 12, 2025 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ramin-t ramin-t ramin-t approved these changes

@eamodio eamodio Awaiting requested review from eamodio

@d13 d13 Awaiting requested review from d13

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Support AI Controls for GK Organizations

2 participants

@sergeibbb @ramin-t