cloudos-cli 2.57.0__tar.gz → 2.58.0__tar.gz

{cloudos_cli-2.57.0 → cloudos_cli-2.58.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.57.0
+Version: 2.58.0
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro
@@ -204,15 +204,7 @@ This will tell you the implemented commands. Each implemented command has its ow
 ```bash
 cloudos job list --help
 ```
-```console
-CloudOS python package: a package for interacting with CloudOS.
-
-Version: 2.55.0
-
-CloudOS job functionality: run, check and abort jobs in CloudOS.
-
-                                                                                                            
- Usage: cloudos job list [OPTIONS]                                                                          
+```console                                                                                                      Usage: cloudos job list [OPTIONS]                                                                          
                                                                                                             
  Collect workspace jobs from a CloudOS workspace in CSV or JSON format.                                     
                                                                                                             
@@ -249,6 +241,7 @@ CloudOS job functionality: run, check and abort jobs in CloudOS.
 │    --filter-queue                  TEXT        Filter jobs by queue name. Only applies to jobs running   │
 │                                                in batch environment. Non-batch jobs are preserved in     │
 │                                                results.                                                  │
+│    --filter-owner                  TEXT        Filter jobs by owner username.                            │
 │    --verbose                                   Whether to print information messages or not.             │
 │    --disable-ssl-verification                  Disable SSL certificate verification. Please, remember    │
 │                                                that this option is not generally recommended for         │
@@ -926,6 +919,7 @@ You find specific jobs within your workspace using the listing filtering options
 - **`--filter-workflow`**: Filter jobs by workflow/pipeline name (exact match required)
 - **`--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 job for the specified owner (exact match required, i.e needs to be in quotes and be "Name Surname")
 - **`--filter-queue`**: Filter jobs by queue name (only applies to batch jobs)
 
 Here following are some examples:

{cloudos_cli-2.57.0 → cloudos_cli-2.58.0}/README.md

@@ -169,15 +169,7 @@ This will tell you the implemented commands. Each implemented command has its ow
 ```bash
 cloudos job list --help
 ```
-```console
-CloudOS python package: a package for interacting with CloudOS.
-
-Version: 2.55.0
-
-CloudOS job functionality: run, check and abort jobs in CloudOS.
-
-                                                                                                            
- Usage: cloudos job list [OPTIONS]                                                                          
+```console                                                                                                      Usage: cloudos job list [OPTIONS]                                                                          
                                                                                                             
  Collect workspace jobs from a CloudOS workspace in CSV or JSON format.                                     
                                                                                                             
@@ -214,6 +206,7 @@ CloudOS job functionality: run, check and abort jobs in CloudOS.
 │    --filter-queue                  TEXT        Filter jobs by queue name. Only applies to jobs running   │
 │                                                in batch environment. Non-batch jobs are preserved in     │
 │                                                results.                                                  │
+│    --filter-owner                  TEXT        Filter jobs by owner username.                            │
 │    --verbose                                   Whether to print information messages or not.             │
 │    --disable-ssl-verification                  Disable SSL certificate verification. Please, remember    │
 │                                                that this option is not generally recommended for         │
@@ -891,6 +884,7 @@ You find specific jobs within your workspace using the listing filtering options
 - **`--filter-workflow`**: Filter jobs by workflow/pipeline name (exact match required)
 - **`--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 job for the specified owner (exact match required, i.e needs to be in quotes and be "Name Surname")
 - **`--filter-queue`**: Filter jobs by queue name (only applies to batch jobs)
 
 Here following are some examples:

{cloudos_cli-2.57.0 → cloudos_cli-2.58.0}/cloudos_cli/__main__.py

@@ -1326,6 +1326,8 @@ def job_details(ctx,
               is_flag=True)
 @click.option('--filter-queue',
               help='Filter jobs by queue name. Only applies to jobs running in batch environment. Non-batch jobs are preserved in results.')
+@click.option('--filter-owner',
+             help='Filter jobs by owner username.')
 @click.option('--verbose',
               help='Whether to print information messages or not.',
               is_flag=True)
@@ -1354,7 +1356,7 @@ def list_jobs(ctx,
               last,
               filter_job_id,
               filter_only_mine,
-              #filter_owner,
+              filter_owner,
               filter_queue,
               verbose,
               disable_ssl_verification,
@@ -1417,10 +1419,25 @@ def list_jobs(ctx,
                                 filter_workflow=filter_workflow,
                                 filter_job_id=filter_job_id,
                                 filter_only_mine=filter_only_mine,
+                                filter_owner=filter_owner,
                                 filter_queue=filter_queue,
                                 last=last)
     if len(my_jobs_r) == 0:
-        if ctx.get_parameter_source('page') == click.core.ParameterSource.DEFAULT:
+        # Check if any filtering options are being used
+        filters_used = any([
+            filter_status,
+            filter_job_name,
+            filter_project,
+            filter_workflow,
+            filter_job_id,
+            filter_only_mine,
+            filter_owner,
+            filter_queue
+        ])
+        
+        if filters_used:
+            print('\t[Message] A total of 0 jobs collected.')
+        elif ctx.get_parameter_source('page') == click.core.ParameterSource.DEFAULT:
             print('\t[Message] A total of 0 jobs collected. This is likely because your workspace ' +
                   'has no jobs created yet.')
         else:

cloudos_cli-2.58.0/cloudos_cli/_version.py

@@ -0,0 +1 @@
+__version__ = '2.58.0'

{cloudos_cli-2.57.0 → cloudos_cli-2.58.0}/cloudos_cli/clos.py

@@ -420,6 +420,63 @@ class Cloudos:
             }
         return headers
 
+    def resolve_user_id(self, filter_owner, workspace_id, verify=True):
+        """Resolve a username or display name to a user ID.
+
+        Parameters
+        ----------
+        filter_owner : str
+            The username or display name to search for.
+        workspace_id : str
+            The CloudOS workspace ID.
+        verify : [bool|string]
+            Whether to use SSL verification or not. Alternatively, if
+            a string is passed, it will be interpreted as the path to
+            the SSL certificate file.
+
+        Returns
+        -------
+        str
+            The user ID corresponding to the filter_owner.
+
+        Raises
+        ------
+        ValueError
+            If the user cannot be found or if there's an error during the search.
+        """
+        try:
+            search_headers = {
+                "Content-type": "application/json",
+                "apikey": self.apikey
+            }
+            search_params = {
+                "q": filter_owner,
+                "teamId": workspace_id
+            }
+            # Note: this endpoint may not be open in all CloudOS instances
+            user_search_r = retry_requests_get(f"{self.cloudos_url}/api/v1/users/search-assist",
+                                             params=search_params, headers=search_headers, verify=verify)
+            if user_search_r.status_code >= 400:
+                raise ValueError(f"Error searching for user '{filter_owner}'")
+            
+            user_search_content = user_search_r.json()
+            user_items = user_search_content.get('items', [])
+            if user_items and len(user_items) > 0:
+                user_match = None
+                for user in user_items:
+                    if user.get("username") == filter_owner or user.get("name") == filter_owner:
+                        user_match = user
+                        break
+                
+                if user_match:
+                    return user_match.get("id")
+                else:
+                    raise ValueError(f"User '{filter_owner}' not found.")
+            else:
+                raise ValueError(f"User '{filter_owner}' not found.")
+        except Exception as e:
+            raise ValueError(f"Error resolving user '{filter_owner}': {str(e)}")
+
     def get_cromwell_status(self, workspace_id, verify=True):
         """Get Cromwell server status from CloudOS.
 
@@ -511,6 +568,8 @@ class Cloudos:
             Filter jobs by specific job ID.
         filter_only_mine : bool, optional
             Filter to show only jobs belonging to the current user.
+        filter_owner : string, optional
+            Filter jobs by owner username (will be resolved to user ID).
         filter_queue : string, optional
             Filter jobs by queue name (will be resolved to queue ID).
             Only applies to jobs running in batch environment.
@@ -598,6 +657,10 @@ class Cloudos:
             except Exception as e:
                 raise ValueError(f"Error getting current user info: {str(e)}")
         
+        # Resolve owner username to user ID
+        if filter_owner:
+            user_id = self.resolve_user_id(filter_owner, workspace_id, verify)
+            params["user.id"] = user_id
 
         # --- Fetch jobs page by page ---
         all_jobs = []

{cloudos_cli-2.57.0 → cloudos_cli-2.58.0}/cloudos_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudos_cli
-Version: 2.57.0
+Version: 2.58.0
 Summary: Python package for interacting with CloudOS
 Home-page: https://github.com/lifebit-ai/cloudos-cli
 Author: David Piñeyro
@@ -204,15 +204,7 @@ This will tell you the implemented commands. Each implemented command has its ow
 ```bash
 cloudos job list --help
 ```
-```console
-CloudOS python package: a package for interacting with CloudOS.
-
-Version: 2.55.0
-
-CloudOS job functionality: run, check and abort jobs in CloudOS.
-
-                                                                                                            
- Usage: cloudos job list [OPTIONS]                                                                          
+```console                                                                                                      Usage: cloudos job list [OPTIONS]                                                                          
                                                                                                             
  Collect workspace jobs from a CloudOS workspace in CSV or JSON format.                                     
                                                                                                             
@@ -249,6 +241,7 @@ CloudOS job functionality: run, check and abort jobs in CloudOS.
 │    --filter-queue                  TEXT        Filter jobs by queue name. Only applies to jobs running   │
 │                                                in batch environment. Non-batch jobs are preserved in     │
 │                                                results.                                                  │
+│    --filter-owner                  TEXT        Filter jobs by owner username.                            │
 │    --verbose                                   Whether to print information messages or not.             │
 │    --disable-ssl-verification                  Disable SSL certificate verification. Please, remember    │
 │                                                that this option is not generally recommended for         │
@@ -926,6 +919,7 @@ You find specific jobs within your workspace using the listing filtering options
 - **`--filter-workflow`**: Filter jobs by workflow/pipeline name (exact match required)
 - **`--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 job for the specified owner (exact match required, i.e needs to be in quotes and be "Name Surname")
 - **`--filter-queue`**: Filter jobs by queue name (only applies to batch jobs)
 
 Here following are some examples:

cloudos_cli-2.57.0/cloudos_cli/_version.py

@@ -1 +0,0 @@
-__version__ = '2.57.0'