diff --git a/.idea/php-sdk.iml b/.idea/php-sdk.iml deleted file mode 100644 index 877f80c..0000000 --- a/.idea/php-sdk.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.openapi-generator/api-doc-php-sdk.sha256 b/.openapi-generator/api-doc-php-sdk.sha256 index b5a3c4a..868ba8e 100644 --- a/.openapi-generator/api-doc-php-sdk.sha256 +++ b/.openapi-generator/api-doc-php-sdk.sha256 @@ -1 +1 @@ -08504b0248ce92ba6dce17da036909ea47284081432e1da812464ee138f82957 \ No newline at end of file +5cfee8fe30859348644aa6b9b7f47799fee40915a953feaece9df5bc94c3c8c0 \ No newline at end of file diff --git a/README.md b/README.md index beec9c1..c083c5a 100644 --- a/README.md +++ b/README.md @@ -119,13 +119,18 @@ function example() $streamClient = new StreamApiClient($config); // 语音合成参数 $param = new SynthesizerParam(); - // 需要转换的文本 + // 必须-需要转换的文本 $param->setText("你好，我的名字叫知楠。"); - // 声音模型可选值参考地址：https://help.aliyun.com/zh/dashscope/developer-reference/model-list-old-version + // 必须-声音模型，可选值参考地址：https://help.aliyun.com/zh/dashscope/developer-reference/model-list-old-version $param->setModel("sambert-zhinan-v1"); - // 可选值wav、mp3,默认mp3 + // 可选-输入格式：可选值wav、mp3(默认mp3) // $param->setFormat("mp3"); - + // 可选-返回音频音量，取值范围是0~100。(默认50) + // $param->setVolume(50); + // 可选-返回音频语速，取值范围0.5-2(默认1.0) + // $param->setRate(1.0); + // 可选-返回音频语调，取值范围:0.5-2(默认1.0) + // $param->setPitch(1.0); // 传入语音合成参数和StreamResponseHandler子类实例 $streamClient->synthesizer($param, new class() extends StreamResponseHandler { // 必须重写对应处理器的方法，实时处理返回的二进制流 @@ -171,4 +176,4 @@ vendor/bin/phpunit ## 关于 - API version: `0.4.8` - - Package version: `1.0` + - Package version: `1.1` diff --git a/composer.json b/composer.json index abaa519..1ea4629 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tsl3060/low-carbon-platform", - "version": "1.0", + "version": "1.1", "description": "碳丝路数据开放平台", "keywords": [ "openapitools", diff --git a/docs/Model/SynthesizerParam.md b/docs/Model/SynthesizerParam.md index 52d77a6..9739922 100644 --- a/docs/Model/SynthesizerParam.md +++ b/docs/Model/SynthesizerParam.md @@ -7,5 +7,8 @@ Name | Type | Description | Notes **text** | **string** | 需要转换为语音的文本 | **model** | **string** | 使用的语音合成模型 | **format** | **string** | 生成的音频格式 | +**volume** | **int** | 返回音频音量，取值范围是0~100。(默认50) | +**rate** | **float** | 返回音频语速，取值范围0.5-2(默认1.0) | +**pitch** | **float** | 返回音频语调，取值范围:0.5-2(默认1.0) | [[返回模型列表]](../../README.md#模型文档) [[返回API列表]](../../README.md#api端点文档) [[返回README]](../../README.md) diff --git a/lib/Configuration.php b/lib/Configuration.php index 2f49e11..83332d5 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -100,7 +100,7 @@ class Configuration * * @var string */ - protected $userAgent = 'OpenAPI-Generator/1.0/PHP'; + protected $userAgent = 'OpenAPI-Generator/1.1/PHP'; /** * Debug switch (default set to false) @@ -524,7 +524,7 @@ class Configuration $report .= ' OS: ' . php_uname() . PHP_EOL; $report .= ' PHP Version: ' . PHP_VERSION . PHP_EOL; $report .= ' The version of the OpenAPI document: 0.4.8' . PHP_EOL; - $report .= ' SDK Package Version: 1.0' . PHP_EOL; + $report .= ' SDK Package Version: 1.1' . PHP_EOL; $report .= ' Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL; return $report; diff --git a/lib/Model/SynthesizerParam.php b/lib/Model/SynthesizerParam.php index 50ea94e..cf83b1b 100644 --- a/lib/Model/SynthesizerParam.php +++ b/lib/Model/SynthesizerParam.php @@ -60,7 +60,10 @@ class SynthesizerParam implements ModelInterface, ArrayAccess, \JsonSerializable protected static $openAPITypes = [ 'text' => 'string', 'model' => 'string', - 'format' => 'string' + 'format' => 'string', + 'volume' => 'int', + 'rate' => 'float', + 'pitch' => 'float' ]; /** @@ -73,7 +76,10 @@ class SynthesizerParam implements ModelInterface, ArrayAccess, \JsonSerializable protected static $openAPIFormats = [ 'text' => null, 'model' => null, - 'format' => null + 'format' => null, + 'volume' => 'int32', + 'rate' => 'float', + 'pitch' => 'float' ]; /** @@ -84,7 +90,10 @@ class SynthesizerParam implements ModelInterface, ArrayAccess, \JsonSerializable protected static array $openAPINullables = [ 'text' => false, 'model' => false, - 'format' => false + 'format' => false, + 'volume' => false, + 'rate' => false, + 'pitch' => false ]; /** @@ -175,7 +184,10 @@ class SynthesizerParam implements ModelInterface, ArrayAccess, \JsonSerializable protected static $attributeMap = [ 'text' => 'text', 'model' => 'model', - 'format' => 'format' + 'format' => 'format', + 'volume' => 'volume', + 'rate' => 'rate', + 'pitch' => 'pitch' ]; /** @@ -186,7 +198,10 @@ class SynthesizerParam implements ModelInterface, ArrayAccess, \JsonSerializable protected static $setters = [ 'text' => 'setText', 'model' => 'setModel', - 'format' => 'setFormat' + 'format' => 'setFormat', + 'volume' => 'setVolume', + 'rate' => 'setRate', + 'pitch' => 'setPitch' ]; /** @@ -197,7 +212,10 @@ class SynthesizerParam implements ModelInterface, ArrayAccess, \JsonSerializable protected static $getters = [ 'text' => 'getText', 'model' => 'getModel', - 'format' => 'getFormat' + 'format' => 'getFormat', + 'volume' => 'getVolume', + 'rate' => 'getRate', + 'pitch' => 'getPitch' ]; /** @@ -260,6 +278,9 @@ class SynthesizerParam implements ModelInterface, ArrayAccess, \JsonSerializable $this->setIfExists('text', $data ?? [], null); $this->setIfExists('model', $data ?? [], null); $this->setIfExists('format', $data ?? [], null); + $this->setIfExists('volume', $data ?? [], null); + $this->setIfExists('rate', $data ?? [], null); + $this->setIfExists('pitch', $data ?? [], null); } /** @@ -298,6 +319,15 @@ class SynthesizerParam implements ModelInterface, ArrayAccess, \JsonSerializable if ($this->container['format'] === null) { $invalidProperties[] = "'format' can't be null"; } + if ($this->container['volume'] === null) { + $invalidProperties[] = "'volume' can't be null"; + } + if ($this->container['rate'] === null) { + $invalidProperties[] = "'rate' can't be null"; + } + if ($this->container['pitch'] === null) { + $invalidProperties[] = "'pitch' can't be null"; + } return $invalidProperties; } @@ -393,6 +423,87 @@ class SynthesizerParam implements ModelInterface, ArrayAccess, \JsonSerializable return $this; } + + /** + * Gets volume + * + * @return int + */ + public function getVolume() + { + return $this->container['volume']; + } + + /** + * Sets volume + * + * @param int $volume 返回音频音量，取值范围是0~100。(默认50) + * + * @return self + */ + public function setVolume($volume) + { + if (is_null($volume)) { + throw new \InvalidArgumentException('non-nullable volume cannot be null'); + } + $this->container['volume'] = $volume; + + return $this; + } + + /** + * Gets rate + * + * @return float + */ + public function getRate() + { + return $this->container['rate']; + } + + /** + * Sets rate + * + * @param float $rate 返回音频语速，取值范围0.5-2(默认1.0) + * + * @return self + */ + public function setRate($rate) + { + if (is_null($rate)) { + throw new \InvalidArgumentException('non-nullable rate cannot be null'); + } + $this->container['rate'] = $rate; + + return $this; + } + + /** + * Gets pitch + * + * @return float + */ + public function getPitch() + { + return $this->container['pitch']; + } + + /** + * Sets pitch + * + * @param float $pitch 返回音频语调，取值范围:0.5-2(默认1.0) + * + * @return self + */ + public function setPitch($pitch) + { + if (is_null($pitch)) { + throw new \InvalidArgumentException('non-nullable pitch cannot be null'); + } + $this->container['pitch'] = $pitch; + + return $this; + } /** * Returns true if offset exists. False otherwise. * diff --git a/test/Model/SynthesizerParamTest.php b/test/Model/SynthesizerParamTest.php index efd7e2c..689d3e9 100644 --- a/test/Model/SynthesizerParamTest.php +++ b/test/Model/SynthesizerParamTest.php @@ -105,4 +105,31 @@ class SynthesizerParamTest extends TestCase // TODO: implement $this->markTestIncomplete('Not implemented'); } + + /** + * Test attribute "volume" + */ + public function testPropertyVolume() + { + // TODO: implement + $this->markTestIncomplete('Not implemented'); + } + + /** + * Test attribute "rate" + */ + public function testPropertyRate() + { + // TODO: implement + $this->markTestIncomplete('Not implemented'); + } + + /** + * Test attribute "pitch" + */ + public function testPropertyPitch() + { + // TODO: implement + $this->markTestIncomplete('Not implemented'); + } }