welearn-database 1.4.5.dev0__tar.gz → 1.4.5.dev1__tar.gz

{welearn_database-1.4.5.dev0 → welearn_database-1.4.5.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: welearn-database
-Version: 1.4.5.dev0
+Version: 1.4.5.dev1
 Summary: All stuff related to relationnal database from the WeLearn project
 License: cc-by-sa-nc
 Author: Théo

{welearn_database-1.4.5.dev0 → welearn_database-1.4.5.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "welearn-database"
-version = "1.4.5.dev0"
+version = "1.4.5.dev1"
 description = "All stuff related to relationnal database from the WeLearn project"
 authors = [
     {name = "Théo",email = "theo.nardin@cri-paris.org"}

{welearn_database-1.4.5.dev0 → welearn_database-1.4.5.dev1}/welearn_database/alembic/versions/8b780aea403a_add_university_data.py

@@ -20,6 +20,9 @@ depends_on: Union[str, Sequence[str], None] = None
 
 
 def upgrade() -> None:
+    # op.execute("""
+    # CREATE TYPE user_related.university_role AS ENUM ('student', 'teacher', 'staff')
+    # """)
     op.add_column(
         "inferred_user",
         sa.Column("university_title", sa.String(), nullable=True),
@@ -29,13 +32,7 @@ def upgrade() -> None:
         "inferred_user",
         sa.Column(
             "role",
-            postgresql.ENUM(
-                "student",
-                "teacher",
-                "staff",
-                name="university_role",
-                schema="user_related",
-            ),
+            sa.String(),
             nullable=True,
         ),
         schema="user_related",
@@ -45,4 +42,3 @@ def upgrade() -> None:
 def downgrade() -> None:
     op.drop_column("inferred_user", "university_title", schema="user_related")
     op.drop_column("inferred_user", "role", schema="user_related")
-    op.execute("DROP TYPE user_related.university_role")

{welearn_database-1.4.5.dev0 → welearn_database-1.4.5.dev1}/welearn_database/data/enumeration.py

@@ -43,9 +43,3 @@ class ExternalIdType(StrEnum):
 class FilterType(StrEnum):
     SDG = auto()
     SOURCE = auto()
-
-
-class UniversityRole(StrEnum):
-    STUDENT = auto()
-    TEACHER = auto()
-    STAFF = auto()

{welearn_database-1.4.5.dev0 → welearn_database-1.4.5.dev1}/welearn_database/data/models/user_related.py

@@ -3,12 +3,11 @@ from uuid import UUID
 
 from sqlalchemy import ForeignKey, func, types
 from sqlalchemy.dialects.postgresql import ENUM, TIMESTAMP
-from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from welearn_database.data.enumeration import DbSchemaEnum, FilterType, UniversityRole
+from welearn_database.data.enumeration import DbSchemaEnum, FilterType
 from welearn_database.data.models.document_related import WeLearnDocument
 
-from ...exceptions import EarlyEnumerationVerificationError
 from . import Base
 
 schema_name = DbSchemaEnum.USER_RELATED.value
@@ -218,14 +217,7 @@ class InferredUser(Base):
     )
     origin_referrer: Mapped[str | None]
     university_title: Mapped[str | None]
-    role: Mapped[str] = mapped_column(
-        ENUM(
-            *(r.value.lower() for r in UniversityRole),
-            name="university_role",
-            schema="user_related",
-        ),
-        nullable=True,
-    )
+    role: Mapped[str | None]
     created_at: Mapped[datetime] = mapped_column(
         TIMESTAMP(timezone=False),
         nullable=False,
@@ -233,13 +225,6 @@ class InferredUser(Base):
         server_default="NOW()",
     )
 
-    @validates("role")
-    def validate_role(self, key, value):
-        valid_roles = {r.value.lower() for r in UniversityRole}
-        if value not in valid_roles:
-            raise EarlyEnumerationVerificationError(f"Invalid role: {value}")
-        return value
-
 
 class EndpointRequest(Base):
     __tablename__ = "endpoint_request"