Fix Geo vis IP address & SQL logic bugs.

maro/cli/maro_real_time_vis/back_end/vis_app/app.py

@@ -244,5 +244,5 @@ def get_acc_attrs():
 # Use Only For Local Debug
 # ************************************
 if __name__ == '__main__':
-    app_backend.run(debug=True, port=5000)
+    app_backend.run(debug=False, port=5000, host="0.0.0.0")
 # ************************************

maro/cli/maro_real_time_vis/back_end/vis_app/data_process/request/request_decision.py

@@ -50,9 +50,12 @@ def get_acc_decision_data(experiment_name: str, episode: str, start_tick: str, e
 
     """
     input_range = get_input_range(start_tick, end_tick)
+    query = f"select {request_column.decision_header.value} from {experiment_name}.full_on_vessels"\
+        f" where episode='{episode}'"
+    if input_range != "()":
+        query += f" and tick in {input_range}"
     params = {
-        "query": f"select {request_column.decision_header.value} from {experiment_name}.full_on_vessels"
-        f" where episode='{episode}' and tick in {input_range}",
+        "query": query,
         "count": "true"
     }
     original_decision_data = requests.get(

maro/cli/maro_real_time_vis/back_end/vis_app/data_process/request/request_exp_info.py

@@ -66,7 +66,7 @@ def get_experiment_info():
     data_in_format["start_episode"] = start_episode_num
     data_in_format['start_snapshot'] = start_snapshot_num
     total_params = {
-        "query": f"select count(episode), count(tick) from {experiment_name}.port_details",
+        "query": f"select count_distinct(episode), count_distinct(tick) from {experiment_name}.port_details",
         "count": "true"
     }
     total_episode = requests.get(

maro/cli/maro_real_time_vis/back_end/vis_app/data_process/request/request_order.py

@@ -50,9 +50,12 @@ def get_acc_order_data(experiment_name: str, episode: str, start_tick: str, end_
 
     """
     input_range = get_input_range(start_tick, end_tick)
+    query = f"select {request_column.order_header.value} from {experiment_name}.full_on_ports"\
+        f" where episode='{episode}'"
+    if input_range != "()":
+        query += f" and tick in {input_range}"
     params = {
-        "query": f"select {request_column.order_header.value} from {experiment_name}.full_on_ports"
-        f" where episode='{episode}' and tick in {input_range}",
+        "query": query,
         "count": "true"
     }
     original_order_data = requests.get(

maro/cli/maro_real_time_vis/back_end/vis_app/data_process/request/request_port.py

@@ -71,9 +71,12 @@ def get_acc_port_data(experiment_name: str, episode: str, start_tick: str, end_t
 
     """
     input_range = get_input_range(start_tick, end_tick)
+    query = f"select {request_column.port_header.value}  from {experiment_name}.port_details"\
+        f" where episode='{episode}'"
+    if input_range != "()":
+        query += f" and tick in {input_range}"
     params = {
-        "query": f"select {request_column.port_header.value}  from {experiment_name}.port_details"
-        f" where episode='{episode}' and tick in {input_range}",
+        "query": query,
         "count": "true"
     }
     db_port_data = requests.get(

maro/cli/maro_real_time_vis/back_end/vis_app/data_process/request/request_vessel.py

@@ -51,9 +51,12 @@ def get_acc_vessel_data(experiment_name: str, episode: str, start_tick: str, end
 
     """
     input_range = get_input_range(start_tick, end_tick)
+    query = f"select {request_column.vessel_header.value} from {experiment_name}.vessel_details"\
+        f" where episode='{episode}'"
+    if input_range != "()":
+        query += f" and tick in {input_range}"
     params = {
-        "query": f"select {request_column.vessel_header.value} from {experiment_name}.vessel_details"
-        f" where episode='{episode}' and tick in {input_range}",
+        "query": query,
         "count": "true"
     }
     db_vessel_data = requests.get(

maro/cli/maro_real_time_vis/back_end/vis_app/data_process/request/utils.py

@@ -34,12 +34,4 @@ def get_input_range(start_tick: str, end_tick: str) -> str:
         str: Range of tick in string format.
 
     """
-    i = int(start_tick)
-    input_range = "("
-    while i < int(end_tick):
-        if i == int(end_tick) - 1:
-            input_range = input_range + "'" + str(i) + "'" + ")"
-        else:
-            input_range = input_range + "'" + str(i) + "'" + ","
-        i = i + 1
-    return input_range
+    return "(" + ", ".join([f"'{i}'" for i in range(int(start_tick), int(end_tick))]) + ")"

maro/cli/maro_real_time_vis/start_maro_geo_vis.py

@@ -12,6 +12,9 @@
 
 from .back_end.vis_app.data_process.request.request_params import request_settings
 
+GEO_FRONT_SERVICE_DOCKER_IMAGE = "maro2020/geo_front_service"
+DEFAULT_FRONT_END_PORT = 8080
+
 
 def start_geo_vis(start: str, experiment_name: str, front_end_port: int, **kwargs: dict):
     grader_path = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(__file__))))
@@ -77,15 +80,14 @@ def start_geo_vis(start: str, experiment_name: str, front_end_port: int, **kwarg
 
         # Start front-end docker container.
         exec_path = os.path.dirname(inspect.getfile(inspect.currentframe()))
-        os.system("docker pull maro2020/geo_front_service")
+        os.system(f"docker pull {GEO_FRONT_SERVICE_DOCKER_IMAGE}")
         os.system("docker stop geo-vis")
         os.system("docker rm geo-vis")
-        if front_end_port is not None:
-            os.system(f"docker run -d -p {front_end_port}:8080 --name geo-vis maro2020/geo_front_service")
-        else:
-            os.system("docker run -d -p 8080:8080 --name geo-vis maro2020/geo_front_service")
+        os.system(
+            f"docker run -d -p {front_end_port if front_end_port is not None else DEFAULT_FRONT_END_PORT}:8080 "
+            f"--name geo-vis {GEO_FRONT_SERVICE_DOCKER_IMAGE}"
+        )
         back_end_path = f"{exec_path}/back_end/vis_app/app.py"
         os.system(f"python {back_end_path}")
-
     else:
         raise CliError("Please input 'database' or 'service'.")