welearn-database 0.2.4__tar.gz → 0.2.6__tar.gz

{welearn_database-0.2.4 → welearn_database-0.2.6}/PKG-INFO

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

{welearn_database-0.2.4 → welearn_database-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "welearn-database"
-version = "0.2.4"
+version = "0.2.6"
 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.4 → welearn_database-0.2.6}/welearn_database/data/models/document_related.py

@@ -6,7 +6,6 @@ from zlib import adler32
 
 from sqlalchemy import ForeignKey, Integer, LargeBinary, UniqueConstraint, func, types
 from sqlalchemy.dialects.postgresql import ARRAY, ENUM, TIMESTAMP
-from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
 
 from welearn_database.data.enumeration import ContextType, Counter, DbSchemaEnum, Step
@@ -52,8 +51,8 @@ class WeLearnDocument(Base):
     url: Mapped[str] = mapped_column(nullable=False)
     title: Mapped[str | None]
     lang: Mapped[str | None]
-    _description: Mapped[str | None]
-    _full_content: Mapped[str | None]
+    description: Mapped[str | None]
+    full_content: Mapped[str | None]
     details: Mapped[dict[str, Any] | None]
     _trace: Mapped[int | None] = mapped_column(types.BIGINT)
     corpus_id: Mapped[UUID] = mapped_column(
@@ -92,7 +91,7 @@ class WeLearnDocument(Base):
             raise InvalidURLScheme("There is an error on the URL form : %s", value)
         return value
 
-    @validates("_full_content")
+    @validates("full_content")
     def validate_full_content(self, key, value):
         """
         Validate the full content to ensure it meets the minimum length requirement.
@@ -105,29 +104,26 @@ class WeLearnDocument(Base):
             return value
         if len(value) < 25:
             raise ValueError(f"Content is too short : {len(value)}")
-        return value
-
-    @hybrid_property
-    def full_content(self):
-        return self._full_content
-
-    @full_content.setter
-    def full_content(self, full_content):
-        self._full_content = clean_text(full_content)
-
-    @hybrid_property
-    def description(self):
-        return self._description
+        return clean_text(value)
 
-    @description.setter
-    def description(self, description):
-        if not description:
-            self._description = description
-        self._description = clean_text(description)
+    @validates("description")
+    def validate_description(self, key, value):
+        """
+        Validate and clean the description text.
+        :param key: The name of the attribute being validated.
+        :param value: The value of the description to validate.
+        :return: The cleaned description text. If the value is None or empty, it returns the value as is.
+        """
+        if not value:
+            return value
+        return clean_text(value)
 
-    @hybrid_property
+    @property
     def trace(self):
-        return adler32(bytes(self.full_content, "utf-8"))
+        if self.full_content:
+            return adler32(bytes(self.full_content, "utf-8"))
+        else:
+            return None
 
 
 class ProcessState(Base):