Shared llm package refactoring

assessment_module_manager/assessment_module_manager/endpoints/health_endpoint.py

@@ -29,7 +29,7 @@ class HealthResponse(BaseModel):
     and whether all the modules are healthy (i.e. reachable).
     Additional information about the modules is also provided.
     """
-    status: str = Field(const=True, default="ok", example="ok")
+    status: str = Field(Literal=True, default="ok", example="ok")
     modules: dict = Field(
         example=[
             {

athena-workspace.code-workspace

@@ -33,6 +33,7 @@
 	],
 	"settings": {
 		"python.linting.prospectorEnabled": true,
-		"python.linting.mypyEnabled": true
+		"python.linting.mypyEnabled": true,
+		"liveServer.settings.multiRootWorkspaceName": "Athena"
 	}
 }

athena/athena/schemas/exercise.py

@@ -29,4 +29,5 @@ class Exercise(Schema, ABC):
     meta: dict = Field({}, example={"internal_id": "5"})
 
     class Config:
+        from_attributes=True
         orm_mode = True

athena/athena/schemas/feedback.py

@@ -33,4 +33,5 @@ def to_model(self, is_suggestion: bool = False, lms_id: Optional[int] = None, lm
         return type(self).get_model_class()(**self.dict(), is_suggestion=is_suggestion, lms_id=lms_id, lms_url=lms_url)
 
     class Config:
+        from_attributes=True
         orm_mode = True

athena/athena/schemas/modeling_exercise.py

@@ -8,6 +8,6 @@
 class ModelingExercise(Exercise):
     """A modeling exercise that can be solved by students, enhanced with metadata."""
 
-    type: ExerciseType = Field(ExerciseType.modeling, const=True)
+    type: ExerciseType = Field(ExerciseType.modeling, Literal=True)
 
     example_solution: Optional[str] = Field(None, description="An example solution to the exercise.")

athena/athena/schemas/programming_exercise.py

@@ -1,4 +1,4 @@
-from pydantic import Field, AnyUrl
+from pydantic import Field, HttpUrl
 from zipfile import ZipFile
 from git.repo import Repo
 
@@ -10,16 +10,16 @@
 class ProgrammingExercise(Exercise):
     """A programming exercise that can be solved by students, enhanced with metadata."""
 
-    type: ExerciseType = Field(ExerciseType.programming, const=True)
+    type: ExerciseType = Field(ExerciseType.programming, Literal=True)
 
     programming_language: str = Field(description="The programming language that is used for this exercise.", example="java")
-    solution_repository_uri: AnyUrl = Field(description="URL to the solution git repository, which contains the "
+    solution_repository_uri: str = Field(description="URL to the solution git repository, which contains the "
                                                         "reference solution.",
                                             example="http://localhost:3000/api/example-solutions/1")
-    template_repository_uri: AnyUrl = Field(description="URL to the template git repository, which is the starting "
+    template_repository_uri: str = Field(description="URL to the template git repository, which is the starting "
                                                         "point for students.",
                                             example="http://localhost:3000/api/example-template/1")
-    tests_repository_uri: AnyUrl = Field(description="URL to the tests git repository, which contains the tests that "
+    tests_repository_uri: str = Field(description="URL to the tests git repository, which contains the tests that "
                                                      "are used to automatically grade the exercise.",
                                          example="http://localhost:3000/api/example-tests/1")
 

athena/athena/schemas/schema.py

@@ -8,9 +8,8 @@
 
 # https://stackoverflow.com/a/42450252/4306257
 def to_camel(snake_str):
-    first, *others = snake_str.split('_')
-    return ''.join([first.lower(), *map(str.title, others)])
-
+   first, *others = snake_str.split('_')
+   return ''.join([first.lower(), *map(str.title, others)])
 
 class Schema(BaseModel, abc.ABC):
     @classmethod
@@ -32,4 +31,4 @@ def to_model(self):
     class Config:
         # Allow camelCase field names in the API (converted to snake_case)
         alias_generator = to_camel
-        allow_population_by_field_name = True
+        populate_by_name = True

athena/athena/schemas/submission.py

@@ -12,4 +12,5 @@ class Submission(Schema, ABC):
     meta: dict = Field({}, example={})
 
     class Config:
+        from_attributes=True
         orm_mode = True

athena/athena/schemas/text_exercise.py

@@ -8,6 +8,6 @@
 class TextExercise(Exercise):
     """A text exercise that can be solved by students, enhanced with metadata."""
 
-    type: ExerciseType = Field(ExerciseType.text, const=True)
+    type: ExerciseType = Field(ExerciseType.text, Literal=True)
 
     example_solution: Optional[str] = Field(None, description="An example solution to the exercise.")

module_modeling_llm/module_modeling_llm/config.py

@@ -1,7 +1,7 @@
 from pydantic import BaseModel, Field
 
 from athena import config_schema_provider
-from module_modeling_llm.helpers.models import ModelConfigType, DefaultModelConfig
+from shared_llm.helpers.models import ModelConfigType, DefaultModelConfig
 from module_modeling_llm.prompts.generate_suggestions import (
     system_message as generate_suggestions_system_message,
     human_message as generate_suggestions_human_message

module_modeling_llm/module_modeling_llm/generate_suggestions.py

@@ -7,15 +7,15 @@
 from athena.logger import logger
 from athena.modeling import Exercise, Submission, Feedback
 from module_modeling_llm.config import BasicApproachConfig
-from module_modeling_llm.helpers.llm_utils import (
+from shared_llm.helpers.llm_utils import (
     get_chat_prompt_with_formatting_instructions,
     check_prompt_length_and_omit_features_if_necessary,
     num_tokens_from_prompt,
     predict_and_parse
 )
-from module_modeling_llm.helpers.models.diagram_types import DiagramType
-from module_modeling_llm.helpers.serializers.diagram_model_serializer import DiagramModelSerializer
-from module_modeling_llm.helpers.utils import format_grading_instructions, get_elements
+from shared_llm.helpers.models.diagram_types import DiagramType
+from shared_llm.helpers.serializers.diagram_model_serializer import DiagramModelSerializer
+from shared_llm.helpers.modeling_utils import format_grading_instructions, get_elements
 from module_modeling_llm.prompts.submission_format.submission_format_remarks import get_submission_format_remarks