minor edits based on PR feedback

Author: vineetbansal

imap_processing/cli.py

@@ -117,13 +117,13 @@ def _parse_args() -> argparse.Namespace:
                 {
                     "type": "science",
                     "files": [
-                        "imap_idex_l2_sci_20240312_v000.cdf",
-                        "imap_idex_l2_sci_20240312_v001.cdf"
+                        "imap_idex_l2_sci_20240312_v001.0000.cdf",
+                        "imap_idex_l2_sci_20240312_v001.0001.cdf"
                     ]
                 }
             ],
             "version": {
-                "<descriptor>": {"major_version": 2, "minor_version": 1}
+                "sci": {"major_version": 2, "minor_version": 1}
             }
         }'
     --upload-to-sdc
@@ -153,13 +153,13 @@ def _parse_args() -> argparse.Namespace:
         "        {"
         '            "type": "science",'
         '            "files": ['
-        '                "imap_idex_l2_sci_20240312_v000.cdf",'
-        '                "imap_idex_l2_sci_20240312_v001.cdf"'
+        '                "imap_idex_l2_sci_20240312_v001.0000.cdf",'
+        '                "imap_idex_l2_sci_20240312_v001.0001.cdf"'
         "            ]"
         "        }"
         "    ],"
         '    "version": {'
-        '        "<descriptor>": {"major_version": 2, "minor_version": 1}'
+        '        "sci": {"major_version": 2, "minor_version": 1}'
         "    }"
         "}"
         ' --upload-to-sdc"'
@@ -197,7 +197,7 @@ def _parse_args() -> argparse.Namespace:
         "            ]"
         "        }"
         "    ],"
-        '    "version": {"<descriptor>": '
+        '    "version": {"sci": '
         '{"major_version": 2, "minor_version": 1}}'
         "}'"
         "    A path to a JSON file containing this same information may also be"
@@ -386,7 +386,7 @@ class ProcessInstrument(ABC):
                 }
             ],
             "version": {
-                "<descriptor>": {"major_version": 2, "minor_version": 1},
+                "sci": {"major_version": 2, "minor_version": 1},
                 ...
             }
         }'
@@ -460,7 +460,7 @@ def _resolve_version(self, descriptor: str) -> Version:
             The Version to use for the product.
         """
         if descriptor not in self.version_map:
-            msg = f"No version provided for descriptor: {descriptor}"
+            msg = f"No version provided for descriptor: '{descriptor}'"
             logger.warning(msg)
         return self.version_map.get(descriptor, self._fallback_version)
 
@@ -635,7 +635,7 @@ def post_processing(
                 # final field of Logical_source).
                 descriptor = ds.attrs.get("Logical_source", "").split("_")[-1]
                 if descriptor == "":
-                    logger.warning("No descriptor found in dataset.")
+                    logger.error("No descriptor found in dataset.")
                 version = self._resolve_version(descriptor)
                 logger.info(f"Product {descriptor} version: {version}")
                 # `Data_version` is stored without the leading `v`.

imap_processing/tests/test_cli.py

@@ -89,12 +89,12 @@ def test_main(mock_instrument):
                     {
                         "type": "science",
                         "files": [
-                            "imap_mag_l0_raw_20240430_v001.cdf",
+                            "imap_mag_l0_raw_20240430_v001.0001.cdf",
                         ],
                     },
                 ],
                 "version": {
-                    "all": {"major_version": 1, "minor_version": 1},
+                    "sci": {"major_version": 1, "minor_version": 1},
                 },
             }
         ),
@@ -128,13 +128,13 @@ def test_parse_args_dependency_json_file(caplog, tmp_path):
             {
                 "type": "science",
                 "files": [
-                    "imap_idex_l2_sci_20240312_v000.cdf",
-                    "imap_idex_l2_sci_20240312_v001.cdf",
+                    "imap_idex_l2_sci_20240312_v001.0000.cdf",
+                    "imap_idex_l2_sci_20240312_v001.0001.cdf",
                 ],
             },
         ],
         "version": {
-            "all": {"major_version": 1, "minor_version": 1},
+            "sci": {"major_version": 1, "minor_version": 1},
         },
     }
     test_json_filename = "imap_ultra_l2_test-dependency-json_20250520_v999.json"