Update core athena version in text and modeling llm (#344)

ls1intum · Sep 28, 2024 · 9773c41 · 9773c41
1 parent 5c2eae4
commit 9773c41
Show file tree

Hide file tree

Showing 10 changed files with 1,210 additions and 1,164 deletions.
diff --git a/athena/athena/models/db_exercise.py b/athena/athena/models/db_exercise.py
@@ -7,6 +7,7 @@
 
 class DBExercise(Model):
     id = Column(BigIntegerWithAutoincrement, primary_key=True, index=True, nullable=False)
+    lms_url = Column(String, index=True, nullable=False)
     title = Column(String, index=True, nullable=False)
     type = Column(SqlEnum(ExerciseType), index=True, nullable=False)
     max_points = Column(Float, index=True, nullable=False)

diff --git a/athena/athena/models/db_feedback.py b/athena/athena/models/db_feedback.py
@@ -8,6 +8,7 @@ class DBFeedback(Model):
     __table_args__ = (UniqueConstraint('lms_id'),)
 
     id = Column(BigIntegerWithAutoincrement, primary_key=True, index=True, autoincrement=True)
+    lms_url = Column(String, index=True, nullable=False)
     lms_id = Column(BigInteger)
     title = Column(String)
     description = Column(String)

diff --git a/athena/athena/models/db_submission.py b/athena/athena/models/db_submission.py
@@ -1,9 +1,10 @@
-from sqlalchemy import Column, JSON
+from sqlalchemy import Column, JSON, String
 
 from .model import Model
 from .big_integer_with_autoincrement import BigIntegerWithAutoincrement
 
 
 class DBSubmission(Model):
     id = Column(BigIntegerWithAutoincrement, primary_key=True, index=True, autoincrement=True,)
+    lms_url = Column(String, index=True, nullable=False)
     meta = Column(JSON, nullable=False)
diff --git a/athena/athena/models/model.py b/athena/athena/models/model.py
@@ -6,12 +6,6 @@
 
 class Model:
 
-    lms_url = Column(String, index=True, nullable=False)
-
-    __table_args__ = (
-        UniqueConstraint('id', 'lms_url'),
-    )
-
     @classmethod
     def get_schema_class(cls) -> BaseModel:
         # The schema class has the same name as myself, but without the "DB" prefix.

diff --git a/modules/modeling/module_modeling_llm/poetry.lock b/modules/modeling/module_modeling_llm/poetry.lock
diff --git a/modules/modeling/module_modeling_llm/pyproject.toml b/modules/modeling/module_modeling_llm/pyproject.toml
@@ -7,7 +7,8 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = "3.11.*"
-athena = { git = "https://github.com/ls1intum/Athena.git", rev = "7678f60343caf2489116c331cbe5ac253d1a4d07", subdirectory = "athena"}
+athena = { path = "../../../athena", develop = true }
+#athena = { git = "https://github.com/ls1intum/Athena.git", rev = "d9ff3bd", subdirectory = "athena"}
 openai = "1.42.0"
 langchain = "0.2.15"
 python-dotenv = "1.0.0"

diff --git a/modules/programming/module_programming_llm/poetry.lock b/modules/programming/module_programming_llm/poetry.lock
diff --git a/modules/programming/module_programming_llm/pyproject.toml b/modules/programming/module_programming_llm/pyproject.toml
@@ -9,7 +9,8 @@ license = "MIT"
 python = "3.11.*"
 # if you have local changes in the common Athena module, use the line below. Otherwise, please use a VCS stable version. Also, a version with tag = "" is possible.
 # athena = { path = "../athena", develop = true }
-athena = { git = "https://github.com/ls1intum/Athena.git", rev = "2da2d33", subdirectory = "athena"}
+athena = { path = "../../../athena", develop = true }
+#athena = { git = "https://github.com/ls1intum/Athena.git", rev = "2da2d33", subdirectory = "athena"}
 openai = "1.37.1"
 langchain = "0.2.11"
 langchain-community="0.2.10"

diff --git a/modules/text/module_text_llm/poetry.lock b/modules/text/module_text_llm/poetry.lock
diff --git a/modules/text/module_text_llm/pyproject.toml b/modules/text/module_text_llm/pyproject.toml
@@ -7,7 +7,8 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = "3.11.*"
-athena = {path = "../../../athena", develop = true}
+athena = { path = "../../../athena", develop = true }
+#athena = { git = "https://github.com/ls1intum/Athena.git", rev = "2da2d33", subdirectory = "athena"}
 replicate = "^0.11.0"
 langsmith = ">=0.1.0,<0.2.0"
 gitpython = "3.1.41"