Rename module_programming_ast to module_programming_apted (#276)

ls1intum · Jun 13, 2024 · 02625ab · 02625ab
1 parent 2a089a5
commit 02625ab
Show file tree

Hide file tree

Showing 47 changed files with 718 additions and 647 deletions.
diff --git a/.prospector.yaml b/.prospector.yaml
@@ -7,7 +7,7 @@ ignore-paths:
   - module_text_cofee/module_text_cofee/protobuf
   - module_programming_themisml/module_programming_themisml/extract_methods/languages
   - module_programming_themisml/module_programming_themisml/extract_methods/method_parser_listener.py
-  - module_programming_ast/module_programming_ast/convert_code_to_ast/languages
+  - module_programming_apted/module_programming_apted/convert_code_to_ast/languages
 
 mypy:
   run: true

diff --git a/assessment_module_manager/modules.docker.ini b/assessment_module_manager/modules.docker.ini
@@ -23,8 +23,8 @@ url = http://module-programming-themisml:5005
 type = programming
 supports_evaluation = false
 
-[module_programming_ast]
-url = http://module-programming-ast:5006
+[module_programming_apted]
+url = http://module-programming-apted:5006
 type = programming
 supports_evaluation = false
 

diff --git a/assessment_module_manager/modules.ini b/assessment_module_manager/modules.ini
@@ -23,7 +23,7 @@ url = http://localhost:5005
 type = programming
 supports_evaluation = false
 
-[module_programming_ast]
+[module_programming_apted]
 url = http://localhost:5006
 type = programming
 supports_evaluation = false

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -60,13 +60,13 @@ services:
       - postgres
     image: ls1tum/athena_module_programming_themisml:${ATHENA_TAG:-develop}
 
-  module_programming_ast:
-    hostname: module-programming-ast
+  module_programming_apted:
+    hostname: module-programming-apted
     env_file:
-      - ${ATHENA_ENV_DIR:-./env_example}/module_programming_ast.env
+      - ${ATHENA_ENV_DIR:-./env_example}/module_programming_apted.env
     depends_on:
       - postgres
-    image: ls1tum/athena_module_programming_ast:${ATHENA_TAG:-develop}
+    image: ls1tum/athena_module_programming_apted:${ATHENA_TAG:-develop}
 
   module_programming_code_embedding:
     hostname: module-programming-code-embedding

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -55,9 +55,9 @@ services:
     ports:
       - "5005:5005"
 
-  module_programming_ast:
-    hostname: module-programming-ast
-    build: ./module_programming_ast
+  module_programming_apted:
+    hostname: module-programming-apted
+    build: module_programming_apted
     depends_on:
       - athena
     ports:

diff --git a/env_example/module_programming_ast.env → env_example/module_programming_apted.env b/env_example/module_programming_ast.env → env_example/module_programming_apted.env
diff --git a/module_programming_ast/.dockerignore → module_programming_apted/.dockerignore b/module_programming_ast/.dockerignore → module_programming_apted/.dockerignore
diff --git a/module_programming_ast/.vscode/settings.json → ...e_programming_apted/.vscode/settings.json b/module_programming_ast/.vscode/settings.json → ...e_programming_apted/.vscode/settings.json
diff --git a/module_programming_ast/Dockerfile → module_programming_apted/Dockerfile b/module_programming_ast/Dockerfile → module_programming_apted/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-# This is the Dockerfile for the module_programming_ast.
+# This is the Dockerfile for the module_programming_apted.
 
 FROM python:3.11
 LABEL org.opencontainers.image.source=https://github.com/ls1intum/Athena

diff --git a/module_programming_ast/README.md → module_programming_apted/README.md b/module_programming_ast/README.md → module_programming_apted/README.md
diff --git a/module_programming_ast/module.conf → module_programming_apted/module.conf b/module_programming_ast/module.conf → module_programming_apted/module.conf
@@ -1,4 +1,4 @@
 [module]
-name = module_programming_ast
+name = module_programming_apted
 type = programming
 port = 5006
diff --git a/...ng_ast/module_programming_ast/__init__.py → ...pted/module_programming_apted/__init__.py b/...ng_ast/module_programming_ast/__init__.py → ...pted/module_programming_apted/__init__.py
diff --git a/...ng_ast/module_programming_ast/__main__.py → ...pted/module_programming_apted/__main__.py b/...ng_ast/module_programming_ast/__main__.py → ...pted/module_programming_apted/__main__.py
@@ -1,24 +1,24 @@
 """
-Entry point for the module_programming_ast module.
+Entry point for the module_programming_apted module.
 """
 import random
 from typing import List, Any, cast
 from pydantic import BaseModel, Field
-from module_programming_ast.convert_code_to_ast.get_feedback_methods import get_feedback_method
-from module_programming_ast.feedback_suggestions.feedback_suggestions import create_feedback_suggestions
+from module_programming_apted.convert_code_to_ast.get_feedback_methods import get_feedback_method
+from module_programming_apted.feedback_suggestions.feedback_suggestions import create_feedback_suggestions
 from athena import (app, config_schema_provider, submissions_consumer, submission_selector, feedback_consumer,
                     feedback_provider, evaluation_provider, emit_meta)
 from athena.logger import logger
 from athena.storage import store_exercise, store_submissions, store_feedback, store_feedback_suggestions
 from athena.programming import (Exercise, Submission, Feedback, get_stored_feedback_suggestions,
                                 count_stored_submissions, get_stored_submissions)
-from module_programming_ast.remove_overlapping import filter_overlapping_suggestions
-from module_programming_ast.remove_suspicious import filter_suspicious
+from module_programming_apted.remove_overlapping import filter_overlapping_suggestions
+from module_programming_apted.remove_suspicious import filter_suspicious
 
 
 @config_schema_provider
 class Configuration(BaseModel):
-    """Example configuration for the module_programming_ast module."""
+    """Example configuration for the module_programming_apted module."""
     debug: bool = Field(False, description="Whether the module is in **debug mode**. This is an example config option.")
 
 

diff --git a/...mming_ast/convert_code_to_ast/__init__.py → ...ing_apted/convert_code_to_ast/__init__.py b/...mming_ast/convert_code_to_ast/__init__.py → ...ing_apted/convert_code_to_ast/__init__.py
diff --git a/...ert_code_to_ast/extract_method_and_ast.py → ...ert_code_to_ast/extract_method_and_ast.py b/...ert_code_to_ast/extract_method_and_ast.py → ...ert_code_to_ast/extract_method_and_ast.py
@@ -1,12 +1,12 @@
 from antlr4 import CommonTokenStream, InputStream
 from antlr4.tree.Tree import ParseTreeWalker
-from module_programming_ast.convert_code_to_ast.languages.python.Python3Lexer import Python3Lexer
-from module_programming_ast.convert_code_to_ast.languages.python.Python3Parser import Python3Parser
-from module_programming_ast.convert_code_to_ast.languages.java.JavaLexer import JavaLexer
-from module_programming_ast.convert_code_to_ast.languages.java.JavaParser import JavaParser
-from module_programming_ast.convert_code_to_ast.languages.python.Python3MethodParserListener import \
+from module_programming_apted.convert_code_to_ast.languages.python.Python3Lexer import Python3Lexer
+from module_programming_apted.convert_code_to_ast.languages.python.Python3Parser import Python3Parser
+from module_programming_apted.convert_code_to_ast.languages.java.JavaLexer import JavaLexer
+from module_programming_apted.convert_code_to_ast.languages.java.JavaParser import JavaParser
+from module_programming_apted.convert_code_to_ast.languages.python.Python3MethodParserListener import \
     MethodParserListener as PythonMethodParserListener
-from module_programming_ast.convert_code_to_ast.languages.java.JavaMethodParserListener import \
+from module_programming_apted.convert_code_to_ast.languages.java.JavaMethodParserListener import \
     MethodParserListener as JavaMethodParserListener
 
 # TODO: DO I need the to_ast method?

diff --git a/...nvert_code_to_ast/get_feedback_methods.py → ...nvert_code_to_ast/get_feedback_methods.py b/...nvert_code_to_ast/get_feedback_methods.py → ...nvert_code_to_ast/get_feedback_methods.py
@@ -1,8 +1,8 @@
 from typing import Optional
 
 from athena.programming import Submission, Feedback
-from module_programming_ast.convert_code_to_ast.extract_method_and_ast import parse
-from module_programming_ast.convert_code_to_ast.method_node import MethodNode
+from module_programming_apted.convert_code_to_ast.extract_method_and_ast import parse
+from module_programming_apted.convert_code_to_ast.method_node import MethodNode
 from athena.logger import logger
 
 

diff --git a/...convert_code_to_ast/languages/__init__.py → ...convert_code_to_ast/languages/__init__.py b/...convert_code_to_ast/languages/__init__.py → ...convert_code_to_ast/languages/__init__.py
diff --git a/...t_code_to_ast/languages/java/JavaLexer.py → ...t_code_to_ast/languages/java/JavaLexer.py b/...t_code_to_ast/languages/java/JavaLexer.py → ...t_code_to_ast/languages/java/JavaLexer.py
diff --git a/...anguages/java/JavaMethodParserListener.py → ...anguages/java/JavaMethodParserListener.py b/...anguages/java/JavaMethodParserListener.py → ...anguages/java/JavaMethodParserListener.py
@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from antlr4 import *
 
-from module_programming_ast.convert_code_to_ast.languages.java.JavaParser import JavaParser
+from module_programming_apted.convert_code_to_ast.languages.java.JavaParser import JavaParser
 
 
 @dataclass

diff --git a/..._code_to_ast/languages/java/JavaParser.py → ..._code_to_ast/languages/java/JavaParser.py b/..._code_to_ast/languages/java/JavaParser.py → ..._code_to_ast/languages/java/JavaParser.py
diff --git a/...rt_code_to_ast/languages/java/__init__.py → ...rt_code_to_ast/languages/java/__init__.py b/...rt_code_to_ast/languages/java/__init__.py → ...rt_code_to_ast/languages/java/__init__.py
diff --git a/...e_to_ast/languages/python/Python3Lexer.py → ...e_to_ast/languages/python/Python3Lexer.py b/...e_to_ast/languages/python/Python3Lexer.py → ...e_to_ast/languages/python/Python3Lexer.py
@@ -9,9 +9,9 @@
 
 
 if "." in __name__:
-    from module_programming_ast.convert_code_to_ast.languages.python.Python3LexerBase import Python3LexerBase
+    from module_programming_apted.convert_code_to_ast.languages.python.Python3LexerBase import Python3LexerBase
 else:
-    from module_programming_ast.convert_code_to_ast.languages.python.Python3LexerBase import Python3LexerBase
+    from module_programming_apted.convert_code_to_ast.languages.python.Python3LexerBase import Python3LexerBase
 
 def serializedATN():
     return [

diff --git a/..._ast/languages/python/Python3LexerBase.py → ..._ast/languages/python/Python3LexerBase.py b/..._ast/languages/python/Python3LexerBase.py → ..._ast/languages/python/Python3LexerBase.py
@@ -1,7 +1,7 @@
 from typing import TextIO
 from antlr4 import *
 from antlr4.Token import CommonToken
-from module_programming_ast.convert_code_to_ast.languages.python.Python3Parser import Python3Parser
+from module_programming_apted.convert_code_to_ast.languages.python.Python3Parser import Python3Parser
 
 import sys
 from typing import TextIO

diff --git a/...ges/python/Python3MethodParserListener.py → ...ges/python/Python3MethodParserListener.py b/...ges/python/Python3MethodParserListener.py → ...ges/python/Python3MethodParserListener.py
@@ -1,7 +1,7 @@
 from antlr4 import ParseTreeListener
 
-from module_programming_ast.convert_code_to_ast.languages.python.Python3Parser import Python3Parser
-from module_programming_ast.convert_code_to_ast.languages.python.Python3ParserListener import Python3ParserListener
+from module_programming_apted.convert_code_to_ast.languages.python.Python3Parser import Python3Parser
+from module_programming_apted.convert_code_to_ast.languages.python.Python3ParserListener import Python3ParserListener
 from dataclasses import dataclass
 
 

diff --git a/..._to_ast/languages/python/Python3Parser.py → ..._to_ast/languages/python/Python3Parser.py b/..._to_ast/languages/python/Python3Parser.py → ..._to_ast/languages/python/Python3Parser.py
diff --git a/...ast/languages/python/Python3ParserBase.py → ...ast/languages/python/Python3ParserBase.py b/...ast/languages/python/Python3ParserBase.py → ...ast/languages/python/Python3ParserBase.py
@@ -1,5 +1,6 @@
 from antlr4 import *
 
+
 class Python3ParserBase(Parser):
 
     def CannotBePlusMinus(self) -> bool:

diff --git a/...languages/python/Python3ParserListener.py → ...languages/python/Python3ParserListener.py b/...languages/python/Python3ParserListener.py → ...languages/python/Python3ParserListener.py
diff --git a/...ng_ast/convert_code_to_ast/method_node.py → ..._apted/convert_code_to_ast/method_node.py b/...ng_ast/convert_code_to_ast/method_node.py → ..._apted/convert_code_to_ast/method_node.py
diff --git a/...ming_ast/feedback_suggestions/__init__.py → ...ng_apted/feedback_suggestions/__init__.py b/...ming_ast/feedback_suggestions/__init__.py → ...ng_apted/feedback_suggestions/__init__.py
diff --git a/...t/feedback_suggestions/ap_ted_computer.py → ...d/feedback_suggestions/ap_ted_computer.py b/...t/feedback_suggestions/ap_ted_computer.py → ...d/feedback_suggestions/ap_ted_computer.py
diff --git a/...ramming_ast/feedback_suggestions/batch.py → ...mming_apted/feedback_suggestions/batch.py b/...ramming_ast/feedback_suggestions/batch.py → ...mming_apted/feedback_suggestions/batch.py
diff --git a/...dback_suggestions/feedback_suggestions.py → ...dback_suggestions/feedback_suggestions.py b/...dback_suggestions/feedback_suggestions.py → ...dback_suggestions/feedback_suggestions.py
@@ -5,10 +5,10 @@
 from athena.logger import logger
 from athena.programming import Feedback, Submission
 
-from module_programming_ast.convert_code_to_ast.extract_method_and_ast import parse
-from module_programming_ast.convert_code_to_ast.method_node import MethodNode
-from module_programming_ast.feedback_suggestions.ap_ted_computer import CodeSimilarityComputer
-from module_programming_ast.feedback_suggestions.batch import batched
+from module_programming_apted.convert_code_to_ast.extract_method_and_ast import parse
+from module_programming_apted.convert_code_to_ast.method_node import MethodNode
+from module_programming_apted.feedback_suggestions.ap_ted_computer import CodeSimilarityComputer
+from module_programming_apted.feedback_suggestions.batch import batched
 
 
 APTED_THRESHOLD = 10  # TODO Needs to be adapted

diff --git a/...ule_programming_ast/remove_overlapping.py → ...e_programming_apted/remove_overlapping.py b/...ule_programming_ast/remove_overlapping.py → ...e_programming_apted/remove_overlapping.py
diff --git a/...dule_programming_ast/remove_suspicious.py → ...le_programming_apted/remove_suspicious.py b/...dule_programming_ast/remove_suspicious.py → ...le_programming_apted/remove_suspicious.py
diff --git a/...programming_ast/test_files/output_ast.txt → ...ogramming_apted/test_files/output_ast.txt b/...programming_ast/test_files/output_ast.txt → ...ogramming_apted/test_files/output_ast.txt
diff --git a/...dule_programming_ast/test_files/test.java → ...le_programming_apted/test_files/test.java b/...dule_programming_ast/test_files/test.java → ...le_programming_apted/test_files/test.java
diff --git a/...ule_programming_ast/test_files/test2.java → ...e_programming_apted/test_files/test2.java b/...ule_programming_ast/test_files/test2.java → ...e_programming_apted/test_files/test2.java
diff --git a/...ule_programming_ast/test_files/test3.java → ...e_programming_apted/test_files/test3.java b/...ule_programming_ast/test_files/test3.java → ...e_programming_apted/test_files/test3.java
diff --git a/...ogramming_ast/test_files/test_java_1.java → ...ramming_apted/test_files/test_java_1.java b/...ogramming_ast/test_files/test_java_1.java → ...ramming_apted/test_files/test_java_1.java
diff --git a/...ogramming_ast/test_files/test_java_2.java → ...ramming_apted/test_files/test_java_2.java b/...ogramming_ast/test_files/test_java_2.java → ...ramming_apted/test_files/test_java_2.java
diff --git a/...ogramming_ast/test_files/test_python_1.py → ...ramming_apted/test_files/test_python_1.py b/...ogramming_ast/test_files/test_python_1.py → ...ramming_apted/test_files/test_python_1.py
diff --git a/...ogramming_ast/test_files/test_python_2.py → ...ramming_apted/test_files/test_python_2.py b/...ogramming_ast/test_files/test_python_2.py → ...ramming_apted/test_files/test_python_2.py
diff --git a/...ramming_ast/test_files/test_swift_1.swift → ...mming_apted/test_files/test_swift_1.swift b/...ramming_ast/test_files/test_swift_1.swift → ...mming_apted/test_files/test_swift_1.swift
diff --git a/...ramming_ast/test_files/test_swift_2.swift → ...mming_apted/test_files/test_swift_2.swift b/...ramming_ast/test_files/test_swift_2.swift → ...mming_apted/test_files/test_swift_2.swift