e2xauthoring 0.1.0__tar.gz → 0.2.0.dev1__tar.gz

{e2xauthoring-0.1.0 → e2xauthoring-0.2.0.dev1}/.pre-commit-config.yaml

@@ -1,20 +1,26 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 23.1.0
     hooks:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.11.5
     hooks:
       - id: isort
         files: \.py$
         args: [--profile=black]
 
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: "v0.0.267"
+    hooks:
+      - id: ruff
+
   - repo: local
     hooks:
       - id: prettier
         name: prettier
         entry: 'npm run prettier:files'
         language: node
-        types_or: [json, markdown, ts, tsx, javascript, jsx, css]
+        types_or: [json, markdown, ts, tsx, javascript, jsx, css]
+        exclude_types: [jupyter]

{e2xauthoring-0.1.0 → e2xauthoring-0.2.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e2xauthoring
-Version: 0.1.0
+Version: 0.2.0.dev1
 Summary: Authoring app for e2xgrader
 Project-URL: Source, https://github.com/Digiklausur/e2xauthoring
 Author-email: Tim Metzler <tim.metzler@h-brs.de>
@@ -12,15 +12,16 @@ Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.7
-Requires-Dist: e2xgrader==0.1.*
+Requires-Dist: e2xcore==0.0.2
 Requires-Dist: gitpython
 Provides-Extra: dev
 Requires-Dist: hatchling; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'
+Requires-Dist: tbump; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # e2xauthoring
 
 ---
 
-This is an authoring component for e2xgrader
+This is an authoring component for e2xgrader

e2xauthoring-0.2.0.dev1/README.md

@@ -0,0 +1,5 @@
+# e2xauthoring
+
+---
+
+This is an authoring component for e2xgrader

e2xauthoring-0.2.0.dev1/e2xauthoring/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.2.0-dev1"

{e2xauthoring-0.1.0 → e2xauthoring-0.2.0.dev1}/e2xauthoring/app/authoring.py

@@ -1,15 +1,14 @@
 import os
 
-from e2xgrader.server_extensions.grader.apps.base import BaseApp
+from e2xcore import BaseApp
 from nbgrader.apps.baseapp import NbGrader
 from tornado import web
 
-from .apihandlers import default_handlers
-from .handlers import default_handlers as handlers
+from .handlers.apihandlers import default_handlers
+from .handlers.handlers import default_handlers as handlers
 
 
 class AuthoringApp(NbGrader, BaseApp):
-
     template_path = os.path.join(os.path.dirname(__file__), "templates")
     static_path = os.path.join(template_path, "authoring", "static")
 

{e2xauthoring-0.1.0/e2xauthoring/app → e2xauthoring-0.2.0.dev1/e2xauthoring/app/handlers}/apihandlers.py

@@ -1,27 +1,71 @@
 import json
+import os
 
-from e2xgrader.converters import GenerateExercise
-from e2xgrader.models import AssignmentModel, TemplateModel
-from e2xgrader.server_extensions.grader.apps.authoring.apihandlers import (
-    BaseApiListHandler,
-    BaseApiManageHandler,
-    E2xApiHandler,
-    ExerciseModel,
-    KernelSpecHandler,
-    PresetHandler,
-    TemplateVariableHandler,
-    api_url,
-    assignment_regex,
-    name_regex,
-    pool_regex,
-)
-from e2xgrader.utils import urljoin
+from e2xcore.handlers import E2xApiHandler
+from e2xcore.utils import urljoin
+from jupyter_client.kernelspec import KernelSpecManager
 from nbgrader.server_extensions.formgrader.base import check_xsrf
 from tornado import web
 
-from e2xauthoring.utils import get_author, set_author
+from ...converters import GenerateExercise
+from ...models import (
+    AssignmentModel,
+    ExerciseModel,
+    PresetModel,
+    TaskModel,
+    TaskPoolModel,
+    TemplateModel,
+)
+from ...utils import NotebookVariableExtractor
+from ...utils.gitutils import get_author, set_author
+from .base import BaseApiListHandler, BaseApiManageHandler
+
+
+class PresetHandler(E2xApiHandler):
+    def initialize(self):
+        self.__model = PresetModel(self.coursedir)
+
+    def _list_template(self):
+        self.write(json.dumps(self.__model.list_template_presets()))
+
+    def _get_template(self):
+        name = self.get_argument("name")
+        self.write(json.dumps(self.__model.get_template_preset(name)))
+
+    def _list_question(self):
+        self.write(json.dumps(self.__model.list_question_presets()))
+
+    def _get_question(self):
+        name = self.get_argument("name")
+        self.write(json.dumps(self.__model.get_question_preset(name)))
+
+    @web.authenticated
+    @check_xsrf
+    def get(self):
+        action = self.get_argument("action")
+        preset_type = self.get_argument("type")
+        handler = getattr(self, "_{}_{}".format(action, preset_type))
+        handler()
+
+
+class TemplateVariableHandler(E2xApiHandler):
+    @web.authenticated
+    @check_xsrf
+    def get(self):
+        template = self.get_argument("template")
+        variables = NotebookVariableExtractor().extract(
+            os.path.join(
+                self.url_prefix, "templates", template, "{}.ipynb".format(template)
+            )
+        )
+        self.write(json.dumps(variables))
+
 
-from ..models import TaskModel, TaskPoolModel
+class KernelSpecHandler(E2xApiHandler):
+    @web.authenticated
+    @check_xsrf
+    def get(self):
+        self.write(json.dumps(KernelSpecManager().get_all_specs()))
 
 
 class ManagePoolsHandler(E2xApiHandler):
@@ -185,6 +229,9 @@ class GitAuthorHandler(E2xApiHandler):
         self.write(json.dumps(set_author(name=name, email=email)))
 
 
+api_url = urljoin("e2x", "authoring", "api")
+name_regex = r"(?P<name>[^/]+)"
+assignment_regex = r"(?P<assignment>[^/]+)"
 pool_action_regex = r"(?P<action>new|list|remove|get|init_repo)"
 task_action_regex = r"(?P<action>new|list|list_all|remove|commit|get|diff)"
 template_action_regex = r"(?P<action>new|list|remove)"

e2xauthoring-0.2.0.dev1/e2xauthoring/app/handlers/base.py

@@ -0,0 +1,41 @@
+import json
+
+from e2xcore.handlers import E2xApiHandler
+from nbgrader.server_extensions.formgrader.base import check_xsrf
+from tornado import web
+
+
+class BaseApiManageHandler(E2xApiHandler):
+    def initialize(self, model_cls):
+        self.__model = model_cls(self.coursedir)
+
+    @web.authenticated
+    @check_xsrf
+    def post(self, **kwargs):
+        self.write(self.__model.new(**kwargs))
+
+    @web.authenticated
+    @check_xsrf
+    def delete(self, **kwargs):
+        self.__model.remove(**kwargs)
+        self.write({"status": True})
+
+    @web.authenticated
+    @check_xsrf
+    def get(self, **kwargs):
+        self.write(json.dumps(self.__model.get(**kwargs)))
+
+    @web.authenticated
+    @check_xsrf
+    def put(self, **kwargs):
+        self.write(self.__model.new(**kwargs))
+
+
+class BaseApiListHandler(E2xApiHandler):
+    def initialize(self, model_cls):
+        self.__model = model_cls(self.coursedir)
+
+    @web.authenticated
+    @check_xsrf
+    def get(self, **kwargs):
+        self.write(json.dumps(self.__model.list(**kwargs)))

{e2xauthoring-0.1.0/e2xauthoring/app → e2xauthoring-0.2.0.dev1/e2xauthoring/app/handlers}/handlers.py

@@ -1,9 +1,7 @@
 import os
 import sys
-from email.policy import default
 
-from e2xgrader.server_extensions.grader.apps.authoring.handlers import app_url
-from e2xgrader.utils import urljoin
+from e2xcore.utils import urljoin
 from nbgrader.server_extensions.formgrader.base import (
     BaseHandler,
     check_notebook_dir,
@@ -11,6 +9,8 @@ from nbgrader.server_extensions.formgrader.base import (
 )
 from tornado import web
 
+app_url = urljoin("e2x", "authoring", "app")
+
 
 class AuthoringHandler(BaseHandler):
     @web.authenticated

e2xauthoring-0.2.0.dev1/e2xauthoring/app/templates/authoring/asset-manifest.json

@@ -0,0 +1,10 @@
+{
+  "files": {
+    "main.js": "/e2x/authoring/static/js/main.fe9bcd55.js",
+    "index.html": "/e2x/authoring/index.html",
+    "main.fe9bcd55.js.map": "/e2x/authoring/static/js/main.fe9bcd55.js.map"
+  },
+  "entrypoints": [
+    "static/js/main.fe9bcd55.js"
+  ]
+}

e2xauthoring-0.2.0.dev1/e2xauthoring/app/templates/authoring/index.html

@@ -0,0 +1 @@
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>e²xgrader - Authoring</title><script type="text/javascript">window.base_url="{{ base_url }}",window.url_prefix="{{ url_prefix }}",window.webpackstuff="/e2x/authoring/static/js/main.fe9bcd55.js"</script><script defer="defer" src="{{base_url}}/e2x/authoring/static/js/main.fe9bcd55.js"></script>{%- block head -%} {%- endblock -%}</head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>