Feat: Adds support for system queues

.github/workflows/ci.yml

@@ -55,7 +55,7 @@ jobs:
         CLOUDOS_WORKSPACE_ID: ${{ secrets.CLOUDOS_WORKSPACE_ID_ADAPT }}
         CLOUDOS_URL: "https://cloudos.lifebit.ai"
       run: |
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID
+        echo 'q' | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID
   job_list_filtering:
     needs: job_run_and_status
     runs-on: ubuntu-latest
@@ -81,15 +81,15 @@ jobs:
       run: |
         JOB_ID="${{ needs.job_run_and_status.outputs.job_id }}"
         # Test filtering by status, project  and workflow name
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-status completed --filter-project cloudos-cli-tests  --filter-workflow GH-rnatoy --last --last-n-jobs 10
+        echo 'q' | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-status completed --filter-project cloudos-cli-tests  --filter-workflow GH-rnatoy --last --last-n-jobs 10
         # Test filtering job id
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-id $JOB_ID 
+        echo 'q' | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-id $JOB_ID 
         # Test filtering job name
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-name "cloudos-cli-CI-test" --last-n-jobs 10
+        echo 'q' | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-name "cloudos-cli-CI-test" --last-n-jobs 10
         # Test filtering by only mine
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-only-mine --last-n-jobs 10
+        echo 'q' | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-only-mine --last-n-jobs 10
         # Test filtering by queue
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-queue "cost_saving_standard_nextflow" --last-n-jobs 10
+        echo 'q' | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-queue "cost_saving_standard_nextflow" --last-n-jobs 10
   job_details:
     needs: job_run_and_status
     runs-on: ubuntu-latest

.github/workflows/ci_az.yml

@@ -36,7 +36,7 @@ jobs:
         CLOUDOS_WORKSPACE_ID: ${{ secrets.CLOUDOS_WORKSPACE_ID_AZURE }}
         CLOUDOS_URL: "https://dev.sdlc.lifebit.ai"
       run: |
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID
   job_list_filtering_az:
     needs: job_run_and_status_az
     runs-on: ubuntu-latest
@@ -62,15 +62,15 @@ jobs:
       run: |
         JOB_ID="${{ needs.job_run_and_status_az.outputs.job_id }}"
         # Test filtering by status, project  and workflow name
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-status completed --filter-project cloudos-cli-tests  --filter-workflow GH-rnatoy --last --last-n-jobs 10
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-status completed --filter-project cloudos-cli-tests  --filter-workflow GH-rnatoy --last --last-n-jobs 10
         # Test filtering job id
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-id $JOB_ID 
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-id $JOB_ID 
         # Test filtering job name
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-name "cloudos-cli-CI-test" --last-n-jobs 10
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-name "cloudos-cli-CI-test" --last-n-jobs 10
         # Test filtering by only mine
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-only-mine --last-n-jobs 10
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-only-mine --last-n-jobs 10
         # Test filtering by queue
-        #cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-queue "cost_saving_standard_nextflow" --last-n-jobs 10
+        #echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-queue "cost_saving_standard_nextflow" --last-n-jobs 10
   job_details_az:
     needs: job_run_and_status_az
     runs-on: ubuntu-latest

.github/workflows/ci_dev.yml

@@ -36,7 +36,7 @@ jobs:
         CLOUDOS_WORKSPACE_ID: ${{ secrets.CLOUDOS_WORKSPACE_ID_DEV }}
         CLOUDOS_URL: "https://dev.sdlc.lifebit.ai"
       run: |
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID
   job_list_filtering_dev:
     needs: job_run_and_status_dev
     runs-on: ubuntu-latest
@@ -62,15 +62,15 @@ jobs:
       run: |
         JOB_ID="${{ needs.job_run_and_status_dev.outputs.job_id }}"
         # Test filtering by status, project  and workflow name
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-status completed --filter-project cloudos-cli-tests  --filter-workflow GH-rnatoy --last --last-n-jobs 10
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-status completed --filter-project cloudos-cli-tests  --filter-workflow GH-rnatoy --last --last-n-jobs 10
         # Test filtering job id
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-id $JOB_ID 
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-id $JOB_ID 
         # Test filtering job name
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-name "cloudos-cli-CI-test" --last-n-jobs 10
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-job-name "cloudos-cli-CI-test" --last-n-jobs 10
         # Test filtering by only mine
-        cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-only-mine --last-n-jobs 10
+        echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-only-mine --last-n-jobs 10
         # Test filtering by queue
-        #cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-queue "cost_saving_standard_nextflow" --last-n-jobs 10
+        #echo q | cloudos job list --cloudos-url $CLOUDOS_URL --apikey $CLOUDOS_TOKEN --workspace-id $CLOUDOS_WORKSPACE_ID --filter-queue "cost_saving_standard_nextflow" --last-n-jobs 10
   job_details_dev:
     needs: job_run_and_status_dev
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## lifebit-ai/cloudos-cli: changelog
 
+## v2.87.0 (2026-03-30)
+
+### Feat
+
+- Adds system queues
+
 ## v2.86.0 (2026-03-23)
 
 ### Feat

README.md

@@ -401,7 +401,7 @@ Job queues are required for running jobs using AWS batch executor. The available
 
 #### List Queues
 
-This command allows you to view available computational queues and their configurations. You can get a summary of all available workspace job queues in three different output formats using the `--output-format` option:
+This command allows you to view available computational queues and their configurations. By default, both regular workspace queues and system queues are displayed. You can get a summary of all available job queues in three different output formats using the `--output-format` option:
 
 - **stdout** (default): Displays a rich formatted table directly in the terminal with pagination and visual formatting
 - **csv**: Saves queue data to a CSV file with a selection of available queue information, or all information using the `--all-fields` flag
@@ -415,6 +415,12 @@ cloudos queue list --profile my_profile
 cloudos queue list --profile my_profile --output-format stdout
 ```
 
+To exclude system queues and show only workspace queues:
+
+```bash
+cloudos queue list --profile my_profile --exclude-system-queues
+```
+
 To save all available job queues in JSON format:
 
 ```bash
@@ -437,7 +443,7 @@ cloudos queue list --profile my_profile --output-format csv
 
 **Job queues for platform workflows**
 
-Platform workflows (those provided by CloudOS in your workspace as modules) run on separate and specific AWS batch queues. Therefore, CloudOS will automatically assign the valid queue and you should not specify any queue using the `--job-queue` parameter. Any attempt to use this parameter will be ignored. Examples of such platform workflows are "System Tools" and "Data Factory" workflows.
+Platform workflows (those provided by CloudOS in your workspace as modules) run on separate and specific AWS batch queues (system queues). Therefore, CloudOS will automatically assign the valid queue and you should not specify any queue using the `--job-queue` parameter. Any attempt to use this parameter will be ignored. Examples of such platform workflows are "System Tools" and "Data Factory" workflows.
 
 
 ### Workflow
@@ -851,7 +857,7 @@ You can find specific jobs within your workspace using the filtering options. Fi
 - **`--filter-job-id`**: Filter jobs by specific job ID (exact match required)
 - **`--filter-only-mine`**: Show only jobs belonging to the current user
 - **`--filter-owner`**: Show only jobs for the specified owner (exact match required, e.g., "John Doe")
-- **`--filter-queue`**: Filter jobs by queue name (only applies to batch jobs)
+- **`--filter-queue`**: Filter jobs by queue name (works with both regular and system queues; only applies to batch jobs)
 
 **Filtering Examples**
 

cloudos_cli/_version.py

@@ -1 +1 @@
-__version__ = '2.86.0'
+__version__ = '2.87.0'

cloudos_cli/clos.py

@@ -1239,9 +1239,7 @@ def get_job_list(self, workspace_id, last_n_jobs=None, page=None, page_size=None
                 if target_job_count != 'all' and len(all_jobs) >= target_job_count:
                     break
             else:
-                # In direct mode (page/page_size), only get one page unless filter_queue is used
-                # When filter_queue is used, continue fetching pages until we have enough filtered results
-                if not filter_queue or len(all_jobs) >= current_page_size:
+                if not filter_queue and len(all_jobs) >= current_page_size:
                     break
 
             # Check if we reached the last page (fewer jobs than requested page size)
@@ -1257,6 +1255,18 @@ def get_job_list(self, workspace_id, last_n_jobs=None, page=None, page_size=None
         if use_pagination_mode and target_job_count != 'all' and isinstance(target_job_count, int) and target_job_count > 0:
             all_jobs = all_jobs[:target_job_count]
 
+        # --- Adjust pagination metadata for client-side filtering ---
+        # When filter_queue is applied, we've fetched multiple API pages and filtered them.
+        # We need to return all filtered jobs so the CLI can handle pagination client-side.
+        if filter_queue and last_pagination_metadata:
+            # Mark this as client-filtered so the CLI knows to handle pagination differently
+            last_pagination_metadata = {
+                'Pagination-Count': len(all_jobs),  # Total filtered jobs collected  
+                'Pagination-Page': page,  # The initial page requested
+                'Pagination-Limit': current_page_size,  # Page size
+                '_client_filtered': True  # Flag indicating client-side pagination needed
+            }
+
         return {'jobs': all_jobs, 'pagination_metadata': last_pagination_metadata}
 
     @staticmethod

cloudos_cli/jobs/cli.py

@@ -2,6 +2,11 @@
 
 import rich_click as click
 import cloudos_cli.jobs.job as jb
+from cloudos_cli.jobs.job import (
+    fetch_job_page,
+    create_api_pagination_callback,
+    create_client_pagination_callback
+)
 from cloudos_cli.clos import Cloudos
 from cloudos_cli.utils.errors import BadRequestException
 from cloudos_cli.utils.resources import ssl_selector
@@ -1335,7 +1340,13 @@ def list_jobs(ctx,
         ])
         if output_format == 'stdout':
             # For stdout, always show a user-friendly message
-            create_job_list_table([], cloudos_url, pagination_metadata, selected_columns)
+            # Create callback for interactive pagination using helper function
+            fetch_page = create_api_pagination_callback(
+                cl, workspace_id, page_size, archived, verify_ssl,
+                filter_status, filter_job_name, filter_project, filter_workflow,
+                filter_job_id, filter_only_mine, filter_owner, filter_queue, last
+            )
+            create_job_list_table([], cloudos_url, pagination_metadata, selected_columns, fetch_page_callback=fetch_page)
         else:
             if filters_used:
                 print('A total of 0 jobs collected.')
@@ -1347,8 +1358,32 @@ def list_jobs(ctx,
                       'does not exist. Please, try a smaller number for --page or collect all the jobs by not ' +
                       'using --page parameter.')
     elif output_format == 'stdout':
-        # Display as table
-        create_job_list_table(my_jobs_r, cloudos_url, pagination_metadata, selected_columns)
+        # Display as table with interactive pagination
+
+        # Check if results are client-side filtered (e.g., by queue)
+        is_client_filtered = pagination_metadata and pagination_metadata.get('_client_filtered', False)
+
+        if is_client_filtered:
+            # For client-filtered results, we have all jobs already
+            # Create a callback that paginates them client-side using helper function
+            fetch_page = create_client_pagination_callback(my_jobs_r, page_size)
+
+            # Show first page of filtered results
+            first_page_jobs = my_jobs_r[:page_size]
+            first_page_metadata = {
+                'Pagination-Count': len(my_jobs_r),
+                'Pagination-Page': 1,
+                'Pagination-Limit': page_size
+            }
+            create_job_list_table(first_page_jobs, cloudos_url, first_page_metadata, selected_columns, fetch_page_callback=fetch_page)
+        else:
+            # For normal (non-filtered) results, use API pagination with helper function
+            fetch_page = create_api_pagination_callback(
+                cl, workspace_id, page_size, archived, verify_ssl,
+                filter_status, filter_job_name, filter_project, filter_workflow,
+                filter_job_id, filter_only_mine, filter_owner, filter_queue, last
+            )
+            create_job_list_table(my_jobs_r, cloudos_url, pagination_metadata, selected_columns, fetch_page_callback=fetch_page)
     elif output_format == 'csv':
         my_jobs = cl.process_job_list(my_jobs_r, all_fields)
         cl.save_job_list_to_csv(my_jobs, outfile)