servala/website
1
0
Fork 0
Code Issues 12 Pull requests Projects 1 Packages 1 Activity Actions

improve performane on full pricelist view

Browse source
This commit is contained in:
Tobias Brunner 2025-06-20 15:53:57 +02:00
parent fbca67ef66
commit dc1842ef5a
No known key found for this signature in database
1 changed files with 111 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

379
hub/services/views/pricelist.py
View file

@ -124,7 +124,7 @@ def get_internal_cloud_provider_comparisons(
@staff_member_required @staff_member_required
def pricelist(request): def pricelist(request):
"""Generate comprehensive price list grouped by compute plan groups and service levels""" """Generate comprehensive price list grouped by compute plan groups and service levels (optimized)"""
# Get filter parameters from request # Get filter parameters from request
show_discount_details = request.GET.get("discount_details", "").lower() == "true" show_discount_details = request.GET.get("discount_details", "").lower() == "true"
show_addon_details = request.GET.get("addon_details", "").lower() == "true" show_addon_details = request.GET.get("addon_details", "").lower() == "true"
@ -134,45 +134,38 @@ def pricelist(request):
filter_compute_plan_group = request.GET.get("compute_plan_group", "") filter_compute_plan_group = request.GET.get("compute_plan_group", "")
filter_service_level = request.GET.get("service_level", "") filter_service_level = request.GET.get("service_level", "")
# Fetch all active compute plans with related data # Fetch all active compute plans with related data (move as much sorting/filtering to DB as possible)
compute_plans = ( compute_plans_qs = ComputePlan.objects.filter(active=True)
ComputePlan.objects.filter(active=True)
.select_related("cloud_provider", "group")
.prefetch_related("prices")
.order_by("group__order", "group__name", "cloud_provider__name")
)
# Apply compute plan filters
if filter_cloud_provider: if filter_cloud_provider:
compute_plans = compute_plans.filter(cloud_provider__name=filter_cloud_provider) compute_plans_qs = compute_plans_qs.filter(cloud_provider__name=filter_cloud_provider)
if filter_compute_plan_group: if filter_compute_plan_group:
if filter_compute_plan_group == "No Group": if filter_compute_plan_group == "No Group":
compute_plans = compute_plans.filter(group__isnull=True) compute_plans_qs = compute_plans_qs.filter(group__isnull=True)
else: else:
compute_plans = compute_plans.filter(group__name=filter_compute_plan_group) compute_plans_qs = compute_plans_qs.filter(group__name=filter_compute_plan_group)
compute_plans = list(
# Apply natural sorting for compute plan names compute_plans_qs
compute_plans = sorted( .select_related("cloud_provider", "group")
compute_plans, .prefetch_related("prices")
key=lambda x: ( .order_by("group__order", "group__name", "cloud_provider__name", "name")
x.group.order if x.group else 999, # No group plans at the end
x.group.name if x.group else "ZZZ",
x.cloud_provider.name,
natural_sort_key(x.name),
),
) )
# Fetch all appcat price configurations # Fetch all appcat price configurations (prefetch addons)
appcat_prices = ( appcat_prices_qs = (
VSHNAppCatPrice.objects.all() VSHNAppCatPrice.objects.all()
.select_related("service", "discount_model") .select_related("service", "discount_model")
.prefetch_related("base_fees", "unit_rates", "discount_model__tiers") .prefetch_related("base_fees", "unit_rates", "discount_model__tiers", "addons")
.order_by("service__name") .order_by("service__name")
) )
# Apply service filter
if filter_service: if filter_service:
appcat_prices = appcat_prices.filter(service__name=filter_service) appcat_prices_qs = appcat_prices_qs.filter(service__name=filter_service)
appcat_prices = list(appcat_prices_qs)
# Prefetch all storage plans for all cloud providers and build a lookup
all_storage_plans = StoragePlan.objects.all().prefetch_related("prices")
storage_plans_by_provider = defaultdict(list)
for sp in all_storage_plans:
storage_plans_by_provider[sp.cloud_provider_id].append(sp)
pricing_data_by_group_and_service_level = defaultdict(lambda: defaultdict(list)) pricing_data_by_group_and_service_level = defaultdict(lambda: defaultdict(list))
processed_combinations = set() processed_combinations = set()
@ -180,7 +173,6 @@ def pricelist(request):
# Generate pricing combinations for each compute plan and service # Generate pricing combinations for each compute plan and service
for plan in compute_plans: for plan in compute_plans:
plan_currencies = set(plan.prices.values_list("currency", flat=True)) plan_currencies = set(plan.prices.values_list("currency", flat=True))
for appcat_price in appcat_prices: for appcat_price in appcat_prices:
# Determine units based on variable unit type # Determine units based on variable unit type
if appcat_price.variable_unit == VSHNAppCatPrice.VariableUnit.RAM: if appcat_price.variable_unit == VSHNAppCatPrice.VariableUnit.RAM:
@ -189,39 +181,22 @@ def pricelist(request):
units = int(plan.vcpus) units = int(plan.vcpus)
else: else:
continue continue
base_fee_currencies = set(appcat_price.base_fees.values_list("currency", flat=True))
base_fee_currencies = set( service_levels = appcat_price.unit_rates.values_list("service_level", flat=True).distinct()
appcat_price.base_fees.values_list("currency", flat=True)
)
service_levels = appcat_price.unit_rates.values_list(
"service_level", flat=True
).distinct()
# Apply service level filter # Apply service level filter
if filter_service_level: if filter_service_level:
service_levels = [ service_levels = [
sl sl for sl in service_levels
for sl in service_levels if dict(VSHNAppCatPrice.ServiceLevel.choices)[sl] == filter_service_level
if dict(VSHNAppCatPrice.ServiceLevel.choices)[sl]
== filter_service_level
] ]
for service_level in service_levels: for service_level in service_levels:
unit_rate_currencies = set( unit_rate_currencies = set(
appcat_price.unit_rates.filter( appcat_price.unit_rates.filter(service_level=service_level).values_list("currency", flat=True)
service_level=service_level
).values_list("currency", flat=True)
) )
# Find currencies that exist across all pricing components # Find currencies that exist across all pricing components
matching_currencies = plan_currencies.intersection( matching_currencies = plan_currencies.intersection(base_fee_currencies).intersection(unit_rate_currencies)
base_fee_currencies
).intersection(unit_rate_currencies)
if not matching_currencies: if not matching_currencies:
continue continue
for currency in matching_currencies: for currency in matching_currencies:
combination_key = ( combination_key = (
plan.cloud_provider.name, plan.cloud_provider.name,
@ -230,63 +205,35 @@ def pricelist(request):
service_level, service_level,
currency, currency,
) )
# Skip if combination already processed
if combination_key in processed_combinations: if combination_key in processed_combinations:
continue continue
processed_combinations.add(combination_key) processed_combinations.add(combination_key)
# Get pricing components # Get pricing components
compute_plan_price = plan.get_price(currency) compute_plan_price = plan.get_price(currency)
base_fee = appcat_price.get_base_fee(currency, service_level) base_fee = appcat_price.get_base_fee(currency, service_level)
unit_rate = appcat_price.get_unit_rate(currency, service_level) unit_rate = appcat_price.get_unit_rate(currency, service_level)
if any(price is None for price in [compute_plan_price, base_fee, unit_rate]):
# Skip if any pricing component is missing
if any(
price is None
for price in [compute_plan_price, base_fee, unit_rate]
):
continue continue
# Calculate replica enforcement based on service level # Calculate replica enforcement based on service level
if service_level == VSHNAppCatPrice.ServiceLevel.GUARANTEED: if service_level == VSHNAppCatPrice.ServiceLevel.GUARANTEED:
replica_enforce = appcat_price.ha_replica_min replica_enforce = appcat_price.ha_replica_min
else: else:
replica_enforce = 1 replica_enforce = 1
total_units = units * replica_enforce total_units = units * replica_enforce
standard_sla_price = base_fee + (total_units * unit_rate) standard_sla_price = base_fee + (total_units * unit_rate)
# Apply discount if available # Apply discount if available
discount_breakdown = None discount_breakdown = None
if ( if appcat_price.discount_model and appcat_price.discount_model.active:
appcat_price.discount_model discounted_price = appcat_price.discount_model.calculate_discount(unit_rate, total_units)
and appcat_price.discount_model.active
):
discounted_price = (
appcat_price.discount_model.calculate_discount(
unit_rate, total_units
)
)
sla_price = base_fee + discounted_price sla_price = base_fee + discounted_price
discount_savings = standard_sla_price - sla_price discount_savings = standard_sla_price - sla_price
discount_percentage = ( discount_percentage = (discount_savings / standard_sla_price) * 100 if standard_sla_price > 0 else 0
(discount_savings / standard_sla_price) * 100 discount_breakdown = appcat_price.discount_model.get_discount_breakdown(unit_rate, total_units)
if standard_sla_price > 0
else 0
)
discount_breakdown = (
appcat_price.discount_model.get_discount_breakdown(
unit_rate, total_units
)
)
else: else:
sla_price = standard_sla_price sla_price = standard_sla_price
discounted_price = total_units * unit_rate discounted_price = total_units * unit_rate
discount_savings = 0 discount_savings = 0
discount_percentage = 0 discount_percentage = 0
# Calculate final price using the model method to ensure consistency # Calculate final price using the model method to ensure consistency
price_calculation = appcat_price.calculate_final_price( price_calculation = appcat_price.calculate_final_price(
currency_code=currency, currency_code=currency,
@ -294,60 +241,22 @@ def pricelist(request):
number_of_units=total_units, number_of_units=total_units,
addon_ids=None, # This will include only mandatory addons addon_ids=None, # This will include only mandatory addons
) )
if price_calculation is None: if price_calculation is None:
continue continue
# Calculate base service price (without addons) for display purposes # Calculate base service price (without addons) for display purposes
base_sla_price = base_fee + (total_units * unit_rate) base_sla_price = base_fee + (total_units * unit_rate)
# Extract addon information from the calculation (use prefetched addons)
# Apply discount if available
discount_breakdown = None
if (
appcat_price.discount_model
and appcat_price.discount_model.active
):
discounted_price = (
appcat_price.discount_model.calculate_discount(
unit_rate, total_units
)
)
sla_price = base_fee + discounted_price
discount_savings = base_sla_price - sla_price
discount_percentage = (
(discount_savings / base_sla_price) * 100
if base_sla_price > 0
else 0
)
discount_breakdown = (
appcat_price.discount_model.get_discount_breakdown(
unit_rate, total_units
)
)
else:
sla_price = base_sla_price
discounted_price = total_units * unit_rate
discount_savings = 0
discount_percentage = 0
# Extract addon information from the calculation
mandatory_addons = [] mandatory_addons = []
optional_addons = [] optional_addons = []
all_addons = [a for a in appcat_price.addons.all() if a.active]
# Get all addons to separate mandatory from optional
all_addons = appcat_price.addons.filter(active=True)
for addon in all_addons: for addon in all_addons:
addon_price = None addon_price = None
if addon.addon_type == "BF": # Base Fee if addon.addon_type == "BF": # Base Fee
addon_price = addon.get_price(currency, service_level) addon_price = addon.get_price(currency, service_level)
elif addon.addon_type == "UR": # Unit Rate elif addon.addon_type == "UR": # Unit Rate
addon_price_per_unit = addon.get_price( addon_price_per_unit = addon.get_price(currency, service_level)
currency, service_level
)
if addon_price_per_unit: if addon_price_per_unit:
addon_price = addon_price_per_unit * total_units addon_price = addon_price_per_unit * total_units
addon_info = { addon_info = {
"id": addon.id, "id": addon.id,
"name": addon.name, "name": addon.name,
@ -356,165 +265,102 @@ def pricelist(request):
"addon_type": addon.get_addon_type_display(), "addon_type": addon.get_addon_type_display(),
"price": addon_price, "price": addon_price,
} }
if addon.mandatory: if addon.mandatory:
mandatory_addons.append(addon_info) mandatory_addons.append(addon_info)
else: else:
optional_addons.append(addon_info) optional_addons.append(addon_info)
# Use the calculated total price which includes mandatory addons
service_price_with_addons = price_calculation["total_price"] service_price_with_addons = price_calculation["total_price"]
final_price = compute_plan_price + service_price_with_addons final_price = compute_plan_price + service_price_with_addons
service_level_display = dict(VSHNAppCatPrice.ServiceLevel.choices)[ service_level_display = dict(VSHNAppCatPrice.ServiceLevel.choices).get(service_level, service_level)
service_level # Get external/internal price comparisons if enabled (unchanged, but could be optimized further)
]
# Get external price comparisons if enabled
external_comparisons = [] external_comparisons = []
internal_comparisons = [] internal_comparisons = []
if show_price_comparison: if show_price_comparison:
# Get external price comparisons external_prices = get_external_price_comparisons(plan, appcat_price, currency, service_level)
external_prices = get_external_price_comparisons(
plan, appcat_price, currency, service_level
)
for ext_price in external_prices: for ext_price in external_prices:
# Calculate price difference using external price currency
difference = ext_price.amount - final_price difference = ext_price.amount - final_price
ratio = ( ratio = ext_price.amount / final_price if final_price > 0 else 0
ext_price.amount / final_price if final_price > 0 else 0 external_comparisons.append({
) "plan_name": ext_price.plan_name,
"provider": ext_price.cloud_provider.name,
external_comparisons.append( "description": ext_price.description,
{ "amount": ext_price.amount,
"plan_name": ext_price.plan_name, "currency": ext_price.currency,
"provider": ext_price.cloud_provider.name, "vcpus": ext_price.vcpus,
"description": ext_price.description, "ram": ext_price.ram,
"amount": ext_price.amount, "storage": ext_price.storage,
"currency": ext_price.currency, # Use external price currency "replicas": ext_price.replicas,
"vcpus": ext_price.vcpus, "difference": difference,
"ram": ext_price.ram, "ratio": ratio,
"storage": ext_price.storage, "source": ext_price.source,
"replicas": ext_price.replicas, "date_retrieved": ext_price.date_retrieved,
"difference": difference, "is_internal": False,
"ratio": ratio, })
"source": ext_price.source, internal_price_comparisons = get_internal_cloud_provider_comparisons(plan, appcat_price, currency, service_level)
"date_retrieved": ext_price.date_retrieved,
"is_internal": False,
}
)
# Get internal cloud provider comparisons
internal_price_comparisons = (
get_internal_cloud_provider_comparisons(
plan, appcat_price, currency, service_level
)
)
for int_price in internal_price_comparisons: for int_price in internal_price_comparisons:
# Calculate price difference
difference = int_price["final_price"] - final_price difference = int_price["final_price"] - final_price
ratio = ( ratio = int_price["final_price"] / final_price if final_price > 0 else 0
int_price["final_price"] / final_price internal_comparisons.append({
if final_price > 0 "plan_name": int_price["plan_name"],
else 0 "provider": int_price["provider"],
) "description": f"Same specs with {int_price['provider']}",
"amount": int_price["final_price"],
internal_comparisons.append( "currency": int_price["currency"],
{ "vcpus": int_price["vcpus"],
"plan_name": int_price["plan_name"], "ram": int_price["ram"],
"provider": int_price["provider"], "group_name": int_price["group_name"],
"description": f"Same specs with {int_price['provider']}", "compute_plan_price": int_price["compute_plan_price"],
"amount": int_price["final_price"], "service_price": int_price["service_price"],
"currency": int_price["currency"], "difference": difference,
"vcpus": int_price["vcpus"], "ratio": ratio,
"ram": int_price["ram"], "is_internal": True,
"group_name": int_price["group_name"], })
"compute_plan_price": int_price[
"compute_plan_price"
],
"service_price": int_price["service_price"],
"difference": difference,
"ratio": ratio,
"is_internal": True,
}
)
group_name = plan.group.name if plan.group else "No Group" group_name = plan.group.name if plan.group else "No Group"
# Use prefetched storage plans
# Get storage plans for this cloud provider storage_plans = storage_plans_by_provider.get(plan.cloud_provider_id, [])
storage_plans = StoragePlan.objects.filter( pricing_data_by_group_and_service_level[group_name][service_level_display].append({
cloud_provider=plan.cloud_provider "cloud_provider": plan.cloud_provider.name,
).prefetch_related("prices") "service": appcat_price.service.name,
"compute_plan": plan.name,
# Add pricing data to the grouped structure "compute_plan_group": group_name,
pricing_data_by_group_and_service_level[group_name][ "compute_plan_group_description": (plan.group.description if plan.group else ""),
service_level_display "compute_plan_group_node_label": (plan.group.node_label if plan.group else ""),
].append( "storage_plans": storage_plans,
{ "vcpus": plan.vcpus,
"cloud_provider": plan.cloud_provider.name, "ram": plan.ram,
"service": appcat_price.service.name, "cpu_mem_ratio": plan.cpu_mem_ratio,
"compute_plan": plan.name, "term": plan.get_term_display(),
"compute_plan_group": group_name, "currency": currency,
"compute_plan_group_description": ( "compute_plan_price": compute_plan_price,
plan.group.description if plan.group else "" "variable_unit": appcat_price.get_variable_unit_display(),
), "units": units,
"compute_plan_group_node_label": ( "replica_enforce": replica_enforce,
plan.group.node_label if plan.group else "" "total_units": total_units,
), "service_level": service_level_display,
"storage_plans": storage_plans, "sla_base": base_fee,
"vcpus": plan.vcpus, "sla_per_unit": unit_rate,
"ram": plan.ram, "sla_price": service_price_with_addons,
"cpu_mem_ratio": plan.cpu_mem_ratio, "standard_sla_price": base_sla_price,
"term": plan.get_term_display(), "discounted_sla_price": (base_fee + discounted_price if appcat_price.discount_model and appcat_price.discount_model.active else None),
"currency": currency, "discount_savings": discount_savings,
"compute_plan_price": compute_plan_price, "discount_percentage": discount_percentage,
"variable_unit": appcat_price.get_variable_unit_display(), "discount_breakdown": discount_breakdown,
"units": units, "final_price": final_price,
"replica_enforce": replica_enforce, "discount_model": (appcat_price.discount_model.name if appcat_price.discount_model else None),
"total_units": total_units, "has_discount": bool(appcat_price.discount_model and appcat_price.discount_model.active),
"service_level": service_level_display, "external_comparisons": external_comparisons,
"sla_base": base_fee, "internal_comparisons": internal_comparisons,
"sla_per_unit": unit_rate, "mandatory_addons": mandatory_addons,
"sla_price": service_price_with_addons, "optional_addons": optional_addons,
"standard_sla_price": base_sla_price, })
"discounted_sla_price": (
base_fee + discounted_price
if appcat_price.discount_model
and appcat_price.discount_model.active
else None
),
"discount_savings": discount_savings,
"discount_percentage": discount_percentage,
"discount_breakdown": discount_breakdown,
"final_price": final_price,
"discount_model": (
appcat_price.discount_model.name
if appcat_price.discount_model
else None
),
"has_discount": bool(
appcat_price.discount_model
and appcat_price.discount_model.active
),
"external_comparisons": external_comparisons,
"internal_comparisons": internal_comparisons,
"mandatory_addons": mandatory_addons,
"optional_addons": optional_addons,
}
)
# Order groups correctly, placing "No Group" last # Order groups correctly, placing "No Group" last
ordered_groups_intermediate = {} ordered_groups_intermediate = {}
all_group_names = list(pricing_data_by_group_and_service_level.keys()) all_group_names = list(pricing_data_by_group_and_service_level.keys())
if "No Group" in all_group_names: if "No Group" in all_group_names:
all_group_names.remove("No Group") all_group_names.remove("No Group")
all_group_names.append("No Group") all_group_names.append("No Group")
for group_name_key in all_group_names: for group_name_key in all_group_names:
ordered_groups_intermediate[group_name_key] = ( ordered_groups_intermediate[group_name_key] = pricing_data_by_group_and_service_level[group_name_key]
pricing_data_by_group_and_service_level[group_name_key]
)
# Convert defaultdicts to regular dicts for the template # Convert defaultdicts to regular dicts for the template
final_context_data = {} final_context_data = {}
for group_key, service_levels_dict in ordered_groups_intermediate.items(): for group_key, service_levels_dict in ordered_groups_intermediate.items():
@ -522,7 +368,6 @@ def pricelist(request):
sl_key: list(plans_list) sl_key: list(plans_list)
for sl_key, plans_list in service_levels_dict.items() for sl_key, plans_list in service_levels_dict.items()
} }
# Get filter options for dropdowns # Get filter options for dropdowns
all_cloud_providers = ( all_cloud_providers = (
ComputePlan.objects.filter(active=True) ComputePlan.objects.filter(active=True)
@ -543,13 +388,11 @@ def pricelist(request):
) )
all_compute_plan_groups.append("No Group") # Add option for plans without groups all_compute_plan_groups.append("No Group") # Add option for plans without groups
all_service_levels = [choice[1] for choice in VSHNAppCatPrice.ServiceLevel.choices] all_service_levels = [choice[1] for choice in VSHNAppCatPrice.ServiceLevel.choices]
# If no filter is specified, select the first available provider/service by default # If no filter is specified, select the first available provider/service by default
if not filter_cloud_provider and all_cloud_providers: if not filter_cloud_provider and all_cloud_providers:
filter_cloud_provider = all_cloud_providers[0] filter_cloud_provider = all_cloud_providers[0]
if not filter_service and all_services: if not filter_service and all_services:
filter_service = all_services[0] filter_service = all_services[0]
context = { context = {
"pricing_data_by_group_and_service_level": final_context_data, "pricing_data_by_group_and_service_level": final_context_data,
"show_discount_details": show_discount_details, "show_discount_details": show_discount_details,