From cd116ba5063b9bfda029196b310207b45e21604a Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Mon, 5 Feb 2018 10:15:44 +0100 Subject: Implement workflow task dependencies --- opendc/models/task.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opendc/models/task.py b/opendc/models/task.py index 4e6485fb..8ea57b1e 100644 --- a/opendc/models/task.py +++ b/opendc/models/task.py @@ -8,13 +8,12 @@ class Task(Model): 'startTick': 'start_tick', 'totalFlopCount': 'total_flop_count', 'jobId': 'job_id', - 'taskDependencyId': 'task_dependency_id', 'parallelizability': 'parallelizability' } } TABLE_NAME = 'tasks' - COLUMNS = ['id', 'start_tick', 'total_flop_count', 'job_id', 'task_dependency_id', 'parallelizability'] + COLUMNS = ['id', 'start_tick', 'total_flop_count', 'job_id', 'parallelizability'] COLUMNS_PRIMARY_KEY = ['id'] def google_id_has_at_least(self, google_id, authorization_level): -- cgit v1.2.3 From 4e8e897e1c15c58ac32a4ad1aebd60ada96479de Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Fri, 16 Feb 2018 00:07:36 +0100 Subject: bug: Fix model according to new schema These changes fixes the `machine_state` model to use the new schema where a machine can run multiple tasks at the same time. --- opendc/models/machine_state.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/opendc/models/machine_state.py b/opendc/models/machine_state.py index 7f19ba01..1da37c80 100644 --- a/opendc/models/machine_state.py +++ b/opendc/models/machine_state.py @@ -6,7 +6,6 @@ class MachineState(Model): JSON_TO_PYTHON_DICT = { 'MachineState': { 'taskId': 'task_id', - 'machineId': 'machine_id', 'temperatureC': 'temperature_c', 'inUseMemoryMb': 'in_use_memory_mb', 'loadFraction': 'load_fraction', @@ -15,7 +14,7 @@ class MachineState(Model): } TABLE_NAME = 'machine_states' - COLUMNS = ['id', 'task_id', 'machine_id', 'experiment_id', 'tick', 'temperature_c', 'in_use_memory_mb', + COLUMNS = ['id', 'task_id', 'experiment_id', 'tick', 'temperature_c', 'in_use_memory_mb', 'load_fraction'] COLUMNS_PRIMARY_KEY = ['id'] @@ -26,11 +25,10 @@ class MachineState(Model): return cls( task_id=row[1], - machine_id=row[2], - temperature_c=row[5], - in_use_memory_mb=row[6], - load_fraction=row[7], - tick=row[4] + temperature_c=row[4], + in_use_memory_mb=row[5], + load_fraction=row[6], + tick=row[3] ) @classmethod -- cgit v1.2.3 From a9ecf3c48c92d667201bb77e709e2527ee35f7c4 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 12 May 2020 09:06:39 +0200 Subject: Ensure CORS works for socket.io --- main.py | 9 +++++++-- setup.py | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 838d971b..22a5e772 100644 --- a/main.py +++ b/main.py @@ -9,6 +9,7 @@ import urllib2 from flask import Flask, request, send_from_directory, jsonify from flask_compress import Compress from oauth2client import client, crypt +from flask_cors import CORS from opendc.models.user import User from opendc.util import exceptions, rest, path_parser, database @@ -28,12 +29,16 @@ database.init_connection_pool(user=KEYS['MYSQL_USER'], password=KEYS['MYSQL_PASS FLASK_CORE_APP = Flask(__name__, static_url_path='', static_folder=STATIC_ROOT) FLASK_CORE_APP.config['SECREY_KEY'] = KEYS['FLASK_SECRET'] +if 'localhost' in KEYS['SERVER_BASE_URL']: + CORS(FLASK_CORE_APP) compress = Compress() compress.init_app(FLASK_CORE_APP) -SOCKET_IO_CORE = flask_socketio.SocketIO(FLASK_CORE_APP) - +if 'localhost' in KEYS['SERVER_BASE_URL']: + SOCKET_IO_CORE = flask_socketio.SocketIO(FLASK_CORE_APP, cors_allowed_origins="*") +else: + SOCKET_IO_CORE = flask_socketio.SocketIO(FLASK_CORE_APP) @FLASK_CORE_APP.errorhandler(404) def page_not_found(e): diff --git a/setup.py b/setup.py index 6d6e9742..8197b5a2 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,7 @@ setup( 'flask_socketio', 'oauth2client', 'eventlet', - 'flask-compress' + 'flask-compress', + 'flask-cors' ], ) -- cgit v1.2.3