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

Merge new-webenabled into development #716

Merged
merged 180 commits into from
Dec 27, 2023
Merged
Changes from 1 commit
Commits
Show all changes
180 commits
Select commit Hold shift + click to select a range
4df7786
Init version
cedorman Feb 3, 2022
8719d92
Updated readme
cedorman Feb 3, 2022
351075f
Scene files
cedorman Feb 3, 2022
d1587f1
Started laying out
cedorman Feb 3, 2022
13ecd46
More style changes
cedorman Feb 3, 2022
a238570
More improvements
cedorman Feb 3, 2022
3446930
Get list of scenes from dir
cedorman Feb 3, 2022
96df036
Load scene by command, not hard-coded, in run_scene_with_dir. WIP, st…
cedorman Feb 4, 2022
6a55e1e
Load scene by command, html and mcs_interface changes. WIP
cedorman Feb 4, 2022
9488b1d
WIP
cedorman Feb 4, 2022
54273b6
Cleanup; add newline at end of html
cedorman Feb 4, 2022
3994cbc
WIP; get action list
cedorman Feb 7, 2022
b3009b7
Split respond to scene selection separately from updating image; ret…
cedorman Feb 15, 2022
dff5160
Put action list higher (so can see when you load); make sure action l…
cedorman Feb 16, 2022
f29d5ac
Format action list; better debug statements.
cedorman Feb 17, 2022
fdb18d4
Do sessions properly, using random cookie value; when loading scene, …
cedorman Feb 17, 2022
edb86c9
flake8 fixes
cedorman Feb 17, 2022
5eb5ed9
add scene filename to list of actions
cedorman Feb 17, 2022
ebbed10
applied isort
cedorman Feb 17, 2022
1376020
added lots of log info when looking for mcs_interface
cedorman Feb 17, 2022
254dbc2
Local isort changes
deanwetherby Feb 17, 2022
ad28db3
Local flake8 changes
deanwetherby Feb 17, 2022
7979db5
Merge branch 'development' into webenabled
rartiss55 May 8, 2023
ea38876
Updates to get things in a semi-working state again.
rartiss55 May 9, 2023
728b614
Updated default actions in webenabled interface.
ThomasSchellenbergNextCentury May 9, 2023
8f6e54c
Replaced scenes in webenabled interface with Eval 6 validation dataset.
ThomasSchellenbergNextCentury May 9, 2023
2d34e5e
Add webenabled directory to precommit.
rartiss55 May 9, 2023
f201afc
flake8 fixes.
rartiss55 May 9, 2023
a8d4d18
Merge branch 'new-webenabled' of https://github.com/NextCenturyCorpor…
rartiss55 May 9, 2023
62d4878
add missing slash.
rartiss55 May 9, 2023
520cf43
Added overview section to webenabled README
ThomasSchellenbergNextCentury May 9, 2023
9a73f6c
Updated logs in the webenabled code
ThomasSchellenbergNextCentury May 11, 2023
d632c58
MCS-1796 Fixed frame off-by-one issue in the webenabled interface
ThomasSchellenbergNextCentury May 11, 2023
fa2dd94
Added step number to webenabled UI and updated main page template
ThomasSchellenbergNextCentury May 11, 2023
bbb6f73
Use the user and same datetime in command and image directory names.
ThomasSchellenbergNextCentury May 11, 2023
96d2b23
Unified webenabled log config
ThomasSchellenbergNextCentury May 11, 2023
9fdf169
Merge branch 'webenabled-docs' into MCS-1796-webenabled-off-by-one
ThomasSchellenbergNextCentury May 11, 2023
10d8d4b
Merge branch 'MCS-1796-webenabled-off-by-one' into webenabled-demo-ma…
ThomasSchellenbergNextCentury May 11, 2023
aea7d1e
Updated versions of python dependencies in requirements file. Updated…
ThomasSchellenbergNextCentury May 15, 2023
34a42c8
Merge branch 'development' into webenabled-docs
ThomasSchellenbergNextCentury May 15, 2023
092f267
Merge branch 'webenabled-docs' into MCS-1796-webenabled-off-by-one
ThomasSchellenbergNextCentury May 15, 2023
4c6342e
Merge branch 'MCS-1796-webenabled-off-by-one' into webenabled-demo-ma…
ThomasSchellenbergNextCentury May 15, 2023
47d3eda
Updated filenames in the webenabled UI
ThomasSchellenbergNextCentury May 16, 2023
424ed97
Merge pull request #660 from NextCenturyCorporation/webenabled-docs
ThomasSchellenbergNextCentury May 18, 2023
472db38
Update README.md
ThomasSchellenbergNextCentury May 30, 2023
b6d3d03
Update README.md
ThomasSchellenbergNextCentury May 30, 2023
f3e8abd
Adding a couple time.sleep() calls to mitigate issues on Mac (MCS-1796).
rartiss55 Jun 15, 2023
da1c2df
Merge pull request #661 from NextCenturyCorporation/MCS-1796-webenabl…
ThomasSchellenbergNextCentury Jun 16, 2023
2a7e7ad
Merge pull request #662 from NextCenturyCorporation/webenabled-demo-m…
ThomasSchellenbergNextCentury Jun 16, 2023
db047d0
Merge branch 'MCS-1808-fixpasshumaninput' into new-webenabled
ThomasSchellenbergNextCentury Jun 22, 2023
356e263
Merge remote-tracking branch 'origin/development' into new-webenabled
ThomasSchellenbergNextCentury Jun 22, 2023
5fb82a0
Updated webenabled log messages.
ThomasSchellenbergNextCentury Jun 22, 2023
2bfdc61
Ignoring extraneous keypresses while a step is being processed (MCS-1…
rartiss55 Jun 26, 2023
ffc34af
Merge pull request #678 from NextCenturyCorporation/MCS-1807
rartiss55 Jun 27, 2023
624e05d
Add loading spinner for when scenes are loading or actions are proces…
rartiss55 Jul 3, 2023
b9b94a5
Add new route to handle loading controller, blank page with spinner w…
rartiss55 Jul 3, 2023
d05198a
Merge pull request #680 from NextCenturyCorporation/MCS-1809-spinner
rartiss55 Jul 5, 2023
a005464
Update default image size so that little to no conversion for image c…
rartiss55 Jul 5, 2023
23764ea
Fix blank image path prior to controller load (MCS-1810).
rartiss55 Jul 5, 2023
7fbdccc
Add ability to click unity image to populate image coordinates for ce…
rartiss55 Jul 6, 2023
89b1011
Fix case for is_json (MCS-1810).
rartiss55 Jul 6, 2023
babc5c2
Reset image coordinates when scene changes, update alert message when…
rartiss55 Jul 10, 2023
7d5b001
Minor update to text (MCS-1810).
rartiss55 Jul 10, 2023
e7d508e
Initial attempt to support all actions by including all parameters (M…
rartiss55 Jul 11, 2023
7efccdf
Cleanup action strings that get processed, ignore case for keyboard s…
rartiss55 Jul 11, 2023
a073c75
Adding client side validation for input parameters, updating image co…
rartiss55 Jul 12, 2023
e92ad7c
Fix includes/in checks, ignore arrow keys for keypress event, fix bug…
rartiss55 Jul 12, 2023
456cd39
Update keyboard shortcut image to display all supported actions (MCS-…
rartiss55 Jul 12, 2023
b159343
Fixing timeout issue when same scene is selected/initialized twice in…
rartiss55 Jul 13, 2023
e5e0023
Merge remote-tracking branch 'origin/MCS-1810-clickImageCoords' into …
rartiss55 Jul 13, 2023
652b749
Update cursor for scene selection per PR comment (MCS-1810).
rartiss55 Jul 13, 2023
361e836
Merge pull request #681 from NextCenturyCorporation/MCS-1810-clickIma…
rartiss55 Jul 17, 2023
9a767a6
Update requirements for webenabled.
rartiss55 Jul 17, 2023
92f9641
Add goal info to UI (MCS-1812).
rartiss55 Jul 18, 2023
1ed0fd9
Update action list on a per step basis (MCS-1812).
rartiss55 Jul 18, 2023
904b7c5
Changing img_ directory to output_, also saving relevant information …
rartiss55 Jul 18, 2023
6588296
Adding step output file to image output directory, rename img directo…
rartiss55 Jul 19, 2023
7112d85
Add step output info to UI (MCS-1812).
rartiss55 Jul 19, 2023
6ff1865
Adding last action taken to output section of UI (MCS-1812).
rartiss55 Jul 19, 2023
03c42e5
Remove print statement.
rartiss55 Jul 19, 2023
8181a37
Merge pull request #682 from NextCenturyCorporation/MCS-1811-supportA…
rartiss55 Jul 20, 2023
f2a3e9a
WIP - adding new error output file, get step_number from step output …
rartiss55 Jul 27, 2023
9ef6d72
Remove old error files from output directory (MCS-1910).
rartiss55 Jul 27, 2023
49d5825
Add seperate logic to handle app start up, fix timing issue with erro…
rartiss55 Aug 2, 2023
a1b55d4
Finalize error handling (MCS-1910).
rartiss55 Aug 3, 2023
8002bd5
Merge pull request #683 from NextCenturyCorporation/MCS-1812-output
rartiss55 Aug 3, 2023
c7a842f
Merge pull request #684 from NextCenturyCorporation/MCS-1910-errorHan…
rartiss55 Aug 8, 2023
5526221
Remove non-existent function, change scene selection to dropdown (MCS…
rartiss55 Aug 8, 2023
b35ffcf
Moving some things around (MCS-1816).
rartiss55 Aug 8, 2023
6b6c61e
Taking out unnecessary tags, update CSS (MCS-1816).
rartiss55 Aug 8, 2023
7166b22
Using flex layout, cleanup (MCS-1816).
rartiss55 Aug 9, 2023
140fa4a
Fix footer (MCS-1816).
rartiss55 Aug 9, 2023
7813a81
MCS-1813 Updated the webenabled app to be packageable with pyinstalle…
ThomasSchellenbergNextCentury Aug 10, 2023
6dd1dfe
Turn shortcuts info into a collapsible sidebar (MCS-1816).
rartiss55 Aug 10, 2023
61367f7
Fix naming conventions (MCS-1816).
rartiss55 Aug 10, 2023
faa0cd9
Attempt to make seperators between different sections (MCS-1816).
rartiss55 Aug 10, 2023
cc30133
MCS-1813 Got my pre-commit working again and fixed some issues.
ThomasSchellenbergNextCentury Aug 11, 2023
a66bdfe
MCS-1813 Fixing some stupid errors.
ThomasSchellenbergNextCentury Aug 11, 2023
c49ad1d
Simplifying layout + removing collapsible side bar for keyboard short…
rartiss55 Aug 14, 2023
16be579
Moving things around.
rartiss55 Aug 14, 2023
79053db
Making select scenes dropdown larger, moving more things to center di…
rartiss55 Aug 14, 2023
61e069e
Making two columns for outputs, making scene select smaller (MCS-1816).
rartiss55 Aug 14, 2023
2379cb8
Moving output metadata beside unity image, fixing margins/padding (MC…
rartiss55 Aug 14, 2023
092ce5b
Minor fixes.
rartiss55 Aug 14, 2023
360ab5a
Making underscores dashes for div ids and labels (MCS-1816).
rartiss55 Aug 14, 2023
c686b78
Fix validation-errors margins (MCS-1816).
rartiss55 Aug 14, 2023
f157b3a
Trying out shortcuts section on the left (MCS-1816).
rartiss55 Aug 14, 2023
871ee2a
Fix console message.
rartiss55 Aug 14, 2023
469c96c
Quick css fix for left section widths (MCS-1816).
rartiss55 Aug 14, 2023
fe9d200
Ignoring non-action keys (MCS-1925).
rartiss55 Aug 14, 2023
6fdbe8e
Update variable reference (MCS-1925).
rartiss55 Aug 14, 2023
84f9f1b
Removing fetch.js -- should not cause an issue in modern browsers (MC…
rartiss55 Aug 15, 2023
3e0ac84
Addressing PR comments.
rartiss55 Aug 17, 2023
5c97c3b
Merge pull request #688 from NextCenturyCorporation/MCS-1931
rartiss55 Aug 17, 2023
27ccd71
Addressing PR comments.
rartiss55 Aug 17, 2023
547ac1f
Merge pull request #686 from NextCenturyCorporation/MCS-1816-styling
rartiss55 Aug 18, 2023
a8f4fbb
Merge branch 'new-webenabled' into MCS-1813-pyinstaller
rartiss55 Aug 18, 2023
66534c3
Merge pull request #687 from NextCenturyCorporation/MCS-1925
rartiss55 Aug 18, 2023
9781cd9
Attempt to close controller + unity when user closes browser (MCS-1817).
rartiss55 Aug 29, 2023
28c6cc0
Add psutil to correct requirements.txt, make sure to kill Unity proce…
rartiss55 Aug 29, 2023
939e8c3
Fix isort.
rartiss55 Aug 29, 2023
7d9c298
Fix isort.
rartiss55 Aug 29, 2023
0c54fc3
Add psutil back into top level requirements.txt.
rartiss55 Aug 29, 2023
6de246c
Fix isort take 3.
rartiss55 Aug 29, 2023
3ec0bb0
Revert "Fix isort take 3."
rartiss55 Aug 29, 2023
ef40bfb
isort (again).
rartiss55 Aug 29, 2023
0ac41df
Use localStorage to detect an open webenabled tab (MCS-1945).
rartiss55 Sep 7, 2023
dee7f72
Merge pull request #692 from NextCenturyCorporation/MCS-1817-closeUni…
rartiss55 Sep 7, 2023
ae9e49f
Fix spelling.
rartiss55 Sep 11, 2023
9b8535d
Handle get_mcs_interface() on exit, better error messaging (MCS-1945).
rartiss55 Sep 11, 2023
3ea996a
flake8 fix.
rartiss55 Sep 11, 2023
520c0ad
Clean up exit case logic in get_mcs_interface (MCS-1945).
rartiss55 Sep 11, 2023
b77fe7f
Adding task description class (WIP) + return task description when sc…
rartiss55 Sep 12, 2023
ef93577
Renaming tool use scene files to match appropriate naming convention …
rartiss55 Sep 12, 2023
c1e605d
Adding tool task descriptions (MCS-1814).
rartiss55 Sep 12, 2023
47daac4
Fix typo (MCS-1814).
rartiss55 Sep 12, 2023
d93f185
Adding more interactive task descriptions (MCS-1814).
rartiss55 Sep 12, 2023
1904e67
Adding the rest of the interactive task descriptions (MCS-1814).
rartiss55 Sep 13, 2023
91f1570
Adding in task descriptions for passive physics task + seeing leads t…
rartiss55 Sep 13, 2023
e52dd0b
Fixing bug with goal display for passive agency tasks.
rartiss55 Sep 13, 2023
234ecb3
Adding missing agency task descriptions (MCS-1814).
rartiss55 Sep 13, 2023
f7c0d1e
Add comment about scene name conventions (MCS-1814).
rartiss55 Sep 13, 2023
e7a0b71
Fix styling issue with odd resizing upon new scene selection.
rartiss55 Sep 13, 2023
d61b607
Fix isort.
rartiss55 Sep 13, 2023
c649011
Fix quotes in description (MCS-1814).
rartiss55 Sep 13, 2023
9b0f7b4
Merge pull request #693 from NextCenturyCorporation/restrictToOneTab
rartiss55 Sep 14, 2023
44cfb3f
Merge pull request #695 from NextCenturyCorporation/MCS-1814
rartiss55 Sep 14, 2023
321675c
Merge branch 'new-webenabled' into MCS-1813-pyinstaller
ThomasSchellenbergNextCentury Sep 21, 2023
cc7e410
MCS-1813 Added webenabled Windows pyinstaller instructions.
ThomasSchellenbergNextCentury Sep 21, 2023
7f8124c
Merge pull request #685 from NextCenturyCorporation/MCS-1813-pyinstaller
ThomasSchellenbergNextCentury Sep 21, 2023
e16aec7
Merge pull request #705 from NextCenturyCorporation/development
phile-caci Oct 13, 2023
0e235a0
Merge branch 'master' into new-webenabled
ThomasSchellenbergNextCentury Oct 23, 2023
9a145de
Updated webenabled required MCS version and config file.
ThomasSchellenbergNextCentury Oct 24, 2023
5a50aac
MCS-1923 Webenabled updates: added a list of previous images; added q…
ThomasSchellenbergNextCentury Oct 25, 2023
6d25d59
MCS-1923 Fixed webenabled spacing inconsistency.
ThomasSchellenbergNextCentury Nov 6, 2023
0967602
Merge pull request #706 from NextCenturyCorporation/MCS-1923-quick-ac…
ThomasSchellenbergNextCentury Nov 18, 2023
63aeeec
Adding error check for more common errors with less of a wait (MCS-19…
rartiss55 Dec 4, 2023
9895158
MCS-1815 MCS-1930 Webenabled app now uses a production-ready server b…
ThomasSchellenbergNextCentury Dec 5, 2023
25f89dd
MCS-1815 MCS-1930 Updated webenabled README and requirements file.
ThomasSchellenbergNextCentury Dec 5, 2023
f955b18
file removal. See TODO
NDCACI Dec 6, 2023
cb8670c
file removal. See TODO
NDCACI Dec 6, 2023
2296278
rearranged import
phile-caci Dec 6, 2023
e9d20cf
Update mcsweb.py
NDCACI Dec 6, 2023
9fbbdad
Merge pull request #709 from NextCenturyCorporation/MCS-1982
ThomasSchellenbergNextCentury Dec 11, 2023
fab805b
Update runner_script.py
NDCACI Dec 12, 2023
18a0e69
Merge remote-tracking branch 'origin/development' into MCS-1815-MCS-1930
ThomasSchellenbergNextCentury Dec 12, 2023
b11574a
Merge remote-tracking branch 'origin/development' into new-webenabled
ThomasSchellenbergNextCentury Dec 12, 2023
876e86a
Merge branch 'new-webenabled' into MCS-1815-MCS-1930
ThomasSchellenbergNextCentury Dec 12, 2023
e2f3f0e
Merge pull request #710 from NextCenturyCorporation/MCS-1815-MCS-1930
ThomasSchellenbergNextCentury Dec 13, 2023
66bd017
Merge pull request #712 from NextCenturyCorporation/mcs-1926
ThomasSchellenbergNextCentury Dec 13, 2023
2001afe
MCS-1983 Removed old webenabled scenes.
ThomasSchellenbergNextCentury Dec 13, 2023
59df9fc
MCS-1983 Added new webenabled scenes.
ThomasSchellenbergNextCentury Dec 13, 2023
c41191b
MCS-1983 Updated webenabled task descriptions.
ThomasSchellenbergNextCentury Dec 13, 2023
26432f0
MCS-1983 Minor updates.
ThomasSchellenbergNextCentury Dec 14, 2023
3c06fe0
MCS-1983 Fixed capitalization.
ThomasSchellenbergNextCentury Dec 14, 2023
e1d266b
commented out old names for now, causing enumeration issues
phile-caci Dec 15, 2023
336bc39
Merge pull request #715 from NextCenturyCorporation/MCS-1983
phile-caci Dec 15, 2023
1213dff
Change rotation amount
NDCACI Dec 15, 2023
40f446c
Merge pull request #718 from NextCenturyCorporation/mcs-2014
phile-caci Dec 18, 2023
cc76c1a
Updating task descriptions for newly updated eval 7 scene files.
rartiss55 Dec 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Load scene by command, not hard-coded, in run_scene_with_dir. WIP, st…
…ill need to send command
cedorman committed Feb 4, 2022
commit 96df03655acbf93e1d4ca6b2454f770eba81e170
149 changes: 89 additions & 60 deletions webenabled/run_scene_with_dir.py
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
import os
import time
import uuid
from os.path import exists

import machine_common_sense as mcs
from machine_common_sense import StepMetadata
@@ -11,99 +12,127 @@

class RunSceneWithDir:

def __init__(self, scene_file, command_in_dir, image_out_dir):
self.scene_file = scene_file
def __init__(self, command_in_dir, image_out_dir):
self.scene_file = None
self.controller = None
self.command_in_dir = command_in_dir
self.image_out_dir = image_out_dir

def run_loop(self):
print(f"Starting controller. Watching files at {command_dir}. Writing images to {image_dir}")

self.controller = mcs.create_controller(config_file_or_dict='./config_level1.ini')

# print("Staring to listen for commands")
patterns = ["command_*.txt"]
ignore_patterns = None
ignore_directories = False
case_sensitive = True
my_event_handler = PatternMatchingEventHandler(patterns, ignore_patterns, ignore_directories, case_sensitive)
my_event_handler.on_create = self.on_created
my_event_handler.on_deleted = self.on_deleted
my_event_handler.on_modified = self.on_modified
my_event_handler.on_moved = self.on_moved

observer = Observer()
observer.schedule(my_event_handler, command_dir, recursive=True)
observer.start()
try:
while True:
time.sleep(1)
except:
observer.stop()

observer.join()

self.controller.end_scene()

def load_command_file(self, command_text_file):
try:
with open(command_text_file, 'r') as command_file:
commands = [line.strip() for line in command_file]
except:
print(f"Failed to open {command_text_file}")
return

for command in commands:
# Ignore blank lines
if command == "":
continue

# Handle file names (new scene file) by loading
if command.endswith(".json"):
self.scene_file = command
self.load_scene()
else:
# Otherwise, assume that it is a valid action
self.step_and_save(command)

def load_scene(self):

if not exists(self.scene_file):
print(f"File {self.scene_file} does not exist")
return

try:
scene_data, status = mcs.load_scene_json_file(self.scene_file)
if status is not None:
raise ValueError("Unable to read in {self.scene_file}: {status}")

self.controller.end_scene()
output: StepMetadata = self.controller.start_scene(scene_data)
self.save_output(output)
except Exception as e:
print(f"Loading scene file failed: {e}")

# TODO: Decide if we need to do this. It may allows us to get an image
# self.step_and_save('Pass')

def step_and_save(self, command):
output: StepMetadata = self.controller.step(command)
if output is not None:
self.save_output(output)

def save_output(self, output: StepMetadata):
try:
img_list = output.image_list
if len(img_list) > 0:
img_path = self.image_out_dir + str(uuid.uuid4()) + ".png"
print(f"command: {command}. Saved image to: {img_path}")
print(f"Saved image to: {img_path}")
img = img_list[0]
img.save(img_path)
return img_path
else:
pass
# print("Image list is empty!!")
except Exception as e:
print(f"didnt work {e}")

def load_command_file(self, command_text_file):
try:
with open(command_text_file, 'r') as command_file:
commands = [line.strip() for line in command_file]
except:
print(f"Failed to open {command_text_file}")

for command in commands:
self.step_and_save(command)
print(f"saving image didnt work: {e}")

# ----------------------------------
# Watchdog functions
# ----------------------------------
def on_created(self, event):
# print(f"{event.src_path} created!")
self.load_command_file(event.src_path)
os.unlink(event.src_path)

# TODO: Write out results and save

def on_deleted(self, event):
# print(f"deleted {event.src_path}!")
pass

def on_modified(self, event):
print(f"{event.src_path} has been modified")
self.load_command_file(event.src_path)
os.unlink(event.src_path)

def on_moved(self, event):
# print(f"moved {event.src_path} to {event.dest_path}")
pass

def run_loop(self):
print(f"Starting controller. Watching files at {command_dir}. Writing images to {image_dir}")

scene_data, status = mcs.load_scene_json_file(self.scene_file)
if status is not None:
print(status)
exit()

self.controller.start_scene(scene_data)
self.step_and_save('Pass')

# print("Staring to listen for commands")
patterns = ["command_*.txt"]
ignore_patterns = None
ignore_directories = False
case_sensitive = True
my_event_handler = PatternMatchingEventHandler(patterns, ignore_patterns, ignore_directories, case_sensitive)
my_event_handler.on_create = self.on_created
my_event_handler.on_deleted = self.on_deleted
my_event_handler.on_modified = self.on_modified
my_event_handler.on_moved = self.on_moved

observer = Observer()
observer.schedule(my_event_handler, command_dir, recursive=True)
observer.start()
try:
while True:
time.sleep(1)
except:
observer.stop()

observer.join()

self.controller.end_scene()
def on_deleted(self, event):
pass


def parse_args():
parser = argparse.ArgumentParser(description='Run MCS')
parser.add_argument(
'mcs_scene_json_file',
help='MCS JSON scene configuration file to load')
# parser.add_argument(
# 'mcs_scene_json_file',
# help='MCS JSON scene configuration file to load')
parser.add_argument(
'--mcs_command_in_dir',
help='MCS directory that commands will appear in')
@@ -115,9 +144,9 @@ def parse_args():

if __name__ == "__main__":
args = parse_args()
scene_file = args.mcs_scene_json_file
# scene_file = args.mcs_scene_json_file
command_dir = args.mcs_command_in_dir
image_dir = args.mcs_image_out_dir

runScene = RunSceneWithDir(scene_file, command_dir, image_dir)
runScene = RunSceneWithDir(command_dir, image_dir)
runScene.run_loop()
Loading