Merge branch 'master' into TESTING_updates_kwq

.github/workflows/assemble-files.yml

@@ -61,7 +61,7 @@ jobs:
     - name: Download SemTK
       shell: bash
       run: |
-        curl -LSfs https://github.com/ge-semtk/semtk/releases/download/v2.5.0-20230323/semtk-opensource-v2.5.0-20230323-dist.tar.gz -o RACK/rack-box/files/semtk.tar.gz
+        curl -LSfs https://github.com/ge-semtk/semtk/releases/download/v2.5.0-20230425/semtk-opensource-v2.5.0-20230425-dist.tar.gz -o RACK/rack-box/files/semtk.tar.gz
 
     - name: Download CSS stylesheet
       shell: bash

.github/workflows/assemble-turnstile-data.yml

@@ -0,0 +1,61 @@
+# Assembles Turnstile ingestion package (reusable workflow)
+
+on:
+  workflow_call:
+
+jobs:
+
+# assemble-turnstile-data job:
+#  - Downloads rack-box files from artifacts
+#  - Unpacks CLI wheels and OWL/CDR files
+#  - Assembles Turnstile ingestion package
+#  - Uploads ingestion package to artifacts or release
+
+  assemble-turnstile-data:
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Check out RACK source
+      uses: actions/checkout@v3
+      with:
+        repository: ge-high-assurance/RACK
+        path: RACK
+
+    - name: Download rack-box files from artifacts
+      uses: actions/download-artifact@v3
+      with:
+        name: rack-box-files
+        path: RACK/rack-box/files
+
+    - name: Unpack CLI wheels and OWL/CDR files
+      run: |
+        tar xfz RACK/rack-box/files/rack-cli.tar.gz
+        tar xfz RACK/rack-box/files/rack.tar.gz
+
+    - name: Install RACK CLI
+      run: |
+        pip3 install RACK/cli/wheels/*.whl
+        sudo apt-get install -qq --yes swi-prolog
+
+    - name: Assemble Turnstile ingestion package
+      run: |
+        RACK/Turnstile-Example/Assemble-TurnstileData.sh
+
+    - name: Upload ingestion package to artifacts
+      uses: actions/upload-artifact@v3
+      if: github.event_name != 'release'
+      with:
+        name: turnstile-ingestion-package.zip
+        path: |
+          RACK/Turnstile-Example/turnstile-ingestion-package.zip
+
+    # softprops/action-gh-release has many issues and PRs filed
+    # against it; replace it with "gh release upload" if CI fails
+    # run: gh release upload ${{ github.event.release.tag_name }} RACK/Turnstile-Example/turnstile-ingestion-package.zip --clobber
+
+    - name: Upload ingestion package to release
+      uses: softprops/action-gh-release@v1
+      if: github.event_name == 'release'
+      with:
+        files: |
+          RACK/Turnstile-Example/turnstile-ingestion-package.zip

.github/workflows/build-virtual-machine.yml

@@ -13,7 +13,7 @@ jobs:
 # build-virtual-machine job:
 #  - Downloads rack-box files from artifacts
 #  - Builds rack-box virtual machine
-#  - Uploads virtual machine to artifacts or releases
+#  - Uploads virtual machine to artifacts or release
 
   build-virtual-machine:
     runs-on: macos-12
@@ -64,7 +64,7 @@ jobs:
     # against it; replace it with "gh release upload" if CI fails
     # run: gh release upload ${{ github.event.release.tag_name }} RACK/rack-box/GitHub-Release-README.md RACK/rack-box/rack-box-${{ inputs.version }}.zip* --clobber
 
-    - name: Upload virtual machine to releases
+    - name: Upload virtual machine to release
       uses: softprops/action-gh-release@v1
       if: github.event_name == 'release'
       with:

.github/workflows/continuous.yml

@@ -3,8 +3,8 @@
 name: RACK Continuous Integration Workflow
 on:
   push:
-    branches: [ '**' ]
-    tags-ignore: [ '**' ]
+    branches: [ '*' ]
+    tags-ignore: [ '*' ]
 
 jobs:
 
@@ -45,8 +45,6 @@ jobs:
 
     - name: Lint RACK Ontology
       run: |
-        sudo apt-add-repository ppa:swi-prolog/stable
-        sudo apt-get update -qq --yes
         sudo apt-get install -qq --yes swi-prolog
         ./assist/bin/check
 

.github/workflows/manual.yml

@@ -2,7 +2,7 @@
 
 name: RACK Build Virtual Machine Workflow
 on:
-  workflow_dispatch:  
+  workflow_dispatch:
     inputs:
       version:
         required: false
@@ -17,9 +17,18 @@ jobs:
   assemble-files:
     uses: ./.github/workflows/assemble-files.yml
 
+# assemble-turnstile-data job:
+#  - Assembles Turnstile ingestion package
+#  - Uploads ingestion package to artifacts
+
+  assemble-turnstile-data:
+    needs: assemble-files
+    uses: ./.github/workflows/assemble-turnstile-data.yml
+    secrets: inherit
+
 # build-virtual-machine job:
 #  - Builds rack-box virtual machine
-#  - Uploads virtual machine to workflow
+#  - Uploads virtual machine to artifacts
 
   build-virtual-machine:
     needs: assemble-files

.github/workflows/release.yml

@@ -13,6 +13,15 @@ jobs:
   assemble-files:
     uses: ./.github/workflows/assemble-files.yml
 
+# assemble-turnstile-data job:
+#  - Assembles Turnstile ingestion package
+#  - Uploads ingestion package to release
+
+  assemble-turnstile-data:
+    needs: assemble-files
+    uses: ./.github/workflows/assemble-turnstile-data.yml
+    secrets: inherit
+
 # build-docker-image job:
 #  - Builds rack-box docker image
 #  - Pushes docker image to Docker Hub

.github/workflows/update-wiki.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches: [ master ]
     paths:
-      - 'nodegroups/queries/store_data.csv'
+      - 'RACK-Ontology/nodegroups/store_data.csv'
 
 jobs:
 
@@ -27,7 +27,7 @@ jobs:
       with:
         repository: ge-high-assurance/RACK.wiki
         path: RACK.wiki
-        
+
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
@@ -47,10 +47,10 @@ jobs:
     - name: Install csvtomd
       run: |
         pip3 install csvtomd --user
-      
+
     - name: Update query wiki page
       run: |
-        csvtomd RACK/nodegroups/queries/store_data.csv > temp.md
+        csvtomd RACK/RACK-Ontology/nodegroups/store_data.csv > temp.md
         cat RACK.wiki/_RACK-Predefined-Queries-header.md temp.md RACK.wiki/_RACK-Predefined-Queries-footer.md > RACK.wiki/RACK-Predefined-Queries.md
         cd RACK.wiki
         git config user.name github-actions

.gitignore

@@ -66,7 +66,9 @@ cli/.project
 /Turnstile-Example/Turnstile-IngestionPackage/CounterApplicationImplementation/*.exe
 /Turnstile-Example/Turnstile-IngestionPackage/CounterApplicationImplementation/*.gz
 /Turnstile-Example/Turnstile-IngestionPackage/CounterApplicationImplementation/*.o
+/Turnstile-Example/turnstile-ingestion-package.zip
 rack-ui/cache/
+rack-ui/config/config-override.yml
 rack-ui/.project
 EntityResolution/.project
 EntityResolution/Resolutions/Summary.csv

EntityResolution/manifest.yaml

@@ -0,0 +1,19 @@
+name: 'Entity Resolution'
+
+copy-to-default-graph: true
+perform-entity-resolution: true
+perform-triplestore-optimization: true
+
+footprint:
+  model-graphs:
+    - http://rack001/model
+  data-graphs:
+    - http://rack001/data
+
+steps:
+  - manifest: ../RACK-Ontology/manifest.yaml
+  - data: TestData/Package-1/import.yaml
+  - data: TestData/Package-2/import.yaml
+  - data: TestData/Package-3/import.yaml
+  - data: TestData/Resolutions-1/import.yaml
+  - data: TestData/Resolutions-2/import.yaml