Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workflow interaction view #185

Merged
merged 40 commits into from
Mar 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
5bac040
Partial work on workflow support
Jan 13, 2024
a2ba7a3
Added button actions to workflow
Jan 15, 2024
7ad1220
More development
Jan 19, 2024
4754776
Added in examples
Jan 19, 2024
abcdd4b
Adding echo_workflow
Jan 20, 2024
00a4134
Adding examples, with some debugging
Jan 20, 2024
d8703dd
Merge branch 'main' into cok-sessions
Jan 20, 2024
9ed3157
Removing local paths
Jan 20, 2024
8be56d5
Removing local paths
Jan 20, 2024
ae0a6f8
Adding support for the 'complete' attribute
Jan 20, 2024
47118ad
Adding some extra Load and Select buttons
Jan 20, 2024
13c4ed0
Fixed problem with scrolling of readonly text boxes
Jan 20, 2024
9aa895b
Making labels bold
Jan 20, 2024
83cd3f9
Making labels bold
Jan 20, 2024
392fad3
Testing checkbox
Jan 20, 2024
8d3f9de
Added support for resource nodes
Jan 20, 2024
ed37961
Inserting data and model graph locations
Jan 20, 2024
7613e88
FIllilng in resources
Jan 22, 2024
142ef80
Scrollbars working
Jan 22, 2024
cd31022
switching checkbox to use the text, rather than the label
Jan 22, 2024
3b6daf0
Fixed the background color
Jan 22, 2024
5fa36a7
Updating FIXME list
Jan 24, 2024
5bb7908
Partial work on always sending connection informaation
Jan 25, 2024
a4a8b5f
Partial work on always sending connection informaation
Jan 25, 2024
edd101c
Fixing problems with sending connection information
Jan 29, 2024
f9ab1f3
Implementing cancelable workflows -- still needs modelessness
Jan 30, 2024
df75c14
Implementing cancelable workflows -- still needs modelessness
Jan 30, 2024
5b4d63d
Removing debug box
Jan 31, 2024
b5120d5
Adding show-console preference
Feb 1, 2024
c502ebd
Avoiding giving console focus on output
Feb 1, 2024
1fd1d60
Avoiding a race
Feb 1, 2024
a94092e
Implemented non-blocking cancel dialog
Feb 6, 2024
4ee769e
Slight adjustments for races
Feb 6, 2024
aafe9b2
Merge branch 'main' into cok-sessions
Feb 6, 2024
fb19eef
Accepted required format changes
Feb 6, 2024
a377faf
Fixing the duplicate connection parameters
Feb 7, 2024
0dc207b
Enabling cancellation with the progress view
Feb 20, 2024
024b966
Enabling cancellation with the progress view
Feb 20, 2024
a7641e1
Merge branch 'main' of https://github.com/ge-high-assurance/RITE into…
Mar 13, 2024
a3c2fac
Merge branch 'main' of https://github.com/ge-high-assurance/RITE into…
Mar 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
.recommenders
.settings/
bin/
!tools/rack/rack.plugin/resources/workflows/bin
local.properties
tmp/

Expand Down
28 changes: 22 additions & 6 deletions tools/rack/rack.plugin/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
</commandParameter>
</command>

<command categoryId="rackplugin.commands"
id="rackplugin.commands.runWorkflow" name="Run Workflow">
</command>


<!-- For reports -->
<command categoryId="rackplugin.commands"
id="rackplugin.commands.reportsCommand"
Expand All @@ -74,11 +79,11 @@
id="rackplugin.commands.ribCommand" name="Access RiB">
</command>

<command id="rack.plugin.commands.showNumTriplesCommand"
<command id="rackplugin.commands.showNumTriplesCommand"
name="Show Data Graphs and number of triples currently on RACK">
</command>

<command id="rack.plugin.commands.refreshCommand"
<command id="rackplugin.commands.refreshCommand"
name="Refresh Ontologies and Nodegroups">
</command>

Expand Down Expand Up @@ -191,10 +196,13 @@
commandId="rackplugin.commands.ribCommand">
</handler>
<handler class="com.ge.research.rack.RefreshHandler"
commandId="rack.plugin.commands.refreshCommand">
commandId="rackplugin.commands.refreshCommand">
</handler>
<handler class="com.ge.research.rack.ShowNumTriplesHandler"
commandId="rack.plugin.commands.showNumTriplesCommand">
commandId="rackplugin.commands.showNumTriplesCommand">
</handler>
<handler class="com.ge.research.rack.RunWorkflowHandler"
commandId="rackplugin.commands.runWorkflow">
</handler>

</extension>
Expand Down Expand Up @@ -225,6 +233,9 @@
<command commandId="rackplugin.commands.clearAll"
id="rackplugin.menus.clearAll" label="Clear RACK" mnemonic="S">
</command>
<command commandId="rackplugin.commands.runWorkflow"
id="rackplugin.menus.runWorkflow" label="Run Workflow">
</command>

<separator name="separator2" visible="true">
</separator>
Expand Down Expand Up @@ -259,15 +270,15 @@
<menuContribution
locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
<toolbar id="rack.plugin.toolbars.refreshInfo">
<command commandId="rack.plugin.commands.refreshCommand"
<command commandId="rackplugin.commands.refreshCommand"
icon="icons/refresh.png" id="rack.plugin.toolbars.refreshCommand"
tooltip="Refresh Ontology and Nodegroups views with latest information on RACK">
</command>
</toolbar>
</menuContribution>

<!-- <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
<toolbar id="rack.plugin.toolbars.showNumTriples"> <command commandId="rack.plugin.commands.showNumTriplesCommand"
<toolbar id="rack.plugin.toolbars.showNumTriples"> <command commandId="rackplugin.commands.showNumTriplesCommand"
icon="icons/ontclass.png" id="rack.plugin.toolbars.showNumTriplesCommand"
tooltip="Show Data graphs with number of triples currently on RACK"> </command>
</toolbar> </menuContribution> -->
Expand All @@ -292,6 +303,11 @@
id="rackplugin.views.CSVTemplates" inject="true"
name="View CDR Templates">
</view>
<view category="rackplugin"
class="com.ge.research.rack.views.SessionView"
id="rackplugin.views.SessionView" inject="true"
name="Interactive Session">
</view>
<view category="rackplugin"
class="com.ge.research.rack.views.AssuranceCaseTree"
id="rackplugin.views.AssuranceCaseTree" inject="true"
Expand Down
5 changes: 5 additions & 0 deletions tools/rack/rack.plugin/resources/workflows/Calc.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<workflow
name="Calc"
command="bin/xmlbc.sh"
>
</workflow>
5 changes: 5 additions & 0 deletions tools/rack/rack.plugin/resources/workflows/Checkbox.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<workflow
name="Checkbox"
command="bin/xmlcheckbox.sh"
>
</workflow>
5 changes: 5 additions & 0 deletions tools/rack/rack.plugin/resources/workflows/Delay.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<workflow
name="Delay"
command="bin/xmldelay.sh"
>
</workflow>
5 changes: 5 additions & 0 deletions tools/rack/rack.plugin/resources/workflows/Echosh.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<workflow
name="Echosh"
command="bin/xmlecho.sh"
>
</workflow>
23 changes: 23 additions & 0 deletions tools/rack/rack.plugin/resources/workflows/bin/badxmlresponse.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#! /usr/bin/env bash

input=`cat -`

orig=`echo $input | sed -e 's/^.*<form[^>]*>//' -e 'sx</form>.*$xx'`

if echo "$input" | grep -q connection ; then
## FIRST TIME

echo "zzzzz"

else
## NOT FIRST TIME

expr=`echo "$orig" | sed -e 's/^.*<control[^>]*>//g' | sed -e 'sx</control>.*$xx'`

res=`echo $expr`

echo "zzzzz"

fi


Binary file not shown.
247 changes: 247 additions & 0 deletions tools/rack/rack.plugin/resources/workflows/bin/venv/bin/Activate.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,247 @@
<#
.Synopsis
Activate a Python virtual environment for the current PowerShell session.

.Description
Pushes the python executable for a virtual environment to the front of the
$Env:PATH environment variable and sets the prompt to signify that you are
in a Python virtual environment. Makes use of the command line switches as
well as the `pyvenv.cfg` file values present in the virtual environment.

.Parameter VenvDir
Path to the directory that contains the virtual environment to activate. The
default value for this is the parent of the directory that the Activate.ps1
script is located within.

.Parameter Prompt
The prompt prefix to display when this virtual environment is activated. By
default, this prompt is the name of the virtual environment folder (VenvDir)
surrounded by parentheses and followed by a single space (ie. '(.venv) ').

.Example
Activate.ps1
Activates the Python virtual environment that contains the Activate.ps1 script.

.Example
Activate.ps1 -Verbose
Activates the Python virtual environment that contains the Activate.ps1 script,
and shows extra information about the activation as it executes.

.Example
Activate.ps1 -VenvDir C:\Users\MyUser\Common\.venv
Activates the Python virtual environment located in the specified location.

.Example
Activate.ps1 -Prompt "MyPython"
Activates the Python virtual environment that contains the Activate.ps1 script,
and prefixes the current prompt with the specified string (surrounded in
parentheses) while the virtual environment is active.

.Notes
On Windows, it may be required to enable this Activate.ps1 script by setting the
execution policy for the user. You can do this by issuing the following PowerShell
command:

PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser

For more information on Execution Policies:
https://go.microsoft.com/fwlink/?LinkID=135170

#>
Param(
[Parameter(Mandatory = $false)]
[String]
$VenvDir,
[Parameter(Mandatory = $false)]
[String]
$Prompt
)

<# Function declarations --------------------------------------------------- #>

<#
.Synopsis
Remove all shell session elements added by the Activate script, including the
addition of the virtual environment's Python executable from the beginning of
the PATH variable.

.Parameter NonDestructive
If present, do not remove this function from the global namespace for the
session.

#>
function global:deactivate ([switch]$NonDestructive) {
# Revert to original values

# The prior prompt:
if (Test-Path -Path Function:_OLD_VIRTUAL_PROMPT) {
Copy-Item -Path Function:_OLD_VIRTUAL_PROMPT -Destination Function:prompt
Remove-Item -Path Function:_OLD_VIRTUAL_PROMPT
}

# The prior PYTHONHOME:
if (Test-Path -Path Env:_OLD_VIRTUAL_PYTHONHOME) {
Copy-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME -Destination Env:PYTHONHOME
Remove-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME
}

# The prior PATH:
if (Test-Path -Path Env:_OLD_VIRTUAL_PATH) {
Copy-Item -Path Env:_OLD_VIRTUAL_PATH -Destination Env:PATH
Remove-Item -Path Env:_OLD_VIRTUAL_PATH
}

# Just remove the VIRTUAL_ENV altogether:
if (Test-Path -Path Env:VIRTUAL_ENV) {
Remove-Item -Path env:VIRTUAL_ENV
}

# Just remove VIRTUAL_ENV_PROMPT altogether.
if (Test-Path -Path Env:VIRTUAL_ENV_PROMPT) {
Remove-Item -Path env:VIRTUAL_ENV_PROMPT
}

# Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether:
if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) {
Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force
}

# Leave deactivate function in the global namespace if requested:
if (-not $NonDestructive) {
Remove-Item -Path function:deactivate
}
}

<#
.Description
Get-PyVenvConfig parses the values from the pyvenv.cfg file located in the
given folder, and returns them in a map.

For each line in the pyvenv.cfg file, if that line can be parsed into exactly
two strings separated by `=` (with any amount of whitespace surrounding the =)
then it is considered a `key = value` line. The left hand string is the key,
the right hand is the value.

If the value starts with a `'` or a `"` then the first and last character is
stripped from the value before being captured.

.Parameter ConfigDir
Path to the directory that contains the `pyvenv.cfg` file.
#>
function Get-PyVenvConfig(
[String]
$ConfigDir
) {
Write-Verbose "Given ConfigDir=$ConfigDir, obtain values in pyvenv.cfg"

# Ensure the file exists, and issue a warning if it doesn't (but still allow the function to continue).
$pyvenvConfigPath = Join-Path -Resolve -Path $ConfigDir -ChildPath 'pyvenv.cfg' -ErrorAction Continue

# An empty map will be returned if no config file is found.
$pyvenvConfig = @{ }

if ($pyvenvConfigPath) {

Write-Verbose "File exists, parse `key = value` lines"
$pyvenvConfigContent = Get-Content -Path $pyvenvConfigPath

$pyvenvConfigContent | ForEach-Object {
$keyval = $PSItem -split "\s*=\s*", 2
if ($keyval[0] -and $keyval[1]) {
$val = $keyval[1]

# Remove extraneous quotations around a string value.
if ("'""".Contains($val.Substring(0, 1))) {
$val = $val.Substring(1, $val.Length - 2)
}

$pyvenvConfig[$keyval[0]] = $val
Write-Verbose "Adding Key: '$($keyval[0])'='$val'"
}
}
}
return $pyvenvConfig
}


<# Begin Activate script --------------------------------------------------- #>

# Determine the containing directory of this script
$VenvExecPath = Split-Path -Parent $MyInvocation.MyCommand.Definition
$VenvExecDir = Get-Item -Path $VenvExecPath

Write-Verbose "Activation script is located in path: '$VenvExecPath'"
Write-Verbose "VenvExecDir Fullname: '$($VenvExecDir.FullName)"
Write-Verbose "VenvExecDir Name: '$($VenvExecDir.Name)"

# Set values required in priority: CmdLine, ConfigFile, Default
# First, get the location of the virtual environment, it might not be
# VenvExecDir if specified on the command line.
if ($VenvDir) {
Write-Verbose "VenvDir given as parameter, using '$VenvDir' to determine values"
}
else {
Write-Verbose "VenvDir not given as a parameter, using parent directory name as VenvDir."
$VenvDir = $VenvExecDir.Parent.FullName.TrimEnd("\\/")
Write-Verbose "VenvDir=$VenvDir"
}

# Next, read the `pyvenv.cfg` file to determine any required value such
# as `prompt`.
$pyvenvCfg = Get-PyVenvConfig -ConfigDir $VenvDir

# Next, set the prompt from the command line, or the config file, or
# just use the name of the virtual environment folder.
if ($Prompt) {
Write-Verbose "Prompt specified as argument, using '$Prompt'"
}
else {
Write-Verbose "Prompt not specified as argument to script, checking pyvenv.cfg value"
if ($pyvenvCfg -and $pyvenvCfg['prompt']) {
Write-Verbose " Setting based on value in pyvenv.cfg='$($pyvenvCfg['prompt'])'"
$Prompt = $pyvenvCfg['prompt'];
}
else {
Write-Verbose " Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virtual environment)"
Write-Verbose " Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'"
$Prompt = Split-Path -Path $venvDir -Leaf
}
}

Write-Verbose "Prompt = '$Prompt'"
Write-Verbose "VenvDir='$VenvDir'"

# Deactivate any currently active virtual environment, but leave the
# deactivate function in place.
deactivate -nondestructive

# Now set the environment variable VIRTUAL_ENV, used by many tools to determine
# that there is an activated venv.
$env:VIRTUAL_ENV = $VenvDir

if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) {

Write-Verbose "Setting prompt to '$Prompt'"

# Set the prompt to include the env name
# Make sure _OLD_VIRTUAL_PROMPT is global
function global:_OLD_VIRTUAL_PROMPT { "" }
Copy-Item -Path function:prompt -Destination function:_OLD_VIRTUAL_PROMPT
New-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Description "Python virtual environment prompt prefix" -Scope Global -Option ReadOnly -Visibility Public -Value $Prompt

function global:prompt {
Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) "
_OLD_VIRTUAL_PROMPT
}
$env:VIRTUAL_ENV_PROMPT = $Prompt
}

# Clear PYTHONHOME
if (Test-Path -Path Env:PYTHONHOME) {
Copy-Item -Path Env:PYTHONHOME -Destination Env:_OLD_VIRTUAL_PYTHONHOME
Remove-Item -Path Env:PYTHONHOME
}

# Add the venv to the PATH
Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH
$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH"
Loading
Loading