dkist-processing-common 14.0.2rc1__tar.gz → 14.0.2rc2__tar.gz

{dkist_processing_common-14.0.2rc1 → dkist_processing_common-14.0.2rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 14.0.2rc1
+Version: 14.0.2rc2
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause

dkist_processing_common-14.0.2rc2/changelog/332.feature.1.rst

@@ -0,0 +1 @@
+Added `TaskCount` quality metric model.

{dkist_processing_common-14.0.2rc1 → dkist_processing_common-14.0.2rc2}/dkist_processing_common/tasks/base.py

@@ -19,13 +19,10 @@ from opentelemetry.metrics import Observation
 
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common._util.tags import TagDB
-from dkist_processing_common.codecs.basemodel import basemodel_encoder
 from dkist_processing_common.codecs.bytes import bytes_encoder
 from dkist_processing_common.codecs.path import path_decoder
 from dkist_processing_common.config import common_configurations
 from dkist_processing_common.models.constants import ConstantsBase
-from dkist_processing_common.models.metric_code import MetricCode
-from dkist_processing_common.models.quality import TaskCount
 from dkist_processing_common.models.tags import StemName
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.models.telemetry import ObservableProgress
@@ -341,25 +338,6 @@ class WorkflowTaskBase(TaskBase, MetadataStoreMixin, ABC):
         """Remove the association between the given tag(s) and the given path."""
         self.scratch.remove_tags(path, tags)
 
-    def quality_write_intermediate_task_type_counts(
-        self, task_type: str, total_frames: int, frames_not_used: int = 0
-    ):
-        """
-        Write intermediate task type data.
-
-        Parameters
-        ----------
-        task_type: task type as listed in the headers
-        total_frames: total number of frames supplied of the given task type
-        frames_not_used: if some frames aren't used, how many
-        """
-        task_count = TaskCount(
-            task_type=task_type,
-            total_frames=total_frames,
-            frames_not_used=frames_not_used,
-        )
-        self.write(task_count, tags=Tag.quality(MetricCode.task_types), encoder=basemodel_encoder)
-
     def _purge(self):
         """Purge the persistent stores associated with the workflow to which this task belongs e.g. when testing."""
         self.scratch.purge()

{dkist_processing_common-14.0.2rc1 → dkist_processing_common-14.0.2rc2}/dkist_processing_common/tests/test_workflow_task_base.py

@@ -11,12 +11,10 @@ from sqids import Sqids
 
 import dkist_processing_common
 from dkist_processing_common._util.scratch import WorkflowFileSystem
-from dkist_processing_common.codecs.basemodel import basemodel_decoder
 from dkist_processing_common.codecs.str import str_encoder
 from dkist_processing_common.models.constants import BudName
 from dkist_processing_common.models.constants import ConstantsBase
 from dkist_processing_common.models.graphql import RecipeRunProvenanceMutation
-from dkist_processing_common.models.quality import TaskCount
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.tasks.base import WorkflowTaskBase
 
@@ -215,46 +213,6 @@ def test_dataset_id(workflow_data_task):
     assert task.constants.dataset_id == expected_dataset_id
 
 
-@pytest.mark.parametrize(
-    "task_type, total_frames, frames_not_used",
-    [
-        pytest.param("one", 1, 1, id="simple"),
-        pytest.param("two", 2, 0, id="not_used_zero"),
-        pytest.param("three", 3, None, id="not_used_none"),
-    ],
-)
-def test_quality_write_intermediate_task_type_counts(
-    task_type: str, total_frames: int, frames_not_used: int | None, workflow_data_task
-):
-    """
-    Given: Valid intermediate task type count input
-    When: Running WorkflowTaskBase quality_write_intermediate_task_type_counts()
-    Then: A single TaskCount file gets created
-    """
-    # Given
-    task, _, _, _, _ = workflow_data_task
-
-    # When
-    if frames_not_used is not None:
-        task.quality_write_intermediate_task_type_counts(task_type, total_frames, frames_not_used)
-    else:
-        task.quality_write_intermediate_task_type_counts(task_type, total_frames)
-
-    # Then
-    task_counts: list[TaskCount] = list(
-        task.read(tags="QUALITY_TASK_TYPES", decoder=basemodel_decoder, model=TaskCount)
-    )
-    assert isinstance(task_counts, list)
-    assert len(task_counts) == 1
-    task_count = task_counts[0]
-    assert task_count.task_type == str(task_type).upper()
-    assert task_count.total_frames == total_frames
-    if frames_not_used is not None:
-        assert task_count.frames_not_used == frames_not_used
-    else:
-        assert task_count.frames_not_used == 0
-
-
 class ProvenanceTask(WorkflowTaskBase):
     record_provenance = True
 

{dkist_processing_common-14.0.2rc1 → dkist_processing_common-14.0.2rc2}/dkist_processing_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 14.0.2rc1
+Version: 14.0.2rc2
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause

{dkist_processing_common-14.0.2rc1 → dkist_processing_common-14.0.2rc2}/dkist_processing_common.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ README.rst
 bitbucket-pipelines.yml
 pyproject.toml
 changelog/.gitempty
+changelog/332.feature.1.rst
 changelog/332.feature.rst
 dkist_processing_common/__init__.py
 dkist_processing_common/config.py