remove sdsections (system, methodology, dataset) if no data present (…

…issue #65)

.github/workflows/actions.yml

@@ -37,6 +37,7 @@ jobs:
         env:
           TEST_PYPI_TOKEN_PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }}
         run: |
+          poetry update
           poetry build
           poetry config repositories.testpypi https://test.pypi.org/legacy/
           poetry publish -r testpypi --username "__token__" --password $TEST_PYPI_TOKEN_PASSWORD

example2.py

@@ -311,4 +311,4 @@
 lic = 'https://creativecommons.org/licenses/by-nc-nd/4.0/'
 example.rights(holder, lic)
 
-print(json.dumps(example.output, ensure_ascii=False))
+print(json.dumps(example.output, indent=4, ensure_ascii=False))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SciDataLib"
-version = "0.2.3"
+version = "0.2.3.1"
 description = "Python library for development of SciData JSON-LD files"
 authors = [
     "Stuart Chalk <schalk@unf.edu>",

scidatalib/scidata.py

@@ -813,14 +813,15 @@ def output(self) -> dict:
         """
         Generates Scidata JSON-LD File
         """
-        self.__addtoc()
+        # self.__addtoc()
         today = datetime.today()
         self.meta['generatedAt'] = today.strftime("%m-%d-%y %H:%M:%S")
 
         # clean top level
         for key in list(self.meta['@graph']):
             if not self.meta['@graph'][key]:
-                del self.meta['@graph'][key]
+                if key != 'toc':
+                    del self.meta['@graph'][key]
         for key in list(self.meta['@graph']['scidata']):
             if not self.meta['@graph']['scidata'][key]:
                 del self.meta['@graph']['scidata'][key]
@@ -829,5 +830,13 @@ def output(self) -> dict:
             for key in list(self.meta['@graph']['scidata'][sect]):
                 if not self.meta['@graph']['scidata'][sect][key]:
                     del self.meta['@graph']['scidata'][sect][key]
+        if not self.meta['@graph']['scidata'].get('methodology', {}).get('aspects', False):
+            del self.meta['@graph']['scidata']['methodology']
+        if not self.meta['@graph']['scidata'].get('system', {}).get('facets', False):
+            del self.meta['@graph']['scidata']['system']
+        if not self.meta['@graph']['scidata'].get('dataset', {}).get('datapoint', False):
+            if not self.meta['@graph']['scidata'].get('dataset', {}).get('dataseries', False):
+                del self.meta['@graph']['scidata']['dataset']
+        self.__addtoc()
 
         return self.meta