roc-film 1.13.3__tar.gz → 1.13.5__tar.gz

{roc_film-1.13.3 → roc_film-1.13.5}/PKG-INFO

@@ -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 → roc_film-1.13.5}/pyproject.toml

@@ -10,7 +10,7 @@ exclude = "/(\n    \\.git\n  | \\.hg\n  | \\.mypy_cache\n  | \\.tox\n  | \\.venv
 
 [tool.poetry]
 name = "roc-film"
-version = "1.13.3"
+version = "1.13.5"
 readme = "README.md"
 license = "CeCILL-C"
 repository = "https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM"

{roc_film-1.13.3 → roc_film-1.13.5}/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-1.13.3 → roc_film-1.13.5}/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-1.13.3 → roc_film-1.13.5}/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/setup.py

@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-packages = \
-['roc',
- 'roc.film',
- 'roc.film.config',
- 'roc.film.tasks',
- 'roc.film.tests',
- 'roc.film.tools']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['edds_process>=0.8.2',
- 'h5py>=3.7,<4.0',
- 'jinja2>=3.0,<4.0',
- 'maser-tools>=0.1.3',
- 'numpy!=1.19.5',
- 'pandas>=1.3,<2.0',
- 'poppy-core',
- 'poppy-pop',
- 'roc-dingo>=1.0,<2.0',
- 'roc-idb>=1.0,<2.0',
- 'roc-rap>=1.0,<2.0',
- 'roc-rpl>=1.0,<2.0',
- 'spacepy>=0.4,<0.5',
- 'sqlalchemy>=1.4,<2.0',
- 'xmltodict>=0.13,<0.14']
-
-setup_kwargs = {
-    'name': 'roc-film',
-    'version': '1.13.3',
-    'description': 'RPW FILe Maker (FILM): Plugin to make RPW L0, L1 and HK data files',
-    'long_description': '# FILM PLUGIN README\n\n[![pipeline status](https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM/badges/develop/pipeline.svg)](https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM/pipelines)\n\nThis directory contains the source files of the Rpw FILe Maker (FILM), a plugin of the ROC pipelines dedicated to the RPW L0, L1 and HK files production.\n\nFILM has been developed with the [POPPY framework](https://poppy-framework.readthedocs.io/en/latest/).\n\n## Quickstart\n\n### Installation with pip\n\nTo install the plugin using pip:\n\n```\npip install roc-film\n```\n\n### Installation from the repository\n\nFirst, retrieve the `FILM` repository from the ROC gitlab server:\n\n```\ngit clone https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM.git\n```\n\nYou will need a personal access token to reach the package registry in the ROC Gitlab server.\n\nThen, install the package (here using (poetry)[https://python-poetry.org/]):\n\n```\npoetry install"\n```\n\nNOTES:\n\n    - It is also possible to clone the repository using SSH\n    - To install poetry: `pip install poetry`\n\n## Usage\n\nThe roc-film plugin is designed to be run in a POPPy-built pipeline.\nNevertheless, it is still possible to import some classes and methods in Python files.\n\n### How to release a new version of the plugin?\n\n1. Checkout to the git *develop* branch (and make pull to be sure to work from the latest commit in the gitlab server)\n\n2. First update metadata (version, dependencies, etc.) in the plugin *pyproject.toml* file.\n\n3. Then make sure the *descriptor.json* and *poetry.lock* files are also up-to-date.\n\nTo update the *descriptor.json* file, run the command:\n\n    python bump_descriptor.py -m <modification_message>\n\nTo update the *poetry.lock* file, enter:\n\n    poetry lock\n\nN.B. *poetry* Python package must be installed (see https://python-poetry.org/).\n\n4. Commit the changes in the *develop* branch. Make sure to commit with a comprehensive enough message.\n5. Checkout to the *master* branch and merge the *develop* branch into *master*\n6. Create a new git tag `X.Y.Z` for the new version of the plugin (must be the same version than in the *pyproject.toml* file)\n7. Push both the *master* branch and the tag to the gitlab server\n8. Do a rebase of *develop* onto the *master* branch\n9. Push the up-to-date *develop* branch to the gitlab server\n\nN.B. This procedure only concerns the version release. It is assumed that any other changes in the code have been already validated previously.\n\n## CONTACT\n\n* Xavier BONNIN xavier.bonnin@obspm.fr (author, maintainer)\n* Florence HENRY florence.henry@obspm.fr (maintainer)\n\n\nLicense\n-------\n\nThis project is licensed under CeCILL-C.\n\nAcknowledgments\n---------------\n\n* Solar Orbiter / RPW Operation Centre (ROC) team\n',
-    'author': 'Xavier Bonnin',
-    'author_email': 'xavier.bonnin@obspm.fr',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'https://gitlab.obspm.fr/ROC/Pipelines/Plugins/FILM',
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'python_requires': '>=3.8,<4',
-}
-
-
-setup(**setup_kwargs)