refactor Job

move fail_reason into Job definition

Bump aiohttp from 3.9.4 to 3.10.2

Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.9.4 to 3.10.2.
- [Release notes](https://github.com/aio-libs/aiohttp/releases)
- [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst)
- [Commits](aio-libs/aiohttp@v3.9.4...v3.10.2)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Convert min_confidence param to string to appease mypy

docker-compose 'version' has been deprecated

remove unused TextField import

bookwyrm/connectors/abstract_connector.py

@@ -86,7 +86,7 @@ async def get_results(
             ),
             "User-Agent": USER_AGENT,
         }
-        params = {"min_confidence": min_confidence}
+        params = {"min_confidence": str(min_confidence)}
         try:
             async with session.get(url, headers=headers, params=params) as response:
                 if not response.ok:

bookwyrm/migrations/0211_remove_userimportbook_fail_reason_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.15 on 2024-10-20 22:29
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0210_userrelationshipimport_and_more"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="userimportbook",
+            name="fail_reason",
+        ),
+        migrations.RemoveField(
+            model_name="userimportpost",
+            name="fail_reason",
+        ),
+        migrations.RemoveField(
+            model_name="userrelationshipimport",
+            name="fail_reason",
+        ),
+        migrations.AddField(
+            model_name="childjob",
+            name="fail_reason",
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name="parentjob",
+            name="fail_reason",
+            field=models.TextField(null=True),
+        ),
+    ]

bookwyrm/models/bookwyrm_import_job.py

@@ -9,7 +9,6 @@
     ForeignKey,
     FileField,
     JSONField,
-    TextField,
     TextChoices,
     PROTECT,
     SET_NULL,
@@ -95,7 +94,6 @@ class UserImportBook(ChildJob):
 
     book = ForeignKey(models.Book, on_delete=SET_NULL, null=True, blank=True)
     book_data = JSONField(null=False)
-    fail_reason = TextField(null=True)
 
     def start_job(self):
         """Start the job"""
@@ -119,7 +117,6 @@ class StatusType(TextChoices):
     status_type = models.fields.CharField(
         max_length=10, choices=StatusType.choices, default=StatusType.COMMENT, null=True
     )
-    fail_reason = TextField(null=True)
 
     def start_job(self):
         """Start the job"""
@@ -139,7 +136,6 @@ class RelationshipType(TextChoices):
         max_length=10, choices=RelationshipType.choices, null=True
     )
     remote_id = models.fields.RemoteIdField(null=True, unique=False)
-    fail_reason = TextField(null=True)
 
     def start_job(self):
         """Start the job"""

bookwyrm/models/job.py

@@ -29,6 +29,7 @@ class Status(models.TextChoices):
     status = models.CharField(
         max_length=50, choices=Status.choices, default=Status.PENDING, null=True
     )
+    fail_reason = models.TextField(null=True)
 
     class Meta:
         """Make it abstract"""

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   nginx:
     image: nginx:1.25.2

requirements.txt

@@ -1,4 +1,4 @@
-aiohttp==3.9.4
+aiohttp==3.10.2
 bleach==6.1.0
 boto3==1.34.74
 bw-file-resubmit==0.6.0rc2