Fix API controllers to use correct database column names
- 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
@@ -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',
|
||||
|
||||
Reference in New Issue
Block a user