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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: welearn-database
-Version: 1.2.0.dev0
+Version: 1.3.0
 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}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "welearn-database"
-version = "1.2.0.dev0"
+version = "1.3.0"
 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}/welearn_database/alembic/env.py

@@ -1,3 +1,4 @@
+import os
 from logging.config import fileConfig
 
 from alembic import context
@@ -75,6 +76,14 @@ def run_migrations_online() -> None:
     load_dotenv()
     connectable = create_sqlalchemy_engine()
 
+    if "prod" in os.getenv("PG_HOST").lower():
+        print("Connecting to production database for migrations!")
+        input("Press Enter to continue...")
+    elif "dev" in os.getenv("PG_HOST" "").lower():
+        print("Connecting to development database for migrations!")
+    else:
+        print("Connecting to unknown database for migrations!")
+
     with connectable.connect() as connection:
         context.configure(
             connection=connection,

welearn_database-1.3.0/welearn_database/alembic/versions/2ad4895b2674_data_collection.py

@@ -0,0 +1,100 @@
+"""data collection
+
+Revision ID: 2ad4895b2674
+Revises: 068312e7800c
+Create Date: 2026-01-16 15:55:41.447852
+
+"""
+
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "2ad4895b2674"
+down_revision: Union[str, None] = "068312e7800c"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "data_collection_campaign_management",
+        sa.Column(
+            "id", sa.Uuid(), server_default=sa.func.gen_random_uuid(), nullable=False
+        ),
+        sa.Column("is_active", sa.Boolean(), nullable=False),
+        sa.Column("end_at", postgresql.TIMESTAMP(), nullable=False),
+        sa.Column(
+            "created_at", postgresql.TIMESTAMP(), server_default="NOW()", nullable=False
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        schema="user_related",
+    )
+
+    op.add_column(
+        "chat_message",
+        sa.Column("role", sa.String(), nullable=False),
+        schema="user_related",
+    )
+    op.add_column(
+        "chat_message",
+        sa.Column("inferred_user_id", sa.Uuid(), nullable=False),
+        schema="user_related",
+    )
+    op.add_column(
+        "chat_message",
+        sa.Column("conversation_id", sa.Uuid(), nullable=False),
+        schema="user_related",
+    )
+    op.drop_constraint(
+        op.f("message_user_id_fkey"),
+        "chat_message",
+        schema="user_related",
+        type_="foreignkey",
+    )
+    op.create_foreign_key(
+        "message_inferred_user_id_fkey",
+        "chat_message",
+        "inferred_user",
+        ["inferred_user_id"],
+        ["id"],
+        source_schema="user_related",
+        referent_schema="user_related",
+    )
+    op.drop_column("chat_message", "user_id", schema="user_related")
+    op.add_column(
+        "returned_document",
+        sa.Column("is_clicked", sa.Boolean(), nullable=False),
+        schema="user_related",
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("returned_document", "is_clicked", schema="user_related")
+    op.add_column(
+        "chat_message",
+        sa.Column("user_id", sa.Uuid(), nullable=False),
+        schema="user_related",
+    )
+    op.drop_constraint(
+        "message_inferred_user_id_fkey",
+        "chat_message",
+        schema="user_related",
+        type_="foreignkey",
+    )
+    op.create_foreign_key(
+        op.f("message_user_id_fkey"),
+        "chat_message",
+        "user_profile",
+        ["user_id"],
+        ["id"],
+        source_schema="user_related",
+        referent_schema="user_related",
+    )
+    op.drop_column("chat_message", "conversation_id", schema="user_related")
+    op.drop_column("chat_message", "inferred_user_id", schema="user_related")
+    op.drop_column("chat_message", "role", schema="user_related")
+    op.drop_table("data_collection_campaign_management", schema="user_related")

{welearn_database-1.2.0.dev0 → welearn_database-1.3.0}/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}/welearn_database/data/models/user_related.py

@@ -85,11 +85,16 @@ 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,
     )
+    conversation_id = mapped_column(
+        types.Uuid,
+        nullable=False,
+    )
+    role: Mapped[str]
     textual_content: Mapped[str]
 
     created_at: Mapped[datetime] = mapped_column(
@@ -105,7 +110,7 @@ class ChatMessage(Base):
         server_default="NOW()",
         onupdate=func.localtimestamp(),
     )
-    user: Mapped["UserProfile"] = relationship()
+    inferred_user: Mapped["InferredUser"] = relationship()
 
 
 class ReturnedDocument(Base):
@@ -128,6 +133,7 @@ class ReturnedDocument(Base):
         ),
         nullable=False,
     )
+    is_clicked: Mapped[bool] = mapped_column(default=False)
     welearn_document: Mapped["WeLearnDocument"] = relationship()
     chat_message: Mapped["ChatMessage"] = relationship()
 
@@ -158,6 +164,23 @@ class APIKeyManagement(Base):
     )
 
 
+class DataCollectionCampaignManagement(Base):
+    __tablename__ = "data_collection_campaign_management"
+    __table_args__ = {"schema": DbSchemaEnum.USER_RELATED.value}
+
+    id: Mapped[UUID] = mapped_column(
+        types.Uuid, primary_key=True, nullable=False, server_default="gen_random_uuid()"
+    )
+    is_active: Mapped[bool]
+    end_at: Mapped[datetime] = mapped_column(TIMESTAMP(timezone=False), nullable=False)
+    created_at: Mapped[datetime] = mapped_column(
+        TIMESTAMP(timezone=False),
+        nullable=False,
+        default=func.localtimestamp(),
+        server_default="NOW()",
+    )
+
+
 class Session(Base):
     __tablename__ = "session"
     __table_args__ = {"schema": "user_related"}