dkist-processing-common 6.2.4__tar.gz → 7.0.0rc2__tar.gz

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-common
-Version: 6.2.4
+Version: 7.0.0rc2
 Summary: Common task classes used by the DKIST Science Data Processing pipelines to process DKIST data.
 Home-page: https://bitbucket.org/dkistdc/dkist-processing-common/src/main/
 Author: NSO / AURA

dkist-processing-common-7.0.0rc2/changelog/195.misc.rst

@@ -0,0 +1 @@
+Update `sphinx-auotapi` pin to only exclude the breaking version. The bug was fixed in subsequent versions.

dkist-processing-common-7.0.0rc2/changelog/196.misc.rst

@@ -0,0 +1 @@
+Resolve matplotlib version conflict

dkist-processing-common-7.0.0rc2/changelog/197.misc.rst

@@ -0,0 +1 @@
+Upgrade dkist-processing-core to support airflow to 2.9.1 which includes the dependency on pydantic 2 and consequently a few other libraries that needed upgrading for the same pydantic 2 dependency.

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/_util/graphql.py

@@ -10,7 +10,7 @@ from gqlclient.request_wrap import wrap_request
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 
-from dkist_processing_common._util.config import service_configuration
+from dkist_processing_common.config import common_configurations
 
 logger = logging.getLogger(__name__)
 
@@ -41,7 +41,7 @@ class GraphQLClient(GraphQLClientBase):
         kwargs["headers"] = {
             **kwargs.get("headers", {}),
             "Service-Name": __name__,
-            "Authorization": service_configuration.gql_auth_token,
+            "Authorization": common_configurations.gql_auth_token,
         }
         with requests.sessions.Session() as http:
             http.mount("http://", self.adapter)

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/_util/scratch.py

@@ -6,8 +6,8 @@ from pathlib import Path
 from shutil import rmtree
 from typing import Generator
 
-from dkist_processing_common._util.config import service_configuration
 from dkist_processing_common._util.tags import TagDB
+from dkist_processing_common.config import common_configurations
 
 
 logger = logging.getLogger(__name__)
@@ -39,7 +39,7 @@ class WorkflowFileSystem:
         self.recipe_run_id = recipe_run_id
         self.task_name = task_name
         if not scratch_base_path:
-            scratch_base_path = service_configuration.scratch_base_path
+            scratch_base_path = common_configurations.scratch_base_path
         self.scratch_base_path = scratch_base_path
         self.workflow_base_path = Path(self.scratch_base_path) / str(recipe_run_id)
         with self._mask():

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/_util/tags.py

@@ -7,7 +7,7 @@ from redis.backoff import FullJitterBackoff
 from redis.exceptions import ConnectionError
 from redis.retry import Retry
 
-from dkist_processing_common._util.config import service_configuration
+from dkist_processing_common.config import common_configurations
 
 
 class TagDB:
@@ -29,10 +29,10 @@ class TagDB:
     def __init__(self, recipe_run_id: int, task_name: str, namespace: str = "path"):
         self.recipe_run_id = recipe_run_id
         self.task_name = task_name
-        self._db = self.recipe_run_id % service_configuration.scratch_inventory_max_db_index
+        self._db = self.recipe_run_id % common_configurations.scratch_inventory_max_db_index
         self.namespace = f"{self.recipe_run_id}:{namespace}:"
         connection_name = f"{self.namespace}{self.task_name}"
-        scratch_inventory = service_configuration.scratch_inventory_mesh_service
+        scratch_inventory = common_configurations.scratch_inventory_mesh_service
         self.db_retry = Retry(
             backoff=FullJitterBackoff(), retries=3, supported_errors=(ConnectionError,)
         )

{dkist-processing-common-6.2.4/dkist_processing_common/_util → dkist-processing-common-7.0.0rc2/dkist_processing_common}/config.py

@@ -1,9 +1,12 @@
 """Common configurations."""
-from dkist_service_configuration import MeshServiceConfigurationBase
+from dkist_processing_core.config import DKISTProcessingCoreConfiguration
 from dkist_service_configuration.settings import DEFAULT_MESH_SERVICE
 from dkist_service_configuration.settings import MeshService
 from pydantic import BaseModel
 from pydantic import Field
+from talus import ConnectionRetryerFactory
+from talus import ConsumerConnectionParameterFactory
+from talus import ProducerConnectionParameterFactory
 
 
 class RetryConfig(BaseModel):
@@ -16,22 +19,16 @@ class RetryConfig(BaseModel):
     retry_tries: int = -1
 
 
-class ServiceConfiguration(MeshServiceConfigurationBase):
+class DKISTProcessingCommonConfiguration(DKISTProcessingCoreConfiguration):
     """Common configurations."""
 
     retry_config: RetryConfig = Field(default_factory=RetryConfig)
-    # interservice bus
-    isb_username: str = "guest"
-    isb_password: str = "guest"
-    isb_exchange: str = "master.direct.x"
-    isb_heartbeat_timeout: int = 60  # 1 minute
     # metadata-store-api
     gql_auth_token: str | None = None
     # object-store-api
     object_store_access_key: str | None = None
     object_store_secret_key: str | None = None
     object_store_use_ssl: bool = False
-    # start object-clerk library
     multipart_threshold: int | None = None
     s3_client_config: dict | None = None
     s3_upload_config: dict | None = None
@@ -54,11 +51,6 @@ class ServiceConfiguration(MeshServiceConfigurationBase):
         gateway = self.service_mesh_detail(service_name="internal-api-gateway")
         return f"http://{gateway.host}:{gateway.port}/graphql"
 
-    @property
-    def isb_mesh_service(self) -> MeshService:
-        """Interservice bus host and port."""
-        return self.service_mesh_detail(service_name="interservice-bus")
-
     @property
     def object_store_api_mesh_service(self) -> MeshService:
         """Object store host and port."""
@@ -77,6 +69,40 @@ class ServiceConfiguration(MeshServiceConfigurationBase):
         """Scratch inventory's largest db index."""
         return self.scratch_inventory_db_count - 1
 
+    @property
+    def isb_producer_connection_parameters(self) -> ProducerConnectionParameterFactory:
+        """Return the connection parameters for the ISB producer."""
+        return ProducerConnectionParameterFactory(
+            rabbitmq_host=self.isb_mesh_service.host,
+            rabbitmq_port=self.isb_mesh_service.port,
+            rabbitmq_user=self.isb_username,
+            rabbitmq_pass=self.isb_password,
+            connection_name="dkist-processing-common-producer",
+        )
+
+    @property
+    def isb_consumer_connection_parameters(self) -> ConsumerConnectionParameterFactory:
+        """Return the connection parameters for the ISB producer."""
+        return ConsumerConnectionParameterFactory(
+            rabbitmq_host=self.isb_mesh_service.host,
+            rabbitmq_port=self.isb_mesh_service.port,
+            rabbitmq_user=self.isb_username,
+            rabbitmq_pass=self.isb_password,
+            connection_name="dkist-processing-common-consumer",
+        )
+
+    @property
+    def isb_connection_retryer(self) -> ConnectionRetryerFactory:
+        """Return the connection retryer for the ISB connection."""
+        return ConnectionRetryerFactory(
+            delay_min=self.retry_config.retry_delay,
+            delay_max=self.retry_config.retry_max_delay,
+            backoff=self.retry_config.retry_backoff,
+            jitter_min=self.retry_config.retry_jitter[0],
+            jitter_max=self.retry_config.retry_jitter[1],
+            attempts=self.retry_config.retry_tries,
+        )
+
 
-service_configuration = ServiceConfiguration()
-service_configuration.log_configurations()
+common_configurations = DKISTProcessingCommonConfiguration()
+common_configurations.log_configurations()

dkist-processing-common-7.0.0rc2/dkist_processing_common/models/message.py

@@ -0,0 +1,65 @@
+"""Data structures for messages placed on the interservice bus."""
+from typing import Type
+
+from pydantic import Field
+from talus import MessageBodyBase
+from talus import PublishMessageBase
+
+
+########################
+# Message Body Schemas #
+########################
+
+
+class CatalogFrameMessageBody(MessageBodyBase):
+    """Schema for the catalog frame message body."""
+
+    objectName: str
+    bucket: str
+    incrementDatasetCatalogReceiptCount: bool = True
+
+
+class CatalogObjectMessageBody(MessageBodyBase):
+    """Schema for the catalog object message body."""
+
+    objectType: str
+    objectName: str
+    bucket: str
+    groupId: str
+    groupName: str = Field(default="DATASET")
+    incrementDatasetCatalogReceiptCount: bool = True
+
+
+class CreateQualityReportMessageBody(MessageBodyBase):
+    """Schema for the create quality report message body."""
+
+    datasetId: str
+    bucket: str
+    objectName: str
+    incrementDatasetCatalogReceiptCount: bool = True
+
+
+###################
+# Message Classes #
+###################
+
+
+class CatalogFrameMessage(PublishMessageBase):
+    """Catalog frame message."""
+
+    message_body_cls: Type[CatalogFrameMessageBody] = CatalogFrameMessageBody
+    default_routing_key = "catalog.frame.m"
+
+
+class CatalogObjectMessage(PublishMessageBase):
+    """Catalog object message."""
+
+    message_body_cls: Type[CatalogObjectMessageBody] = CatalogObjectMessageBody
+    default_routing_key = "catalog.object.m"
+
+
+class CreateQualityReportMessage(PublishMessageBase):
+    """Create quality report message."""
+
+    message_body_cls: Type[CreateQualityReportMessageBody] = CreateQualityReportMessageBody
+    default_routing_key = "create.quality.report.m"

dkist-processing-common-7.0.0rc2/dkist_processing_common/models/message_queue_binding.py

@@ -0,0 +1,25 @@
+"""Binding between a queue and a message to be published."""
+from talus import Binding
+from talus import Queue
+
+from dkist_processing_common.config import common_configurations
+from dkist_processing_common.models.message import CatalogFrameMessage
+from dkist_processing_common.models.message import CatalogObjectMessage
+from dkist_processing_common.models.message import CreateQualityReportMessage
+
+
+catalog_frame_queue = Queue(
+    name="catalog.frame.q", arguments=common_configurations.isb_queue_arguments
+)
+catalog_object_queue = Queue(
+    name="catalog.object.q", arguments=common_configurations.isb_queue_arguments
+)
+create_quality_report_queue = Queue(
+    name="create.quality.report.q", arguments=common_configurations.isb_queue_arguments
+)
+
+common_message_queue_bindings = [
+    Binding(queue=catalog_frame_queue, message=CatalogFrameMessage),
+    Binding(queue=catalog_object_queue, message=CatalogObjectMessage),
+    Binding(queue=create_quality_report_queue, message=CreateQualityReportMessage),
+]

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/models/wavelength.py

@@ -1,30 +1,28 @@
 """Support classes for manipulating wavelengths."""
 import astropy.units as u
 from pydantic import BaseModel
-from pydantic import validator
+from pydantic import ConfigDict
+from pydantic import field_validator
+from pydantic import model_validator
+from pydantic import ValidationInfo
 
 
 class WavelengthRange(BaseModel):
     """Model for holding a range of wavelengths."""
 
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
     min: u.Quantity
     max: u.Quantity
 
-    @validator("min", "max")
-    def convert_to_nanometers(cls, v):
+    @field_validator("min", "max")
+    @classmethod
+    def convert_to_nanometers(cls, v, info: ValidationInfo) -> u.Quantity:
         """Validate wavelength unit is for distance and convert to nanometers."""
         return v.to(u.nm)
 
-    @validator("max")
-    def max_greater_than_min(cls, v, values):
+    @model_validator(mode="after")
+    def max_greater_than_min(self):
         """Validate that the max wavelength is greater than the min wavelength."""
-        max = v
-        min = values["min"]
-        if min > max:
+        if self.min > self.max:
             raise ValueError("min is greater than max.  Values may be reversed.")
-        return v
-
-    class Config:
-        """pydantic.BaseModel configuration."""
-
-        arbitrary_types_allowed = True

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/tasks/base.py

@@ -12,11 +12,11 @@ from typing import Type
 import pkg_resources
 from dkist_processing_core import TaskBase
 
-from dkist_processing_common._util.config import service_configuration
 from dkist_processing_common._util.scratch import WorkflowFileSystem
 from dkist_processing_common._util.tags import TagDB
 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.tags import StemName
 from dkist_processing_common.models.tags import Tag
@@ -70,7 +70,7 @@ class WorkflowTaskBase(TaskBase, MetadataStoreMixin, ABC):
         self.constants = self.constants_model_class(
             recipe_run_id=recipe_run_id, task_name=self.task_name
         )
-        self.docs_base_url = service_configuration.docs_base_url
+        self.docs_base_url = common_configurations.docs_base_url
         self.filename_counter = TagDB(
             recipe_run_id=recipe_run_id, task_name=self.task_name, namespace="counter"
         )

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/tasks/l1_output_data.py

@@ -8,8 +8,11 @@ from typing import Iterable
 from dkist_processing_common.codecs.quality import quality_data_decoder
 from dkist_processing_common.codecs.quality import quality_data_encoder
 from dkist_processing_common.models.message import CatalogFrameMessage
+from dkist_processing_common.models.message import CatalogFrameMessageBody
 from dkist_processing_common.models.message import CatalogObjectMessage
+from dkist_processing_common.models.message import CatalogObjectMessageBody
 from dkist_processing_common.models.message import CreateQualityReportMessage
+from dkist_processing_common.models.message import CreateQualityReportMessageBody
 from dkist_processing_common.models.tags import Tag
 from dkist_processing_common.tasks.mixin.globus import GlobusMixin
 from dkist_processing_common.tasks.mixin.interservice_bus import InterserviceBusMixin
@@ -181,14 +184,15 @@ class PublishCatalogAndQualityMessages(L1OutputDataBase, InterserviceBusMixin):
         -------
         A list of frame messages
         """
-        messages = [
-            CatalogFrameMessage(
+        message_bodies = [
+            CatalogFrameMessageBody(
                 objectName=self.format_object_key(path=p),
                 conversationId=str(self.recipe_run_id),
                 bucket=self.destination_bucket,
             )
             for p in paths
         ]
+        messages = [CatalogFrameMessage(body=body) for body in message_bodies]
         return messages
 
     def object_messages(
@@ -208,8 +212,8 @@ class PublishCatalogAndQualityMessages(L1OutputDataBase, InterserviceBusMixin):
         -------
         A list of object messages
         """
-        messages = [
-            CatalogObjectMessage(
+        message_bodies = [
+            CatalogObjectMessageBody(
                 objectType=object_type,
                 objectName=self.format_object_key(p),
                 bucket=self.destination_bucket,
@@ -218,19 +222,21 @@ class PublishCatalogAndQualityMessages(L1OutputDataBase, InterserviceBusMixin):
             )
             for p in paths
         ]
+        messages = [CatalogObjectMessage(body=body) for body in message_bodies]
         return messages
 
     @property
     def quality_report_message(self) -> CreateQualityReportMessage:
         """Create the Quality Report Message."""
         file_name = Path(f"{self.constants.dataset_id}_quality_report.pdf")
-        return CreateQualityReportMessage(
+        body = CreateQualityReportMessageBody(
             bucket=self.destination_bucket,
             objectName=self.format_object_key(file_name),
             conversationId=str(self.recipe_run_id),
             datasetId=self.constants.dataset_id,
             incrementDatasetCatalogReceiptCount=True,
         )
+        return CreateQualityReportMessage(body=body)
 
     def run(self) -> None:
         """Run method for this task."""

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/tasks/mixin/globus.py

@@ -9,7 +9,7 @@ from globus_sdk import GlobusError
 from globus_sdk import TransferClient
 from globus_sdk import TransferData
 
-from dkist_processing_common._util.config import service_configuration
+from dkist_processing_common.config import common_configurations
 
 
 logger = logging.getLogger(__name__)
@@ -37,9 +37,9 @@ class GlobusMixin:
         if getattr(self, "_globus_transfer_client", False):
             return self._globus_transfer_client
         confidential_client = ConfidentialAppAuthClient(
-            client_id=service_configuration.globus_client_id,
-            client_secret=service_configuration.globus_client_secret,
-            transport_params=service_configuration.globus_transport_params,
+            client_id=common_configurations.globus_client_id,
+            client_secret=common_configurations.globus_client_secret,
+            transport_params=common_configurations.globus_transport_params,
         )
         authorizer = ClientCredentialsAuthorizer(
             confidential_client, scopes="urn:globus:auth:scope:transfer.api.globus.org:all"
@@ -56,8 +56,8 @@ class GlobusMixin:
     ) -> None:
         """Transfer data from scratch to the object store."""
         self.globus_transfer(
-            source_endpoint=service_configuration.scratch_endpoint,
-            destination_endpoint=service_configuration.object_store_endpoint,
+            source_endpoint=common_configurations.scratch_endpoint,
+            destination_endpoint=common_configurations.object_store_endpoint,
             transfer_items=transfer_items,
             label=label,
             sync_level=sync_level,
@@ -73,8 +73,8 @@ class GlobusMixin:
     ) -> None:
         """Transfer data from the object store to scratch."""
         self.globus_transfer(
-            source_endpoint=service_configuration.object_store_endpoint,
-            destination_endpoint=service_configuration.scratch_endpoint,
+            source_endpoint=common_configurations.object_store_endpoint,
+            destination_endpoint=common_configurations.scratch_endpoint,
             transfer_items=transfer_items,
             label=label,
             sync_level=sync_level,

dkist-processing-common-7.0.0rc2/dkist_processing_common/tasks/mixin/interservice_bus.py

@@ -0,0 +1,22 @@
+"""Mixin for a WorkflowDataTaskBase subclass which implements interservice bus access functionality."""
+from talus import DurableProducer
+from talus import PublishMessageBase
+
+from dkist_processing_common.config import common_configurations
+from dkist_processing_common.models.message_queue_binding import common_message_queue_bindings
+
+
+class InterserviceBusMixin:
+    """Mixin for a WorkflowDataTaskBase subclass which implements interservice bus access functionality."""
+
+    @staticmethod
+    def interservice_bus_publish(messages: list[PublishMessageBase] | PublishMessageBase) -> None:
+        """Publish messages on the interservice bus."""
+        with DurableProducer(
+            queue_bindings=common_message_queue_bindings,
+            publish_exchange=common_configurations.isb_publish_exchange,
+            connection_parameters=common_configurations.isb_producer_connection_parameters,
+            connection_retryer=common_configurations.isb_connection_retryer,
+        ) as producer:
+            for message in messages:
+                producer.publish(message)

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/tasks/mixin/metadata_store.py

@@ -3,9 +3,9 @@ import json
 import logging
 from functools import cached_property
 
-from dkist_processing_common._util.config import service_configuration
 from dkist_processing_common._util.graphql import GraphQLClient
 from dkist_processing_common.codecs.quality import QualityDataEncoder
+from dkist_processing_common.config import common_configurations
 from dkist_processing_common.models.graphql import DatasetCatalogReceiptAccountMutation
 from dkist_processing_common.models.graphql import DatasetCatalogReceiptAccountResponse
 from dkist_processing_common.models.graphql import InputDatasetPartResponse
@@ -35,7 +35,7 @@ class MetadataStoreMixin:
     @property
     def metadata_store_client(self) -> GraphQLClient:
         """Get the graphql client."""
-        return GraphQLClient(service_configuration.metadata_store_api_base)
+        return GraphQLClient(common_configurations.metadata_store_api_base)
 
     def metadata_store_change_recipe_run_to_inprogress(self):
         """Set the recipe run status to "INPROGRESS"."""

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/tasks/mixin/object_store.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 from object_clerk import ObjectClerk
 
-from dkist_processing_common._util.config import service_configuration
+from dkist_processing_common.config import common_configurations
 
 
 class ObjectStoreMixin:
@@ -21,16 +21,16 @@ class ObjectStoreMixin:
 
         """
         return ObjectClerk(
-            host=service_configuration.object_store_api_mesh_service.host,
-            port=service_configuration.object_store_api_mesh_service.port,
-            access_key=service_configuration.object_store_access_key,
-            secret_key=service_configuration.object_store_secret_key,
-            retry_delay=service_configuration.retry_config.retry_delay,
-            retry_backoff=service_configuration.retry_config.retry_backoff,
-            retry_jitter=service_configuration.retry_config.retry_jitter,
-            retry_max_delay=service_configuration.retry_config.retry_max_delay,
-            retry_tries=service_configuration.retry_config.retry_tries,
-            use_ssl=service_configuration.object_store_use_ssl,
+            host=common_configurations.object_store_api_mesh_service.host,
+            port=common_configurations.object_store_api_mesh_service.port,
+            access_key=common_configurations.object_store_access_key,
+            secret_key=common_configurations.object_store_secret_key,
+            retry_delay=common_configurations.retry_config.retry_delay,
+            retry_backoff=common_configurations.retry_config.retry_backoff,
+            retry_jitter=common_configurations.retry_config.retry_jitter,
+            retry_max_delay=common_configurations.retry_config.retry_max_delay,
+            retry_tries=common_configurations.retry_config.retry_tries,
+            use_ssl=common_configurations.object_store_use_ssl,
         )
 
     def object_store_upload_movie(

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/tasks/mixin/quality/_metrics.py

@@ -40,7 +40,7 @@ class _SimpleQualityMixin:
         metric = ReportMetric(
             name=name, description=description, statement=statement, warnings=warnings
         )
-        return metric.dict()
+        return metric.model_dump()
 
     def quality_store_ao_status(self, values: list[bool]):
         """
@@ -97,7 +97,7 @@ class _SimpleQualityMixin:
             "fall within a valid data range. If no parameters are listed here, all "
             "pipeline parameters were measured to be in range",
             warnings=self._format_warnings(warnings),
-        ).dict()
+        ).model_dump()
 
 
 class _SimplePlotQualityMixin:
@@ -134,7 +134,7 @@ class _SimplePlotQualityMixin:
             plot_data=plot_data,
             warnings=warnings,
         )
-        return metric.dict()
+        return metric.model_dump()
 
     def _record_2d_plot_values(
         self,
@@ -419,7 +419,7 @@ class _TableQualityMixin:
             table_data=SimpleTable(rows=rows),
             warnings=warnings,
         )
-        return metric.dict()
+        return metric.model_dump()
 
     def quality_store_health_status(self, values: list[str]):
         """
@@ -722,7 +722,7 @@ class _PolcalQualityMixin:
             "three mirror groups; M12, M34, and M56.",
             table_data=SimpleTable(rows=table_data),
         )
-        return metric.dict()
+        return metric.model_dump()
 
     def _store_polcal_global_parameter_values(
         self,
@@ -859,7 +859,7 @@ class _PolcalQualityMixin:
             table_data=SimpleTable(rows=table_data),
             warnings=self._format_warnings(data["warnings"]),
         )
-        return metric.dict()
+        return metric.model_dump()
 
     def _store_polcal_local_parameter_values(
         self,
@@ -981,7 +981,7 @@ class _PolcalQualityMixin:
             modmat_data=modmat_hist,
             histogram_data=param_histograms,
         )
-        return metric.dict()
+        return metric.model_dump()
 
     def _store_polcal_fit_resdiuals(
         self,
@@ -1091,7 +1091,7 @@ class _PolcalQualityMixin:
             histogram_data=chisq_hist,
             raincloud_data=residual_series,
         )
-        return metric.dict()
+        return metric.model_dump()
 
     def _store_polcal_modulation_efficiency(
         self,
@@ -1153,4 +1153,4 @@ class _PolcalQualityMixin:
             efficiency_data=EfficiencyHistograms(efficiency_list=data["efficiency_list"]),
             warnings=self._format_warnings(data["warnings"]),
         )
-        return metric.dict()
+        return metric.model_dump()

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common/tests/test_publish_catalog_messages.py

@@ -35,9 +35,9 @@ def test_frame_messages(publish_catalog_and_quality_messages_task):
     filepaths = [Path(f"a/b/c/{filename}") for filename in filenames]
     frame_messages = task.frame_messages(paths=filepaths)
     for message in frame_messages:
-        assert message.bucket == "data"
-        assert proposal_id in message.objectName
-        assert message.conversationId == str(task.recipe_run_id)
+        assert message.body.bucket == "data"
+        assert proposal_id in message.body.objectName
+        assert message.body.conversationId == str(task.recipe_run_id)
 
 
 def test_object_messages(publish_catalog_and_quality_messages_task):
@@ -53,11 +53,11 @@ def test_object_messages(publish_catalog_and_quality_messages_task):
     filepaths = [Path(f"a/b/c/{filename}") for filename in filenames]
     object_messages = task.object_messages(paths=filepaths, object_type=object_type)
     for message in object_messages:
-        assert message.bucket == "data"
-        assert proposal_id in message.objectName
-        assert message.conversationId == str(task.recipe_run_id)
-        assert message.objectType == object_type
-        assert message.groupId == task.constants.dataset_id
+        assert message.body.bucket == "data"
+        assert proposal_id in message.body.objectName
+        assert message.body.conversationId == str(task.recipe_run_id)
+        assert message.body.objectType == object_type
+        assert message.body.groupId == task.constants.dataset_id
 
 
 def test_quality_report_message(publish_catalog_and_quality_messages_task):
@@ -72,10 +72,10 @@ def test_quality_report_message(publish_catalog_and_quality_messages_task):
     message = task.quality_report_message
     # Then
     assert isinstance(message, CreateQualityReportMessage)
-    assert message.bucket == task.destination_bucket
+    assert message.body.bucket == task.destination_bucket
     # objectName exists and can be evaluated as a valid path
-    assert message.objectName
-    _ = Path(message.objectName)
-    assert message.datasetId == task.constants.dataset_id
-    assert message.conversationId == str(task.recipe_run_id)
-    assert message.incrementDatasetCatalogReceiptCount is True
+    assert message.body.objectName
+    _ = Path(message.body.objectName)
+    assert message.body.datasetId == task.constants.dataset_id
+    assert message.body.conversationId == str(task.recipe_run_id)
+    assert message.body.incrementDatasetCatalogReceiptCount is True

{dkist-processing-common-6.2.4 → dkist-processing-common-7.0.0rc2}/dkist_processing_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dkist-processing-common
-Version: 6.2.4
+Version: 7.0.0rc2
 Summary: Common task classes used by the DKIST Science Data Processing pipelines to process DKIST data.
 Home-page: https://bitbucket.org/dkistdc/dkist-processing-common/src/main/
 Author: NSO / AURA