dkist-processing-common 11.7.0rc4__tar.gz → 11.7.0rc6__tar.gz

{dkist_processing_common-11.7.0rc4 → dkist_processing_common-11.7.0rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.7.0rc4
+Version: 11.7.0rc6
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -22,7 +22,7 @@ Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<5.0,>=4.1.7
 Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0
 Requires-Dist: solar-wavelength-calibration<2.0,>=1.0
-Requires-Dist: globus-sdk>=3.12.0
+Requires-Dist: globus-sdk<4.0.0,>=3.12.0
 Requires-Dist: gqlclient[pydantic]==1.2.3
 Requires-Dist: sqids==0.5.1
 Requires-Dist: matplotlib>=3.4

{dkist_processing_common-11.7.0rc4 → dkist_processing_common-11.7.0rc6}/dkist_processing_common/models/constants.py

@@ -53,16 +53,12 @@ class BudName(StrEnum):
     dark_date_end = "DARK_DATE_END"
     solar_gain_date_end = "SOLAR_GAIN_DATE_END"
     polcal_date_end = "POLCAL_DATE_END"
-    dark_num_raw_frames_per_fpa = "DARK_NUM_RAW_FRAMES_PER_FPA"
     solar_gain_num_raw_frames_per_fpa = "SOLAR_GAIN_NUM_RAW_FRAMES_PER_FPA"
     polcal_num_raw_frames_per_fpa = "POLCAL_NUM_RAW_FRAMES_PER_FPA"
-    dark_telescope_tracking_mode = "DARK_TELESCOPE_TRACKING_MODE"
     solar_gain_telescope_tracking_mode = "SOLAR_GAIN_TELESCOPE_TRACKING_MODE"
     polcal_telescope_tracking_mode = "POLCAL_TELESCOPE_TRACKING_MODE"
-    dark_coude_table_tracking_mode = "DARK_COUDE_TABLE_TRACKING_MODE"
     solar_gain_coude_table_tracking_mode = "SOLAR_GAIN_COUDE_TABLE_TRACKING_MODE"
     polcal_coude_table_tracking_mode = "POLCAL_COUDE_TABLE_TRACKING_MODE"
-    dark_telescope_scanning_mode = "DARK_TELESCOPE_SCANNING_MODE"
     solar_gain_telescope_scanning_mode = "SOLAR_GAIN_TELESCOPE_SCANNING_MODE"
     polcal_telescope_scanning_mode = "POLCAL_TELESCOPE_SCANNING_MODE"
     dark_average_light_level = "DARK_AVERAGE_LIGHT_LEVEL"
@@ -332,11 +328,6 @@ class ConstantsBase:
         """Return the date end constant for the polcal task."""
         return self._db_dict[BudName.polcal_date_end]
 
-    @property
-    def dark_num_raw_frames_per_fpa(self) -> int:
-        """Return the number of raw frames per fpa constant for the dark task."""
-        return self._db_dict[BudName.dark_num_raw_frames_per_fpa]
-
     @property
     def solar_gain_num_raw_frames_per_fpa(self) -> int:
         """Return the number of raw frames per fpa constant for the solar gain task."""
@@ -347,11 +338,6 @@ class ConstantsBase:
         """Return the num raw frames per fpa constant for the polcal task."""
         return self._db_dict[BudName.polcal_num_raw_frames_per_fpa]
 
-    @property
-    def dark_telescope_tracking_mode(self) -> str:
-        """Return the telescope tracking mode constant for the dark task."""
-        return self._db_dict[BudName.dark_telescope_tracking_mode]
-
     @property
     def solar_gain_telescope_tracking_mode(self) -> str:
         """Return the telescope tracking mode constant for the solar gain task."""
@@ -362,11 +348,6 @@ class ConstantsBase:
         """Return the telescope tracking mode constant for the polcal task."""
         return self._db_dict[BudName.polcal_telescope_tracking_mode]
 
-    @property
-    def dark_coude_table_tracking_mode(self) -> str:
-        """Return the coude table tracking mode constant for the dark task."""
-        return self._db_dict[BudName.dark_coude_table_tracking_mode]
-
     @property
     def solar_gain_coude_table_tracking_mode(self) -> str:
         """Return the coude table tracking mode constant for the solar gain task."""
@@ -377,11 +358,6 @@ class ConstantsBase:
         """Return the coude table tracking mode constant for the polcal task."""
         return self._db_dict[BudName.polcal_coude_table_tracking_mode]
 
-    @property
-    def dark_telescope_scanning_mode(self) -> str:
-        """Return the telescope scanning mode constant for the dark task."""
-        return self._db_dict[BudName.dark_telescope_scanning_mode]
-
     @property
     def solar_gain_telescope_scanning_mode(self) -> str:
         """Return the telescope scanning mode constant for the solar gain task."""

{dkist_processing_common-11.7.0rc4 → dkist_processing_common-11.7.0rc6}/dkist_processing_common/parsers/observing_program_id_bud.py

@@ -8,7 +8,7 @@ from dkist_processing_common.parsers.task import passthrough_header_ip_task
 
 
 class TaskContributingObservingProgramExecutionIdsBud(TaskContributingIdsBud):
-    """Class to create a Bud for the supporting observing_program_ids."""
+    """Class to create a Bud for the supporting observing_program_execution_ids."""
 
     def __init__(
         self,

{dkist_processing_common-11.7.0rc4 → dkist_processing_common-11.7.0rc6}/dkist_processing_common/tasks/parse_l0_input_data.py

@@ -103,11 +103,6 @@ def dataset_extra_bud_factory() -> list[S]:
             constant_name=BudName.polcal_observing_program_execution_ids,
             ip_task_types=TaskName.polcal,
         ),
-        TaskUniqueBud(
-            constant_name=BudName.dark_num_raw_frames_per_fpa,
-            metadata_key=MetadataKey.num_raw_frames_per_fpa,
-            ip_task_types=TaskName.dark,
-        ),
         TaskUniqueBud(
             constant_name=BudName.solar_gain_num_raw_frames_per_fpa,
             metadata_key=MetadataKey.num_raw_frames_per_fpa,

{dkist_processing_common-11.7.0rc4 → dkist_processing_common-11.7.0rc6}/dkist_processing_common/tests/test_parse_l0_input_data.py

@@ -260,7 +260,7 @@ def test_subclass_flowers(visp_parse_inputs_task, max_cs_step_time_sec):
     tag_pot, constant_pot = visp_parse_inputs_task.make_flower_pots()
 
     assert len(tag_pot.stems) == 1
-    assert len(constant_pot.stems) == 61
+    assert len(constant_pot.stems) == 60
     all_flower_names = [StemName.modstate]
     assert sorted([f.stem_name for f in tag_pot.stems]) == sorted(all_flower_names)
     all_bud_names = [b.stem_name for b in default_constant_bud_factory()] + [BudName.num_modstates]
@@ -296,7 +296,12 @@ def test_dataset_extra_bud_factory(visp_parse_inputs_task, max_cs_step_time_sec)
     ]
     for base in bud_name_base:
         assert "SOLAR_GAIN_" + base in stem_names
-        if "MODE" not in base:
+        if base not in [
+            "NUM_RAW_FRAMES_PER_FPA",
+            "TELESCOPE_TRACKING_MODE",
+            "COUDE_TABLE_TRACKING_MODE",
+            "TELESCOPE_SCANNING_MODE",
+        ]:
             assert "DARK_" + base in stem_names
         if "GOS" not in base:
             assert "POLCAL_" + base in stem_names

{dkist_processing_common-11.7.0rc4 → dkist_processing_common-11.7.0rc6}/dkist_processing_common/tests/test_stems.py

@@ -615,11 +615,11 @@ def test_task_contributing_ids_bud(basic_header_objs):
     assert sorted(list(petal[0].value)) == ["experiment_id_2"]
 
 
-def test_task_contributing_observing_program_ids_bud(basic_header_objs):
+def test_task_contributing_observing_program_execution_ids_bud(basic_header_objs):
     """
-    Given: A set of headers with observing program ID values for different tasks
-    When: Ingesting the headers with a TaskContributingIdsBud for a task type
-    Then: The Bud's petal is just the experiment ID for the that task type
+    Given: A set of headers with observing program execution ID values for different tasks
+    When: Ingesting the headers with a TaskContributingObservingProgramExecutionIdsBud for a task type
+    Then: The Bud's petal is the observing program execution IDs for the that task type
     """
     bud = TaskContributingObservingProgramExecutionIdsBud(
         constant_name="NOT_A_REAL_BUD",

{dkist_processing_common-11.7.0rc4 → dkist_processing_common-11.7.0rc6}/dkist_processing_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dkist-processing-common
-Version: 11.7.0rc4
+Version: 11.7.0rc6
 Summary: Common task classes used by the DKIST science data processing pipelines
 Author-email: NSO / AURA <dkistdc@nso.edu>
 License: BSD-3-Clause
@@ -22,7 +22,7 @@ Requires-Dist: dkist-processing-pac<4.0,>=3.1
 Requires-Dist: dkist-service-configuration<5.0,>=4.1.7
 Requires-Dist: dkist-spectral-lines<4.0,>=3.0.0
 Requires-Dist: solar-wavelength-calibration<2.0,>=1.0
-Requires-Dist: globus-sdk>=3.12.0
+Requires-Dist: globus-sdk<4.0.0,>=3.12.0
 Requires-Dist: gqlclient[pydantic]==1.2.3
 Requires-Dist: sqids==0.5.1
 Requires-Dist: matplotlib>=3.4

{dkist_processing_common-11.7.0rc4 → dkist_processing_common-11.7.0rc6}/dkist_processing_common.egg-info/requires.txt

@@ -7,7 +7,7 @@ dkist-processing-pac<4.0,>=3.1
 dkist-service-configuration<5.0,>=4.1.7
 dkist-spectral-lines<4.0,>=3.0.0
 solar-wavelength-calibration<2.0,>=1.0
-globus-sdk>=3.12.0
+globus-sdk<4.0.0,>=3.12.0
 gqlclient[pydantic]==1.2.3
 sqids==0.5.1
 matplotlib>=3.4

{dkist_processing_common-11.7.0rc4 → dkist_processing_common-11.7.0rc6}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
   "dkist-service-configuration >= 4.1.7, <5.0",
   "dkist-spectral-lines >= 3.0.0, <4.0",
   "solar-wavelength-calibration >= 1.0, <2.0",
-  "globus-sdk >= 3.12.0",
+  "globus-sdk >= 3.12.0, <4.0.0",
   "gqlclient[pydantic] == 1.2.3",
   "sqids == 0.5.1",
   "matplotlib >= 3.4",