merge conflicts

Signed-off-by: zethson <[email protected]>
laminlabs · Nov 21, 2024 · 02dc62e · 02dc62e
2 parents 70a7d8a + 3ce7d1e
commit 02dc62e
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 201 deletions.
diff --git a/ourprojects/migrations/0001_initial.py b/ourprojects/migrations/0001_initial.py
@@ -1,6 +1,7 @@
-# Generated by Django 5.1.1 on 2024-10-18 23:40
+# Generated by Django 5.2 on 2024-11-21 10:57
 
 import django.db.models.deletion
+import lnschema_core.fields
 import lnschema_core.ids
 import lnschema_core.models
 import lnschema_core.users
@@ -11,28 +12,46 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("lnschema_core", "0068_alter_artifactulabel_unique_together_and_more"),
+        ("lnschema_core", "0069_squashed"),
     ]
 
     operations = [
         migrations.CreateModel(
             name="ArtifactProject",
             fields=[
-                ("created_at", models.DateTimeField(auto_now_add=True, db_index=True)),
+                (
+                    "created_at",
+                    lnschema_core.fields.DateTimeField(
+                        auto_now_add=True, db_index=True
+                    ),
+                ),
                 ("id", models.BigAutoField(primary_key=True, serialize=False)),
-                ("label_ref_is_name", models.BooleanField(default=None, null=True)),
-                ("feature_ref_is_name", models.BooleanField(default=None, null=True)),
+                (
+                    "label_ref_is_name",
+                    lnschema_core.fields.BooleanField(
+                        blank=True, default=None, null=True
+                    ),
+                ),
+                (
+                    "feature_ref_is_name",
+                    lnschema_core.fields.BooleanField(
+                        blank=True, default=None, null=True
+                    ),
+                ),
                 (
                     "artifact",
-                    models.ForeignKey(
+                    lnschema_core.fields.ForeignKey(
+                        blank=True,
+                        default=None,
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="links_project",
                         to="lnschema_core.artifact",
                     ),
                 ),
                 (
                     "created_by",
-                    models.ForeignKey(
+                    lnschema_core.fields.ForeignKey(
+                        blank=True,
                         default=lnschema_core.users.current_user_id,
                         on_delete=django.db.models.deletion.PROTECT,
                         related_name="+",
@@ -41,7 +60,8 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "feature",
-                    models.ForeignKey(
+                    lnschema_core.fields.ForeignKey(
+                        blank=True,
                         default=None,
                         null=True,
                         on_delete=django.db.models.deletion.PROTECT,
@@ -51,7 +71,8 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "run",
-                    models.ForeignKey(
+                    lnschema_core.fields.ForeignKey(
+                        blank=True,
                         default=lnschema_core.models.current_run,
                         null=True,
                         on_delete=django.db.models.deletion.PROTECT,
@@ -65,27 +86,49 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name="Project",
             fields=[
-                ("created_at", models.DateTimeField(auto_now_add=True, db_index=True)),
-                ("updated_at", models.DateTimeField(auto_now=True, db_index=True)),
+                (
+                    "created_at",
+                    lnschema_core.fields.DateTimeField(
+                        auto_now_add=True, db_index=True
+                    ),
+                ),
+                (
+                    "updated_at",
+                    lnschema_core.fields.DateTimeField(auto_now=True, db_index=True),
+                ),
                 ("id", models.AutoField(primary_key=True, serialize=False)),
                 (
                     "uid",
-                    models.CharField(
-                        default=lnschema_core.ids.base62_12, max_length=12, unique=True
+                    lnschema_core.fields.CharField(
+                        blank=True,
+                        default=lnschema_core.ids.base62_12,
+                        max_length=12,
+                        unique=True,
+                    ),
+                ),
+                (
+                    "name",
+                    lnschema_core.fields.CharField(
+                        blank=True, db_index=True, default=None, max_length=255
                     ),
                 ),
-                ("name", models.CharField(db_index=True, default=None, max_length=255)),
                 (
                     "abbr",
-                    models.CharField(
+                    lnschema_core.fields.CharField(
+                        blank=True,
                         db_index=True,
                         default=None,
                         max_length=32,
                         null=True,
                         unique=True,
                     ),
                 ),
-                ("url", models.URLField(default=None, max_length=255, null=True)),
+                (
+                    "url",
+                    lnschema_core.fields.URLField(
+                        blank=True, default=None, max_length=255, null=True
+                    ),
+                ),
                 (
                     "_previous_runs",
                     models.ManyToManyField(related_name="+", to="lnschema_core.run"),
@@ -100,7 +143,8 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "created_by",
-                    models.ForeignKey(
+                    lnschema_core.fields.ForeignKey(
+                        blank=True,
                         default=lnschema_core.users.current_user_id,
                         on_delete=django.db.models.deletion.PROTECT,
                         related_name="+",
@@ -109,7 +153,8 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "run",
-                    models.ForeignKey(
+                    lnschema_core.fields.ForeignKey(
+                        blank=True,
                         default=lnschema_core.models.current_run,
                         null=True,
                         on_delete=django.db.models.deletion.PROTECT,
@@ -121,12 +166,18 @@ class Migration(migrations.Migration):
             options={
                 "abstract": False,
             },
-            bases=(lnschema_core.models.CanCurate, models.Model),
+            bases=(
+                lnschema_core.models.CanCurate,
+                models.Model,
+                lnschema_core.models.ValidateFields,
+            ),
         ),
         migrations.AddField(
             model_name="artifactproject",
             name="project",
-            field=models.ForeignKey(
+            field=lnschema_core.fields.ForeignKey(
+                blank=True,
+                default=None,
                 on_delete=django.db.models.deletion.PROTECT,
                 related_name="links_artifact",
                 to="ourprojects.project",

diff --git a/ourprojects/migrations/0002_alter_artifactproject_artifact_and_more.py b/ourprojects/migrations/0002_alter_artifactproject_artifact_and_more.py
diff --git a/ourprojects/models.py b/ourprojects/models.py
@@ -6,16 +6,7 @@
 from django.db import models
 from django.db.models import CASCADE, PROTECT
 from lnschema_core import ids
-from lnschema_core.fields import (
-    BigIntegerField,
-    BooleanField,
-    CharField,
-    DateTimeField,
-    ForeignKey,
-    TextField,
-    URLField,
-    EmailField
-)
+from lnschema_core.fields import BooleanField, CharField, ForeignKey, URLField, EmailField, BigIntegerField, TextField, DateTimeField
 from lnschema_core.models import (
     Artifact,
     CanCurate,
@@ -69,15 +60,11 @@ class Meta(Record.Meta, TracksRun.Meta, TracksUpdates.Meta):
     """Internal id, valid only in one DB instance."""
     uid: str = CharField(unique=True, max_length=12, default=ids.base62_12)
     """Universal id, valid across DB instances."""
-    name: str = CharField(max_length=255, default=None, db_index=True)
+    name: str = CharField(db_index=True)
     """Title or name of the Project."""
-    abbr: str | None = CharField(
-        max_length=32, db_index=True, unique=True, null=True, default=None
-    )
+    abbr: str | None = CharField(max_length=32, db_index=True, unique=True, null=True)
     """A unique abbreviation."""
-    url: str | None = models.URLField(
-        max_length=255, null=True, default=None, blank=True
-    )
+    url: str | None = URLField(max_length=255, null=True, default=None)
     """A URL to view."""
     persons: Person = models.ManyToManyField(
         Person, 
@@ -174,7 +161,7 @@ class ArtifactProject(Record, LinkORM, TracksRun):
     id: int = models.BigAutoField(primary_key=True)
     artifact: Artifact = ForeignKey(Artifact, CASCADE, related_name="links_project")
     project: Project = ForeignKey(Project, PROTECT, related_name="links_artifact")
-    feature: Feature = ForeignKey(
+    feature: Feature | None = ForeignKey(
         Feature,
         PROTECT,
         null=True,

diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ authors = [{name = "Lamin Labs", email = "[email protected]"}]
 readme = "README.md"
 dynamic = ["version", "description"]
 dependencies = [
-    "lamindb"
+    "lamindb>=0.77.0"
 ]
 
 [project.urls]