wtrinkl/laravel-llm-gateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix API controllers to use correct database column names

Browse Source 
- Fix model_pricing table references (model_id -> model, display_name -> model)
- Fix price columns (output_price_per_1k -> output_price_per_million)
- Add price conversion (per_million / 1000 = per_1k) in all API responses
- Add whereNotNull('model') filters to exclude invalid entries
- Add getModelDisplayName() helper method to all controllers
- Fix AccountController to use gateway_users budget fields directly
- Remove Budget model dependencies from AccountController
- Add custom Scramble server URL configuration for API docs
- Create ScrambleServiceProvider to set correct /api prefix
- Add migration to rename user_id to gateway_user_id in llm_requests
- Add custom ApiGuard for gateway_users authentication
- Update all API controllers: AccountController, ModelController, PricingController, ProviderController

All API endpoints now working correctly:
- GET /api/account
- GET /api/models
- GET /api/pricing
- GET /api/providers/{provider}
This commit is contained in:
wtrinkl
2025-11-19 19:36:58 +01:00
parent c65643ac1f
commit cb495e18e3
38 changed files with 1045 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
laravel-app/app/Http/Controllers/Api/AccountController.php
View File

@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller;
use App\Models\{GatewayUser, ApiKey, GatewayUserCredential, Budget, LlmRequest};
use App\Models\{GatewayUser, ApiKey, GatewayUserCredential, LlmRequest};
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
@@ -51,12 +51,11 @@ class AccountController extends Controller
->get()
->map(function ($key) {
return [
'id' => $key->id,
'name' => $key->name ?? 'Default Key',
'key_preview' => substr($key->api_key, 0, 8) . '...' . substr($key->api_key, -4),
'token_preview' => substr($key->token, 0, 8) . '...' . substr($key->token, -4),
'name' => $key->key_name ?? $key->key_alias ?? 'Default Key',
'alias' => $key->key_alias,
'created_at' => $key->created_at->toIso8601String(),
'last_used' => $key->last_used_at?->toIso8601String(),
'expires_at' => $key->expires_at?->toIso8601String(),
'expires_at' => $key->expires?->toIso8601String(),
];
});
@@ -65,20 +64,19 @@ class AccountController extends Controller
->where('is_active', true)
->count();
// Get budget info
$budget = Budget::where('gateway_user_id', $user->user_id)->first();
$monthlySpending = LlmRequest::where('gateway_user_id', $user->user_id)
->whereYear('created_at', now()->year)
->whereMonth('created_at', now()->month)
->where('status', 'success')
->sum('total_cost') ?? 0;
$budgetInfo = $budget ? [
'total' => round($budget->monthly_limit, 2),
'used' => round($monthlySpending, 4),
'remaining' => round($budget->monthly_limit - $monthlySpending, 4),
'currency' => 'USD',
] : null;
// Get budget info directly from gateway_user
// The gateway_users table has budget fields: monthly_budget_limit, current_month_spending
$budgetInfo = null;
if ($user->monthly_budget_limit !== null) {
$budgetInfo = [
'total' => round($user->monthly_budget_limit, 2),
'used' => round($user->current_month_spending, 4),
'remaining' => round($user->monthly_budget_limit - $user->current_month_spending, 4),
'currency' => 'USD',
'alert_threshold' => $user->budget_alert_threshold,
];
}
// Get statistics
$stats = LlmRequest::where('gateway_user_id', $user->user_id)
@@ -111,7 +109,7 @@ class AccountController extends Controller
'rate_limits' => [
'requests_per_minute' => 100, // TODO: Get from rate_limits table
'tokens_per_request' => 10000,
'daily_budget_limit' => $budget ? round($budget->monthly_limit / 30, 2) : null,
'daily_budget_limit' => $user->monthly_budget_limit ? round($user->monthly_budget_limit / 30, 2) : null,
],
],
]);

298
laravel-app/app/Http/Controllers/Api/BudgetController.php
View File

@@ -1,298 +0,0 @@
<?php
namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller;
use App\Models\{Budget, LlmRequest};
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\DB;
class BudgetController extends Controller
{
/**
* Get current budget status
*
* Returns comprehensive budget information including total budget, used budget,
* remaining budget, projections, and breakdowns by provider.
*
* ## Example Response
*
* ```json
* {
* "data": {
* "total_budget": 100.00,
* "used_budget": 45.67,
* "remaining_budget": 54.33,
* "budget_percentage": 45.67,
* "currency": "USD",
* "period": "monthly",
* "period_start": "2025-11-01T00:00:00Z",
* "period_end": "2025-11-30T23:59:59Z",
* "days_remaining": 11,
* "projected_spend": 95.34,
* "projected_overspend": false,
* "limits": {
* "daily_limit": 10.00,
* "daily_used": 2.45,
* "daily_remaining": 7.55
* },
* "alerts": {
* "threshold_50_percent": false,
* "threshold_75_percent": false,
* "threshold_90_percent": false
* },
* "breakdown_by_provider": [
* {
* "provider": "openai",
* "provider_name": "OpenAI",
* "spent": 25.30,
* "percentage": 55.4,
* "requests": 850
* }
* ]
* }
* }
* ```
*
* @tags Budget
*
* @param Request $request
* @return JsonResponse
*/
public function index(Request $request): JsonResponse
{
$user = $request->user();
// Get budget configuration
$budget = Budget::where('gateway_user_id', $user->user_id)->first();
if (!$budget) {
return response()->json([
'error' => [
'code' => 'not_found',
'message' => 'No budget configured for this user',
'status' => 404,
],
], 404);
}
// Calculate period dates
$now = now();
$periodStart = $now->copy()->startOfMonth();
$periodEnd = $now->copy()->endOfMonth();
$daysRemaining = $now->diffInDays($periodEnd, false);
$daysInMonth = $periodStart->daysInMonth;
$daysElapsed = $now->diffInDays($periodStart);
// Get current month's spending
$monthlySpending = LlmRequest::where('gateway_user_id', $user->user_id)
->whereYear('created_at', $now->year)
->whereMonth('created_at', $now->month)
->where('status', 'success')
->sum('total_cost') ?? 0;
// Get today's spending
$dailySpending = LlmRequest::where('gateway_user_id', $user->user_id)
->whereDate('created_at', $now->toDateString())
->where('status', 'success')
->sum('total_cost') ?? 0;
// Calculate projections
$dailyAverage = $daysElapsed > 0 ? ($monthlySpending / $daysElapsed) : 0;
$projectedSpend = $dailyAverage * $daysInMonth;
// Calculate remaining budget
$remainingBudget = $budget->monthly_limit - $monthlySpending;
$budgetPercentage = $budget->monthly_limit > 0
? ($monthlySpending / $budget->monthly_limit) * 100
: 0;
// Get breakdown by provider
$providerBreakdown = LlmRequest::where('gateway_user_id', $user->user_id)
->whereYear('created_at', $now->year)
->whereMonth('created_at', $now->month)
->where('status', 'success')
->select('provider', DB::raw('SUM(total_cost) as spent'), DB::raw('COUNT(*) as requests'))
->groupBy('provider')
->orderByDesc('spent')
->get()
->map(function ($item) use ($monthlySpending) {
$percentage = $monthlySpending > 0 ? ($item->spent / $monthlySpending) * 100 : 0;
return [
'provider' => $item->provider,
'provider_name' => $this->getProviderName($item->provider),
'spent' => round($item->spent, 4),
'percentage' => round($percentage, 1),
'requests' => $item->requests,
];
});
// Calculate daily limit (monthly limit / days in month)
$dailyLimit = $budget->monthly_limit / $daysInMonth;
return response()->json([
'data' => [
'total_budget' => round($budget->monthly_limit, 2),
'used_budget' => round($monthlySpending, 4),
'remaining_budget' => round($remainingBudget, 4),
'budget_percentage' => round($budgetPercentage, 2),
'currency' => 'USD',
'period' => 'monthly',
'period_start' => $periodStart->toIso8601String(),
'period_end' => $periodEnd->toIso8601String(),
'days_remaining' => max(0, $daysRemaining),
'projected_spend' => round($projectedSpend, 2),
'projected_overspend' => $projectedSpend > $budget->monthly_limit,
'limits' => [
'daily_limit' => round($dailyLimit, 2),
'daily_used' => round($dailySpending, 4),
'daily_remaining' => round($dailyLimit - $dailySpending, 4),
],
'alerts' => [
'threshold_50_percent' => $budgetPercentage >= 50,
'threshold_75_percent' => $budgetPercentage >= 75,
'threshold_90_percent' => $budgetPercentage >= 90,
'approaching_daily_limit' => ($dailySpending / $dailyLimit) >= 0.8,
],
'breakdown_by_provider' => $providerBreakdown,
'updated_at' => now()->toIso8601String(),
],
]);
}
/**
* Get budget history over time
*
* Returns historical budget data with daily, weekly, or monthly aggregation.
*
* ## Query Parameters
*
* - `period` (optional) - Aggregation period: daily, weekly, monthly (default: daily)
* - `days` (optional) - Number of days to look back (default: 30)
*
* ## Example Response
*
* ```json
* {
* "data": [
* {
* "date": "2025-11-19",
* "total_cost": 2.45,
* "total_requests": 45,
* "total_tokens": 45000,
* "breakdown": [
* {
* "provider": "openai",
* "cost": 1.35,
* "requests": 25
* }
* ]
* }
* ],
* "meta": {
* "period": "daily",
* "days": 30,
* "total_cost": 45.67,
* "total_requests": 1250,
* "avg_daily_cost": 1.52,
* "avg_daily_requests": 41.7
* }
* }
* ```
*
* @tags Budget
*
* @param Request $request
* @return JsonResponse
*/
public function history(Request $request): JsonResponse
{
$validator = Validator::make($request->all(), [
'period' => 'sometimes|string|in:daily,weekly,monthly',
'days' => 'sometimes|integer|min:1|max:365',
]);
if ($validator->fails()) {
return response()->json([
'error' => [
'code' => 'validation_error',
'message' => 'Invalid query parameters',
'status' => 422,
'details' => $validator->errors(),
],
], 422);
}
$user = $request->user();
$period = $request->input('period', 'daily');
$days = $request->input('days', 30);
$startDate = now()->subDays($days)->startOfDay();
// Get daily aggregated data
$dailyData = LlmRequest::where('gateway_user_id', $user->user_id)
->where('created_at', '>=', $startDate)
->where('status', 'success')
->select(
DB::raw('DATE(created_at) as date'),
'provider',
DB::raw('SUM(total_cost) as cost'),
DB::raw('COUNT(*) as requests'),
DB::raw('SUM(total_tokens) as tokens')
)
->groupBy('date', 'provider')
->orderBy('date')
->get();
// Group by date
$groupedByDate = $dailyData->groupBy('date')->map(function ($items, $date) {
return [
'date' => $date,
'total_cost' => round($items->sum('cost'), 4),
'total_requests' => $items->sum('requests'),
'total_tokens' => $items->sum('tokens'),
'breakdown' => $items->map(function ($item) {
return [
'provider' => $item->provider,
'cost' => round($item->cost, 4),
'requests' => $item->requests,
];
})->values(),
];
})->values();
// Calculate meta statistics
$totalCost = $groupedByDate->sum('total_cost');
$totalRequests = $groupedByDate->sum('total_requests');
$dataPoints = $groupedByDate->count();
return response()->json([
'data' => $groupedByDate,
'meta' => [
'period' => $period,
'days' => $days,
'total_cost' => round($totalCost, 4),
'total_requests' => $totalRequests,
'avg_daily_cost' => $dataPoints > 0 ? round($totalCost / $dataPoints, 4) : 0,
'avg_daily_requests' => $dataPoints > 0 ? round($totalRequests / $dataPoints, 1) : 0,
],
]);
}
/**
* Get human-readable provider name
*/
private function getProviderName(string $provider): string
{
return match ($provider) {
'openai' => 'OpenAI',
'anthropic' => 'Anthropic',
'gemini' => 'Google Gemini',
'deepseek' => 'DeepSeek',
'mistral' => 'Mistral AI',
default => ucfirst($provider),
};
}
}

51
laravel-app/app/Http/Controllers/Api/ModelController.php
View File

@@ -87,7 +87,8 @@ class ModelController extends Controller
], 422);
}
$query = ModelPricing::where('is_active', true);
$query = ModelPricing::where('is_active', true)
->whereNotNull('model');
// Apply filters
if ($request->has('provider')) {
@@ -95,7 +96,9 @@ class ModelController extends Controller
}
if ($request->has('max_price')) {
$query->where('output_price_per_1k', '<=', $request->input('max_price'));
// Convert per-1k price to per-million for comparison
$maxPricePerMillion = $request->input('max_price') * 1000;
$query->where('output_price_per_million', '<=', $maxPricePerMillion);
}
if ($request->has('min_context')) {
@@ -106,7 +109,7 @@ class ModelController extends Controller
$sort = $request->input('sort', 'name');
switch ($sort) {
case 'price':
$query->orderBy('output_price_per_1k');
$query->orderBy('output_price_per_million');
break;
case 'context':
$query->orderByDesc('context_window');
@@ -122,7 +125,7 @@ class ModelController extends Controller
->orderByDesc('usage_count');
break;
default:
$query->orderBy('display_name');
$query->orderBy('model');
}
$totalCount = ModelPricing::where('is_active', true)->count();
@@ -130,10 +133,10 @@ class ModelController extends Controller
$data = $models->map(function ($model) {
return [
'id' => $model->model_id,
'id' => $model->model,
'provider' => $model->provider,
'provider_name' => $this->getProviderName($model->provider),
'name' => $model->display_name,
'name' => $this->getModelDisplayName($model->model),
'description' => $this->getModelDescription($model),
'context_window' => $model->context_window,
'max_output_tokens' => $model->max_output_tokens,
@@ -141,8 +144,8 @@ class ModelController extends Controller
'supports_function_calling' => in_array($model->provider, ['openai', 'anthropic']),
'supports_vision' => $this->supportsVision($model->model_id),
'pricing' => [
'input_per_1k_tokens' => $model->input_price_per_1k,
'output_per_1k_tokens' => $model->output_price_per_1k,
'input_per_1k_tokens' => round($model->input_price_per_million / 1000, 6),
'output_per_1k_tokens' => round($model->output_price_per_million / 1000, 6),
'currency' => 'USD',
],
'availability' => 'available',
@@ -225,7 +228,7 @@ class ModelController extends Controller
{
// Find the model
$modelData = ModelPricing::where('provider', $provider)
->where('model_id', $model)
->where('model', $model)
->where('is_active', true)
->first();
@@ -277,11 +280,11 @@ class ModelController extends Controller
$response = [
'data' => [
'id' => $modelData->model_id,
'id' => $modelData->model,
'provider' => $modelData->provider,
'provider_name' => $this->getProviderName($modelData->provider),
'name' => $modelData->display_name,
'full_name' => $this->getProviderName($modelData->provider) . ' ' . $modelData->display_name,
'name' => $this->getModelDisplayName($modelData->model),
'full_name' => $this->getProviderName($modelData->provider) . ' ' . $this->getModelDisplayName($modelData->model),
'description' => $this->getModelDescription($modelData),
'status' => 'active',
'capabilities' => [
@@ -293,8 +296,8 @@ class ModelController extends Controller
'supports_json_mode' => in_array($modelData->provider, ['openai', 'anthropic']),
],
'pricing' => [
'input_per_1k_tokens' => $modelData->input_price_per_1k,
'output_per_1k_tokens' => $modelData->output_price_per_1k,
'input_per_1k_tokens' => round($modelData->input_price_per_million / 1000, 6),
'output_per_1k_tokens' => round($modelData->output_price_per_million / 1000, 6),
'currency' => 'USD',
'last_updated' => $modelData->updated_at->toIso8601String(),
],
@@ -333,13 +336,23 @@ class ModelController extends Controller
};
}
/**
* Get model display name from model ID
*/
private function getModelDisplayName(string $modelId): string
{
// Convert model ID to a readable display name
// e.g., "gpt-4-turbo" -> "GPT-4 Turbo"
return ucwords(str_replace(['-', '_'], ' ', $modelId));
}
/**
* Get model description
*/
private function getModelDescription(ModelPricing $model): string
{
// Extract description from model name or provide generic one
$modelId = strtolower($model->model_id);
$modelId = strtolower($model->model);
if (str_contains($modelId, 'gpt-4')) {
return 'Most capable GPT-4 model with improved instruction following';
@@ -361,14 +374,18 @@ class ModelController extends Controller
return 'Open-source model with strong performance';
}
return $model->display_name;
return $this->getModelDisplayName($model->model);
}
/**
* Check if model supports vision
*/
private function supportsVision(string $modelId): bool
private function supportsVision(?string $modelId): bool
{
if ($modelId === null) {
return false;
}
$visionModels = [
'gpt-4-vision-preview',
'gpt-4-turbo',

61
laravel-app/app/Http/Controllers/Api/PricingController.php
View File

@@ -70,7 +70,8 @@ class PricingController extends Controller
], 422);
}
$query = ModelPricing::where('is_active', true);
$query = ModelPricing::where('is_active', true)
->whereNotNull('model');
// Apply filters
if ($request->has('provider')) {
@@ -81,13 +82,13 @@ class PricingController extends Controller
$sort = $request->input('sort', 'name');
switch ($sort) {
case 'price':
$query->orderBy('output_price_per_1k');
$query->orderBy('output_price_per_million');
break;
case 'provider':
$query->orderBy('provider')->orderBy('display_name');
$query->orderBy('provider')->orderBy('model');
break;
default:
$query->orderBy('display_name');
$query->orderBy('model');
}
$models = $query->get();
@@ -96,11 +97,11 @@ class PricingController extends Controller
return [
'provider' => $model->provider,
'provider_name' => $this->getProviderName($model->provider),
'model' => $model->model_id,
'model_name' => $model->display_name,
'model' => $model->model,
'model_name' => $this->getModelDisplayName($model->model),
'pricing' => [
'input_per_1k_tokens' => $model->input_price_per_1k,
'output_per_1k_tokens' => $model->output_price_per_1k,
'input_per_1k_tokens' => round($model->input_price_per_million / 1000, 6),
'output_per_1k_tokens' => round($model->output_price_per_million / 1000, 6),
'currency' => 'USD',
],
'last_updated' => $model->updated_at->toIso8601String(),
@@ -196,7 +197,7 @@ class PricingController extends Controller
$outputTokens = $request->input('output_tokens');
// Find the model
$model = ModelPricing::where('model_id', $modelId)
$model = ModelPricing::where('model', $modelId)
->where('is_active', true)
->first();
@@ -210,9 +211,12 @@ class PricingController extends Controller
], 404);
}
// Calculate costs
$inputCost = ($inputTokens / 1000) * $model->input_price_per_1k;
$outputCost = ($outputTokens / 1000) * $model->output_price_per_1k;
// Calculate costs (convert from per-million to per-1k)
$inputPricePer1k = $model->input_price_per_million / 1000;
$outputPricePer1k = $model->output_price_per_million / 1000;
$inputCost = ($inputTokens / 1000) * $inputPricePer1k;
$outputCost = ($outputTokens / 1000) * $outputPricePer1k;
$totalCost = $inputCost + $outputCost;
// Calculate examples for different request volumes
@@ -225,13 +229,13 @@ class PricingController extends Controller
return response()->json([
'data' => [
'model' => $model->model_id,
'model' => $model->model,
'provider' => $model->provider,
'input_tokens' => $inputTokens,
'output_tokens' => $outputTokens,
'pricing' => [
'input_per_1k' => $model->input_price_per_1k,
'output_per_1k' => $model->output_price_per_1k,
'input_per_1k' => round($inputPricePer1k, 6),
'output_per_1k' => round($outputPricePer1k, 6),
'currency' => 'USD',
],
'calculation' => [
@@ -296,7 +300,7 @@ class PricingController extends Controller
$outputTokens = $request->input('output_tokens');
// Get all models
$models = ModelPricing::whereIn('model_id', $modelIds)
$models = ModelPricing::whereIn('model', $modelIds)
->where('is_active', true)
->get();
@@ -312,13 +316,16 @@ class PricingController extends Controller
// Calculate costs for each model
$comparisons = $models->map(function ($model) use ($inputTokens, $outputTokens) {
$inputCost = ($inputTokens / 1000) * $model->input_price_per_1k;
$outputCost = ($outputTokens / 1000) * $model->output_price_per_1k;
$inputPricePer1k = $model->input_price_per_million / 1000;
$outputPricePer1k = $model->output_price_per_million / 1000;
$inputCost = ($inputTokens / 1000) * $inputPricePer1k;
$outputCost = ($outputTokens / 1000) * $outputPricePer1k;
$totalCost = $inputCost + $outputCost;
return [
'model' => $model->model_id,
'model_name' => $model->display_name,
'model' => $model->model,
'model_name' => $this->getModelDisplayName($model->model),
'provider' => $model->provider,
'provider_name' => $this->getProviderName($model->provider),
'costs' => [
@@ -327,8 +334,8 @@ class PricingController extends Controller
'total_cost' => round($totalCost, 6),
],
'pricing' => [
'input_per_1k' => $model->input_price_per_1k,
'output_per_1k' => $model->output_price_per_1k,
'input_per_1k' => round($inputPricePer1k, 6),
'output_per_1k' => round($outputPricePer1k, 6),
],
];
})->sortBy('costs.total_cost')->values();
@@ -372,4 +379,14 @@ class PricingController extends Controller
default => ucfirst($provider),
};
}
/**
* Get model display name from model ID
*/
private function getModelDisplayName(string $modelId): string
{
// Convert model ID to a readable display name
// e.g., "gpt-4-turbo" -> "GPT-4 Turbo"
return ucwords(str_replace(['-', '_'], ' ', $modelId));
}
}

22
laravel-app/app/Http/Controllers/Api/ProviderController.php
View File

@@ -68,6 +68,7 @@ class ProviderController extends Controller
// Get model count for this provider
$modelsCount = ModelPricing::where('provider', $providerId)
->where('is_active', true)
->whereNotNull('model')
->count();
$providerData[] = [
@@ -172,19 +173,20 @@ class ProviderController extends Controller
// Get models for this provider
$models = ModelPricing::where('provider', $provider)
->where('is_active', true)
->orderBy('display_name')
->whereNotNull('model')
->orderBy('model')
->get()
->map(function ($model) {
return [
'id' => $model->model_id,
'name' => $model->display_name,
'id' => $model->model,
'name' => $this->getModelDisplayName($model->model),
'context_window' => $model->context_window,
'max_output_tokens' => $model->max_output_tokens,
'supports_streaming' => true, // Default to true for now
'supports_function_calling' => in_array($model->provider, ['openai', 'anthropic']),
'pricing' => [
'input_per_1k' => $model->input_price_per_1k,
'output_per_1k' => $model->output_price_per_1k,
'input_per_1k' => round($model->input_price_per_million / 1000, 6),
'output_per_1k' => round($model->output_price_per_million / 1000, 6),
'currency' => 'USD',
],
];
@@ -308,4 +310,14 @@ class ProviderController extends Controller
default => '#',
};
}
/**
* Get model display name from model ID
*/
private function getModelDisplayName(string $modelId): string
{
// Convert model ID to a readable display name
// e.g., "gpt-4-turbo" -> "GPT-4 Turbo"
return ucwords(str_replace(['-', '_'], ' ', $modelId));
}
}