From ece1ab9983ec74bdd68ad4386b705165ff4290ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Tue, 5 May 2020 16:30:06 +0200 Subject: [PATCH] Make xqueue actually do something Xqueue was mostly broken in the previous releases. In this version, we address the following issues: - Proper initialisation by creating the right users - Shift from 8040 to the more standard 8000 port - Expose xqueue service on the internet for accessing its API - Properly define the xqueue name ("openedx") - Make sure that all logs go to the console - Add convenient CLI for using the awkward Xqueue API - Properly document how to use Xqueue --- README.rst | 82 +++++++++- screenshots/correctanswer.png | Bin 0 -> 35328 bytes setup.py | 2 +- tutorxqueue/__about__.py | 2 +- tutorxqueue/patches/https-create | 1 + tutorxqueue/patches/k8s-deployments | 2 +- tutorxqueue/patches/k8s-ingress-rules | 6 + tutorxqueue/patches/k8s-ingress-tls-hosts | 1 + tutorxqueue/patches/k8s-services | 2 +- tutorxqueue/patches/nginx-extra | 37 +++++ tutorxqueue/patches/openedx-common-settings | 2 +- tutorxqueue/plugin.py | 150 +++++++++++++++++- .../templates/xqueue/apps/settings/tutor.py | 16 +- .../templates/xqueue/build/xqueue/Dockerfile | 4 +- .../templates/xqueue/hooks/xqueue/init | 1 + 15 files changed, 291 insertions(+), 17 deletions(-) create mode 100644 screenshots/correctanswer.png create mode 100644 tutorxqueue/patches/https-create create mode 100644 tutorxqueue/patches/k8s-ingress-rules create mode 100644 tutorxqueue/patches/k8s-ingress-tls-hosts create mode 100644 tutorxqueue/patches/nginx-extra diff --git a/README.rst b/README.rst index b9888d2..764378a 100644 --- a/README.rst +++ b/README.rst @@ -6,7 +6,7 @@ This is a plugin for `Tutor `_ that provides the Installation ------------ -The plugin is currently bundled with the `binary releases of Tutor `_. If you have installed Tutor from source, you will have to install this plugin from source, too:: +The plugin is currently bundled with the `binary releases of Tutor `__. If you have installed Tutor from source, you will have to install this plugin from source, too:: pip install tutor-xqueue @@ -14,15 +14,89 @@ Then, to enable this plugin, run:: tutor plugins enable xqueue +Usage +----- + +In the Open edX studio, edit a course and add a new "Advanced blank problem" ("Problem" 🠆 "Advanced" 🠆 "Advanced blank problem"). Then, click "Edit" and copy-paste the following in the editor:: + +``` + + + + + + + # students write your program here + print "" + + + print "hello world" + + + {"output": "hello world", "max_length": 2} + + + + +``` + +.. note:: + The queue name must be "openedx". + +Save and publish the created unit. Then, access the unit from the LMS and attempt to answer the problem. The answer is sent to the Xqueue service. If you know how to use the Xqueue API, you can access it at http(s)://xqueue.LMS_HOST (in production) or http://xqueue.localhost (in development). However, the Xqueue API is a bit awkward to use. Tutor provides a simple command-line interface to interact with the Xqueue service. + +Count the number of submissions that need to be graded:: + + $ tutor xqueue submissions -u http://xqueue.localhost count + { + "content": 0, + "return_code": 0 + } + +.. note:: + By default, ``tutor xqueue submissions`` will hit the Xqueue API running at http(s)://xqueue.LMS_HOST. When running locally, you will want to interact with http://xqueue.localhost. To do so, you should pass the ``--url=http://xqueue.localhost`` option to the CLI. + +Show the first submission that should be graded:: + + $ tutor xqueue submissions show + { + "id": 1, + "key": "692c2896cdfc8bdc2d073bc3b3daf928", + "body": { + "student_info": "{\"random_seed\": 1, \"anonymous_student_id\": \"af46c9d6c05627aee45257d155ec0b79\", \"submission_time\": \"20200504101653\"}", + "grader_payload": "\n {\"output\": \"hello world\", \"max_length\": 2}\n ", + "student_response": " # students write your program here\r\n print \"42\"\r\n " + }, + "return_code": 0 + } + +Grade the submission (in this case, mark it as being correct):: + + $ tutor xqueue submissions grade 1 692c2896cdfc8bdc2d073bc3b3daf928 0.9 true "Good job\!" + { + "content": "", + "return_code": 0 + } + +.. warning:: + When running locally, the Xqueue client will report back to the LMS at the production url, so there are great chances that it will not work. A workaround is to manually edit the Submission record stored in the Xqueue database and modify the ``lms_callback_url`` attribute, but this is for advanced users only. + +The submission should then appear as correct with the message that you provided on the command line: + +.. image:: https://github.com/overhangio/tutor-xqueue/raw/master/screenshots/correctanswer.png + :alt: Correct answer + :align: center + Configuration ------------- - ``XQUEUE_AUTH_PASSWORD`` (default: ``"{{ 8|random_string }}"``) -- ``XQUEUE_MYSQL_PASSWORD`` (default: ``"{{ 8|random_string }}"``) -- ``XQUEUE_SECRET_KEY`` (default: ``"{{ 24|random_string }}"``) -- ``XQUEUE_DOCKER_IMAGE`` (default: ``"overhangio/openedx-xqueue:{{ TUTOR_VERSION }}"``) - ``XQUEUE_AUTH_USERNAME`` (default: ``"lms"``) +- ``XQUEUE_DOCKER_IMAGE`` (default: ``"overhangio/openedx-xqueue:{{ TUTOR_VERSION }}"``) +- ``XQUEUE_HOST`` (default: ``"xqueue.{{ LMS_HOST }}"``) +- ``XQUEUE_MYSQL_PASSWORD`` (default: ``"{{ 8|random_string }}"``) - ``XQUEUE_MYSQL_DATABASE`` (default: ``"xqueue"`` - ``XQUEUE_MYSQL_USERNAME`` (default: ``"xqueue"``) +- ``XQUEUE_SECRET_KEY`` (default: ``"{{ 24|random_string }}"``) These values can be modified with ``tutor config save --set PARAM_NAME=VALUE`` commands. diff --git a/screenshots/correctanswer.png b/screenshots/correctanswer.png new file mode 100644 index 0000000000000000000000000000000000000000..bf5552834dd92cdafaf287a8f207a143f0127f3b GIT binary patch literal 35328 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 {ne|0da6GqMNOY89kyum@K`ZdqE+p!~3m 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 JZ$Ezip8zW4(=z}7 literal 0 HcmV?d00001 diff --git a/setup.py b/setup.py index d88a41c..e7624c6 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ setup( packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.5", - install_requires=["tutor-openedx"], + install_requires=["tutor-openedx", "requests"], entry_points={"tutor.plugin.v0": ["xqueue = tutorxqueue.plugin"]}, classifiers=[ "Development Status :: 3 - Alpha", diff --git a/tutorxqueue/__about__.py b/tutorxqueue/__about__.py index 0a8da88..d3ec452 100644 --- a/tutorxqueue/__about__.py +++ b/tutorxqueue/__about__.py @@ -1 +1 @@ -__version__ = "0.1.6" +__version__ = "0.2.0" diff --git a/tutorxqueue/patches/https-create b/tutorxqueue/patches/https-create new file mode 100644 index 0000000..9d5d58d --- /dev/null +++ b/tutorxqueue/patches/https-create @@ -0,0 +1 @@ +certbot certonly --standalone -n --agree-tos -m admin@{{ LMS_HOST }} -d {{ XQUEUE_HOST }} \ No newline at end of file diff --git a/tutorxqueue/patches/k8s-deployments b/tutorxqueue/patches/k8s-deployments index 7cc0f14..79796e7 100644 --- a/tutorxqueue/patches/k8s-deployments +++ b/tutorxqueue/patches/k8s-deployments @@ -18,7 +18,7 @@ spec: - name: xqueue image: {{ DOCKER_REGISTRY }}{{ XQUEUE_DOCKER_IMAGE }} ports: - - containerPort: 8040 + - containerPort: 8000 env: - name: DJANGO_SETTINGS_MODULE value: xqueue.tutor diff --git a/tutorxqueue/patches/k8s-ingress-rules b/tutorxqueue/patches/k8s-ingress-rules new file mode 100644 index 0000000..1c5b7c3 --- /dev/null +++ b/tutorxqueue/patches/k8s-ingress-rules @@ -0,0 +1,6 @@ +- host: {{ XQUEUE_HOST }} + http: + paths: + - backend: + serviceName: nginx + servicePort: {% if ACTIVATE_HTTPS %}443{% else %}80{% endif %} \ No newline at end of file diff --git a/tutorxqueue/patches/k8s-ingress-tls-hosts b/tutorxqueue/patches/k8s-ingress-tls-hosts new file mode 100644 index 0000000..50e7b1a --- /dev/null +++ b/tutorxqueue/patches/k8s-ingress-tls-hosts @@ -0,0 +1 @@ +- {{ XQUEUE_HOST }} \ No newline at end of file diff --git a/tutorxqueue/patches/k8s-services b/tutorxqueue/patches/k8s-services index d4a227e..057d2c6 100644 --- a/tutorxqueue/patches/k8s-services +++ b/tutorxqueue/patches/k8s-services @@ -6,7 +6,7 @@ metadata: spec: type: NodePort ports: - - port: 8040 + - port: 8000 protocol: TCP selector: app.kubernetes.io/name: xqueue \ No newline at end of file diff --git a/tutorxqueue/patches/nginx-extra b/tutorxqueue/patches/nginx-extra new file mode 100644 index 0000000..56d9317 --- /dev/null +++ b/tutorxqueue/patches/nginx-extra @@ -0,0 +1,37 @@ +### Xqueue +upstream xqueue-backend { + server xqueue:8000 fail_timeout=0; +} + +{% if ACTIVATE_HTTPS %} +server { + server_name {{ XQUEUE_HOST }}; + listen 80; + return 301 https://$server_name$request_uri; +} +{% endif %} + +server { + {% if ACTIVATE_HTTPS %}listen 443 {{ "" if WEB_PROXY else "ssl" }};{% else %}listen 80;{% endif %} + server_name xqueue.localhost {{ XQUEUE_HOST }}; + + {% if ACTIVATE_HTTPS and not WEB_PROXY %} + ssl_certificate /etc/letsencrypt/live/{{ XQUEUE_HOST }}/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/{{ XQUEUE_HOST }}/privkey.pem; + {% endif %} + + # Disables server version feedback on pages and in headers + server_tokens off; + + location / { + {% if not WEB_PROXY %} + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Port $server_port; + proxy_set_header X-Forwarded-For $remote_addr; + {% endif %} + proxy_set_header Host $http_host; + proxy_redirect off; + + proxy_pass http://xqueue-backend; + } +} \ No newline at end of file diff --git a/tutorxqueue/patches/openedx-common-settings b/tutorxqueue/patches/openedx-common-settings index cdb3f10..7335b47 100644 --- a/tutorxqueue/patches/openedx-common-settings +++ b/tutorxqueue/patches/openedx-common-settings @@ -3,5 +3,5 @@ XQUEUE_INTERFACE = { "username": "{{ XQUEUE_AUTH_USERNAME }}", "password": "{{ XQUEUE_AUTH_PASSWORD }}" }, - "url": "http://xqueue:8040" + "url": "http://xqueue:8000" } \ No newline at end of file diff --git a/tutorxqueue/plugin.py b/tutorxqueue/plugin.py index e7946fb..fe22cc1 100644 --- a/tutorxqueue/plugin.py +++ b/tutorxqueue/plugin.py @@ -1,7 +1,13 @@ from glob import glob +import json import os +import click import pkg_resources +import requests + +from tutor import config as tutor_config +from tutor.exceptions import TutorError from .__about__ import __version__ @@ -14,8 +20,9 @@ config = { }, "defaults": { "VERSION": __version__, - "DOCKER_IMAGE": "overhangio/openedx-xqueue:{{ XQUEUE_VERSION }}", "AUTH_USERNAME": "lms", + "DOCKER_IMAGE": "overhangio/openedx-xqueue:{{ XQUEUE_VERSION }}", + "HOST": "xqueue.{{ LMS_HOST }}", "MYSQL_DATABASE": "xqueue", "MYSQL_USERNAME": "xqueue", }, @@ -39,3 +46,144 @@ def patches(): content = patch_file.read() all_patches[name] = content return all_patches + + +@click.group(help="Interact with the Xqueue server") +def command(): + pass + + +@click.group(help="List and grade submissions") +@click.pass_obj +@click.option("-q", "--queue", default="openedx", show_default=True, help="Queue name") +@click.option( + "-u", + "--url", + help="Xqueue server base url. By default, this value will be defined from the plugin configuration.", +) +def submissions(context, queue, url): + context.queue = queue + context.url = url + + +@click.command(name="count", help="Count submissions in queue") +@click.pass_obj +def count_submissions(context): + print_result(context, "count_submissions", context.queue) + + +@click.command(name="show", help="Show last submission") +@click.pass_obj +def show_submission(context): + print_result(context, "show_submission", context.queue) + + +@click.command(name="grade", help="Grade a specific submission") +@click.argument("submission_id") +@click.argument("submission_key") +@click.argument("grade", type=click.FLOAT) +@click.argument("correct", type=click.BOOL) +@click.argument("message") +@click.pass_obj +def grade_submission(context, submission_id, submission_key, grade, correct, message): + print_result( + context, + "grade_submission", + submission_id, + submission_key, + grade, + correct, + message, + ) + + +def print_result(context, client_func_name, *args, **kwargs): + user_config = tutor_config.load(context.root) + client = Client(user_config, url=context.url) + func = getattr(client, client_func_name) + result = func(*args, **kwargs) + print(json.dumps(result, indent=2)) + + +class Client: + def __init__(self, user_config, url=None): + self._session = None + self.username = user_config["XQUEUE_AUTH_USERNAME"] + self.password = user_config["XQUEUE_AUTH_PASSWORD"] + + self.base_url = url + if not self.base_url: + scheme = "https" if user_config["ACTIVATE_HTTPS"] else "http" + host = host or user_config["XQUEUE_HOST"] + self.base_url = "{}://{}".format(scheme, host) + self.login() + + @property + def session(self): + if self._session is None: + self._session = requests.Session() + return self._session + + def url(self, endpoint): + # Don't forget to add a trailing slash to all endpoints: this is how xqueue + # works... + return self.base_url + endpoint + + def login(self): + response = self.request( + "/xqueue/login/", + method="POST", + data={"username": self.username, "password": self.password}, + ) + message = response.get("content") + if message != "Logged in": + raise TutorError( + "Could not login to xqueue server at {}. Response: '{}'".format( + self.base_url, message + ) + ) + + def show_submission(self, queue): + response = self.request("/xqueue/get_submission/", params={"queue_name": queue}) + if response["return_code"] != 0: + return response + data = json.loads(response["content"]) + header = json.loads(data["xqueue_header"]) + submission_body = json.loads(data["xqueue_body"]) + submission_id = header["submission_id"] + submission_key = header["submission_key"] + return { + "id": submission_id, + "key": submission_key, + "body": submission_body, + "return_code": response["return_code"], + } + + def count_submissions(self, queue): + return self.request("/xqueue/get_queuelen/", params={"queue_name": queue}) + + def grade_submission(self, submission_id, submission_key, grade, correct, msg): + return self.request( + "/xqueue/put_result/", + method="POST", + data={ + "xqueue_header": json.dumps( + {"submission_id": submission_id, "submission_key": submission_key} + ), + "xqueue_body": json.dumps( + {"correct": correct, "score": grade, "msg": msg} + ), + }, + ) + + def request(self, endpoint, method="GET", data=None, params=None): + func = getattr(self.session, method.lower()) + response = func(self.url(endpoint), data=data, params=params) + # TODO handle errors >= 400 and non-parsable json responses + return response.json() + + +submissions.add_command(count_submissions) +submissions.add_command(show_submission) +submissions.add_command(grade_submission) +command.add_command(submissions) diff --git a/tutorxqueue/templates/xqueue/apps/settings/tutor.py b/tutorxqueue/templates/xqueue/apps/settings/tutor.py index 423cf62..33dfc1c 100644 --- a/tutorxqueue/templates/xqueue/apps/settings/tutor.py +++ b/tutorxqueue/templates/xqueue/apps/settings/tutor.py @@ -1,21 +1,27 @@ from .settings import * +ALLOWED_HOSTS = [ + "{{ XQUEUE_HOST }}", + "xqueue", + "xqueue.localhost", +] + DATABASES = { "default": { "ENGINE": "django.db.backends.mysql", "HOST": "{{ MYSQL_HOST }}", - "PORT": {{MYSQL_PORT}}, + "PORT": {{ MYSQL_PORT }}, "NAME": "{{ XQUEUE_MYSQL_DATABASE }}", "USER": "{{ XQUEUE_MYSQL_USERNAME }}", "PASSWORD": "{{ XQUEUE_MYSQL_PASSWORD }}", - "OPTIONS": { - "init_command": "SET sql_mode='STRICT_TRANS_TABLES'", - }, + "OPTIONS": {"init_command": "SET sql_mode='STRICT_TRANS_TABLES'",}, } } LOGGING = get_logger_config(log_dir="/openedx/data/", logging_env="tutor", dev_env=True) +LOGGING["loggers"][""]["handlers"].append("console") SECRET_KEY = "{{ XQUEUE_SECRET_KEY }}" -XQUEUE_USERS = {"{{ XQUEUE_AUTH_USERNAME }}": "{{ XQUEUE_AUTH_PASSWORD}}"} +USERS = {"{{ XQUEUE_AUTH_USERNAME }}": "{{ XQUEUE_AUTH_PASSWORD}}"} +XQUEUES = {"openedx": None} diff --git a/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile b/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile index 45273ae..8168fce 100644 --- a/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile +++ b/tutorxqueue/templates/xqueue/build/xqueue/Dockerfile @@ -11,5 +11,5 @@ WORKDIR /openedx/xqueue RUN pip install -r requirements.txt -EXPOSE 8040 -CMD gunicorn --workers=2 --name xqueue --bind=0.0.0.0:8040 --max-requests=1000 xqueue.wsgi:application +EXPOSE 8000 +CMD gunicorn --workers=2 --name xqueue --bind=0.0.0.0:8000 --max-requests=1000 xqueue.wsgi:application diff --git a/tutorxqueue/templates/xqueue/hooks/xqueue/init b/tutorxqueue/templates/xqueue/hooks/xqueue/init index f0c3d44..d65fc76 100644 --- a/tutorxqueue/templates/xqueue/hooks/xqueue/init +++ b/tutorxqueue/templates/xqueue/hooks/xqueue/init @@ -1 +1,2 @@ ./manage.py migrate +./manage.py update_users