roc-film 1.13.3__py3-none-any.whl → 1.13.5__py3-none-any.whl

roc/film/descriptor.json

@@ -6,10 +6,10 @@
     "description": "RPW FILe Maker (FILM): Plugin to make RPW L0, L1 and HK data files"
   },
   "release": {
-    "version": "1.13.3",
-    "date": "2023-02-01",
+    "version": "1.13.5",
+    "date": "2023-09-07",
     "author": "Xavier Bonnin <xavier.bonnin@obspm.fr>, ROC Team <roc.support@sympa.obspm.fr>",
-    "modification": "Fix errors in l0_to_l1_sbm processing",
+    "modification": "Hotfix https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM/-/issues/40",
     "url": "https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM"
   },
   "tasks": [
@@ -790,4 +790,4 @@
       }
     }
   ]
-}
+}

roc/film/tasks/dds_to_l0.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import collections
+
 import os
 from datetime import datetime
 import uuid
@@ -188,7 +188,7 @@ class DdsToL0(Task):
         try:
             # Initialize task inputs
             self.setup_inputs()
-        except:
+        except Exception:
             logger.exception(f'Initializing inputs has failed for task {self.job_id}!')
             self.pipeline.exit()
             return
@@ -239,7 +239,6 @@ class DdsToL0(Task):
 
         # Initialize some loop variables
         parent_list = []
-        packet_count = 0
 
         # Start loop over dds XML file
         for i, dds_file in enumerate(self.dds_file_list):
@@ -247,7 +246,6 @@ class DdsToL0(Task):
             # (Re)initialize loop variables
             dds_data = None
             packet_parser = None
-            valid_packet_parser = None
 
             # Parse input RPW TM/TC DDS format file
             logger.info(f'Parsing {dds_file}...')
@@ -270,7 +268,7 @@ class DdsToL0(Task):
                 try:
                     logger.info(f'Extracting {dds_packet_num_list[i]} packets from {dds_file}...    [{self.job_id}]')
                     packet_parser = self._parse_packet(dds_data)
-                except:
+                except Exception:
                     logger.exception(f'Parsing current packet list has failed!    [{self.job_id}]')
                     continue
 
@@ -290,7 +288,7 @@ class DdsToL0(Task):
                     logger.error(f'{n_invalid} invalid TM/TC packets found in {dds_file}!    [{self.job_id}]')
                     try:
                         self.invalid_to_db(invalid_packets)
-                    except:
+                    except Exception:
                         logger.exception(f'Invalid packets cannot be inserted in the database!    [{self.job_id}]')
                         raise L0ProdFailure
 
@@ -310,7 +308,7 @@ class DdsToL0(Task):
                 logger.exception('L0ProdFailure')
                 self.failed_files.append(l0_file)
                 break
-            except:
+            except Exception:
                 logger.exception(f'Error when parsing {dds_file}!    [{self.job_id}]')
                 self.failed_dds_files.append(dds_file)
             else:
@@ -344,16 +342,13 @@ class DdsToL0(Task):
 
         output_list = []
 
-        dds_data = xml_to_dict(dds_file)['ns2:ResponsePart']\
-            ['Response']
+        dds_data = xml_to_dict(dds_file)['ns2:ResponsePart']['Response']
 
         if 'PktRawResponse' in dds_data:
-            dds_data = dds_data['PktRawResponse'] \
-                ['PktRawResponseElement']
+            dds_data = dds_data['PktRawResponse']['PktRawResponseElement']
             dds_type = 'TM'
         elif 'PktTcReportResponse' in dds_data:
-            dds_data = dds_data['PktTcReportResponse'] \
-                ['PktTcReportList']['PktTcReportListElement']
+            dds_data = dds_data['PktTcReportResponse']['PktTcReportList']['PktTcReportListElement']
             dds_type = 'TC'
         else:
             logger.warning(f'Invalid input dds file {dds_file}')
@@ -362,7 +357,7 @@ class DdsToL0(Task):
         # Make sure that returned dds_data is a list
         # (If only one XML element is found in the file
         # the xml_to_dict method returns a collections.OrderedDict() instance).
-        if isinstance(dds_data, collections.OrderedDict):
+        if not isinstance(dds_data, list):
             dds_data = [dds_data]
 
         output_list = [self._build_packet_dict(current_packet, dds_type)
@@ -390,28 +385,36 @@ class DdsToL0(Task):
 
         file_type = dds_file_type.upper()
 
+        if not isinstance(packet, dict):
+            logger.error(f'Problem with packet: {packet}')
+            return {}
+
         if file_type == 'TC':
 
             # Get packet SRDB id
             srdb_id = packet.get('CommandName', None)
+            if srdb_id is None:
+                logger.error('CommandName not defined!')
+                return {}
 
             # Get corresponding PALISADE ID
-            if srdb_id:
+            try:
                 palisade_id = self.palisade_metadata[srdb_id]['palisade_id']
-            else:
-                palisade_id = None
+            except Exception:
+                logger.error(f'palisade_id not found for {srdb_id}')
+                return {}
 
             # Get corresponding packet category
-            if srdb_id:
-                packet_category = self.palisade_metadata[
-                    srdb_id]['packet_category']
-            else:
-                packet_category = None
+            try:
+                packet_category = self.palisade_metadata[srdb_id]['packet_category']
+            except Exception:
+                logger.error(f'packet_category not found for {srdb_id}')
+                return {}
 
             try:
                 utc_time = datetime.strptime(packet.get(
                     'ExecutionTime'), TIME_ISO_STRFORMAT)
-            except:
+            except Exception:
                 utc_time = INVALID_UTC_DATETIME
 
             # Get ack execution completion status
@@ -434,7 +437,7 @@ class DdsToL0(Task):
                     if field['FieldName'] == 'uniqueID':
                         unique_id = packet['CustomField'][i]['Value']
                         break
-            except:
+            except Exception:
                 unique_id = 'UNKNOWN'
 
             # Only keep "PASSED" and "FAILED" exe status in L0

roc/film/tasks/merge_tmraw.py

@@ -292,7 +292,7 @@ class MergeTmRaw(Task):
         # Make sure that returned output_tmraw_list is a list
         # (If only one Packet element is found in the XML
         # the xml_to_dict method returns a collections.OrderedDict() instance).
-        if isinstance(output_packet_list, collections.OrderedDict):
+        if not isinstance(output_packet_list, list):
             output_packet_list = [output_packet_list]
 
         # Add packet date and time to output list
@@ -302,7 +302,7 @@ class MergeTmRaw(Task):
 
         output_packet_list = list(set([
             self._get_packet_time(current_packet['Packet'],
-                                  scos_header=scos_header)
+                              scos_header=scos_header)
             for current_packet in output_packet_list
         ]))
 

{roc_film-1.13.3.dist-info → roc_film-1.13.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: roc-film
-Version: 1.13.3
+Version: 1.13.5
 Summary: RPW FILe Maker (FILM): Plugin to make RPW L0, L1 and HK data files
 Home-page: https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM
 License: CECILL-C

{roc_film-1.13.3.dist-info → roc_film-1.13.5.dist-info}/RECORD

@@ -3,13 +3,13 @@ roc/film/__init__.py,sha256=jUW739rZC4yDLTfWhspDjrNBYdPUhBvI8fjS_fLYls8,114
 roc/film/commands.py,sha256=zG40YQKNrXR64ggOKTXUHyiV2zfaAg0WS01CDZU-IPc,36766
 roc/film/config/__init__.py,sha256=GGK4JAwslXPWoB6cqM9L9MdH06Oadq09WyKHTY-Poaw,69
 roc/film/constants.py,sha256=oF-DhusBcMaDjJ5mrp_Jb4AG1JH_ivQng5VlbmuDRHE,3545
-roc/film/descriptor.json,sha256=7Jsaq1nJn_YFkFmajZ45kHupYnfgLJHG-SgQm6wFdYQ,29934
+roc/film/descriptor.json,sha256=2vi9405cs6d3le0flsMYUqi8augWECZhRRCFho6_oZw,29965
 roc/film/exceptions.py,sha256=HJ0Mwf1aFv6ZqlL46kl_Mcw4SAbh34idJAN5KeXM6Js,5267
 roc/film/tasks/__init__.py,sha256=2gjcefCsrXrkp_Rb216h8nj0AsFVF_56qg51WR2vp34,737
 roc/film/tasks/cat_solo_hk.py,sha256=HSxn14LLVVgd54zzCRrGnAAZ4HU-h3CFMnoxrgr6YvA,11328
 roc/film/tasks/cdf_postpro.py,sha256=aoP6q9acyl8IOtC-j1ngG-DlysuZ4FTn1E6PLxli5-g,29343
 roc/film/tasks/check_dds.py,sha256=zKvHF2q73BP7xLhhUnTgJpSLi197smrV8L2_h_nlbwo,3953
-roc/film/tasks/dds_to_l0.py,sha256=JJWeg6K4xigDgExACeuOiJg0kotp98DzQnhZC-10MRg,21622
+roc/film/tasks/dds_to_l0.py,sha256=hdf5FkbrjDyyd2LKtiapojUZNr83zK6K3AxWiC6rA_I,21880
 roc/film/tasks/file_handler.py,sha256=-j4k-AScStO0-leNPRQ1mt40g1EU_7nHeKVfD_n9TFI,9018
 roc/film/tasks/l0_to_anc_bia_sweep_table.py,sha256=FmcOSmz7pJF5Ml7O9TY9F6x-agYs4cWLb0DpMsOx4Tg,14015
 roc/film/tasks/l0_to_hk.py,sha256=AIpcFhoWWehTwmOzuRO8Q-_ldlXwWFWr1dGOThwLjRU,10853
@@ -19,7 +19,7 @@ roc/film/tasks/l0_to_l1_sbm.py,sha256=riQpWlgV7s4na1JbPRcE3earUyiZkEA6jV0EzWU8RN
 roc/film/tasks/l0_to_l1_surv.py,sha256=n0h5Mizo5mzYWW6Q1AdmMrF8TiOq9t2Glin9ai4ANeM,13886
 roc/film/tasks/make_daily_tm.py,sha256=tLeNnvCVkB7DqU2_Sw6J8qetofVufBPu860Z0MOhOI8,4407
 roc/film/tasks/merge_tcreport.py,sha256=4O14qqkSAQZRP0jCjgyGzovgWQr87cxoJEVAA189j8E,9770
-roc/film/tasks/merge_tmraw.py,sha256=45WTIYb4NnCIORP5fQm8lYi9BW87f46MqVxgg5MpYAw,12354
+roc/film/tasks/merge_tmraw.py,sha256=wBYaGTFmz-U-nOtNnIWbOdijx6ZrquNFAZrFXb4723w,12335
 roc/film/tasks/parse_dds_xml.py,sha256=KWNC_bxzABdiz9V_TpNXm8_ktCicN8W-Ec2EZW1NN8s,2106
 roc/film/tasks/set_l0_utc.py,sha256=kcZAM58FseL-IHTEpqckxlrY9FDXsJ3ccYBzCPrwxCQ,6147
 roc/film/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -42,7 +42,7 @@ roc/film/tools/metadata.py,sha256=3NoW2gNID7_K8RSqIf8pMtDMLBUU-88r9miwrxJqN_4,12
 roc/film/tools/skeleton.py,sha256=T4JN6W7GXhycHpqLmKE5gGlZm_vNwuTYMCV4HS3ik2k,10921
 roc/film/tools/tools.py,sha256=FMBmgk_IF4obJPBBXb_eGdWMVajW7hw7x0XHiBhyZJ4,18132
 roc/film/tools/xlsx2skt.py,sha256=LJcVDtEuGY55RvtKm92AZb8vV2fpugaXU3Ae-LP1uRU,19691
-roc_film-1.13.3.dist-info/LICENSE,sha256=dukgTUfTdh4BFRSdIM5OWE6H4wfVR6m7A4wbLEilMTk,21863
-roc_film-1.13.3.dist-info/METADATA,sha256=dGwzcWVl7z92gUQ-tCZ6L1d2h82nnXwtqvUin6i9MlY,3978
-roc_film-1.13.3.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-roc_film-1.13.3.dist-info/RECORD,,
+roc_film-1.13.5.dist-info/LICENSE,sha256=dukgTUfTdh4BFRSdIM5OWE6H4wfVR6m7A4wbLEilMTk,21863
+roc_film-1.13.5.dist-info/METADATA,sha256=4bOMoQZnqqaCWOnM-F6E0LH3y4Q9g6Z21FHS3TjFJRA,3978
+roc_film-1.13.5.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+roc_film-1.13.5.dist-info/RECORD,,

{roc_film-1.13.3.dist-info → roc_film-1.13.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.4.0
+Generator: poetry-core 1.7.0
 Root-Is-Purelib: true
 Tag: py3-none-any