Updates

Author: transientlunatic

asimov/analysis.py

@@ -701,7 +701,7 @@ def make_config(self, filename, template_directory=None, dryrun=False):
                 template_file = str(files("asimov").joinpath(f"configs/{template}"))
 
         liq = Liquid(template_file)
-        rendered = liq.render(production=self, analysis=self, config=config)
+        rendered = liq.render(production=self, analysis=self, pipeline=pipeline, config=config)
         with open(filename, "w") as output_file:
             output_file.write(rendered)
 
@@ -973,10 +973,8 @@ def __init__(self, subject, name, pipeline, status=None, comment=None, **kwargs)
         self.pipeline = pipeline.lower()
         self.pipeline = known_pipelines[pipeline.lower()](self)
 
-        if "needs" in self.meta:
-            self._needs = cast(List[Any], self.meta.pop("needs"))
-        else:
-            self._needs = []
+        needs_value = self.meta.pop("needs", None)
+        self._needs = cast(List[Any], needs_value) if needs_value is not None else []
 
         self.comment = kwargs.get("comment", None)
 
@@ -1363,11 +1361,9 @@ def __init__(self, name, pipeline, ledger=None, **kwargs):
             # except KeyError:
             self.logger.warning(f"The pipeline {pipeline} could not be found.")
 
-        if "needs" in self.meta:
-            self._needs = cast(List[Any], self.meta.pop("needs"))
-        else:
-            self._needs = []
-        
+        needs_value = self.meta.pop("needs", None)
+        self._needs = cast(List[Any], needs_value) if needs_value is not None else []
+
         if "comment" in kwargs:
             self.comment = kwargs["comment"]
         else:
@@ -1648,6 +1644,83 @@ def rundir(self, value):
         else:
             self.meta["rundir"] = value
 
+    def html(self):
+        """
+        Generate HTML card for this project analysis.
+
+        This method creates an HTML representation of the project analysis
+        for display in the asimov HTML report. It includes status information,
+        subject and analysis counts, and pipeline-specific content.
+
+        Returns
+        -------
+        str
+            HTML string representing this project analysis as a card.
+        """
+        from asimov.event import status_map
+
+        # Status badge mapping
+        status_badge = status_map.get(self.status, "secondary")
+
+        card = f"""
+<div class='project-analysis-card card event-data' id='project-{self.name}'>
+    <div class='card-header'>
+        <h3 class='card-title'>{self.name}</h3>
+"""
+
+        if self.comment:
+            card += f"        <p class='text-muted'>{self.comment}</p>\n"
+
+        # Status badge
+        card += f"""        <span class='badge badge-{status_badge}'>{self.status}</span>
+    </div>
+    <div class='card-body'>
+"""
+
+        # Show pipeline info
+        if self.pipeline:
+            pipeline_name = self.pipeline.name if hasattr(self.pipeline, 'name') else str(self.pipeline)
+            card += f"        <p><strong>Pipeline:</strong> {pipeline_name}</p>\n"
+
+        # Show number of subjects
+        if hasattr(self, '_subjects') and self._subjects:
+            card += f"        <p><strong>Subjects:</strong> {len(self._subjects)}</p>\n"
+
+        # Show number of analyses
+        if hasattr(self, 'analyses') and self.analyses:
+            card += f"        <p><strong>Analyses:</strong> {len(self.analyses)}</p>\n"
+
+        # List subjects with links to event cards
+        if hasattr(self, '_subjects') and self._subjects:
+            card += """        <details>
+            <summary>View Subjects</summary>
+            <ul>
+"""
+            for subject in self._subjects:
+                subject_name = subject.name if hasattr(subject, 'name') else str(subject)
+                card += f"                <li><a href='#card-{subject_name}'>{subject_name}</a></li>\n"
+
+            card += """            </ul>
+        </details>
+"""
+
+        # Pipeline-specific content (e.g., plots for CatalogPlotter)
+        if self.pipeline and hasattr(self.pipeline, 'html'):
+            try:
+                pipeline_html = self.pipeline.html()
+                card += pipeline_html
+            except Exception as e:
+                # Log but don't fail if pipeline HTML generation has issues
+                import logging
+                logger = logging.getLogger(__name__)
+                logger.warning(f"Failed to generate pipeline HTML for {self.name}: {e}")
+
+        card += """    </div>
+</div>
+"""
+
+        return card
+
 
 class GravitationalWaveTransient(SimpleAnalysis):
     """

asimov/blueprints.py

@@ -312,7 +312,41 @@ class Subject(Blueprint):
         default=None,
         description="A dictionary of prior configurations for the subject."
     )
-    
+
     model_config = ConfigDict(extra='forbid')
 
 
+class ProjectAnalysis(Blueprint):
+    """
+    A blueprint defining the configuration for a project-level analysis.
+
+    Project analyses operate across multiple subjects/events, useful for
+    population studies, catalog plots, or any analysis requiring data from
+    multiple events.
+    """
+    name: str = pydantic.Field(
+        description="The name of the project analysis."
+    )
+    pipeline: str = pydantic.Field(
+        description="The pipeline to use for this project analysis."
+    )
+    status: str = pydantic.Field(
+        default="ready",
+        description="The initial status of the project analysis."
+    )
+    comment: str | None = pydantic.Field(
+        default=None,
+        description="A comment describing this project analysis."
+    )
+    subjects: list[str] | None = pydantic.Field(
+        default=None,
+        description="List of subject names to include in this project analysis."
+    )
+    analyses: list[dict | str] | None = pydantic.Field(
+        default=None,
+        description="Smart dependency specifications for which analyses to include."
+    )
+
+    model_config = ConfigDict(extra='allow')
+
+

asimov/cli/application.py

@@ -4,6 +4,7 @@
 """
 
 import os
+import re
 import sys
 from copy import deepcopy
 from datetime import datetime
@@ -54,7 +55,47 @@ def get_ledger():
         return current_ledger
 
 
-def apply_page(file, event=None, ledger=None, update_page=False):
+def _raw_production_names(ledger, event_name):
+    """Return the set of production names for an event from raw ledger data.
+
+    Reads directly from ``ledger.events`` (a plain dict) rather than
+    constructing a full ``Event`` object, avoiding expensive git and
+    Production initialisation just to obtain a set of strings.
+    """
+    names = set()
+    for prod in ledger.events.get(event_name, {}).get("productions", []):
+        if isinstance(prod, dict) and len(prod) == 1:
+            names.add(next(iter(prod)))
+        elif isinstance(prod, dict) and "name" in prod:
+            names.add(prod["name"])
+    return names
+
+
+def next_available_name(name, existing_names):
+    """Return the next available analysis name, incrementing a numeric suffix if needed.
+
+    If ``name`` is not already taken, it is returned unchanged.  Otherwise the
+    trailing ``-N`` suffix (if present) is stripped to find the stem, and the
+    lowest integer >= 2 that produces a free name is appended.
+
+    Examples
+    --------
+    >>> next_available_name("bilby-IMRPhenomXPHM", {"bilby-IMRPhenomXPHM"})
+    'bilby-IMRPhenomXPHM-2'
+    >>> next_available_name("bilby-IMRPhenomXPHM-2", {"bilby-IMRPhenomXPHM-2"})
+    'bilby-IMRPhenomXPHM-3'
+    """
+    if name not in existing_names:
+        return name
+    match = re.match(r"^(.*)-(\d+)$", name)
+    stem, n = (match.group(1), int(match.group(2))) if match else (name, 1)
+    n += 1
+    while f"{stem}-{n}" in existing_names:
+        n += 1
+    return f"{stem}-{n}"
+
+
+def apply_page(file, event=None, ledger=None, update_page=False, name=None, iterate=False):
     # Get ledger if not provided
     if ledger is None:
         ledger = get_ledger()
@@ -121,10 +162,10 @@ def apply_page(file, event=None, ledger=None, update_page=False):
                 history[version]["date changed"] = datetime.now()
 
                 ledger.data["history"][event_obj.name] = history
-                ledger.save()
                 update(ledger.events[event_obj.name], event_obj.meta)
                 ledger.events[event_obj.name]["productions"] = analyses
                 ledger.events[event_obj.name].pop("ledger", None)
+                ledger.save()
 
                 click.echo(
                     click.style("●", fg="green") + f" Successfully updated {event_obj.name}"
@@ -169,33 +210,46 @@ def apply_page(file, event=None, ledger=None, update_page=False):
                         prompt = "Which event should these be applied to?"
                     event_s = str(click.prompt(prompt))
 
+            # Resolve name overrides before constructing the Event object.
+            # Reading from the raw ledger dict is cheap; get_event() is expensive
+            # (it instantiates Production objects and runs git/graph operations).
+            if name is not None or iterate:
+                existing_names = _raw_production_names(ledger, event_s)
             for expanded_doc in expanded_documents:
-                    
-              try:
-                  event_obj = ledger.get_event(event_s)[0]
-              except KeyError as e:
-                  click.echo(
-                      click.style("●", fg="red")
-                      + f" Could not apply a production, couldn't find the event {event}"
-                  )
-                  logger.exception(e)
-              production = asimov.event.Production.from_dict(
-                  parameters=expanded_doc, subject=event_obj, ledger=ledger
-              )
-              try:
-                  ledger.add_analysis(production, event=event_obj)
-                  click.echo(
-                      click.style("●", fg="green")
-                      + f" Successfully applied {production.name} to {event_obj.name}"
-                  )
-                  logger.info(f"Added {production.name} to {event_obj.name}")
-              except ValueError as e:
-                  click.echo(
-                      click.style("●", fg="red")
-                      + f" Could not apply {production.name} to {event_obj.name} as "
-                      + "an analysis already exists with this name"
-                  )
-                  logger.exception(e)
+                if name is not None:
+                    expanded_doc["name"] = name
+                elif iterate:
+                    expanded_doc["name"] = next_available_name(expanded_doc["name"], existing_names)
+                    # Keep existing_names current so consecutive iterations in a
+                    # strategy expansion don't collide with each other.
+                    existing_names.add(expanded_doc["name"])
+
+                try:
+                    event_obj = ledger.get_event(event_s)[0]
+                except KeyError as e:
+                    click.echo(
+                        click.style("●", fg="red")
+                        + f" Could not apply a production, couldn't find the event {event}"
+                    )
+                    logger.exception(e)
+                    continue
+                production = asimov.event.Production.from_dict(
+                    parameters=expanded_doc, subject=event_obj, ledger=ledger
+                )
+                try:
+                    ledger.add_analysis(production, event=event_obj)
+                    click.echo(
+                        click.style("●", fg="green")
+                        + f" Successfully applied {production.name} to {event_obj.name}"
+                    )
+                    logger.info(f"Added {production.name} to {event_obj.name}")
+                except ValueError as e:
+                    click.echo(
+                        click.style("●", fg="red")
+                        + f" Could not apply {production.name} to {event_obj.name} as "
+                        + "an analysis already exists with this name"
+                    )
+                    logger.exception(e)
 
         elif document["kind"].lower() == "postprocessing":
             # Handle a project analysis
@@ -436,11 +490,24 @@ def apply_via_plugin(event, hookname, **kwargs):
     default=False,
     help="Update the project with this blueprint rather than adding a new record.",
 )
-def apply(file, event, plugin, update):
+@click.option(
+    "--name",
+    "-n",
+    default=None,
+    help="Override the analysis name specified in the blueprint.",
+)
+@click.option(
+    "--iterate",
+    "-I",
+    is_flag=True,
+    default=False,
+    help="Automatically increment the analysis name suffix to avoid a name conflict.",
+)
+def apply(file, event, plugin, update, name, iterate):
     from asimov import setup_file_logging
     current_ledger = get_ledger()
     setup_file_logging()
     if plugin:
         apply_via_plugin(event, hookname=plugin)
     elif file:
-        apply_page(file, event, ledger=current_ledger, update_page=update)
+        apply_page(file, event, ledger=current_ledger, update_page=update, name=name, iterate=iterate)

asimov/cli/monitor.py

@@ -184,14 +184,20 @@ def _has_pesummary_outputs(webdir: Path) -> bool:
         logger.warning(f"Failed to use new JobList, falling back to legacy: {e}")
         try:
             job_list = condor.CondorJobList()
-        except condor.htcondor.HTCondorLocateError:
-            click.echo(click.style("Could not find the scheduler", bold=True))
-            click.echo(
-                "You need to run asimov on a machine which has access to a"
-                "scheduler in order to work correctly, or to specify"
-                "the address of a valid scheduler."
-            )
-            sys.exit()
+        except Exception as locate_error:
+            # Handle both HTCondor 1 and 2 exceptions
+            error_name = type(locate_error).__name__
+            if "Locate" in error_name or "locate" in str(locate_error).lower():
+                click.echo(click.style("Could not find the scheduler", bold=True))
+                click.echo(
+                    "You need to run asimov on a machine which has access to a"
+                    "scheduler in order to work correctly, or to specify"
+                    "the address of a valid scheduler."
+                )
+                sys.exit()
+            else:
+                # Re-raise if it's not a locate error
+                raise
 
     # also check the analyses in the project analyses
     for analysis in ledger.project_analyses: