welearn-database 1.2.0.dev0__tar.gz → 1.3.0.dev2__tar.gz

{welearn_database-1.2.0.dev0 → welearn_database-1.3.0.dev2}/PKG-INFO

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

{welearn_database-1.2.0.dev0 → welearn_database-1.3.0.dev2}/pyproject.toml

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

{welearn_database-1.2.0.dev0 → welearn_database-1.3.0.dev2}/welearn_database/alembic/versions/e354666f951d_inferred_user.py

@@ -10,9 +10,8 @@ from typing import Sequence, Union
 
 import sqlalchemy
 import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
 from alembic import op
+from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision: str = "e354666f951d"
@@ -80,9 +79,37 @@ def upgrade() -> None:
         sa.PrimaryKeyConstraint("id"),
         schema="user_related",
     )
+    op.drop_column("bookmark", "user_id", schema="user_related")
+    op.add_column(
+        "bookmark",
+        sa.Column("inferred_user_id", sa.Uuid(), nullable=True),
+        schema="user_related",
+    )
+    op.create_foreign_key(
+        "bookmark_inferred_user_id_fkey",
+        "bookmark",
+        "inferred_user",
+        ["inferred_user_id"],
+        ["id"],
+        source_schema="user_related",
+        referent_schema="user_related",
+        ondelete="CASCADE",
+    )
 
 
 def downgrade() -> None:
     op.drop_table("endpoint_request", schema="user_related")
     op.drop_table("session", schema="user_related")
     op.drop_table("inferred_user", schema="user_related")
+    op.drop_constraint(
+        "bookmark_inferred_user_id_fkey",
+        "bookmark",
+        schema="user_related",
+        type_="foreignkey",
+    )
+    op.drop_column("bookmark", "inferred_user_id", schema="user_related")
+    op.add_column(
+        "bookmark",
+        sa.Column("user_id", sa.Uuid(), nullable=True),
+        schema="user_related",
+    )

{welearn_database-1.2.0.dev0 → welearn_database-1.3.0.dev2}/welearn_database/data/models/user_related.py

@@ -85,11 +85,12 @@ class ChatMessage(Base):
     id: Mapped[UUID] = mapped_column(
         types.Uuid, primary_key=True, nullable=False, server_default="gen_random_uuid()"
     )
-    user_id = mapped_column(
+    inferred_user_id = mapped_column(
         types.Uuid,
-        ForeignKey(f"{DbSchemaEnum.USER_RELATED.value}.user_profile.id"),
+        ForeignKey(f"{DbSchemaEnum.USER_RELATED.value}.inferred_user.id"),
         nullable=False,
     )
+    role: Mapped[str]
     textual_content: Mapped[str]
 
     created_at: Mapped[datetime] = mapped_column(
@@ -105,7 +106,7 @@ class ChatMessage(Base):
         server_default="NOW()",
         onupdate=func.localtimestamp(),
     )
-    user: Mapped["UserProfile"] = relationship()
+    inferred_user: Mapped["InferredUser"] = relationship()
 
 
 class ReturnedDocument(Base):