Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sandialabs/slycat
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.3.0
Choose a base ref
...
head repository: sandialabs/slycat
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jan 5, 2022

  1. py version update

    wlhunt committed Jan 5, 2022
    Copy the full SHA
    af45dab View commit details

Commits on Jan 6, 2022

  1. Updating package-lock

    alexsielicki committed Jan 6, 2022
    Copy the full SHA
    9f83368 View commit details

Commits on Jan 14, 2022

  1. Closes #1051

    Spurs20 committed Jan 14, 2022
    Copy the full SHA
    cda251b View commit details
  2. closes #1049

    Mletter1 committed Jan 14, 2022
    Copy the full SHA
    c42df6b View commit details
  3. Closes #1062

    Spurs20 committed Jan 14, 2022
    Copy the full SHA
    602264c View commit details
  4. Copy the full SHA
    21845a8 View commit details
  5. Copy the full SHA
    4596dcf View commit details
  6. Closes #1038

    Spurs20 committed Jan 14, 2022
    Copy the full SHA
    76c5980 View commit details

Commits on Jan 20, 2022

  1. Updating filters whenever edits are made to the table and when model …

    …loads. Closes #923
    
    This prevents filter from becoming out of sync with data. For example, missing categories, showing non-existent categories, or having wrong min/max on the sliders.
    alexsielicki committed Jan 20, 2022
    Copy the full SHA
    afbcff2 View commit details
  2. Copy the full SHA
    47ea536 View commit details
  3. Closes #1027

    Spurs20 committed Jan 20, 2022
    Copy the full SHA
    e571cc1 View commit details
  4. Closes #970

    Spurs20 committed Jan 20, 2022
    Copy the full SHA
    2d4f105 View commit details

Commits on Jan 23, 2022

  1. Copy the full SHA
    5518f41 View commit details
  2. Copy the full SHA
    c175595 View commit details

Commits on Jan 24, 2022

  1. Removing unnecessary npm commands from DockerFile

    We no longer need to install node-sass since it's been replaced by dart-sass. Also, no need to 'npm install' here since that happens in docker-compose.yml. When 'npm install' runs here, I get integrity check errors. Not sure why, but might have something to do with node version mismatch.
    alexsielicki committed Jan 24, 2022
    Copy the full SHA
    1f9e94d View commit details

Commits on Jan 26, 2022

  1. Copy the full SHA
    52dc167 View commit details
  2. Copy the full SHA
    4b9cb80 View commit details
  3. Changing 'Reset Model' so it's available to reader role by moving it …

    …to 'Info' menu instead of 'Edit' menu. Addresses #1063
    alexsielicki committed Jan 26, 2022
    Copy the full SHA
    2b99704 View commit details

Commits on Jan 27, 2022

  1. Copy the full SHA
    3868bbb View commit details

Commits on Feb 2, 2022

  1. Updating tons of js packages. Updating .babelrc to get rid of webpack…

    … warnings. Updating webpack config due to breaking change in updated webpack version. Updating resource dependencies doc.
    alexsielicki committed Feb 2, 2022
    Copy the full SHA
    8036e7a View commit details

Commits on Feb 3, 2022

  1. Copy the full SHA
    b86841e View commit details
  2. Removing layout integrity hash from layout package as it keeps changi…

    …ng between two values and breaks 'npm install'
    alexsielicki committed Feb 3, 2022
    Copy the full SHA
    10464fe View commit details
  3. Copy the full SHA
    4fb37ee View commit details
  4. Switching to layout from npm instead of github since it's available t…

    …here now.
    
    This also circumvents issue with inconsistent integrity hashes for the git version of layout. 'npm install' would fail sometimes when it would get a different integrity hash for this package.
    alexsielicki committed Feb 3, 2022
    Copy the full SHA
    a6275d3 View commit details
  5. Copy the full SHA
    ac8585e View commit details
  6. Closes #1066 and #1018

    Spurs20 committed Feb 3, 2022
    Copy the full SHA
    626894b View commit details

Commits on Feb 10, 2022

  1. Adding debounce to function that POSTs bookmark to avoid dozens of re…

    …quests per second in some situations. Closes #1067
    alexsielicki committed Feb 10, 2022
    Copy the full SHA
    917f295 View commit details
  2. Copy the full SHA
    11d11d8 View commit details

Commits on Feb 16, 2022

  1. Copy the full SHA
    cdd1091 View commit details

Commits on Feb 17, 2022

  1. Copy the full SHA
    c654c5f View commit details
  2. Allow disabling of individual radio buttons. Disabling radio buttons …

    …for variables with mins of 0 or less.
    alexsielicki committed Feb 17, 2022
    Copy the full SHA
    1e1d458 View commit details

Commits on Feb 18, 2022

  1. Closes #1069

    Spurs20 committed Feb 18, 2022
    Copy the full SHA
    4130e1b View commit details

Commits on Feb 24, 2022

  1. Closes #1047

    Spurs20 committed Feb 24, 2022
    Copy the full SHA
    c0f5cac View commit details
  2. fixing read the docs

    Mletter1 committed Feb 24, 2022
    Copy the full SHA
    7abf8a8 View commit details
  3. Copy the full SHA
    b65a241 View commit details
  4. Copy the full SHA
    0d5ee45 View commit details
  5. Copy the full SHA
    75ebae8 View commit details
  6. Copy the full SHA
    e556f38 View commit details
  7. Copy the full SHA
    7907af2 View commit details

Commits on Mar 4, 2022

  1. Closes #1010

    Spurs20 committed Mar 4, 2022
    Copy the full SHA
    aa3c290 View commit details

Commits on Mar 6, 2022

  1. Copy the full SHA
    825db46 View commit details

Commits on Mar 7, 2022

  1. Updated slycat-web-client

    smartin71 committed Mar 7, 2022
    Copy the full SHA
    35deec6 View commit details

Commits on Mar 11, 2022

  1. Copy the full SHA
    50aaa8d View commit details

Commits on Mar 22, 2022

  1. Copy the full SHA
    703fe24 View commit details

Commits on Mar 24, 2022

  1. Removing unused scrips

    alexsielicki committed Mar 24, 2022
    Copy the full SHA
    a7cbfd2 View commit details
  2. Copy the full SHA
    5ab99e6 View commit details

Commits on Mar 25, 2022

  1. Copy the full SHA
    92f4860 View commit details
  2. Copy the full SHA
    4b4f642 View commit details
  3. Copy the full SHA
    626c505 View commit details
  4. Create setup.py

    Mletter1 committed Mar 25, 2022
    Copy the full SHA
    4d7d289 View commit details
Showing 784 changed files with 86,310 additions and 120,156 deletions.
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
"@babel/plugin-transform-runtime",
["@babel/plugin-proposal-class-properties", { "loose": true }],
["@babel/plugin-proposal-object-rest-spread", { "loose": true, "useBuiltIns": true }],
["@babel/plugin-proposal-private-methods", { "loose": true }]
["@babel/plugin-proposal-private-methods", { "loose": true }],
["@babel/plugin-proposal-private-property-in-object", { "loose": true }],
],
}
16 changes: 8 additions & 8 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"globals": {
"nconf": true
},
"parser": "babel-eslint",
"parser": "@babel/eslint-parser",
"plugins": ["react"],

"parserOptions": {
@@ -46,7 +46,7 @@
//
// The following rules point out areas where you might have made mistakes.
//
"quotemark": [true, "double", "avoid-escape"],
// "quotemark": [1, "double", "avoid-escape"],
"comma-dangle": 0, // disallow or enforce trailing commas
"no-cond-assign": 2, // disallow assignment in conditional expressions
"no-console": ["error", { "allow": ["warn", "error", "log"] }], // disallow use of console (off by default in the node environment)
@@ -73,8 +73,8 @@
"no-sparse-arrays": 2, // disallow sparse arrays
"no-unreachable": 2, // disallow unreachable statements after a return, throw, continue, or break statement
"use-isnan": 2, // disallow comparisons with the value NaN
"valid-jsdoc": 2, // Ensure JSDoc comments are valid (off by default)
"valid-typeof": 2, // Ensure that the results of typeof are compared against a valid string
"valid-jsdoc": 0, // Ensure JSDoc comments are valid (off by default)
"valid-typeof": 0, // Ensure that the results of typeof are compared against a valid string

//
// Best Practices
@@ -148,9 +148,9 @@
"no-label-var": 2, // disallow labels that share a name with a variable
"no-shadow": 2, // disallow declaration of variables already declared in the outer scope
"no-shadow-restricted-names": 2, // disallow shadowing of names such as arguments
"no-undef": 2, // disallow use of undeclared variables unless mentioned in a /*global */ block
"no-undef-init": 2, // disallow use of undefined when initializing variables
"no-undefined": 2, // disallow use of undefined variable (off by default)
"no-undef": 0, // disallow use of undeclared variables unless mentioned in a /*global */ block
"no-undef-init": 1, // disallow use of undefined when initializing variables
"no-undefined": 1, // disallow use of undefined variable (off by default)
"no-unused-vars": 0, // disallow declaration of variables that are not used in the code
"no-use-before-define": 2, // disallow use of variables before they are defined

@@ -229,7 +229,7 @@
// React specific linting rules for ESLint
//
"react/display-name": 0, // Prevent missing displayName in a React component definition
"jsx-quotes": ["error", "prefer-single"], // Enforce quote style for JSX attributes
"jsx-quotes": ["error", "prefer-double"], // Enforce quote style for JSX attributes
"react/jsx-no-undef": 2, // Disallow undeclared variables in JSX
"react/jsx-sort-props": 0, // Enforce props alphabetical sorting
"react/jsx-uses-react": 2, // Prevent React to be incorrectly marked as unused
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -3,5 +3,5 @@
"printWidth": 100,
"tabWidth": 2,
"useTabs": false,
"parser": "typescript"
// "parser": "typescript"
}
24 changes: 24 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the OS, Python version and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.11"

# Build documentation in the "docs/" directory with Sphinx
sphinx:
builder: html
configuration: docs/source/conf.py
fail_on_warning: false

# Optional but recommended, declare the Python requirements required
# to build your documentation
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
python:
install:
- requirements: docs/requirements.txt
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -9,9 +9,9 @@

This is Slycat - a web-based ensemble analysis and visualization platform, created at [Sandia National Laboratories](http://www.sandia.gov).

# Quick Start
# Demo and Developer Instance

[Build Your own local slycat environment with docker-compose](https://github.com/sandialabs/slycat/tree/master/docker/compose/slycat-compose).
[Build Your own development-oriented Slycat environment with docker-compose](https://github.com/sandialabs/slycat/tree/master/docker/compose/slycat-compose).

# Documentation

3 changes: 2 additions & 1 deletion agent/README.md
Original file line number Diff line number Diff line change
@@ -146,7 +146,8 @@
for command_script in command["scripts"]:
# compare the payload commands to the registered commands on the agent
if command_script != "":
run_commands.append(self.get_script_run_string(command_script) + " --log_file " + str(jid) + ".log")
run_commands.append(self.get_script_run_string(command_script))
# run_commands.append(self.get_script_run_string(command_script) + " --log_file " + str(jid) + ".log")
if not run_commands:
results = {"ok": False, "message": "could not create a run command did you register your script with "
"slycat?"}
4 changes: 0 additions & 4 deletions agent/json/compute_timeseries.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Copyright © 2013, 2018 National Technology and Engineering Solutions of Sandia, LLC . Under the terms of Contract
// DE-NA0003525 with National Technology and Engineering Solutions of Sandia, LLC, the U.S. Government
// retains certain rights in this software.

{
"name": "compute_timeseries",
"exec_path": "/home/slycat/install/conda/bin/python",
4 changes: 0 additions & 4 deletions agent/json/img-to-video.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Copyright © 2013, 2018 National Technology and Engineering Solutions of Sandia, LLC . Under the terms of Contract
// DE-NA0003525 with National Technology and Engineering Solutions of Sandia, LLC, the U.S. Government
// retains certain rights in this software.

{
"name": "img-to-video",
"exec_path": "/home/slycat/install/conda/bin/python",
4 changes: 0 additions & 4 deletions agent/json/test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Copyright © 2013, 2018 National Technology and Engineering Solutions of Sandia, LLC . Under the terms of Contract
// DE-NA0003525 with National Technology and Engineering Solutions of Sandia, LLC, the U.S. Government
// retains certain rights in this software.

{
"name": "test",
"exec_path": "/home/slycat/install/conda/bin/python",
4 changes: 0 additions & 4 deletions agent/json/timesereis_to_hdf5.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// Copyright © 2013, 2018 National Technology and Engineering Solutions of Sandia, LLC . Under the terms of Contract
// DE-NA0003525 with National Technology and Engineering Solutions of Sandia, LLC, the U.S. Government
// retains certain rights in this software.

{
"name": "timeseries_to_hdf5",
"exec_path": "/home/slycat/install/conda/bin/python",
10 changes: 7 additions & 3 deletions agent/slycat-agent-compute-timeseries.py
Original file line number Diff line number Diff line change
@@ -174,9 +174,13 @@ def tardir(path):
key_list.append(key)

for key in key_list:
new_key = key.decode("UTF-8")
clusters[new_key] = clusters[key]
del clusters[key]
if not isinstance(key, str):
try:
new_key = key.decode("UTF-8")
except:
new_key = key
clusters[new_key] = clusters[key]
del clusters[key]

file_clusters = dict(aid="clusters", file=json.dumps(sorted(clusters.keys())), parser="slycat-blob-parser",
timeseries_count=str(timeseries_count))
3 changes: 2 additions & 1 deletion agent/slycat-docker-agent.py
Original file line number Diff line number Diff line change
@@ -51,7 +51,8 @@ def run_remote_command(self, command):
for command_script in command["scripts"]:
# compare the payload commands to the registered commands on the agent
if command_script != "":
run_commands.append(self.get_script_run_string(command_script) + " --log_file " + str(jid) + ".log")
run_commands.append(self.get_script_run_string(command_script))
# run_commands.append(self.get_script_run_string(command_script) + " --log_file " + str(jid) + ".log")
if not run_commands:
results = {"ok": False, "message": "could not create a run command did you register your script with "
"slycat?"}
5 changes: 3 additions & 2 deletions agent/slycat-pbs-agent.py
Original file line number Diff line number Diff line change
@@ -52,7 +52,8 @@ def run_remote_command(self, command):
for command_script in command["scripts"]:
# compare the payload commands to the registered commands on the agent
if command_script != "":
run_commands.append(self.get_script_run_string(command_script) + " --log_file " + str(jid) + ".log")
run_commands.append(self.get_script_run_string(command_script))
# run_commands.append(self.get_script_run_string(command_script) + " --log_file " + str(jid) + ".log")
if not run_commands:
results = {"ok": False, "message": "could not create a run command did you register your script with "
"slycat?"}
@@ -79,7 +80,7 @@ def run_remote_command(self, command):
self.run_shell_command("mkdir -p %s" % working_dir)
except Exception as e:
output[0] = e.message
tmp_file = tempfile.NamedTemporaryFile(delete=False, dir=working_dir)
tmp_file = tempfile.NamedTemporaryFile(delete=False, dir=working_dir, mode="w")
self.generate_batch(module_name, wckey, nnodes, partition, ntasks_per_node, time_hours, time_minutes,
time_seconds, run_commands,
tmp_file)
3 changes: 2 additions & 1 deletion agent/slycat-slurm-agent.py
Original file line number Diff line number Diff line change
@@ -51,7 +51,8 @@ def run_remote_command(self, command):
for command_script in command["scripts"]:
# compare the payload commands to the registered commands on the agent
if command_script != "":
run_commands.append(self.get_script_run_string(command_script) + " --log_file " + str(jid) + ".log")
run_commands.append(self.get_script_run_string(command_script))
# run_commands.append(self.get_script_run_string(command_script) + " --log_file " + str(jid) + ".log")
if not run_commands:
results = {"ok": False, "message": "could not create a run command did you register your script with "
"slycat?"}
4 changes: 3 additions & 1 deletion docker/compose/slycat-compose/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Slycat Docker-compose (Alpha release, non production build for development)
# Slycat Docker-compose
This Docker system is primarily intended for Developer Use. It can provide an example of a small, non-scalable, non-production Slycat instance that demonstrates how the Slycat service interacts with a web server and a CouchDB server.

## Requirements
- Download `docker desktop for mac` see https://docs.docker.com/compose/install/
- git
106 changes: 66 additions & 40 deletions docker/compose/slycat-compose/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -30,38 +30,61 @@ services:
restart: always

slycat-client:
build:
context: .
dockerfile: ./slycat-client/DockerFile
working_dir: /usr/src/app/slycat
command:
- bash
- -c
- |
NODE_TLS_REJECT_UNAUTHORIZED=0 npm install \
&& npm run dev
ports:
- 9000:9000
networks:
- sly-net
volumes:
- ../../../:/usr/src/app/slycat
build:
context: .
dockerfile: ./slycat-client/DockerFile
working_dir: /usr/src/app/slycat
command:
- bash
- -c
- |
npm config set strict-ssl false \
&& NODE_TLS_REJECT_UNAUTHORIZED=0 npm install \
&& npm run dev
ports:
- 9000:9000
networks:
- sly-net
volumes:
- ../../../:/usr/src/app/slycat
restart: always

# slycat-test-client:
# build:
# context: .
# dockerfile: ./slycat-test-client/DockerFile
# working_dir: /usr/src/app/slycat/test-client/test-client/
# command:
# - bash
# - -c
# - |
# npm config set strict-ssl false \
# && NODE_TLS_REJECT_UNAUTHORIZED=0 npm install \
# && npm run dev
# ports:
# - 9001:9001
# networks:
# - sly-net
# volumes:
# - ../../../:/usr/src/app/slycat
# restart: always

# http://host_os_ip/haproxy?stats usr:admin, password:admin
haproxy:
build:
context: .
dockerfile: ./haproxy/DockerFile
depends_on:
- "slycat-web-server"
ports:
- 80:80
- 443:443
expose:
- 80
- 443
networks:
- sly-net
build:
context: .
dockerfile: ./haproxy/DockerFile
depends_on:
- "slycat-web-server"
ports:
- 80:80
- 443:443
expose:
- 80
- 443
networks:
- sly-net
restart: always

couchdb:
image: couchdb
@@ -78,19 +101,22 @@ services:
- couchdb-data-volume:/usr/local/var/lib/couchdb

sshd:
build:
context: .
dockerfile: ./sshd/DockerFile
ports:
- "2222:22"
expose:
- 22
# user:password:uid:gid
command: slycat:slycat:1001:1001
networks:
- sly-net
build:
context: .
dockerfile: ./sshd/DockerFile
ports:
- "2222:22"
expose:
- 22
# user:password:uid:gid
command: slycat:slycat:1001:1001
networks:
- sly-net
restart: always

networks:
sly-net:

volumes:
web-data-store-volume:
couchdb-data-volume:
4 changes: 3 additions & 1 deletion docker/compose/slycat-compose/requirements.txt
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@ configparser
future
routes
scipy
npTDMS
scikit-learn
npTDMS==1.6.0
pandas
pysmb
natsort
Loading