Improve the sales import
This commit is contained in:
@@ -6,8 +6,10 @@ Manages progress calculation for parallel product training (20-80% range)
|
||||
import asyncio
|
||||
import structlog
|
||||
from typing import Optional
|
||||
from datetime import datetime, timezone
|
||||
|
||||
from app.services.training_events import publish_product_training_completed
|
||||
from app.utils.time_estimation import calculate_estimated_completion_time
|
||||
|
||||
logger = structlog.get_logger()
|
||||
|
||||
@@ -20,6 +22,7 @@ class ParallelProductProgressTracker:
|
||||
- Each product completion contributes 60/N% to overall progress
|
||||
- Progress range: 20% (after data analysis) to 80% (before completion)
|
||||
- Thread-safe for concurrent product trainings
|
||||
- Calculates time estimates based on elapsed time and progress
|
||||
"""
|
||||
|
||||
def __init__(self, job_id: str, tenant_id: str, total_products: int):
|
||||
@@ -28,6 +31,7 @@ class ParallelProductProgressTracker:
|
||||
self.total_products = total_products
|
||||
self.products_completed = 0
|
||||
self._lock = asyncio.Lock()
|
||||
self.start_time = datetime.now(timezone.utc)
|
||||
|
||||
# Calculate progress increment per product
|
||||
# 60% of total progress (from 20% to 80%) divided by number of products
|
||||
@@ -40,20 +44,40 @@ class ParallelProductProgressTracker:
|
||||
|
||||
async def mark_product_completed(self, product_name: str) -> int:
|
||||
"""
|
||||
Mark a product as completed and publish event.
|
||||
Mark a product as completed and publish event with time estimates.
|
||||
Returns the current overall progress percentage.
|
||||
"""
|
||||
async with self._lock:
|
||||
self.products_completed += 1
|
||||
current_progress = self.products_completed
|
||||
|
||||
# Publish product completion event
|
||||
# Calculate time estimates based on elapsed time and progress
|
||||
elapsed_seconds = (datetime.now(timezone.utc) - self.start_time).total_seconds()
|
||||
products_remaining = self.total_products - current_progress
|
||||
|
||||
# Calculate estimated time remaining
|
||||
# Avg time per product * remaining products
|
||||
estimated_time_remaining_seconds = None
|
||||
estimated_completion_time = None
|
||||
|
||||
if current_progress > 0 and products_remaining > 0:
|
||||
avg_time_per_product = elapsed_seconds / current_progress
|
||||
estimated_time_remaining_seconds = int(avg_time_per_product * products_remaining)
|
||||
|
||||
# Calculate estimated completion time
|
||||
estimated_duration_minutes = estimated_time_remaining_seconds / 60
|
||||
completion_datetime = calculate_estimated_completion_time(estimated_duration_minutes)
|
||||
estimated_completion_time = completion_datetime.isoformat()
|
||||
|
||||
# Publish product completion event with time estimates
|
||||
await publish_product_training_completed(
|
||||
job_id=self.job_id,
|
||||
tenant_id=self.tenant_id,
|
||||
product_name=product_name,
|
||||
products_completed=current_progress,
|
||||
total_products=self.total_products
|
||||
total_products=self.total_products,
|
||||
estimated_time_remaining_seconds=estimated_time_remaining_seconds,
|
||||
estimated_completion_time=estimated_completion_time
|
||||
)
|
||||
|
||||
# Calculate overall progress (20% base + progress from completed products)
|
||||
@@ -65,7 +89,8 @@ class ParallelProductProgressTracker:
|
||||
product_name=product_name,
|
||||
products_completed=current_progress,
|
||||
total_products=self.total_products,
|
||||
overall_progress=overall_progress)
|
||||
overall_progress=overall_progress,
|
||||
estimated_time_remaining_seconds=estimated_time_remaining_seconds)
|
||||
|
||||
return overall_progress
|
||||
|
||||
|
||||
Reference in New Issue
Block a user