fix test

Author: ltalirz

amorphouspy_api/src/amorphouspy_api/pipeline.py

@@ -221,7 +221,11 @@ def _run_elastic(submission: JobSubmission, config: ElasticAnalysis, result: dic
 # Analyses that build their own sub-DAG instead of going through _run_analysis.
 _SUBMITTERS: dict[str, Callable[..., Future]] = {"viscosity": _submit_viscosity}
 
-__all__ = ["ANALYSES", "BASE_STEPS", "STEPS", "submit_pipeline"]
+# All known analysis names (simple + DAG-based), used for result lookups and
+# progress tracking.
+ANALYSIS_NAMES: frozenset[str] = frozenset(ANALYSES) | frozenset(_SUBMITTERS)
+
+__all__ = ["ANALYSES", "ANALYSIS_NAMES", "BASE_STEPS", "STEPS", "submit_pipeline"]
 
 
 # ---------------------------------------------------------------------------

amorphouspy_api/src/amorphouspy_api/routers/jobs.py

@@ -51,7 +51,7 @@
     _job_urls,
     validate_atoms,
 )
-from amorphouspy_api.pipeline import ANALYSES
+from amorphouspy_api.pipeline import ANALYSIS_NAMES
 from amorphouspy_api.routers.jobs_helpers import (
     _analyses_list,
     _initial_progress,
@@ -450,7 +450,7 @@ def get_job_results(job_id: str) -> JobResultsResponse:
         raise HTTPException(status_code=404, detail="No results available yet")
 
     # Collect results for all analysis types
-    analyses = {key: result[key] for key in ANALYSES if key in result}
+    analyses = {key: result[key] for key in ANALYSIS_NAMES if key in result}
 
     return JobResultsResponse(
         job_id=job.job_id,

amorphouspy_api/src/amorphouspy_api/routers/jobs_helpers.py

@@ -21,7 +21,7 @@
     JobSubmission,
     StepStatus,
 )
-from amorphouspy_api.pipeline import ANALYSES, BASE_STEPS, submit_pipeline
+from amorphouspy_api.pipeline import ANALYSIS_NAMES, BASE_STEPS, submit_pipeline
 
 if TYPE_CHECKING:
     from amorphouspy_api.database import Job
@@ -267,7 +267,7 @@ def _update_from_resolved(job_id: str, resolved: dict, submission: JobSubmission
     # Build the expected step list
     all_steps = list(BASE_STEPS)
     if submission:
-        all_steps.extend(a.type for a in submission.analyses if a.type in ANALYSES)
+        all_steps.extend(a.type for a in submission.analyses if a.type in ANALYSIS_NAMES)
 
     if status == "completed":
         result = resolved["result"]
@@ -399,7 +399,7 @@ def refresh_job_from_cache(job: Job) -> None:
     submission = _parse_submission(job)
     all_steps = list(BASE_STEPS)
     if submission:
-        all_steps.extend(a.type for a in submission.analyses if a.type in ANALYSES)
+        all_steps.extend(a.type for a in submission.analyses if a.type in ANALYSIS_NAMES)
 
     progress, partial_results, has_failure, errors = _probe_step_caches(job, all_steps)
 

amorphouspy_api/src/tests/test_pipeline.py

@@ -5,6 +5,7 @@
 from amorphouspy_api.pipeline import (
     _SUBMITTERS,
     ANALYSES,
+    ANALYSIS_NAMES,
     BASE_STEPS,
     STEPS,
     _accumulate_step,
@@ -131,6 +132,11 @@ def test_submitters_contain_viscosity(self) -> None:
         assert "viscosity" in _SUBMITTERS
         assert callable(_SUBMITTERS["viscosity"])
 
+    def test_analysis_names_includes_all(self) -> None:
+        """ANALYSIS_NAMES is the union of ANALYSES and _SUBMITTERS."""
+        assert frozenset(ANALYSES) | frozenset(_SUBMITTERS) == ANALYSIS_NAMES
+        assert "viscosity" in ANALYSIS_NAMES
+
     def test_all_steps_are_callable(self) -> None:
         """Every registered step function is callable."""
         for fn in STEPS.values():