Skip to content

feat(amazonq): enable @sage, pass feature config to mynahUI #5683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 8, 2025
Merged

feat(amazonq): enable @sage, pass feature config to mynahUI #5683

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0673fd
init mynahUI with featCfg
leigaol May 7, 2025
a0ea047
detekt
leigaol May 7, 2025
7b296f2
detekt
leigaol May 7, 2025
f4d75d4
Merge branch 'feature/q-lsp-chat' into featCfg
leigaol May 8, 2025
0d31e2c
Merge branch 'feature/q-lsp-chat' into featCfg
leigaol May 8, 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
3 changes: 2 additions & 1 deletion ...tbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Disposer
import com.intellij.ui.jcef.JBCefJSQuery
import org.cef.CefApp
import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AwsServerCapabilitiesProvider
import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
Expand Down Expand Up @@ -154,7 +155,7 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
pairProgrammingAcknowledged: ${!MeetQSettings.getInstance().amazonQChatPairProgramming}
},
hybridChatConnector,
{}
${CodeWhispererFeatureConfigService.getInstance().getFeatureConfigJsonString()}

);
}
Expand Down
14 changes: 13 additions & 1 deletion ...src/software/aws/toolkits/jetbrains/services/amazonq/CodeWhispererFeatureConfigService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

@file:Suppress("BannedImports")
package software.aws.toolkits.jetbrains.services.amazonq

import com.google.gson.Gson
import com.intellij.openapi.components.Service
import com.intellij.openapi.components.service
import com.intellij.openapi.project.Project
Expand All @@ -17,7 +19,6 @@ import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomization
import software.aws.toolkits.jetbrains.utils.isQExpired

@Service
class CodeWhispererFeatureConfigService {
private val featureConfigs = mutableMapOf<String, FeatureContext>()
Expand Down Expand Up @@ -82,6 +83,17 @@ class CodeWhispererFeatureConfigService {

fun getChatWSContext(): Boolean = getFeatureValueForKey(CHAT_WS_CONTEXT).stringValue() == "TREATMENT"

// convert into mynahUI parsable string
// format: '[["key1", {"name":"Feature1","variation":"A","value":true}]]'
fun getFeatureConfigJsonString(): String {
val jsonString = featureConfigs.entries.map { (key, value) ->
"[\"$key\",${Gson().toJson(value)}]"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

If I use objectMapper here then this function would be blocked on IO forever and webview will never load.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

and Gson formatted string happens to match what MynahUI requires.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This data in VSC is a JSON.stringfied(JSON.stringfield(Object)). See https://github.com/aws/aws-toolkit-vscode/blob/bb11bd9a4b498b2129085f43217b6b712dbf8c44/packages/amazonq/src/lsp/chat/webviewProvider.ts#L85.

Copy link
Contributor Author

@leigaol leigaol May 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

If I implement it in this way

val jsonString = featureConfigs.entries.map { (key, value) ->
            "[\"$key\",${jacksonObjectMapper().writeValueAsString(value)}]"
        }

then it would stuck at public native void park(boolean isAbsolute, long time); of Unsafe.java. It may have sometime to do with featureConfigs list being not thread safe but I don't find a easy fix.

It can also hang at handleMessage function of StreamMessageProducer.java

Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder why the key value pairs are not modelled as json in mynah-ui

}
return """
Copy link
Contributor

Choose a reason for hiding this comment

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

can we return jsonstring directly?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No it will fail. I spent 6 hours making it correct.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is trying to deserialize as a typescript MAP on MynahUI end

'$jsonString'
""".trimIndent()
}

// Get the feature value for the given key.
// In case of a misconfiguration, it will return a default feature value of Boolean false.
private fun getFeatureValueForKey(name: String): FeatureValue =
Expand Down
Loading