feat: Meshy.ai cost integration — settings, new job form, price breakdown
Deploy via Portainer / deploy (push) Successful in 0s
Deploy via Portainer / deploy (push) Successful in 0s
This commit is contained in:
@@ -256,6 +256,9 @@ def init_db():
|
||||
('ha_url',''),
|
||||
('ha_token',''),
|
||||
('ha_poll_interval','60'),
|
||||
('meshy_annual_cost','200.0'),
|
||||
('meshy_monthly_credits','1000'),
|
||||
('meshy_cost_multiplier','1.0'),
|
||||
]
|
||||
conn.executemany('INSERT OR IGNORE INTO settings VALUES (?,?)', defaults)
|
||||
|
||||
@@ -302,6 +305,9 @@ def init_db():
|
||||
'ALTER TABLE print_slots ADD COLUMN pieces_override INTEGER DEFAULT NULL',
|
||||
'ALTER TABLE calendar_blocks ADD COLUMN date_end TEXT DEFAULT NULL',
|
||||
'ALTER TABLE jobs ADD COLUMN source_nc_path TEXT DEFAULT ""',
|
||||
'ALTER TABLE jobs ADD COLUMN meshy_enabled INTEGER DEFAULT 0',
|
||||
'ALTER TABLE jobs ADD COLUMN meshy_credits_used INTEGER DEFAULT 0',
|
||||
'ALTER TABLE jobs ADD COLUMN meshy_cost REAL DEFAULT 0',
|
||||
]
|
||||
for sql in migrations:
|
||||
try:
|
||||
@@ -456,7 +462,8 @@ def parse_3mf(file_stream):
|
||||
return result
|
||||
|
||||
def calc(weight_g, print_time_s, design_mult, gross_margin_pct, discount_pct,
|
||||
price_per_kg_override=None, s=None, pieces_per_plate=1):
|
||||
price_per_kg_override=None, s=None, pieces_per_plate=1,
|
||||
meshy_enabled=False, meshy_credits_used=0):
|
||||
"""
|
||||
Moteur de pricing principal — calcule le prix de vente d'une pièce.
|
||||
|
||||
@@ -509,10 +516,20 @@ def calc(weight_g, print_time_s, design_mult, gross_margin_pct, discount_pct,
|
||||
wear = printer_w + nozzle_w + plate_w
|
||||
elec = s['printer_power_kw'] * (print_time_s / 3600) * s['electricity_price_kwh'] / pieces_per_plate
|
||||
|
||||
# Coût Meshy.ai (génération IA) — pro-raté par crédits utilisés
|
||||
meshy_unit = 0.0
|
||||
meshy_billed = 0.0
|
||||
if meshy_enabled and meshy_credits_used > 0:
|
||||
_meshy_annual = float(s.get('meshy_annual_cost', 200.0))
|
||||
_meshy_credits = float(s.get('meshy_monthly_credits', 1000)) or 1
|
||||
_meshy_mult = float(s.get('meshy_cost_multiplier', 1.0))
|
||||
meshy_unit = _meshy_annual / 12 / _meshy_credits
|
||||
meshy_billed = meshy_credits_used * meshy_unit * _meshy_mult
|
||||
|
||||
cout_fixe = mat + mat_margin + wear + elec
|
||||
sous_total = cout_fixe + handling + design
|
||||
sous_total = cout_fixe + handling + design + meshy_billed
|
||||
margin = sous_total * (gross_margin_pct / 100)
|
||||
total_marge= handling + design + margin
|
||||
total_marge= handling + design + meshy_billed + margin
|
||||
prix_ht = cout_fixe + total_marge
|
||||
|
||||
cot_rate = s.get('cotisations_rate_pct', 12.3) / 100
|
||||
@@ -557,6 +574,8 @@ def calc(weight_g, print_time_s, design_mult, gross_margin_pct, discount_pct,
|
||||
'tva_amount': round(tva_amount, 4),
|
||||
'prix_ht_net': round(prix_ht_net, 4),
|
||||
'prix_ttc': round(prix_ttc, 4),
|
||||
'meshy_cost': round(meshy_billed, 4),
|
||||
'meshy_unit_cost': round(meshy_unit, 6),
|
||||
'tax_amount': round(cot_amount + vfl_amount + other_taxes_amount, 4),
|
||||
'final_price': round(final, 2),
|
||||
'_cot_pct': round(cot_rate * 100, 2),
|
||||
@@ -1311,19 +1330,24 @@ def new_job():
|
||||
if mat:
|
||||
price_kg = mat['price_per_kg']
|
||||
|
||||
meshy_enabled_v = bool(request.form.get('meshy_enabled'))
|
||||
meshy_credits_v = max(0, int(request.form.get('meshy_credits_used', 0) or 0))
|
||||
r = calc(weight_g, print_time_s, design_mult, gross_margin, discount,
|
||||
price_kg, s, pieces_per_plate)
|
||||
price_kg, s, pieces_per_plate,
|
||||
meshy_enabled=meshy_enabled_v, meshy_credits_used=meshy_credits_v)
|
||||
conn.execute('''INSERT INTO jobs(client_id,material_id,machine_profile_id,handling_profile_id,
|
||||
material_profile_id,pricing_profile_id,project_id,source_file,source_nc_path,plate_name,name,description,
|
||||
meshy_enabled,meshy_credits_used,meshy_cost,
|
||||
weight_g,print_time_s,design_multiplier,gross_margin_pct,discount_pct,
|
||||
pieces_per_plate,order_qty,
|
||||
material_cost,material_margin,design_cost,handling_cost,wear_cost,electricity_cost,
|
||||
cout_fixe,total_marge,subtotal,margin_amount,marge_pct_on_ht,
|
||||
cotisations_amount,vfl_amount,tva_amount,other_taxes_amount,tax_amount,
|
||||
price_per_piece,final_price,notes)
|
||||
VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''',
|
||||
VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''',
|
||||
(client_id,material_id,machine_pid,handling_pid,material_pid,pricing_pid,project_id,
|
||||
source_file,source_nc_path,plate_name,request.form['name'],request.form.get('description',''),
|
||||
int(meshy_enabled_v),meshy_credits_v,r['meshy_cost'],
|
||||
weight_g,print_time_s,design_mult,gross_margin,discount,
|
||||
pieces_per_plate,order_qty,
|
||||
r['material_cost'],r['material_margin'],r['design_cost'],r['handling_cost'],
|
||||
@@ -1687,6 +1711,8 @@ def api_calculate():
|
||||
pieces_per_plate = max(1, int(d.get('pieces_per_plate', 1)))
|
||||
order_qty = max(1, int(d.get('order_qty', 1)))
|
||||
print_time_s = int(d.get('hours',0))*3600 + int(d.get('minutes',0))*60
|
||||
meshy_enabled = bool(d.get('meshy_enabled', False))
|
||||
meshy_credits = max(0, int(d.get('meshy_credits_used', 0)))
|
||||
|
||||
result = calc(
|
||||
weight_g=float(d['weight_g']),
|
||||
@@ -1695,7 +1721,8 @@ def api_calculate():
|
||||
gross_margin_pct=float(d.get('gross_margin_pct',27.5)),
|
||||
discount_pct=float(d.get('discount_pct',0)),
|
||||
price_per_kg_override=price_kg, s=s,
|
||||
pieces_per_plate=pieces_per_plate)
|
||||
pieces_per_plate=pieces_per_plate,
|
||||
meshy_enabled=meshy_enabled, meshy_credits_used=meshy_credits)
|
||||
|
||||
# Multi-piece extras
|
||||
nb_plateaux = math.ceil(order_qty / pieces_per_plate)
|
||||
|
||||
Reference in New Issue
Block a user