Merge branch 'release/3.19.x'

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.19.3 Apr 17, 2024
+- Resolve issue with new runs after tracking queue shutdown (mihran113)
+- Reset base path when opening new tabs (mihran113)
+
 ## 3.19.2  Mar 22, 2024
 - Resolve live update failing issue (mihran113)
 - Resolve issue with remote tracking protocol probe fail (mihran113)

aim/VERSION

@@ -1 +1 @@
-3.19.2
+3.19.3

aim/ext/transport/client.py

@@ -32,16 +32,7 @@
 class Client:
     _thread_local = threading.local()
 
-    _queue = RequestQueue(
-        'remote_tracker',
-        max_queue_memory=os.getenv(AIM_CLIENT_QUEUE_MAX_MEMORY, 1024 * 1024 * 1024),
-        retry_count=DEFAULT_RETRY_COUNT,
-        retry_interval=DEFAULT_RETRY_INTERVAL
-    )
-
     def __init__(self, remote_path: str):
-        # temporary workaround for M1 build
-
         self._id = str(uuid.uuid4())
         if remote_path.endswith('/'):
             remote_path = remote_path[:-1]
@@ -58,6 +49,12 @@ def __init__(self, remote_path: str):
         self._tracking_endpoint = f'{self.remote_path}/tracking'
         self.connect()
 
+        self._queue = RequestQueue(
+            f'remote_tracker_{self._id}',
+            max_queue_memory=os.getenv(AIM_CLIENT_QUEUE_MAX_MEMORY, 1024 * 1024 * 1024),
+            retry_count=DEFAULT_RETRY_COUNT,
+            retry_interval=DEFAULT_RETRY_INTERVAL
+        )
         self._heartbeat_sender = HeartbeatSender(self)
         self._heartbeat_sender.start()
         self._thread_local.atomic_instructions = {}

aim/ext/transport/request_queue.py

@@ -33,7 +33,7 @@ def register_task(self, client, task_f, *args):
             self._client = weakref.ref(client)
 
         if self._shutdown:
-            logger.debug('Cannot register task: rpc task queue is stopped.')
+            logger.debug('Cannot register task: task queue is stopped.')
             return
 
         arg_size = self._calculate_size(args)
@@ -100,7 +100,7 @@ def wait_for_finish(self):
     def stop(self):
         pending_task_count = self._queue.qsize()
         if pending_task_count:
-            logger.warning(f'Processing {pending_task_count} pending tasks in the rpc queue \'{self._name}\'... '
+            logger.warning(f'Processing {pending_task_count} pending tasks in the task queue \'{self._name}\'... '
                            f'Please do not kill the process.')
             self._queue.join()
         logger.debug('No pending tasks left.')

aim/web/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui_v2",
-  "version": "3.19.2",
+  "version": "3.19.3",
   "private": true,
   "dependencies": {
     "@aksel/structjs": "^1.0.0",

aim/web/ui/src/pages/Metrics/components/Table/CompareSelectedRunsPopover/CompareSelectedRunsPopover.tsx

@@ -8,6 +8,7 @@ import ControlPopover from 'components/ControlPopover/ControlPopover';
 import { Button, Icon, Text } from 'components/kit';
 import { IconName } from 'components/kit/Icon';
 
+import { getBasePath } from 'config/config';
 import { EXPLORE_SELECTED_RUNS_CONFIG } from 'config/table/tableConfigs';
 import { ANALYTICS_EVENT_KEYS } from 'config/analytics/analyticsKeysMap';
 
@@ -75,6 +76,7 @@ function CompareSelectedRunsPopover({
           ANALYTICS_EVENT_KEYS[appName]?.table?.compareSelectedRuns,
         );
         if (newTab) {
+          url = `${getBasePath()}${url}`;
           window.open(url, '_blank');
           window.focus();
           return;

aim/web/ui/src/services/api/api.ts

@@ -24,6 +24,7 @@ export interface AuthToken {
 
 const AUTH_TOKEN_KEY = 'Auth';
 const AUTH_REFRESH_TOKEN_KEY = 'token';
+const AUTH_USER_KEY = 'user';
 
 export const CONTENT_TYPE = {
   JSON: 'application/json',
@@ -265,6 +266,7 @@ function getAuthToken(): string {
  */
 function removeAuthToken(): void {
   localStorage.removeItem(AUTH_TOKEN_KEY);
+  localStorage.removeItem(AUTH_USER_KEY);
   removeRefreshToken();
 }
 
@@ -346,13 +348,20 @@ async function checkCredentials<T>(
   if (response.status === 401) {
     if (endpoint === `${ENDPOINTS.AUTH.BASE}/${ENDPOINTS.AUTH.REFRESH}`) {
       removeAuthToken();
+      window.location.assign(`${window.location.origin}/sign-in`);
       return parseResponse<T>(response);
     }
-    // Refresh token
-    const token = await refreshToken().call();
-    if (token) {
-      setAuthToken(token);
-      return refetch();
+    if (localStorage.getItem('refreshing') !== 'true') {
+      localStorage.setItem('refreshing', 'true');
+      // Refresh token
+      const token = await refreshToken().call();
+      if (token) {
+        setAuthToken(token);
+        localStorage.setItem('refreshing', 'false');
+        window.location.reload();
+        return refetch();
+      }
+      localStorage.setItem('refreshing', 'false');
     }
   }
   return parseResponse<T>(response);