diff --git a/llmage/utils.py b/llmage/utils.py index e2f6d3d..41f80be 100644 --- a/llmage/utils.py +++ b/llmage/utils.py @@ -263,7 +263,7 @@ where a.enabled_date <= ${today}$ pricing_list = [] for ppid in pp_map.get(l.id, []): try: - pd = await env.get_pricing_display(ppid) + pd = await env.get_pricing_display(ppid, model=l.name) if pd: pricing_list.append(pd.get('display_text', '')) except: @@ -413,7 +413,7 @@ async def get_llms_by_catelog(catelogid=None, orderby='providerid'): pricing_list = [] for ppid in pp_map.get(r.id, []): try: - pd = await env.get_pricing_display(ppid) + pd = await env.get_pricing_display(ppid, model=r.name) if pd: pricing_list.append(pd.get('display_text', '')) except: diff --git a/wwwroot/show_llms_cards.ui b/wwwroot/show_llms_cards.ui index 170555b..a8df1fc 100644 --- a/wwwroot/show_llms_cards.ui +++ b/wwwroot/show_llms_cards.ui @@ -31,30 +31,21 @@ "subwidgets":[ { "widgettype":"HBox", - "options":{ - "cheight":2 - }, + "options":{"cheight":2}, "subwidgets":[ { "widgettype":"Svg", - "options":{ - "rate":1.5, - "url":"{{entire_url('/appbase/show_icon.dspy')}}?id={{llm.iconid}}" - } + "options":{"rate":1.5,"url":"{{entire_url('/appbase/show_icon.dspy')}}?id={{llm.iconid}}"} }, { "widgettype":"Title6", - "options":{ - "text":"{{llm.name}}" - } + "options":{"text":"{{llm.name}}"} } ] }, { "widgettype":"VScrollPanel", - "options":{ - "css":"card-body-scroll" - }, + "options":{"css":"card-body-scroll","flex":"1"}, "subwidgets":[ { "widgettype":"Text", @@ -63,30 +54,28 @@ "wrap":true, "halign":"left" } - }, - { - "widgettype":"Filler", - "options":{ - "css":"pricing-box" - }, - "subwidgets":[ - {% for pricing_text in llm.pricing_display %} - { - "widgettype":"Text", - "options":{ - "text":{{json.dumps(pricing_text, ensure_ascii=False)}}, - "wrap":true, - "halign":"left", - "css":"pricing-text" - } - }{% if not loop.last %},{% endif %} - {% endfor %} - ] } ] + }, + { + "widgettype":"VBox", + "options":{"css":"pricing-box","cheight":4}, + "subwidgets":[ + {% for pricing_text in llm.pricing_display %} + { + "widgettype":"Text", + "options":{ + "text":{{json.dumps(pricing_text, ensure_ascii=False)}}, + "wrap":true, + "halign":"left", + "css":"pricing-text" + } + }{% if not loop.last %},{% endif %} + {% endfor %} + ] } - ], - "binds":[ + ], + "binds":[ { "wid":"self", "event":"click", @@ -103,9 +92,7 @@ {% endif %} }, "options":{ - "params":{ - "id":"{{llm.id}}" - }, + "params":{"id":"{{llm.id}}"}, "url":"{{entire_url('./llm_dialog.ui')}}" } }