wip

archivebox/machine/migrations/0001_squashed.py

@@ -14,9 +14,9 @@ class Migration(migrations.Migration):
 
     replaces = [
         ('machine', '0001_initial'),
-        ('machine', '0002_alter_machine_stats_binary'),
-        ('machine', '0003_alter_binary_options_and_more'),
-        ('machine', '0004_alter_binary_abspath_and_more'),
+        ('machine', '0002_alter_machine_stats_installedbinary'),
+        ('machine', '0003_alter_installedbinary_options_and_more'),
+        ('machine', '0004_alter_installedbinary_abspath_and_more'),
     ]
 
     dependencies = []
@@ -70,22 +70,7 @@ class Migration(migrations.Migration):
                 'unique_together': {('machine', 'ip_public', 'ip_local', 'mac_address', 'dns_server')},
             },
         ),
-        migrations.CreateModel(
-            name='Dependency',
-            fields=[
-                ('id', models.UUIDField(default=uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('created_at', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
-                ('modified_at', models.DateTimeField(auto_now=True)),
-                ('bin_name', models.CharField(db_index=True, max_length=63, unique=True)),
-                ('bin_providers', models.CharField(default='*', max_length=127)),
-                ('custom_cmds', models.JSONField(blank=True, default=dict)),
-                ('config', models.JSONField(blank=True, default=dict)),
-            ],
-            options={
-                'verbose_name': 'Dependency',
-                'verbose_name_plural': 'Dependencies',
-            },
-        ),
+        # Dependency model removed - not needed anymore
         migrations.CreateModel(
             name='Binary',
             fields=[
@@ -100,7 +85,7 @@ class Migration(migrations.Migration):
                 ('version', models.CharField(blank=True, default=None, max_length=32)),
                 ('sha256', models.CharField(blank=True, default=None, max_length=64)),
                 ('machine', models.ForeignKey(blank=True, default=None, on_delete=django.db.models.deletion.CASCADE, to='machine.machine')),
-                ('dependency', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='binary_set', to='machine.dependency')),
+                # dependency FK removed - Dependency model deleted
             ],
             options={
                 'verbose_name': 'Binary',

archivebox/machine/migrations/0002_rename_custom_cmds_to_overrides.py

@@ -1,6 +1,8 @@
 # Generated manually on 2025-12-26
+# NOTE: This migration is intentionally empty but kept for dependency chain
+# The Dependency model was removed in 0004, so all operations have been stripped
 
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
@@ -10,29 +12,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RenameField(
-            model_name='dependency',
-            old_name='custom_cmds',
-            new_name='overrides',
-        ),
-        migrations.AlterField(
-            model_name='dependency',
-            name='bin_name',
-            field=models.CharField(db_index=True, help_text='Binary executable name (e.g., wget, yt-dlp, chromium)', max_length=63, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='dependency',
-            name='bin_providers',
-            field=models.CharField(default='*', help_text='Comma-separated list of allowed providers: apt,brew,pip,npm,gem,nix,custom or * for any', max_length=127),
-        ),
-        migrations.AlterField(
-            model_name='dependency',
-            name='overrides',
-            field=models.JSONField(blank=True, default=dict, help_text="JSON map matching abx-pkg Binary.overrides format: {'pip': {'packages': ['pkg']}, 'apt': {'packages': ['pkg']}}"),
-        ),
-        migrations.AlterField(
-            model_name='dependency',
-            name='config',
-            field=models.JSONField(blank=True, default=dict, help_text='JSON map of env var config to use during install'),
-        ),
+        # All Dependency operations removed - model deleted in 0004
     ]

archivebox/machine/migrations/0003_alter_dependency_id_alter_installedbinary_dependency_and_more.py

@@ -1,8 +1,8 @@
 # Generated by Django 6.0 on 2025-12-28 05:12
+# NOTE: This migration is intentionally empty but kept for dependency chain
+# The Dependency model was removed in 0004, all operations stripped
 
-import django.db.models.deletion
-from archivebox import uuid_compat
-from django.db import migrations, models
+from django.db import migrations
 
 
 class Migration(migrations.Migration):
@@ -12,34 +12,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AlterField(
-            model_name='dependency',
-            name='id',
-            field=models.UUIDField(default=uuid_compat.uuid7, editable=False, primary_key=True, serialize=False, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='binary',
-            name='dependency',
-            field=models.ForeignKey(blank=True, help_text='The Dependency this binary satisfies', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='binary_set', to='machine.dependency'),
-        ),
-        migrations.AlterField(
-            model_name='binary',
-            name='id',
-            field=models.UUIDField(default=uuid_compat.uuid7, editable=False, primary_key=True, serialize=False, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='machine',
-            name='config',
-            field=models.JSONField(blank=True, default=dict, help_text='Machine-specific config overrides (e.g., resolved binary paths like WGET_BINARY)'),
-        ),
-        migrations.AlterField(
-            model_name='machine',
-            name='id',
-            field=models.UUIDField(default=uuid_compat.uuid7, editable=False, primary_key=True, serialize=False, unique=True),
-        ),
-        migrations.AlterField(
-            model_name='networkinterface',
-            name='id',
-            field=models.UUIDField(default=uuid_compat.uuid7, editable=False, primary_key=True, serialize=False, unique=True),
-        ),
+        # All operations removed - Dependency model deleted in 0004
+        # This is a stub migration for users upgrading from old dev versions
     ]

archivebox/machine/migrations/0004_drop_dependency_table.py

@@ -0,0 +1,28 @@
+# Generated migration - removes Dependency model entirely
+# NOTE: This is a cleanup migration for users upgrading from old dev versions
+# that had the Dependency model. Fresh installs never create this table.
+
+from django.db import migrations
+
+
+def drop_dependency_table(apps, schema_editor):
+    """
+    Drop old Dependency table if it exists (from dev versions that had it).
+    Safe to run multiple times, safe if table doesn't exist.
+
+    Does NOT touch machine_binary - that's our current Binary model table!
+    """
+    schema_editor.execute('DROP TABLE IF EXISTS machine_dependency')
+    # Also drop old InstalledBinary table if it somehow still exists
+    schema_editor.execute('DROP TABLE IF EXISTS machine_installedbinary')
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machine', '0003_alter_dependency_id_alter_installedbinary_dependency_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(drop_dependency_table, migrations.RunPython.noop),
+    ]

archivebox/machine/migrations/0004_rename_installedbinary_to_binary.py

@@ -1,56 +0,0 @@
-# Generated migration - Clean slate for Binary model
-# Drops old InstalledBinary and Dependency tables, creates new Binary table
-
-from django.db import migrations, models
-import django.utils.timezone
-import archivebox.uuid_compat
-
-
-def drop_old_tables(apps, schema_editor):
-    """Drop old tables using raw SQL"""
-    schema_editor.execute('DROP TABLE IF EXISTS machine_installedbinary')
-    schema_editor.execute('DROP TABLE IF EXISTS machine_dependency')
-    schema_editor.execute('DROP TABLE IF EXISTS machine_binary')  # In case rename happened
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('machine', '0003_alter_dependency_id_alter_installedbinary_dependency_and_more'),
-    ]
-
-    operations = [
-        # Drop old tables using raw SQL
-        migrations.RunPython(drop_old_tables, migrations.RunPython.noop),
-
-        # Create new Binary model from scratch
-        migrations.CreateModel(
-            name='Binary',
-            fields=[
-                ('id', models.UUIDField(default=archivebox.uuid_compat.uuid7, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('created_at', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
-                ('modified_at', models.DateTimeField(auto_now=True)),
-                ('name', models.CharField(blank=True, db_index=True, default=None, max_length=63)),
-                ('binproviders', models.CharField(blank=True, default='env', help_text='Comma-separated list of allowed providers: apt,brew,pip,npm,env', max_length=127)),
-                ('overrides', models.JSONField(blank=True, default=dict, help_text="Provider-specific overrides: {'apt': {'packages': ['pkg']}, ...}")),
-                ('binprovider', models.CharField(blank=True, default=None, help_text='Provider that successfully installed this binary', max_length=31)),
-                ('abspath', models.CharField(blank=True, default=None, max_length=255)),
-                ('version', models.CharField(blank=True, default=None, max_length=32)),
-                ('sha256', models.CharField(blank=True, default=None, max_length=64)),
-                ('status', models.CharField(choices=[('queued', 'Queued'), ('started', 'Started'), ('succeeded', 'Succeeded'), ('failed', 'Failed')], db_index=True, default='queued', max_length=16)),
-                ('retry_at', models.DateTimeField(blank=True, db_index=True, default=django.utils.timezone.now, help_text='When to retry this binary installation', null=True)),
-                ('output_dir', models.CharField(blank=True, default='', help_text='Directory where installation hook logs are stored', max_length=255)),
-                ('num_uses_failed', models.PositiveIntegerField(default=0)),
-                ('num_uses_succeeded', models.PositiveIntegerField(default=0)),
-                ('machine', models.ForeignKey(blank=True, default=None, on_delete=models.deletion.CASCADE, to='machine.machine')),
-            ],
-            options={
-                'verbose_name': 'Binary',
-                'verbose_name_plural': 'Binaries',
-            },
-        ),
-        migrations.AddIndex(
-            model_name='binary',
-            index=models.Index(fields=['machine', 'name', 'abspath', 'version', 'sha256'], name='machine_bin_machine_idx'),
-        ),
-    ]