feat: Add port config.

Author: drudilorenzo

.gitignore

@@ -2,7 +2,7 @@
 openai_config.json
 
 environment/frontend_server/storage/*
-environment/frontend_server/temp_storage/*
+environment/frontend_server/temp_storage*/*
 reverie/backend_server/cost-logs/*
 
 # Logs folder

environment/frontend_server/translator/views.py

@@ -17,6 +17,8 @@
 from django.contrib.staticfiles.templatetags.staticfiles import static
 from .models import *
 
+fs_temp_storage = "temp_storage"
+
 def landing(request): 
   context = {}
   template = "landing/landing.html"
@@ -103,8 +105,8 @@ def UIST_Demo(request):
 
 
 def home(request):
-  f_curr_sim_code = "temp_storage/curr_sim_code.json"
-  f_curr_step = "temp_storage/curr_step.json"
+  f_curr_sim_code = f"{fs_temp_storage}/curr_sim_code.json"
+  f_curr_step = f"{fs_temp_storage}/curr_step.json"
 
   if not check_if_file_exists(f_curr_step): 
     context = {}
@@ -308,7 +310,7 @@ def path_tester_update(request):
   data = json.loads(request.body)
   camera = data["camera"]
 
-  with open(f"temp_storage/path_tester_env.json", "w") as outfile:
+  with open(f"{fs_temp_storage}/path_tester_env.json", "w") as outfile:
     outfile.write(json.dumps(camera, indent=2))
 
   return HttpResponse("received")

reverie/backend_server/automatic_execution.py

@@ -55,14 +55,21 @@ def parse_args() -> Tuple[str, str, int, bool]:
         default="/usr/bin/google-chrome %s",
         help='Browser path, default is /usr/bin/google-chrome %s'
     )
+    parser.add_argument(
+        '--port',
+        type=str,
+        default="8000",
+        help='Port number for the frontend server'
+    )
     origin = parser.parse_args().origin
     target = parser.parse_args().target
     steps = parser.parse_args().steps
     ui = parser.parse_args().ui
     ui = True if ui.lower() == "true" else False
     browser_path = parser.parse_args().browser_path
+    port = parser.parse_args().port
 
-    return origin, target, steps, ui, browser_path
+    return origin, target, steps, ui, browser_path, port
 
 
 def get_starting_step(exp_name: str) -> int:
@@ -81,13 +88,15 @@ def get_starting_step(exp_name: str) -> int:
     return current_step
 
 
-def start_web_tab(ui: bool, browser_path: str) -> None:
+def start_web_tab(ui: bool, browser_path: str, port: str) -> None:
     """Open a new tab in the browser with the simulator home page
     
     Args:
         ui (bool): Open the simulator UI.
+        browser_path (str): The path of the browser.
+        port (str): The port number of the frontend server.
     """
-    url = "http://localhost:8000/simulator_home"
+    url = f"http://localhost:{port}/simulator_home"
     print("(Auto-Exec): Opening the simulator home page", flush=True)
     time.sleep(5)
     try:
@@ -137,7 +146,7 @@ def save_checkpoint(rs, idx: int, th: Process) -> Tuple[str, int, int]:
     checkpoint_freq = 2 # 1 step = 10 sec
     log_path = "cost-logs"
     idx = 0
-    origin, target, tot_steps, ui, browser_path = parse_args()
+    origin, target, tot_steps, ui, browser_path, port = parse_args()
     current_step = get_starting_step(origin)
     exp_name = target
     start_time = datetime.now()
@@ -149,15 +158,15 @@ def save_checkpoint(rs, idx: int, th: Process) -> Tuple[str, int, int]:
     print(f"(Auto-Exec): Target: {target}", flush=True)
     print(f"(Auto-Exec): Total steps: {tot_steps}", flush=True)
     print(f"(Auto-Exec): Checkpoint Freq: {checkpoint_freq}", flush=True)
-    
+        
     while current_step < tot_steps:
         try:
             steps_to_run = curr_checkpoint - current_step
             target = f"{exp_name}-s-{idx}-{current_step}-{curr_checkpoint}"
             print(f"(Auto-Exec): STAGE {idx}", flush=True)
             print(f"(Auto-Exec): Running experiment '{exp_name}' from step '{current_step}' to '{curr_checkpoint}'", flush=True)
             rs = reverie.ReverieServer(origin, target)
-            th = Process(target=start_web_tab, args=(ui, browser_path))
+            th = Process(target=start_web_tab, args=(ui, browser_path, port))
             th.start()
             rs.open_server(input_command=f"run {steps_to_run}")
         except KeyboardInterrupt:
@@ -178,7 +187,7 @@ def save_checkpoint(rs, idx: int, th: Process) -> Tuple[str, int, int]:
         finally:
             time.sleep(10) # Wait for the server to finish and then kill the process
             if th.is_alive():
-                th.terminate()
+                th.kill()
 
     print(f"(Auto-Exec): EXPERIMENT FINISHED: {exp_name}")
     OpenAICostLoggerViz.print_experiment_cost(experiment=exp_name, path=log_path)

reverie/backend_server/reverie.py

@@ -56,6 +56,9 @@ class ReverieServer:
   def __init__(self, 
                fork_sim_code,
                sim_code):
+    
+    print ("(reverie): Temp storage: ", fs_temp_storage)
+        
     # FORKING FROM A PRIOR SIMULATION:
     # <fork_sim_code> indicates the simulation we are forking from. 
     # Interestingly, all simulations must be forked from some initial 
@@ -650,9 +653,6 @@ def open_server(self, input_command: str = None) -> None:
   origin = parser.parse_args().origin
   target = parser.parse_args().target
 
-  print(f"Origin: {origin}")
-  print(f"Target: {target}")
-
   rs = ReverieServer(origin, target)
   rs.open_server()
 

run_backend_automatic.sh

@@ -6,7 +6,6 @@ CONDA_ENV="simulacra"
 LOGS_PATH="../../logs"
 
 FILE_NAME="Bash-Script"
-echo "(${FILE_NAME}): Running backend server at: http://127.0.0.1:8000/simulator_home"
 cd ${BACKEND_SCRIPT_PATH}
 source /home/${USER}/anaconda3/bin/activate ${CONDA_ENV}
 
@@ -38,6 +37,12 @@ while [[ $# -gt 0 ]]; do
             shift
             shift
             ;;
+        --port|-p)
+            ARGS="${ARGS} --port ${2}"
+            echo "(${FILE_NAME}): Running backend server at: http://127.0.0.1:${2}/simulator_home"
+            shift
+            shift
+            ;;
         *)
             echo "Unknown argument: $1"
             exit 1

run_frontend.sh

@@ -4,8 +4,17 @@ FRONTEND_SCRIPT_PATH="environment/frontend_server"
 FRONTEND_SCRIPT_FILE="manage.py"
 CONDA_ENV="simulacra"
 
-echo "Running frontend server"
+FILE_NAME="Bash-Script-Frontend"
+echo "(${FILE_NAME}): Running frontend server"
 cd ${FRONTEND_SCRIPT_PATH}
 source /home/${USER}/anaconda3/bin/activate ${CONDA_ENV}
 
-python ${FRONTEND_SCRIPT_FILE} runserver
+PORT=8000
+if [ -z "$1" ]
+then
+    echo "(${FILE_NAME}): No port provided. Using default port: ${PORT}"
+else
+    PORT=$1
+fi
+
+python ${FRONTEND_SCRIPT_FILE} runserver ${PORT}