Polling for new notifications #5110

samgst-amazon · 2024-11-20T20:10:32Z

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Implement polling service to check for new notifications from a remote endpoint

Description

Checklist

My code follows the code style of this project
I have added tests to cover my changes
A short description of the change has been added to the CHANGELOG if the change is customer-facing in the IDE.
I have added metrics for my changes (if required)

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

…ions

…ons' into manodnyb/checkRulesForNotifications

rli · 2024-11-20T20:18:22Z

...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

+    /**
+     * Loads notifications, preferring the latest downloaded version if available,
+     * falling back to bundled resource if no downloaded version exists
+     */
+    private fun loadLocalNotifications(): NotificationFile? {
+        // First try to load from system directory (latest downloaded version)
+        getLocalNotificationsPath().let { path ->
+            if (path.exists()) {
+                try {
+                    val content = path.readText()
+                    return deserializeNotifications(content)
+                } catch (e: Exception) {
+                    LOG.error(e) { "Failed to load downloaded notifications, falling back to bundled resource" }
+                }
+            }
+        }
+
+        // Fall back to bundled resource if no downloaded version exists
+        return try {
+            val resourceStream = javaClass.getResourceAsStream(NOTIFICATIONS_RESOURCE_PATH)
+                ?: return null
+
+            val content = resourceStream.use { stream ->
+                stream.bufferedReader().readText()
+            }
+
+            deserializeNotifications(content)
+        } catch (e: Exception) {
+            LOG.error(e) { "Failed to load notifications from bundled resources" }
+            null
+        }
+    }
+


isnt this just the RemoteResource system

github-actions · 2024-11-20T20:45:49Z

Qodana Community for JVM

18 new problems were found

Inspection name	Severity	Problems
`Unused symbol`	🔶 Warning	5
`Unused import directive`	🔶 Warning	3
`Extension class should be final and non-public`	🔶 Warning	2
`Constant conditions`	🔶 Warning	2
`Class member can have 'private' visibility`	◽️ Notice	4
`Cascade 'if' can be replaced with 'when'`	◽️ Notice	1
`Function or property has platform type`	◽️ Notice	1

💡 Qodana analysis was run in the pull request mode: only the changed files were checked
☁️ View the detailed Qodana report

Contact Qodana team

Contact us at [email protected]

Or via our issue tracker: https://jb.gg/qodana-issue
Or share your feedback: https://jb.gg/qodana-discussions

...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

...ity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationServiceInitializer.kt

+import com.intellij.openapi.project.Project
+import com.intellij.openapi.startup.ProjectActivity
+
+class NotificationServiceInitializer : ProjectActivity {


...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

+}
+
+@Service(Service.Level.APP)
+class NotificationPollingServiceImpl :


...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

github-advanced-security

QDJVMC found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

…/checkRulesForNotifications

…tifs-polling

...community/src/software/aws/toolkits/jetbrains/core/notifications/CustomizeNotificationsUi.kt

...ommunity/src/software/aws/toolkits/jetbrains/core/notifications/DisplayToastNotifications.kt

...community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt

...re/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/RulesEngine.kt

...community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt


-    fun processNotification() {
-        // TODO: calls the Rule engine and notifies listeners
+    fun processNotification(project: Project, notificationData: NotificationData) {


manodnyab · 2024-11-21T17:11:46Z

...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

+     * Emits telemetry metric for polling failures
+     */
+    private fun emitFailureMetric(exception: Exception?) {
+        // todo: add metric


I think this already exists in common, we can add this metric

manodnyab · 2024-11-21T17:13:36Z

...ity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationServiceInitializer.kt

+class NotificationServiceInitializer : ProjectActivity {
+
+    override suspend fun execute(project: Project) {
+        val service = ApplicationManager.getApplication().getService(NotificationPollingService::class.java)


can we use the getInstance method here?

manodnyab · 2024-11-21T17:13:56Z

...ity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationServiceInitializer.kt

+
+    override suspend fun execute(project: Project) {
+        val service = ApplicationManager.getApplication().getService(NotificationPollingService::class.java)
+        RunOnceUtil.runOnceForApp(this::class.qualifiedName.toString()) {


Do we need this? Wont the startup activity anyway run just once?

I added this to explicitly only run once per IDE instance and not per-project. It's what I understood to work, don't know about a better way yet

manodnyab · 2024-11-21T17:15:06Z

...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

+     * Main polling function that checks for updates and downloads if necessary
+     * Returns the parsed notifications if successful, null otherwise
+     */
+    private fun pollForNotifications(): Boolean {


can we add tests for this?

...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

1. Auto-trigger now triggers much more frequently and suggestions will consistently show whenever user stops typing. The key shortcuts for Q inline suggestions are now configurable from the keymap settings. Default key shortcut for force accept is option + tab or option + enter and default for navigation keys has now changed from <- (navigating to prev) and -> (navigating to next) arrow keys to option + [ and option + ] , respectively. 2. Amazon Q suggestions can now co-exist with JetBrains code completions (IntelliSense). When both suggestions appear on the screen, tab accepts JetBrains suggestions first. Users will also have other key shortcuts to force accept the other Q suggestion (option + tab or option + enter) 3. The Amazon Q suggestion popup is now hidden by default and only appears above the current editing line when the user hovers over the suggestion preview text. IntelliSense popup (if it's showing) will also appear to be more transparent when user hovers over the suggestion preview.

...y/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

+                startTime = endTime
+                val requestId = response.responseMetadata().requestId()
+                val sessionId = response.sdkHttpResponse().headers().getOrDefault(KET_SESSION_ID, listOf(requestId))[0]
+                if (requestCount == 1) {


...y/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

+                    LOG.debug { "Skipping sending remaining requests on inactive CodeWhisperer session exit" }
+                    return
+                }
+                if (requestCount >= PAGINATION_REQUEST_COUNT_ALLOWED) {


...y/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

+                    content = message("codewhisperer.notification.custom.not_available"),
+                    project = requestContext.project,
+                    notificationActions = listOf(
+                        NotificationAction.create(


...y/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

+                            message("codewhisperer.notification.custom.simple.button.select_another_customization")
+                        ) { _, notification ->
+                            CodeWhispererModelConfigurator.getInstance().showConfigDialog(requestContext.project)
+                            notification.expire()


...y/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

+                displayMessage = e.awsErrorDetails().errorMessage() ?: message("codewhisperer.trigger.error.server_side")
+            } else if (e is CodeWhispererRuntimeException) {
+                requestId = e.requestId().orEmpty()
+                sessionId = e.awsErrorDetails().sdkHttpResponse().headers().getOrDefault(KET_SESSION_ID, listOf(requestId))[0]


...y/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

+                displayMessage = e.awsErrorDetails().errorMessage() ?: message("codewhisperer.trigger.error.server_side")
+            } else {
+                requestId = ""
+                sessionId = ""


...y/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

+                        message("codewhisperer.trigger.error.server_side")
+                    } else {
+                        message("codewhisperer.trigger.error.client_side")
                    }


...its/jetbrains/services/codewhisperer/startup/CodeWhispererIntelliSenseAutoTriggerListener.kt

-                        }
+        (newLookup as LookupImpl).component.addMouseHoverListener(
+            newLookup,
+            object : HoverListener() {


...its/jetbrains/services/codewhisperer/startup/CodeWhispererIntelliSenseAutoTriggerListener.kt

-                        }
+        (newLookup as LookupImpl).component.addMouseHoverListener(
+            newLookup,
+            object : HoverListener() {


...its/jetbrains/services/codewhisperer/startup/CodeWhispererIntelliSenseAutoTriggerListener.kt

+        (newLookup as LookupImpl).component.addMouseHoverListener(
+            newLookup,
+            object : HoverListener() {
+                override fun mouseEntered(component: Component, x: Int, y: Int) {


...its/jetbrains/services/codewhisperer/startup/CodeWhispererIntelliSenseAutoTriggerListener.kt

-            )
-        }
+
+                override fun mouseMoved(component: Component, x: Int, y: Int) {}


...its/jetbrains/services/codewhisperer/startup/CodeWhispererIntelliSenseAutoTriggerListener.kt

-        }
+
+                override fun mouseMoved(component: Component, x: Int, y: Int) {}
+                override fun mouseExited(component: Component) {}


...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

+            }
+
+    // Helper method to get Path from stored String
+    fun getCachedPath(): Path? =


...community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt

...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

+
+package software.aws.toolkits.jetbrains.core.notifications
+
+import com.fasterxml.jackson.databind.DeserializationFeature


...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt

+package software.aws.toolkits.jetbrains.core.notifications
+
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper


...community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt

+import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.project.Project
+import software.aws.toolkits.core.utils.inputStream
+import java.io.InputStream


...community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt

+import java.nio.file.Path
+
+object NotificationMapperUtil{
+    val mapper = jacksonObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)


...community/src/software/aws/toolkits/jetbrains/core/notifications/ProcessNotificationsBase.kt

-    fun getNotificationsFromFile() {
-        // TODO: returns a notification list
-    }
+    fun getNotificationsFromFile(path: Path): NotificationsList =


manodnyab and others added 10 commits November 12, 2024 16:23

Display toast notifications with actions

c3cc2bf

Condition matcher for displaying notifications

09729c7

initial commit

f0dbe5b

Modified deserialization cases and added tests

e909a0e

Merge branch 'feature/ideNotifs' into manodnyb/checkRulesForNotificat…

5a84e39

…ions

not required file change

56c1888

Merge remote-tracking branch 'origin/manodnyb/checkRulesForNotificati…

a981227

…ons' into manodnyb/checkRulesForNotifications

run on startup

bd354fc

detekt

fea410a

move vals

746e5ab

rli reviewed Nov 20, 2024

View reviewed changes

Merge main into feature/ideNotifs-polling

b038d48

github-advanced-security bot found potential problems Nov 20, 2024

View reviewed changes

Merge main into feature/ideNotifs-polling

1d6e7d2

manodnyab changed the base branch from main to feature/ideNotifs November 20, 2024 22:27

manodnyab changed the base branch from feature/ideNotifs to main November 20, 2024 22:28

samgst-amazon changed the base branch from main to feature/ideNotifs November 20, 2024 22:36

remote resource implementation

c4f3cac

github-advanced-security bot found potential problems Nov 20, 2024

View reviewed changes

samgst-amazon and others added 9 commits November 20, 2024 15:14

comments

867bcda

Merge branch 'feature/ideNotifs' into feature/ideNotifs-polling

b7f336e

detekt

1883530

feedback 1

dbfcefc

Merge remote-tracking branch 'origin/feature/ideNotifs' into manodnyb…

823ea7f

…/checkRulesForNotifications

modified the base class

218c8ed

Merge main into feature/ideNotifs-polling

285650f

Merge branch 'manodnyb/checkRulesForNotifications' into feature/ideNo…

d2b7a6c

…tifs-polling

Validate file before saving

c82ee66

github-advanced-security bot found potential problems Nov 21, 2024

View reviewed changes

manodnyab reviewed Nov 21, 2024

View reviewed changes

samgst-amazon added 2 commits November 21, 2024 11:04

cache path

4c397f4

merge conflicts

033a3a9

github-advanced-security bot found potential problems Nov 21, 2024

View reviewed changes

...mmunity/src/software/aws/toolkits/jetbrains/core/notifications/NotificationPollingService.kt Fixed Show fixed Hide fixed

andrewyuq and others added 2 commits November 21, 2024 12:49

Merge main into feature/ideNotifs-polling

5506ca8

github-advanced-security bot found potential problems Nov 21, 2024

View reviewed changes

observer implementation

dd72d29

github-advanced-security bot found potential problems Nov 21, 2024

View reviewed changes

deserialize notifs from file

d6e7aa7

samgst-amazon closed this Nov 21, 2024

github-advanced-security bot found potential problems Nov 21, 2024

View reviewed changes


		package software.aws.toolkits.jetbrains.core.notifications

		import com.fasterxml.jackson.databind.DeserializationFeature

Polling for new notifications #5110

Polling for new notifications #5110

Uh oh!

Conversation

samgst-amazon commented Nov 20, 2024

Types of changes

Description

Checklist

License

Uh oh!

rli Nov 20, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Nov 20, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Qodana Community for JVM

Uh oh!

Uh oh!

Check warning

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check warning

Uh oh!

github-advanced-security bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check warning

manodnyab Nov 21, 2024

Choose a reason for hiding this comment

Uh oh!

manodnyab Nov 21, 2024

Choose a reason for hiding this comment

Uh oh!

manodnyab Nov 21, 2024

Choose a reason for hiding this comment

Uh oh!

samgst-amazon Nov 21, 2024

Choose a reason for hiding this comment

Uh oh!

manodnyab Nov 21, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check notice

Uh oh!

Check warning

Check warning

Check warning

Check notice

Check notice

Reviewers

Assignees

Labels

Projects

Milestone

Development

github-actions bot commented Nov 20, 2024 •

edited

Loading