salman/igny8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fina autoamtiona adn billing and credits

Browse Source
This commit is contained in:
IGNY8 VPS (Salman)
2025-12-04 15:54:15 +00:00
parent f8a9293196
commit 40dfe20ead
40 changed files with 5680 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
backend/igny8_core/business/automation/migrations/0004_add_pause_resume_cancel_fields.py Normal file
View File

@@ -0,0 +1,33 @@
# Generated by Django 5.2.8 on 2025-12-04 15:27
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('automation', '0003_alter_automationconfig_options_and_more'),
]
operations = [
migrations.AddField(
model_name='automationrun',
name='cancelled_at',
field=models.DateTimeField(blank=True, help_text='When automation was cancelled', null=True),
),
migrations.AddField(
model_name='automationrun',
name='paused_at',
field=models.DateTimeField(blank=True, help_text='When automation was paused', null=True),
),
migrations.AddField(
model_name='automationrun',
name='resumed_at',
field=models.DateTimeField(blank=True, help_text='When automation was last resumed', null=True),
),
migrations.AlterField(
model_name='automationrun',
name='status',
field=models.CharField(choices=[('running', 'Running'), ('paused', 'Paused'), ('cancelled', 'Cancelled'), ('completed', 'Completed'), ('failed', 'Failed')], db_index=True, default='running', max_length=20),
),
]

6
backend/igny8_core/business/automation/models.py
View File

@@ -65,6 +65,7 @@ class AutomationRun(models.Model):
STATUS_CHOICES = [
('running', 'Running'),
('paused', 'Paused'),
('cancelled', 'Cancelled'),
('completed', 'Completed'),
('failed', 'Failed'),
]
@@ -77,6 +78,11 @@ class AutomationRun(models.Model):
status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='running', db_index=True)
current_stage = models.IntegerField(default=1, help_text="Current stage number (1-7)")
# Pause/Resume tracking
paused_at = models.DateTimeField(null=True, blank=True, help_text="When automation was paused")
resumed_at = models.DateTimeField(null=True, blank=True, help_text="When automation was last resumed")
cancelled_at = models.DateTimeField(null=True, blank=True, help_text="When automation was cancelled")
started_at = models.DateTimeField(auto_now_add=True, db_index=True)
completed_at = models.DateTimeField(null=True, blank=True)

334
backend/igny8_core/business/automation/services/automation_service.py
View File

@@ -24,7 +24,7 @@ from igny8_core.ai.functions.auto_cluster import AutoClusterFunction
from igny8_core.ai.functions.generate_ideas import GenerateIdeasFunction
from igny8_core.ai.functions.generate_content import GenerateContentFunction
from igny8_core.ai.functions.generate_image_prompts import GenerateImagePromptsFunction
from igny8_core.ai.functions.generate_images import GenerateImagesFunction
from igny8_core.ai.tasks import process_image_generation_queue
logger = logging.getLogger(__name__)
@@ -58,6 +58,26 @@ class AutomationService:
service.run = run
return service
def _check_should_stop(self) -> tuple[bool, str]:
"""
Check if automation should stop (paused or cancelled)
Returns:
(should_stop, reason)
"""
if not self.run:
return False, ""
# Refresh run from database
self.run.refresh_from_db()
if self.run.status == 'paused':
return True, "paused"
elif self.run.status == 'cancelled':
return True, "cancelled"
return False, ""
def start_automation(self, trigger_type: str = 'manual') -> str:
"""
Start automation run
@@ -130,6 +150,45 @@ class AutomationService:
total_count = pending_keywords.count()
# NEW: Pre-stage validation for minimum keywords
from igny8_core.ai.validators.cluster_validators import validate_minimum_keywords
keyword_ids_for_validation = list(pending_keywords.values_list('id', flat=True))
min_validation = validate_minimum_keywords(
keyword_ids=keyword_ids_for_validation,
account=self.account,
min_required=5
)
if not min_validation['valid']:
# Log validation failure
self.logger.log_stage_start(
self.run.run_id, self.account.id, self.site.id,
stage_number, stage_name, total_count
)
error_msg = min_validation['error']
self.logger.log_stage_error(
self.run.run_id, self.account.id, self.site.id,
stage_number, error_msg
)
# Skip stage with proper result
self.run.stage_1_result = {
'keywords_processed': 0,
'clusters_created': 0,
'batches_run': 0,
'skipped': True,
'skip_reason': error_msg,
'credits_used': 0
}
self.run.current_stage = 2
self.run.save()
logger.warning(f"[AutomationService] Stage 1 skipped: {error_msg}")
return
# Log stage start
self.logger.log_stage_start(
self.run.run_id, self.account.id, self.site.id,
@@ -929,15 +988,25 @@ class AutomationService:
stage_number, f"Generating image {idx}/{total_images}: {image.image_type} for '{content_title}'"
)
# Call AI function via AIEngine
engine = AIEngine(account=self.account)
result = engine.execute(
fn=GenerateImagesFunction(),
payload={'image_ids': [image.id]}
)
# Call process_image_generation_queue directly (same as Writer/Images page)
# Queue the task
if hasattr(process_image_generation_queue, 'delay'):
task = process_image_generation_queue.delay(
image_ids=[image.id],
account_id=self.account.id,
content_id=image.content.id if image.content else None
)
task_id = str(task.id)
else:
# Fallback for testing (synchronous)
result = process_image_generation_queue(
image_ids=[image.id],
account_id=self.account.id,
content_id=image.content.id if image.content else None
)
task_id = None
# Monitor task
task_id = result.get('task_id')
# Monitor task (if async)
if task_id:
# FIXED: Pass continue_on_error=True to keep processing other images on failure
self._wait_for_task(task_id, stage_number, f"Image for '{content_title}'", continue_on_error=True)
@@ -1185,3 +1254,250 @@ class AutomationService:
minutes = int(elapsed // 60)
seconds = int(elapsed % 60)
return f"{minutes}m {seconds}s"
def get_current_processing_state(self) -> dict:
"""
Get real-time processing state for current automation run
Returns detailed info about what's currently being processed
"""
if not self.run or self.run.status != 'running':
return None
stage = self.run.current_stage
# Get stage-specific data based on current stage
if stage == 1: # Keywords → Clusters
return self._get_stage_1_state()
elif stage == 2: # Clusters → Ideas
return self._get_stage_2_state()
elif stage == 3: # Ideas → Tasks
return self._get_stage_3_state()
elif stage == 4: # Tasks → Content
return self._get_stage_4_state()
elif stage == 5: # Content → Image Prompts
return self._get_stage_5_state()
elif stage == 6: # Image Prompts → Images
return self._get_stage_6_state()
elif stage == 7: # Manual Review Gate
return self._get_stage_7_state()
return None
def _get_stage_1_state(self) -> dict:
"""Get processing state for Stage 1: Keywords → Clusters"""
queue = Keywords.objects.filter(
site=self.site, status='new'
).order_by('id')
processed = self._get_processed_count(1)
total = queue.count() + processed
return {
'stage_number': 1,
'stage_name': 'Keywords → Clusters',
'stage_type': 'AI',
'total_items': total,
'processed_items': processed,
'percentage': round((processed / total * 100) if total > 0 else 0),
'currently_processing': self._get_current_items(queue, 3),
'up_next': self._get_next_items(queue, 2, skip=3),
'remaining_count': queue.count()
}
def _get_stage_2_state(self) -> dict:
"""Get processing state for Stage 2: Clusters → Ideas"""
queue = Clusters.objects.filter(
site=self.site, status='new', disabled=False
).order_by('id')
processed = self._get_processed_count(2)
total = queue.count() + processed
return {
'stage_number': 2,
'stage_name': 'Clusters → Ideas',
'stage_type': 'AI',
'total_items': total,
'processed_items': processed,
'percentage': round((processed / total * 100) if total > 0 else 0),
'currently_processing': self._get_current_items(queue, 1),
'up_next': self._get_next_items(queue, 2, skip=1),
'remaining_count': queue.count()
}
def _get_stage_3_state(self) -> dict:
"""Get processing state for Stage 3: Ideas → Tasks"""
queue = ContentIdeas.objects.filter(
site=self.site, status='approved'
).order_by('id')
processed = self._get_processed_count(3)
total = queue.count() + processed
return {
'stage_number': 3,
'stage_name': 'Ideas → Tasks',
'stage_type': 'Local',
'total_items': total,
'processed_items': processed,
'percentage': round((processed / total * 100) if total > 0 else 0),
'currently_processing': self._get_current_items(queue, 1),
'up_next': self._get_next_items(queue, 2, skip=1),
'remaining_count': queue.count()
}
def _get_stage_4_state(self) -> dict:
"""Get processing state for Stage 4: Tasks → Content"""
queue = Tasks.objects.filter(
site=self.site, status='ready'
).order_by('id')
processed = self._get_processed_count(4)
total = queue.count() + processed
return {
'stage_number': 4,
'stage_name': 'Tasks → Content',
'stage_type': 'AI',
'total_items': total,
'processed_items': processed,
'percentage': round((processed / total * 100) if total > 0 else 0),
'currently_processing': self._get_current_items(queue, 1),
'up_next': self._get_next_items(queue, 2, skip=1),
'remaining_count': queue.count()
}
def _get_stage_5_state(self) -> dict:
"""Get processing state for Stage 5: Content → Image Prompts"""
queue = Content.objects.filter(
site=self.site,
status='draft'
).annotate(
images_count=Count('images')
).filter(
images_count=0
).order_by('id')
processed = self._get_processed_count(5)
total = queue.count() + processed
return {
'stage_number': 5,
'stage_name': 'Content → Image Prompts',
'stage_type': 'AI',
'total_items': total,
'processed_items': processed,
'percentage': round((processed / total * 100) if total > 0 else 0),
'currently_processing': self._get_current_items(queue, 1),
'up_next': self._get_next_items(queue, 2, skip=1),
'remaining_count': queue.count()
}
def _get_stage_6_state(self) -> dict:
"""Get processing state for Stage 6: Image Prompts → Images"""
queue = Images.objects.filter(
site=self.site, status='pending'
).order_by('id')
processed = self._get_processed_count(6)
total = queue.count() + processed
return {
'stage_number': 6,
'stage_name': 'Image Prompts → Images',
'stage_type': 'AI',
'total_items': total,
'processed_items': processed,
'percentage': round((processed / total * 100) if total > 0 else 0),
'currently_processing': self._get_current_items(queue, 1),
'up_next': self._get_next_items(queue, 2, skip=1),
'remaining_count': queue.count()
}
def _get_stage_7_state(self) -> dict:
"""Get processing state for Stage 7: Manual Review Gate"""
queue = Content.objects.filter(
site=self.site, status='review'
).order_by('id')
total = queue.count()
return {
'stage_number': 7,
'stage_name': 'Manual Review Gate',
'stage_type': 'Manual',
'total_items': total,
'processed_items': total,
'percentage': 100,
'currently_processing': [],
'up_next': self._get_current_items(queue, 3),
'remaining_count': total
}
def _get_processed_count(self, stage: int) -> int:
"""Get count of items processed in current stage"""
if not self.run:
return 0
result_key = f'stage_{stage}_result'
result = getattr(self.run, result_key, {})
if not result:
return 0
# Extract appropriate count from result
if stage == 1:
return result.get('keywords_processed', 0)
elif stage == 2:
return result.get('clusters_processed', 0)
elif stage == 3:
return result.get('ideas_processed', 0)
elif stage == 4:
return result.get('tasks_processed', 0)
elif stage == 5:
return result.get('content_processed', 0)
elif stage == 6:
return result.get('images_processed', 0)
return 0
def _get_current_items(self, queryset, count: int) -> list:
"""Get currently processing items"""
items = queryset[:count]
return [
{
'id': item.id,
'title': self._get_item_title(item),
'type': queryset.model.__name__.lower()
}
for item in items
]
def _get_next_items(self, queryset, count: int, skip: int = 0) -> list:
"""Get next items in queue"""
items = queryset[skip:skip + count]
return [
{
'id': item.id,
'title': self._get_item_title(item),
'type': queryset.model.__name__.lower()
}
for item in items
]
def _get_item_title(self, item) -> str:
"""Extract title from various model types"""
# Try different title fields based on model type
if hasattr(item, 'keyword'):
return item.keyword
elif hasattr(item, 'cluster_name'):
return item.cluster_name
elif hasattr(item, 'idea_title'):
return item.idea_title
elif hasattr(item, 'title'):
return item.title
elif hasattr(item, 'image_type') and hasattr(item, 'content'):
content_title = item.content.title if item.content else 'Unknown'
return f"{item.image_type} for '{content_title}'"
return 'Unknown'

4
backend/igny8_core/business/automation/tasks.py
View File

@@ -147,6 +147,10 @@ def resume_automation_task(self, run_id: str):
run.error_message = str(e)
run.completed_at = timezone.now()
run.save()
# Alias for continue_automation_task (same as resume)
continue_automation_task = resume_automation_task
# Release lock
from django.core.cache import cache

195
backend/igny8_core/business/automation/views.py
View File

@@ -474,3 +474,198 @@ class AutomationViewSet(viewsets.ViewSet):
]
})
@action(detail=False, methods=['get'], url_path='current_processing')
def current_processing(self, request):
"""
GET /api/v1/automation/current_processing/?site_id=123&run_id=abc
Get current processing state for active automation run
"""
site_id = request.query_params.get('site_id')
run_id = request.query_params.get('run_id')
if not site_id or not run_id:
return Response(
{'error': 'site_id and run_id required'},
status=status.HTTP_400_BAD_REQUEST
)
try:
# Get the site
site = get_object_or_404(Site, id=site_id, account=request.user.account)
# Get the run
run = AutomationRun.objects.get(run_id=run_id, site=site)
# If not running, return None
if run.status != 'running':
return Response({'data': None})
# Get current processing state
service = AutomationService.from_run_id(run_id)
state = service.get_current_processing_state()
return Response({'data': state})
except AutomationRun.DoesNotExist:
return Response(
{'error': 'Run not found'},
status=status.HTTP_404_NOT_FOUND
)
except Exception as e:
return Response(
{'error': str(e)},
status=status.HTTP_500_INTERNAL_SERVER_ERROR
)
@action(detail=False, methods=['post'], url_path='pause')
def pause_automation(self, request):
"""
POST /api/v1/automation/pause/?site_id=123&run_id=abc
Pause current automation run
Will complete current queue item then pause before next item
"""
site_id = request.query_params.get('site_id')
run_id = request.query_params.get('run_id')
if not site_id or not run_id:
return Response(
{'error': 'site_id and run_id required'},
status=status.HTTP_400_BAD_REQUEST
)
try:
site = get_object_or_404(Site, id=site_id, account=request.user.account)
run = AutomationRun.objects.get(run_id=run_id, site=site)
if run.status != 'running':
return Response(
{'error': f'Cannot pause automation with status: {run.status}'},
status=status.HTTP_400_BAD_REQUEST
)
# Update status to paused
run.status = 'paused'
run.paused_at = timezone.now()
run.save(update_fields=['status', 'paused_at'])
return Response({
'message': 'Automation paused',
'status': run.status,
'paused_at': run.paused_at
})
except AutomationRun.DoesNotExist:
return Response(
{'error': 'Run not found'},
status=status.HTTP_404_NOT_FOUND
)
except Exception as e:
return Response(
{'error': str(e)},
status=status.HTTP_500_INTERNAL_SERVER_ERROR
)
@action(detail=False, methods=['post'], url_path='resume')
def resume_automation(self, request):
"""
POST /api/v1/automation/resume/?site_id=123&run_id=abc
Resume paused automation run
Will continue from next queue item in current stage
"""
site_id = request.query_params.get('site_id')
run_id = request.query_params.get('run_id')
if not site_id or not run_id:
return Response(
{'error': 'site_id and run_id required'},
status=status.HTTP_400_BAD_REQUEST
)
try:
site = get_object_or_404(Site, id=site_id, account=request.user.account)
run = AutomationRun.objects.get(run_id=run_id, site=site)
if run.status != 'paused':
return Response(
{'error': f'Cannot resume automation with status: {run.status}'},
status=status.HTTP_400_BAD_REQUEST
)
# Update status to running
run.status = 'running'
run.resumed_at = timezone.now()
run.save(update_fields=['status', 'resumed_at'])
# Queue continuation task
from igny8_core.business.automation.tasks import continue_automation_task
continue_automation_task.delay(run_id)
return Response({
'message': 'Automation resumed',
'status': run.status,
'resumed_at': run.resumed_at
})
except AutomationRun.DoesNotExist:
return Response(
{'error': 'Run not found'},
status=status.HTTP_404_NOT_FOUND
)
except Exception as e:
return Response(
{'error': str(e)},
status=status.HTTP_500_INTERNAL_SERVER_ERROR
)
@action(detail=False, methods=['post'], url_path='cancel')
def cancel_automation(self, request):
"""
POST /api/v1/automation/cancel/?site_id=123&run_id=abc
Cancel current automation run
Will complete current queue item then stop permanently
"""
site_id = request.query_params.get('site_id')
run_id = request.query_params.get('run_id')
if not site_id or not run_id:
return Response(
{'error': 'site_id and run_id required'},
status=status.HTTP_400_BAD_REQUEST
)
try:
site = get_object_or_404(Site, id=site_id, account=request.user.account)
run = AutomationRun.objects.get(run_id=run_id, site=site)
if run.status not in ['running', 'paused']:
return Response(
{'error': f'Cannot cancel automation with status: {run.status}'},
status=status.HTTP_400_BAD_REQUEST
)
# Update status to cancelled
run.status = 'cancelled'
run.cancelled_at = timezone.now()
run.completed_at = timezone.now()
run.save(update_fields=['status', 'cancelled_at', 'completed_at'])
return Response({
'message': 'Automation cancelled',
'status': run.status,
'cancelled_at': run.cancelled_at
})
except AutomationRun.DoesNotExist:
return Response(
{'error': 'Run not found'},
status=status.HTTP_404_NOT_FOUND
)
except Exception as e:
return Response(
{'error': str(e)},
status=status.HTTP_500_INTERNAL_SERVER_ERROR
)