Merge branch 'NASA-AMMOS:master' into master

kmarwah · Jun 15, 2022 · 08c7419 · 08c7419
2 parents c7af2ff + 7d60feb
commit 08c7419
Show file tree

Hide file tree

Showing 30 changed files with 1,691 additions and 623 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,116 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [2.3.6-rc1](https://github.com/NASA-AMMOS/AIT-Core/compare/2.3.5...2.3.6-rc1) - 2022-04-07
+
+### Merged
+
+- Issue #168 - Add ability for plugins to publish to arbitrary topic [`#435`](https://github.com/NASA-AMMOS/AIT-Core/pull/435)
+- Issue #427 - Update AIT OpenMCT comp. provider to serve packets as fold… [`#433`](https://github.com/NASA-AMMOS/AIT-Core/pull/433)
+- Issue #358 - OpenMCT Plugin support for multiple clients and filtered telemetry [`#426`](https://github.com/NASA-AMMOS/AIT-Core/pull/426)
+- Issue #401 - Minor fixes to issues found in master [`#422`](https://github.com/NASA-AMMOS/AIT-Core/pull/422)
+- Issue #371 - Fix calls to logger in util pkl handling [`#423`](https://github.com/NASA-AMMOS/AIT-Core/pull/423)
+- Issue #420 - Add Packet Accumulator [`#418`](https://github.com/NASA-AMMOS/AIT-Core/pull/418)
+- Issue #419 - Add Packet Padder Plugin [`#417`](https://github.com/NASA-AMMOS/AIT-Core/pull/417)
+- Issue #328 - Update getDefaultDict to return CmdDict extensions when applicable [`#404`](https://github.com/NASA-AMMOS/AIT-Core/pull/404)
+- Issue #304 - Improve time handling in database insert method [`#421`](https://github.com/NASA-AMMOS/AIT-Core/pull/421)
+- Issue #371 - Testing nested includes during test for 'dirty' (pickle) [`#416`](https://github.com/NASA-AMMOS/AIT-Core/pull/416)
+- Issue #394 - Add DSN paths to ait-create-dirs [`#396`](https://github.com/NASA-AMMOS/AIT-Core/pull/396)
+- issue #401 - Fix ArrayType encode bug [`#402`](https://github.com/NASA-AMMOS/AIT-Core/pull/402)
+- Issue #399 - Fix error when IPV6 is disabled at kernel level [`#400`](https://github.com/NASA-AMMOS/AIT-Core/pull/400)
+- Issue #383 - update poetry builds [`#385`](https://github.com/NASA-AMMOS/AIT-Core/pull/385)
+- Issue #395 - Add try except when attempting to pack opcode into struct. [`#397`](https://github.com/NASA-AMMOS/AIT-Core/pull/397)
+- Issue #352 - Ait-tlm-csv fields argument fix [`#387`](https://github.com/NASA-AMMOS/AIT-Core/pull/387)
+- Issue #351 - Update ait-tlm-csv cmd packet option description [`#388`](https://github.com/NASA-AMMOS/AIT-Core/pull/388)
+- Issue #382 - Change CSV-generating fields file to open 'r' mode [`#386`](https://github.com/NASA-AMMOS/AIT-Core/pull/386)
+- Issue #364 - Update Core package handling [`#381`](https://github.com/NASA-AMMOS/AIT-Core/pull/381)
+- Issue #364 - Dev Tool Updates [`#379`](https://github.com/NASA-AMMOS/AIT-Core/pull/379)
+- Issue #362 - Add "core.seq" to extensions documentation [`#378`](https://github.com/NASA-AMMOS/AIT-Core/pull/378)
+- Issue #360 - Fix time handling in table encode / decode [`#361`](https://github.com/NASA-AMMOS/AIT-Core/pull/361)
+- Issue #354 - Rework table support [`#355`](https://github.com/NASA-AMMOS/AIT-Core/pull/355)
+- Issue #345 - Document 64-bit integer limitation in GUI [`#346`](https://github.com/NASA-AMMOS/AIT-Core/pull/346)
+- Issue #341 - Update database API docs page [`#343`](https://github.com/NASA-AMMOS/AIT-Core/pull/343)
+- Issue #302 - Add historical query support to the OpenMCT plugin [`#349`](https://github.com/NASA-AMMOS/AIT-Core/pull/349)
+- Issue #339 - Document Packet / Field naming constraints [`#340`](https://github.com/NASA-AMMOS/AIT-Core/pull/340)
+
+### Fixed
+
+- Update Core package handling [`#364`](https://github.com/NASA-AMMOS/AIT-Core/issues/364)
+- Issue #360 - Fix time handling in table encode / decode [`#360`](https://github.com/NASA-AMMOS/AIT-Core/issues/360)
+- Issue #345 - Document 64-bit integer limitation in GUI [`#345`](https://github.com/NASA-AMMOS/AIT-Core/issues/345)
+- Issue #341 - Update database API docs page [`#341`](https://github.com/NASA-AMMOS/AIT-Core/issues/341)
+
+### Commits
+
+- Run black across codebase [`2834d47`](https://github.com/NASA-AMMOS/AIT-Core/commit/2834d4753bc247fe716665e7de69b0e6294ebf21)
+- Initial pre-commit additions and cleanup. mypy compatibility fixes [`4573211`](https://github.com/NASA-AMMOS/AIT-Core/commit/4573211dc7949041b5ea60ba3a7769ab941468be)
+- Issue #302 - Support historical queries in OpenMCT plugin [`39ecd2a`](https://github.com/NASA-AMMOS/AIT-Core/commit/39ecd2ad3ad1f4a72f4404e2460a9b43698d2ed3)
+- Port tests to pytest [`6b5a779`](https://github.com/NASA-AMMOS/AIT-Core/commit/6b5a7798015bfc6d2f441ea6fd6518cce5fd42eb)
+- Issue 427: Update AIT OpenMCT comp. provider to serve packets as folders of fields [`bd5cfd6`](https://github.com/NASA-AMMOS/AIT-Core/commit/bd5cfd6eb1c863bc25e90356c8676009f89679f0)
+- Fix linting errors in dmc module [`61fbf57`](https://github.com/NASA-AMMOS/AIT-Core/commit/61fbf573c6f06e695f2c46c3f7ba16c248f9f3a0)
+- bin script linting error cleanup [`b458412`](https://github.com/NASA-AMMOS/AIT-Core/commit/b458412363e6697f4ee965abddda6c74c4257678)
+- Issue #354 - Table documentation update [`2867e2a`](https://github.com/NASA-AMMOS/AIT-Core/commit/2867e2a1be68a45278f0f8e5f0232fd07ff22731)
+- Fix linting errors in db module [`89d38b5`](https://github.com/NASA-AMMOS/AIT-Core/commit/89d38b547af07e9160f59b96864d80e4d1ffa5c4)
+- Linting related cleanup [`d557cef`](https://github.com/NASA-AMMOS/AIT-Core/commit/d557cefb79d95de77e624cf00f730906a6985c6e)
+- Fix linting errors in tlm module. [`c5ae415`](https://github.com/NASA-AMMOS/AIT-Core/commit/c5ae415398ea2de2f58586d3d1d2c1dc93c61878)
+- Fix linting errors in API module [`20aeb70`](https://github.com/NASA-AMMOS/AIT-Core/commit/20aeb70d576c8b71fdb80528061bc1b29ae8c4ac)
+- Additional Core server linting fixes [`42b6539`](https://github.com/NASA-AMMOS/AIT-Core/commit/42b6539f2482252bb01cdef9886e2db70a4cd91e)
+- issue-#420 Add Packet Accumulator [`9255006`](https://github.com/NASA-AMMOS/AIT-Core/commit/9255006bba7ce1762acf9a694877c08a6b717621)
+- Fix linting errors in util module [`526b5f4`](https://github.com/NASA-AMMOS/AIT-Core/commit/526b5f4f9b71ef1bd62ce5b7ba60cebf2b9db985)
+- Additional cfg.py module linting cleanup [`2820f1d`](https://github.com/NASA-AMMOS/AIT-Core/commit/2820f1ddcb8f99c7fab3cb10b19f194f2d2be9ed)
+- Make sure sphinx-build is poetry compatible update README and installation doc [`bfdb9a6`](https://github.com/NASA-AMMOS/AIT-Core/commit/bfdb9a6a1cee2b8739d5fa59fdcda33b7b6d3af5)
+- minor nose-&gt;pytest cleanup [`7a7e3bf`](https://github.com/NASA-AMMOS/AIT-Core/commit/7a7e3bf2cbb655965769bdf8364ced71695762e2)
+- Additional mypy related updates and cleanup for full pipeline check [`ce725b5`](https://github.com/NASA-AMMOS/AIT-Core/commit/ce725b5d9d828a740f23d9092d8a314e2604d52f)
+- Update ait-tlm-csv command and add documentation [`7e02fa8`](https://github.com/NASA-AMMOS/AIT-Core/commit/7e02fa875f8e113f0a7875c7a683d63c4a832aa7)
+- Fix linting errors in seq module [`8f0b17f`](https://github.com/NASA-AMMOS/AIT-Core/commit/8f0b17f6c976ec28bf892ea877250e823a8f1988)
+- Fix linting errors in val module [`896efd5`](https://github.com/NASA-AMMOS/AIT-Core/commit/896efd5e7eb40042afc6066a33c182396cc5e2f8)
+- Fix linting errors in gds module [`8bb3ffa`](https://github.com/NASA-AMMOS/AIT-Core/commit/8bb3ffa33335e64113253f0c35f973cfd36d6ea9)
+- Fix linting errors in dtype module. [`22f2efb`](https://github.com/NASA-AMMOS/AIT-Core/commit/22f2efb2d4ab4f9455a8099a6c85dfaa9a22918e)
+- issue-#419 Add Packet Padder Plugin [`86bf9ce`](https://github.com/NASA-AMMOS/AIT-Core/commit/86bf9cebf77ee990f11d5ebef1d1e31799958467)
+- Revert testdata changes [`511fa7e`](https://github.com/NASA-AMMOS/AIT-Core/commit/511fa7efc4db80799fad4409b746da8e93bef61f)
+- Fix linting errors in cmd module [`093d26b`](https://github.com/NASA-AMMOS/AIT-Core/commit/093d26bb0a73c7e4a97205e4fad322753ed9f471)
+- Update optional package install handling and add new depdencies [`6919de8`](https://github.com/NASA-AMMOS/AIT-Core/commit/6919de8aa3c40696e1d22229b9719c561c2f45ae)
+- Fix unit-test related issues [`d6b088d`](https://github.com/NASA-AMMOS/AIT-Core/commit/d6b088d49da6227ff77df953f2dbd94793af2e72)
+- Add getDefaultDict with extension unit tests [`4cd31ca`](https://github.com/NASA-AMMOS/AIT-Core/commit/4cd31cab11dc31b7d23942aec23b5a4944fddfac)
+- Add tox support and rearrange test structuring [`aec5df4`](https://github.com/NASA-AMMOS/AIT-Core/commit/aec5df424b7b9e5234b1ddc2887ee850b87311ab)
+- Fix linting errors in evr module [`a2b0013`](https://github.com/NASA-AMMOS/AIT-Core/commit/a2b0013a803437e82b4fe382026d6d69c8ef864f)
+- Drop custom git hook install in prep for pre-commit changes [`2414dff`](https://github.com/NASA-AMMOS/AIT-Core/commit/2414dff8053c8edafea510f39c7f483c07d94feb)
+- Fix linting erros in json module [`23d3076`](https://github.com/NASA-AMMOS/AIT-Core/commit/23d3076cf5e5d234a4f6cd377f755374d8e53890)
+- Fix linting errors in limits module [`c5158d4`](https://github.com/NASA-AMMOS/AIT-Core/commit/c5158d41d0945af97ed2b457b0ef7c183ce4b418)
+- Fix linting errors in geom module [`e805c64`](https://github.com/NASA-AMMOS/AIT-Core/commit/e805c64e7fa558dd13fa0400a95f2eebbe05895b)
+- Fix linting errors in log module [`9baf9ea`](https://github.com/NASA-AMMOS/AIT-Core/commit/9baf9ea3cae4ba13495d8a1ea5d40435b83f347d)
+- Clean up server.broker linting errors [`7e5c646`](https://github.com/NASA-AMMOS/AIT-Core/commit/7e5c646a0619b5f3f17e9377404b00c1ef1c0301)
+- Cleanup linting errors in server.stream [`fb0a137`](https://github.com/NASA-AMMOS/AIT-Core/commit/fb0a1374ce74ac22ec971e887b08ed5d081936d1)
+- Issue #434 Add ability for plugins to publish to arbitrary topic [`36f60a6`](https://github.com/NASA-AMMOS/AIT-Core/commit/36f60a6ced0c30b00eefe50090ebe323130ac6cb)
+- Cleanup server.__init__ linting errors [`3cbd17d`](https://github.com/NASA-AMMOS/AIT-Core/commit/3cbd17d8bdf49a7ccc921bb32b8f8def3eb7a8f7)
+- Fix linting errors in coord module [`3abd4d9`](https://github.com/NASA-AMMOS/AIT-Core/commit/3abd4d93ab9b1eb74cfd0b0eee3c96eef130aeb2)
+- More black cleanup [`7939298`](https://github.com/NASA-AMMOS/AIT-Core/commit/79392987ea3e9638e707d9dea67e9ced45f597cd)
+- core.__init__ linting error cleanup [`92a1f65`](https://github.com/NASA-AMMOS/AIT-Core/commit/92a1f65800ce8657ca183d5545895216e07fa59b)
+- Issue #394 Add DSN paths to ait-create-dirs [`b0073a6`](https://github.com/NASA-AMMOS/AIT-Core/commit/b0073a64b5ab98cf039d07a68d5ab4d0bbd768fe)
+- Issue #395 Add try except when attempting to pack opcode into struct. [`1e34a6d`](https://github.com/NASA-AMMOS/AIT-Core/commit/1e34a6d49012b8de7edf4f78db1e36e6423ea096)
+- Cleanup server.server linting errors [`9bf5c51`](https://github.com/NASA-AMMOS/AIT-Core/commit/9bf5c5123030ea57c8c7ee55b2bb7a90055cfa39)
+- Drop nose from setup.cfg [`f43a156`](https://github.com/NASA-AMMOS/AIT-Core/commit/f43a156a57029ff9414ddcb9ca47654a0d157688)
+- Cleanup server.plugin linting errors [`688ead2`](https://github.com/NASA-AMMOS/AIT-Core/commit/688ead279a189151471dc1d1a8ffa91484765ef8)
+- Fix linting errors in bsc module [`9277ed2`](https://github.com/NASA-AMMOS/AIT-Core/commit/9277ed20fadb11b6af148bf2e4fb7274bb59ae13)
+- Issue 371: Fix calls to logger [`648d84d`](https://github.com/NASA-AMMOS/AIT-Core/commit/648d84dcb60c2107582aee4e0e088e5c16c8240e)
+- Add support for array type in ArgDefn encode method [`fc9e5a3`](https://github.com/NASA-AMMOS/AIT-Core/commit/fc9e5a33a5cda0835fac7eb0a62f3f08a3041099)
+- Clean up server.utils linting errors [`7c0e38b`](https://github.com/NASA-AMMOS/AIT-Core/commit/7c0e38b5b978502f2c467feaa5480f91e19b7cc0)
+- server.plugins.__init__ linting error cleanup [`8f30508`](https://github.com/NASA-AMMOS/AIT-Core/commit/8f30508629b31daf61e2a2a04925086449c37d6e)
+- Add flake8 exclusions for module level import errors [`390f223`](https://github.com/NASA-AMMOS/AIT-Core/commit/390f223636896ef5ecba83dfd3e3a272af5d0c6f)
+- added comments to mame files causing new pickle cache [`3f2f0a4`](https://github.com/NASA-AMMOS/AIT-Core/commit/3f2f0a4472866a9705cf21b320eccc8e77a23f16)
+- change print() statements to ait.log.debug() [`9265e49`](https://github.com/NASA-AMMOS/AIT-Core/commit/9265e49fbfef717f55bd6c16a6dfce5c09522601)
+- Method cmd.getDefaultDict shall return CmdDict extensions if applicable [`9f3c91b`](https://github.com/NASA-AMMOS/AIT-Core/commit/9f3c91b99e98fc53ad3457cffd6f723181272561)
+- Cleanup server.plugins.data_archive linting errors [`a67a88c`](https://github.com/NASA-AMMOS/AIT-Core/commit/a67a88cc5898fbc77eb1175ca3229e6d77b64bc4)
+- server.handlers.__init__ linting error cleanup [`75a9826`](https://github.com/NASA-AMMOS/AIT-Core/commit/75a9826605dd472ef5c327bc4635d5be2ffdc2f2)
+- Drop pylint and pep-related config [`cf506e5`](https://github.com/NASA-AMMOS/AIT-Core/commit/cf506e5ea58079f2677916b7621fc8a5a15acc07)
+- Use values variable database execution [`04ec870`](https://github.com/NASA-AMMOS/AIT-Core/commit/04ec8705c929b2494985949c8b781842b8f63836)
+- Remove invalid log statements in util.py [`5eb57d5`](https://github.com/NASA-AMMOS/AIT-Core/commit/5eb57d5d1d7069b16b67e303540ce889df47aca0)
+- Update ait-tlm-csv cmd option description [`0677dd9`](https://github.com/NASA-AMMOS/AIT-Core/commit/0677dd9303f73853bad959cc97d22b9b4dfb7c8d)
+- Fix linting errors in table module [`63e6502`](https://github.com/NASA-AMMOS/AIT-Core/commit/63e6502eb0d58385528d9196852a9e81b6d4287c)
+- Fix linting errors in pcap module [`e0151e3`](https://github.com/NASA-AMMOS/AIT-Core/commit/e0151e3dc0aa67302f2e67c7a33b58e9bbee5089)
+- Add tag files to .gitignore [`4768a7e`](https://github.com/NASA-AMMOS/AIT-Core/commit/4768a7eea7ece04b7eb82d5bba20b2f32cb1bf32)
+- final nose removal cleanup [`9a648fd`](https://github.com/NASA-AMMOS/AIT-Core/commit/9a648fd6e0c42c9146ad0d74a28b64dd96c10ca7)
+
 ## [2.3.5](https://github.com/NASA-AMMOS/AIT-Core/compare/2.3.4...2.3.5)
 
 ### Merged

diff --git a/ait/core/api.py b/ait/core/api.py
@@ -91,7 +91,8 @@ def __str__(self):
 
     @property
     def msg(self):
-        s = 'FalseWaitError: "False" boolean passed as argument to wait. Ensure wait condition args are surounded by lambda or " "'
+        s = 'FalseWaitError: "False" boolean passed as argument to wait. Ensure wait ' \
+            'condition args are surrounded by lambda or " "'
 
         if self._msg:
             s += ": " + self._msg
@@ -115,7 +116,7 @@ def __init__(self, udp_dest=None, cmddict=None, verbose=False, cmdtopic=None):
         self._cmddict = cmddict
         self._verbose = verbose
 
-        # Setup the destination of our commands and arguments based on destination
+        # Set up the destination of our commands and arguments based on destination
         # information.
         if udp_dest:
             # Convert partial info to full tuple

diff --git a/ait/core/cfg.py b/ait/core/cfg.py
@@ -333,12 +333,13 @@ def _datapaths(self):
             for k in data:
                 paths[k] = data[k]["path"]
 
-            data = self._config.get("dsn",{}).get("cfdp",{}).get("datasink",{})
+            data = self._config.get("dsn", {}).get("cfdp", {}).get("datasink", {})
             for k in data:
                 paths[k] = data[k]["path"]
 
-            data = self._config.get("dsn",{}).get("cfdp",{})
-            if data: paths["mib"] = data["mib"]["path"]
+            data = self._config.get("dsn", {}).get("cfdp", {})
+            if data:
+                paths["mib"] = data["mib"]["path"]
 
         except KeyError as e:
             raise AitConfigMissing(str(e))

diff --git a/ait/core/cmd.py b/ait/core/cmd.py
@@ -126,7 +126,6 @@ def encode(self, value):
             value = self.enum[value]
         return self.type.encode(*value) if type(value) in [tuple, list] else self.type.encode(value)
 
-
     def slice(self, offset=0):
         """Returns a Python slice object (e.g. for array indexing) indicating
         the start and stop byte position of this Command argument.  The

diff --git a/ait/core/db.py b/ait/core/db.py
@@ -395,7 +395,7 @@ def query(self, query, **kwargs):
             db_res = self._query(query)
             return AITDBResult(query=query, results=db_res)
         except self._backend.exceptions.InfluxDBClientError as e:
-            log.error(f"query_time_range failed with exception: {e}")
+            log.error(f"db.InfluxDBBackend.query failed with exception: {e}")
             return AITDBResult(query=query, errors=[str(e)])
 
     def query_packets(self, packets=None, start_time=None, end_time=None, **kwargs):
@@ -467,7 +467,7 @@ def query_packets(self, packets=None, start_time=None, end_time=None, **kwargs):
         try:
             db_res = self._query(query_string, **kwargs)
         except self._backend.exceptions.InfluxDBClientError as e:
-            log.error(f"query_time_range failed with exception: {e}")
+            log.error(f"db.InfluxDBBackend.query failed with exception: {e}")
             return AITDBResult(query=query_string, errors=[str(e)])
 
         def influx_results_gen(db_res, **kwargs):
@@ -748,7 +748,7 @@ def query(self, query, **kwargs):
             results = self._query(query, **kwargs)
             return AITDBResult(query=query, results=results)
         except self._backend.OperationalError as e:
-            log.error(f"query_time_range failed with exception: {e}")
+            log.error(f"db.SQLiteBackend.query failed with exception: {e}")
             return AITDBResult(query=query, errors=[str(e)])
 
     def query_packets(self, packets=None, start_time=None, end_time=None, **kwargs):
@@ -829,7 +829,7 @@ def query_packets(self, packets=None, start_time=None, end_time=None, **kwargs):
             try:
                 results.append((pkt, self._query(query_string)))
             except self._backend.OperationalError as e:
-                log.error(f"query_time_range failed with exception: {e}")
+                log.error(f"db.SQLiteBackend.query failed with exception: {e}")
                 errs.append(str(e))
 
         def sqlite_results_gen(results, **kwargs):