diff options
| -rw-r--r-- | main.py | 9 | ||||
| -rw-r--r-- | opendc/models/machine_state.py | 14 | ||||
| -rw-r--r-- | opendc/models/task.py | 4 | ||||
| -rw-r--r-- | setup.py | 14 |
4 files changed, 24 insertions, 17 deletions
@@ -9,6 +9,7 @@ import urllib 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['MONGODB_USER'], password=KEYS['MONGODB_ 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/opendc/models/machine_state.py b/opendc/models/machine_state.py index 7f19ba01..ad295e1a 100644 --- a/opendc/models/machine_state.py +++ b/opendc/models/machine_state.py @@ -5,7 +5,6 @@ from opendc.util import database class MachineState(Model): JSON_TO_PYTHON_DICT = { 'MachineState': { - 'taskId': 'task_id', 'machineId': 'machine_id', 'temperatureC': 'temperature_c', 'inUseMemoryMb': 'in_use_memory_mb', @@ -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', 'machine_id', 'experiment_id', 'tick', 'temperature_c', 'in_use_memory_mb', 'load_fraction'] COLUMNS_PRIMARY_KEY = ['id'] @@ -25,12 +24,11 @@ class MachineState(Model): """Instantiate a MachineState from a database row (including tick from the TaskState).""" 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] + machine_id=row[1], + temperature_c=row[4], + in_use_memory_mb=row[5], + load_fraction=row[6], + tick=row[3] ) @classmethod diff --git a/opendc/models/task.py b/opendc/models/task.py index 8ea57b1e..ff1dd16a 100644 --- a/opendc/models/task.py +++ b/opendc/models/task.py @@ -7,13 +7,13 @@ class Task(Model): 'id': 'id', 'startTick': 'start_tick', 'totalFlopCount': 'total_flop_count', + 'coreCount': 'core_count', 'jobId': 'job_id', - 'parallelizability': 'parallelizability' } } TABLE_NAME = 'tasks' - COLUMNS = ['id', 'start_tick', 'total_flop_count', 'job_id', 'parallelizability'] + COLUMNS = ['id', 'start_tick', 'total_flop_count', 'job_id', 'core_count'] COLUMNS_PRIMARY_KEY = ['id'] def google_id_has_at_least(self, google_id, authorization_level): @@ -34,10 +34,14 @@ setup( packages=['opendc'], install_requires=[ - 'flask', - 'flask_socketio', - 'oauth2client', - 'eventlet', - 'flask-compress' + 'flask==1.0.2', + 'flask-socketio==3.0.2', + 'oauth2client==4.1.3', + 'eventlet==0.24.1', + 'flask-compress==1.4.0', + 'flask-cors==3.0.8', + 'mysql-connector-python-rf==2.2.2', + 'pyasn1-modules==0.2.2', + 'six==1.11.0' ], ) |