welearn-database 0.2.7__tar.gz → 0.2.8__tar.gz

{welearn_database-0.2.7 → welearn_database-0.2.8}/PKG-INFO

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

{welearn_database-0.2.7 → welearn_database-0.2.8}/pyproject.toml

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

{welearn_database-0.2.7 → welearn_database-0.2.8}/welearn_database/data/models/corpus_related.py

@@ -1,15 +1,17 @@
 from datetime import datetime
 from uuid import UUID
 
-from sqlalchemy import types, ForeignKey, func
+from sqlalchemy import ForeignKey, UniqueConstraint, func, types
 from sqlalchemy.dialects.postgresql import TIMESTAMP
-from sqlalchemy.orm import mapped_column, Mapped
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
-from . import Base
 from welearn_database.data.enumeration import DbSchemaEnum
 
+from . import Base
+
 schema_name = DbSchemaEnum.CORPUS_RELATED.value
 
+
 class Corpus(Base):
     __tablename__ = "corpus"
     __table_args__ = {"schema": schema_name}
@@ -26,6 +28,7 @@ class Corpus(Base):
         ForeignKey(f"{schema_name}.category.id"),
     )
 
+
 class Category(Base):
     __tablename__ = "category"
     __table_args__ = {"schema": schema_name}
@@ -97,11 +100,109 @@ class NClassifierModel(Base):
         server_default="NOW()",
     )
 
+
 class CorpusNameEmbeddingModelLang(Base):
     __tablename__ = "corpus_name_embedding_model_lang"
     __table_args__ = {"schema": schema_name}
     __read_only__ = True
-    source_name : Mapped[str]= mapped_column(primary_key=True)
+    source_name: Mapped[str] = mapped_column(primary_key=True)
     title: Mapped[str]
     lang: Mapped[str]
 
+
+class CorpusEmbeddingModel(Base):
+    __tablename__ = "corpus_embedding_model"
+    __table_args__ = (
+        UniqueConstraint(
+            "corpus_id",
+            "embedding_model_id",
+            name="unique_corpus_embedding_association",
+        ),
+        {"schema": schema_name},
+    )
+
+    corpus_id = mapped_column(
+        types.Uuid,
+        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.corpus.id"),
+        primary_key=True,
+    )
+    embedding_model_id = mapped_column(
+        types.Uuid,
+        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.embedding_model.id"),
+        primary_key=True,
+    )
+
+    used_since: Mapped[datetime] = mapped_column(
+        TIMESTAMP(timezone=False),
+        nullable=False,
+        default=func.localtimestamp(),
+        server_default="NOW()",
+    )
+
+    embedding_model: Mapped["EmbeddingModel"] = relationship()
+    corpus: Mapped["Corpus"] = relationship()
+
+
+class CorpusNClassifierModel(Base):
+    __tablename__ = "corpus_n_classifier_model"
+    __table_args__ = (
+        UniqueConstraint(
+            "corpus_id",
+            "n_classifier_model_id",
+            name="unique_corpus_n_classifier_association",
+        ),
+        {"schema": schema_name},
+    )
+
+    corpus_id = mapped_column(
+        types.Uuid,
+        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.corpus.id"),
+        primary_key=True,
+    )
+    n_classifier_model_id = mapped_column(
+        types.Uuid,
+        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.n_classifier_model.id"),
+        primary_key=True,
+    )
+
+    used_since: Mapped[datetime] = mapped_column(
+        TIMESTAMP(timezone=False),
+        nullable=False,
+        default=func.localtimestamp(),
+        server_default="NOW()",
+    )
+
+    n_classifier_model: Mapped["NClassifierModel"] = relationship()
+    corpus: Mapped["Corpus"] = relationship()
+
+
+class CorpusBiClassifierModel(Base):
+    __tablename__ = "corpus_bi_classifier_model"
+    __table_args__ = (
+        UniqueConstraint(
+            "corpus_id",
+            "bi_classifier_model_id",
+            name="unique_corpus_bi_classifier_association",
+        ),
+        {"schema": schema_name},
+    )
+
+    corpus_id = mapped_column(
+        types.Uuid,
+        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.corpus.id"),
+        primary_key=True,
+    )
+    bi_classifier_model_id = mapped_column(
+        types.Uuid,
+        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.bi_classifier_model.id"),
+        primary_key=True,
+    )
+    used_since: Mapped[datetime] = mapped_column(
+        TIMESTAMP(timezone=False),
+        nullable=False,
+        default=func.localtimestamp(),
+        server_default="NOW()",
+    )
+
+    bi_classifier_model: Mapped["BiClassifierModel"] = relationship()
+    corpus: Mapped["Corpus"] = relationship()

{welearn_database-0.2.7 → welearn_database-0.2.8}/welearn_database/data/models/document_related.py

@@ -313,104 +313,6 @@ class AnalyticCounter(Base):
     document: Mapped["WeLearnDocument"] = relationship()
 
 
-class CorpusEmbeddingModel(Base):
-    __tablename__ = "corpus_embedding_model"
-    __table_args__ = (
-        UniqueConstraint(
-            "corpus_id",
-            "embedding_model_id",
-            name="unique_corpus_embedding_association",
-        ),
-        {"schema": schema_name},
-    )
-
-    corpus_id = mapped_column(
-        types.Uuid,
-        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.corpus.id"),
-        primary_key=True,
-    )
-    embedding_model_id = mapped_column(
-        types.Uuid,
-        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.embedding_model.id"),
-        primary_key=True,
-    )
-
-    used_since: Mapped[datetime] = mapped_column(
-        TIMESTAMP(timezone=False),
-        nullable=False,
-        default=func.localtimestamp(),
-        server_default="NOW()",
-    )
-
-    embedding_model: Mapped["EmbeddingModel"] = relationship()
-    corpus: Mapped["Corpus"] = relationship()
-
-
-class CorpusNClassifierModel(Base):
-    __tablename__ = "corpus_n_classifier_model"
-    __table_args__ = (
-        UniqueConstraint(
-            "corpus_id",
-            "n_classifier_model_id",
-            name="unique_corpus_n_classifier_association",
-        ),
-        {"schema": schema_name},
-    )
-
-    corpus_id = mapped_column(
-        types.Uuid,
-        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.corpus.id"),
-        primary_key=True,
-    )
-    n_classifier_model_id = mapped_column(
-        types.Uuid,
-        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.n_classifier_model.id"),
-        primary_key=True,
-    )
-
-    used_since: Mapped[datetime] = mapped_column(
-        TIMESTAMP(timezone=False),
-        nullable=False,
-        default=func.localtimestamp(),
-        server_default="NOW()",
-    )
-
-    n_classifier_model: Mapped["NClassifierModel"] = relationship()
-    corpus: Mapped["Corpus"] = relationship()
-
-
-class CorpusBiClassifierModel(Base):
-    __tablename__ = "corpus_bi_classifier_model"
-    __table_args__ = (
-        UniqueConstraint(
-            "corpus_id",
-            "bi_classifier_model_id",
-            name="unique_corpus_bi_classifier_association",
-        ),
-        {"schema": schema_name},
-    )
-
-    corpus_id = mapped_column(
-        types.Uuid,
-        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.corpus.id"),
-        primary_key=True,
-    )
-    bi_classifier_model_id = mapped_column(
-        types.Uuid,
-        ForeignKey(f"{DbSchemaEnum.CORPUS_RELATED.value}.bi_classifier_model.id"),
-        primary_key=True,
-    )
-    used_since: Mapped[datetime] = mapped_column(
-        TIMESTAMP(timezone=False),
-        nullable=False,
-        default=func.localtimestamp(),
-        server_default="NOW()",
-    )
-
-    bi_classifier_model: Mapped["BiClassifierModel"] = relationship()
-    corpus: Mapped["Corpus"] = relationship()
-
-
 class Sdg(Base):
     __tablename__ = "sdg"
     __table_args__ = {"schema": schema_name}