fix migration conflicts

GooeyAI · Aug 28, 2024 · d9e602a · d9e602a
1 parent ca2270a
commit d9e602a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 43 deletions.
diff --git a/bots/migrations/0080_botintegration_twilio_fresh_conversation_per_call_and_more.py b/bots/migrations/0080_botintegration_twilio_fresh_conversation_per_call_and_more.py
diff --git a/bots/migrations/0081_alter_botintegration_streaming_enabled.py b/bots/migrations/0081_alter_botintegration_streaming_enabled.py
diff --git a/bots/migrations/0081_remove_conversation_bots_conver_bot_int_73ac7b_idx_and_more.py b/bots/migrations/0081_remove_conversation_bots_conver_bot_int_73ac7b_idx_and_more.py
@@ -1,19 +1,34 @@
-# Generated by Django 4.2.7 on 2024-08-28 06:45
+# Generated by Django 4.2.7 on 2024-08-28 12:30
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bots', '0080_botintegration_twilio_fresh_conversation_per_call_and_more'),
+        ('bots', '0080_alter_botintegration_streaming_enabled'),
     ]
 
     operations = [
         migrations.RemoveIndex(
             model_name='conversation',
             name='bots_conver_bot_int_73ac7b_idx',
         ),
+        migrations.AddField(
+            model_name='botintegration',
+            name='twilio_fresh_conversation_per_call',
+            field=models.BooleanField(default=False, help_text='If set, the bot will start a new conversation for each call'),
+        ),
+        migrations.AddField(
+            model_name='conversation',
+            name='twilio_call_sid',
+            field=models.TextField(blank=True, default='', help_text='Twilio call sid (only used if each call is a new conversation)'),
+        ),
+        migrations.AlterField(
+            model_name='botintegration',
+            name='streaming_enabled',
+            field=models.BooleanField(default=True, help_text='If set, the bot will stream messages to the frontend'),
+        ),
         migrations.AddIndex(
             model_name='conversation',
             index=models.Index(fields=['bot_integration', 'twilio_phone_number', 'twilio_call_sid'], name='bots_conver_bot_int_477755_idx'),