Skip to content

Commit f93150e

Browse files
committed
feat(ModelGatewayMapper): enhance model creation by adding organization code filtering
1 parent 555d1c1 commit f93150e

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

backend/magic-service/app/Application/ModelGateway/Mapper/ModelGatewayMapper.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,21 @@ private function getModelsByType(string $organizationCode, string $type, ?ModelT
396396
}
397397

398398
// 创建配置
399-
$model = $this->createModelByProvider($providerModel, $providerConfig, $provider);
399+
$model = $this->createModelByProvider($organizationCode, $providerModel, $providerConfig, $provider);
400+
if (! $model) {
401+
continue;
402+
}
400403
$list[$model->getAttributes()->getKey()] = $model;
401404
}
402405

403406
return $list;
404407
}
405408

406-
private function createModelByProvider(ProviderModelEntity $providerModelEntity, ProviderConfigEntity $providerConfigEntity, ProviderEntity $providerEntity): OdinModel
409+
private function createModelByProvider(string $organizationCode, ProviderModelEntity $providerModelEntity, ProviderConfigEntity $providerConfigEntity, ProviderEntity $providerEntity): ?OdinModel
407410
{
411+
if ($providerModelEntity->getVisibleOrganizations() && ! in_array($organizationCode, $providerModelEntity->getVisibleOrganizations())) {
412+
return null;
413+
}
408414
$chat = false;
409415
$functionCall = false;
410416
$multiModal = false;
@@ -483,7 +489,7 @@ private function getByAdmin(string $model, ?string $orgCode = null): ?OdinModel
483489
return null;
484490
}
485491

486-
return $this->createModelByProvider($providerModel, $providerConfig, $provider);
492+
return $this->createModelByProvider($orgCode, $providerModel, $providerConfig, $provider);
487493
}
488494

489495
private function addAttributes(string $key, OdinModelAttributes $attributes): void

0 commit comments

Comments
 (0)