Skip to content

regex matching for studio integrations (F26 changes) #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Albitr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

regex matching for studio integrations (F26 changes) #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions source/autograder_platform/StudentSubmissionImpl/Python/PythonSubmission.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ class PythonSubmission(AbstractStudentSubmission[CodeType]):
# this allows versioned and non versioned packages, but disallows local packages
REQUIREMENTS_LINE_REGEX: re.Pattern = re.compile(r"^(\w|-)+(==)?(\d+\.?){0,3}$")

# matches main.py, submission.py, or submission_<AssessmentName>.py
MAIN_FILE_REGEX: re.Pattern = re.compile(r"^(main|submission(_\w+)?)\.py$")

def __init__(self):
super().__init__()

Expand All @@ -51,7 +54,7 @@ def __init__(self):

self.entryPoint: Optional[CodeType] = None

self.addValidator(PythonFileValidator(self.ALLOWED_STRICT_MAIN_NAMES))
self.addValidator(PythonFileValidator(self.MAIN_FILE_REGEX))
self.addValidator(RequirementsValidator())
self.addValidator(PackageValidator())

Expand Down Expand Up @@ -145,7 +148,7 @@ def _identifyMainFile(self) -> str:
return self.discoveredFileMap[FileTypeMap.PYTHON_FILES][0]

for file in self.discoveredFileMap[FileTypeMap.PYTHON_FILES]:
if os.path.basename(file) in self.ALLOWED_STRICT_MAIN_NAMES:
if self.MAIN_FILE_REGEX.match(os.path.basename(file)):
return file

# unreachable
Expand Down Expand Up @@ -201,4 +204,4 @@ def getDiscoveredFileMap(self) -> Dict[FileTypeMap, List[str]]:
return self.discoveredFileMap

def getExtraPackages(self) -> Dict[str, str]:
return self.extraPackages
return self.extraPackages
21 changes: 8 additions & 13 deletions source/autograder_platform/StudentSubmissionImpl/Python/PythonValidators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import importlib.util
from typing import Callable, Dict, List
import re
from typing import Dict, List
import requests
import os
from autograder_platform.StudentSubmission.AbstractValidator import AbstractValidator
Expand All @@ -12,9 +13,9 @@ class PythonFileValidator(AbstractValidator):
def getValidationHook() -> ValidationHook:
return ValidationHook.POST_LOAD

def __init__(self, allowedMainNames: List[str]):
def __init__(self, mainFileRegex: re.Pattern):
super().__init__()
self.allowedMainNames = allowedMainNames
self.mainFileRegex = mainFileRegex
self.pythonFiles: Dict[FileTypeMap, List[str]] = {}
self.looseMainMatchingAllowed: bool = False

Expand Down Expand Up @@ -42,14 +43,12 @@ def run(self):
if self.looseMainMatchingAllowed:
return

mainNameFilter: Callable[[str], bool] = lambda x: x in self.allowedMainNames

filteredFiles = list(filter(mainNameFilter, self.pythonFiles[FileTypeMap.PYTHON_FILES]))
filteredFiles = [f for f in self.pythonFiles[FileTypeMap.PYTHON_FILES] if self.mainFileRegex.match(f)]

if not filteredFiles:
self.addError(MissingMainFileError(self.allowedMainNames, self.pythonFiles[FileTypeMap.PYTHON_FILES]))
self.addError(MissingMainFileError(["main.py", "submission.py", "submission_<AssessmentName>.py"], self.pythonFiles[FileTypeMap.PYTHON_FILES]))
return

if len(filteredFiles) != 1:
self.addError(TooManyFilesError(filteredFiles))

Expand Down Expand Up @@ -123,8 +122,4 @@ def run(self):
if requests.get(url=url).status_code == 200:
continue

self.addError(InvalidPackageError(package, version))




self.addError(InvalidPackageError(package, version))
Loading