From 32f35b2c8cc0c4866882d6c98b8605f08da4f969 Mon Sep 17 00:00:00 2001
From: leon <leon.wehrhahn@tum.de>
Date: Fri, 13 Sep 2024 12:36:59 +0700
Subject: [PATCH] Update import statements for StructuredGradingCriterion

---
 athena/athena/__init__.py                           | 5 +++--
 athena/athena/schemas/__init__.py                   | 2 +-
 modules/modeling/module_modeling_llm/poetry.lock    | 6 +++---
 modules/modeling/module_modeling_llm/pyproject.toml | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/athena/athena/__init__.py b/athena/athena/__init__.py
index 76841e471..f7eee0079 100644
--- a/athena/athena/__init__.py
+++ b/athena/athena/__init__.py
@@ -4,7 +4,7 @@
 
 from . import contextvars
 from .app import app
-from .schemas import ExerciseType, GradingCriterion, StructuredGradingInstruction
+from .schemas import ExerciseType, GradingCriterion, StructuredGradingInstruction, StructuredGradingCriterion
 from .metadata import emit_meta, get_meta
 from .experiment import get_experiment_environment
 from .endpoints import submission_selector, submissions_consumer, feedback_consumer, feedback_provider, config_schema_provider, evaluation_provider  # type: ignore
@@ -36,5 +36,6 @@ def run_module():
     "get_experiment_environment",
     "ExerciseType",
     "GradingCriterion",
-    "StructuredGradingInstruction"
+    "StructuredGradingInstruction",
+    "StructuredGradingCriterion"
 ]
diff --git a/athena/athena/schemas/__init__.py b/athena/athena/schemas/__init__.py
index 27af7f037..244c2d9c0 100644
--- a/athena/athena/schemas/__init__.py
+++ b/athena/athena/schemas/__init__.py
@@ -13,4 +13,4 @@
 from .modeling_feedback import ModelingFeedback
 from .modeling_exercise import ModelingExercise
 from .modeling_submission import ModelingSubmission
-from .grading_criterion import GradingCriterion, StructuredGradingInstruction
\ No newline at end of file
+from .grading_criterion import GradingCriterion, StructuredGradingInstruction, StructuredGradingCriterion
\ No newline at end of file
diff --git a/modules/modeling/module_modeling_llm/poetry.lock b/modules/modeling/module_modeling_llm/poetry.lock
index b498f3731..5269120f6 100644
--- a/modules/modeling/module_modeling_llm/poetry.lock
+++ b/modules/modeling/module_modeling_llm/poetry.lock
@@ -191,8 +191,8 @@ uvicorn = "^0.23.0"
 [package.source]
 type = "git"
 url = "https://github.com/ls1intum/Athena.git"
-reference = "ccd00cf8346e76738a66e7f4cf04c84aa4cb4378"
-resolved_reference = "ccd00cf8346e76738a66e7f4cf04c84aa4cb4378"
+reference = "7678f60343caf2489116c331cbe5ac253d1a4d07"
+resolved_reference = "7678f60343caf2489116c331cbe5ac253d1a4d07"
 subdirectory = "athena"
 
 [[package]]
@@ -2322,4 +2322,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "3.11.*"
-content-hash = "ec56dc8aa94f1c2e8b830d4e70a253d0e8f96e9dc31cb1e69e5d5b68660f0af4"
+content-hash = "38ea0e5d587a8ae0ae2d209e761ca71712801593af51abd2fe55e73ced6025f9"
diff --git a/modules/modeling/module_modeling_llm/pyproject.toml b/modules/modeling/module_modeling_llm/pyproject.toml
index da2b3cd3a..16f8d9f3b 100644
--- a/modules/modeling/module_modeling_llm/pyproject.toml
+++ b/modules/modeling/module_modeling_llm/pyproject.toml
@@ -7,7 +7,7 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = "3.11.*"
-athena = { git = "https://github.com/ls1intum/Athena.git", rev = "ccd00cf8346e76738a66e7f4cf04c84aa4cb4378", subdirectory = "athena"}
+athena = { git = "https://github.com/ls1intum/Athena.git", rev = "7678f60343caf2489116c331cbe5ac253d1a4d07", subdirectory = "athena"}
 openai = "1.42.0"
 langchain = "0.2.15"
 python-dotenv = "1.0.0"