From 92c70e491829ceef04d27ceb03cf9c538a0e9339 Mon Sep 17 00:00:00 2001 From: yangbowen Date: Wed, 3 Apr 2024 10:08:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=9F=E8=AE=A1token?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .openapi-generator/FILES | 12 + .openapi-generator/api-doc-php-sdk.sha256 | 2 +- README.md | 6 +- composer.json | 2 +- docs/Api/AiApi.md | 53 ++++ lib/Api/AiApi.php | 328 ++++++++++++++++++++++ lib/Configuration.php | 4 +- test/Api/AiApiTest.php | 12 + 8 files changed, 414 insertions(+), 5 deletions(-) diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index c98e7dd..684e6ac 100644 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -14,12 +14,18 @@ docs/Model/ChatResult.md docs/Model/ChatResult.md docs/Model/ResponseOpenAPIChatResult.md docs/Model/ResponseOpenAPIChatResult.md +docs/Model/ResponseOpenAPITokensCountResult.md +docs/Model/ResponseOpenAPITokensCountResult.md docs/Model/SpeechResult.md docs/Model/SpeechResult.md docs/Model/StreamModule.md docs/Model/StreamModule.md docs/Model/SynthesizerParam.md docs/Model/SynthesizerParam.md +docs/Model/TokenCountParam.md +docs/Model/TokenCountParam.md +docs/Model/TokensCountResult.md +docs/Model/TokensCountResult.md git_push.sh lib/ApiClient.php lib/ApiException.php @@ -32,9 +38,12 @@ lib/Model/ChatParam.php lib/Model/ChatResult.php lib/Model/ModelInterface.php lib/Model/ResponseOpenAPIChatResult.php +lib/Model/ResponseOpenAPITokensCountResult.php lib/Model/SpeechResult.php lib/Model/StreamModule.php lib/Model/SynthesizerParam.php +lib/Model/TokenCountParam.php +lib/Model/TokensCountResult.php lib/NotifyHandler.php lib/ObjectSerializer.php lib/StreamApiClient.php @@ -44,6 +53,9 @@ test/Api/AiApiTest.php test/Model/ChatParamTest.php test/Model/ChatResultTest.php test/Model/ResponseOpenAPIChatResultTest.php +test/Model/ResponseOpenAPITokensCountResultTest.php test/Model/SpeechResultTest.php test/Model/StreamModuleTest.php test/Model/SynthesizerParamTest.php +test/Model/TokenCountParamTest.php +test/Model/TokensCountResultTest.php diff --git a/.openapi-generator/api-doc-php-sdk.sha256 b/.openapi-generator/api-doc-php-sdk.sha256 index 868ba8e..26698dd 100644 --- a/.openapi-generator/api-doc-php-sdk.sha256 +++ b/.openapi-generator/api-doc-php-sdk.sha256 @@ -1 +1 @@ -5cfee8fe30859348644aa6b9b7f47799fee40915a953feaece9df5bc94c3c8c0 \ No newline at end of file +93328f7a4d67575a1c99daa92560bd0a39e5116d1e4eb8dd9cd149ca46040344 \ No newline at end of file diff --git a/README.md b/README.md index c083c5a..5ef1c2a 100644 --- a/README.md +++ b/README.md @@ -154,15 +154,19 @@ function example() Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- *AiApi* | [**chat**](docs/Api/AiApi.md#chat) | **POST** /v1/ai/chat | 元梦ai-对话 +*AiApi* | [**tokenCount**](docs/Api/AiApi.md#tokencount) | **POST** /v1/ai/tokenCount | 元梦ai-token统计 ## 模型文档 - [ChatParam](docs/Model/ChatParam.md) - [ChatResult](docs/Model/ChatResult.md) - [ResponseOpenAPIChatResult](docs/Model/ResponseOpenAPIChatResult.md) +- [ResponseOpenAPITokensCountResult](docs/Model/ResponseOpenAPITokensCountResult.md) - [SpeechResult](docs/Model/SpeechResult.md) - [StreamModule](docs/Model/StreamModule.md) - [SynthesizerParam](docs/Model/SynthesizerParam.md) +- [TokenCountParam](docs/Model/TokenCountParam.md) +- [TokensCountResult](docs/Model/TokensCountResult.md) ## 测试 @@ -176,4 +180,4 @@ vendor/bin/phpunit ## 关于 - API version: `0.4.8` - - Package version: `1.1` + - Package version: `1.1.1` diff --git a/composer.json b/composer.json index efb897c..5af83f8 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tsl3060/low-carbon-platform", - "version": "1.1.0", + "version": "1.1.1", "description": "碳丝路数据开放平台", "keywords": [ "openapitools", diff --git a/docs/Api/AiApi.md b/docs/Api/AiApi.md index cd3300f..c493e90 100644 --- a/docs/Api/AiApi.md +++ b/docs/Api/AiApi.md @@ -3,6 +3,7 @@ | Method | HTTP request | Description | | ------------- | ------------- | ------------- | | [**chat()**](AiApi.md#chat) | **POST** /v1/ai/chat | 元梦ai-对话 | +| [**tokenCount()**](AiApi.md#tokenCount) | **POST** /v1/ai/tokenCount | 元梦ai-token统计 | ## `chat()` @@ -56,3 +57,55 @@ try { [[回到顶部]](#) [[返回API列表]](../../README.md#api端点文档) [[返回模型列表]](../../README.md#模型文档) [[返回README]](../../README.md) + +## `tokenCount()` + +```php +tokenCount($token_count_param): \OpenAPI\Client\Model\ResponseOpenAPITokensCountResult +``` + +元梦ai-token统计 + +元梦ai,token统计 + +### 示例 + +```php +tokenCount($token_count_param); + print_r($result); +} catch (Exception $e) { + echo 'Exception when calling AiApi->tokenCount: ', $e->getMessage(), PHP_EOL; +} +``` + +### 参数 + +| Name | Type | Description | Notes | +| ------------- | ------------- | ------------- | ------------- | +| **token_count_param** | [**\OpenAPI\Client\Model\TokenCountParam**](../Model/TokenCountParam.md)| | [optional] | + +### 返回类型 + +[**\OpenAPI\Client\Model\ResponseOpenAPITokensCountResult**](../Model/ResponseOpenAPITokensCountResult.md) + +### HTTP请求头 + +- **Content-Type**: `application/json` +- **Accept**: `*/*` + +[[回到顶部]](#) [[返回API列表]](../../README.md#api端点文档) +[[返回模型列表]](../../README.md#模型文档) +[[返回README]](../../README.md) diff --git a/lib/Api/AiApi.php b/lib/Api/AiApi.php index 81a1007..06a54e9 100644 --- a/lib/Api/AiApi.php +++ b/lib/Api/AiApi.php @@ -81,6 +81,9 @@ class AiApi 'chat' => [ 'application/json', ], + 'tokenCount' => [ + 'application/json', + ], ]; /** @@ -455,6 +458,331 @@ class AiApi ); } + /** + * Operation tokenCount + * + * 元梦ai-token统计 + * + * @param \OpenAPI\Client\Model\TokenCountParam $token_count_param token_count_param (optional) + * @param string $contentType The value for the Content-Type header. Check self::contentTypes['tokenCount'] to see the possible values for this operation + * + * @throws \OpenAPI\Client\ApiException on non-2xx response + * @throws \InvalidArgumentException + * @return \OpenAPI\Client\Model\ResponseOpenAPITokensCountResult + */ + public function tokenCount($token_count_param = null, string $contentType = self::contentTypes['tokenCount'][0]) + { + list($response) = $this->tokenCountWithHttpInfo($token_count_param, $contentType); + return $response; + } + + /** + * Operation tokenCountWithHttpInfo + * + * 元梦ai-token统计 + * + * @param \OpenAPI\Client\Model\TokenCountParam $token_count_param (optional) + * @param string $contentType The value for the Content-Type header. Check self::contentTypes['tokenCount'] to see the possible values for this operation + * + * @throws \OpenAPI\Client\ApiException on non-2xx response + * @throws \InvalidArgumentException + * @return array of \OpenAPI\Client\Model\ResponseOpenAPITokensCountResult, HTTP status code, HTTP response headers (array of strings) + */ + public function tokenCountWithHttpInfo($token_count_param = null, string $contentType = self::contentTypes['tokenCount'][0]) + { + $request = $this->tokenCountRequest($token_count_param, $contentType); + + try { + $options = $this->createHttpClientOption(); + try { + $response = $this->client->send($request, $options); + } catch (RequestException $e) { + throw new ApiException( + "[{$e->getCode()}] {$e->getMessage()}", + (int) $e->getCode(), + $e->getResponse() ? $e->getResponse()->getHeaders() : null, + $e->getResponse() ? (string) $e->getResponse()->getBody() : null + ); + } catch (ConnectException $e) { + throw new ApiException( + "[{$e->getCode()}] {$e->getMessage()}", + (int) $e->getCode(), + null, + null + ); + } + + // 响应预处理 + $data = json_decode($response->getBody(), true); + if (json_last_error() !== JSON_ERROR_NONE) { + throw new ApiException("JSON解码错误: " . json_last_error_msg()); + } + + // 验证签名 + if (!$this->apiClient->verifySign($data)) { + throw new ApiException( + 'Verification failed', + $response->getStatusCode(), + $response->getHeaders(), + $response->getBody() + ); + } + + $statusCode = $response->getStatusCode(); + + if ($statusCode < 200 || $statusCode > 299) { + throw new ApiException( + sprintf( + '[%d] Error connecting to the API (%s)', + $statusCode, + (string) $request->getUri() + ), + $statusCode, + $response->getHeaders(), + (string) $response->getBody() + ); + } + + switch($statusCode) { + case 200: + if ('\OpenAPI\Client\Model\ResponseOpenAPITokensCountResult' === '\SplFileObject') { + $content = $response->getBody(); //stream goes to serializer + } else { + $content = (string) $response->getBody(); + if ('\OpenAPI\Client\Model\ResponseOpenAPITokensCountResult' !== 'string') { + $content = json_decode($content); + } + } + + return [ + ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\ResponseOpenAPITokensCountResult', []), + $response->getStatusCode(), + $response->getHeaders() + ]; + } + + $returnType = '\OpenAPI\Client\Model\ResponseOpenAPITokensCountResult'; + if ($returnType === '\SplFileObject') { + $content = $response->getBody(); //stream goes to serializer + } else { + $content = (string) $response->getBody(); + if ($returnType !== 'string') { + $content = json_decode($content); + } + } + + return [ + ObjectSerializer::deserialize($content, $returnType, []), + $response->getStatusCode(), + $response->getHeaders() + ]; + + } catch (ApiException $e) { + switch ($e->getCode()) { + case 200: + $data = ObjectSerializer::deserialize( + $e->getResponseBody(), + '\OpenAPI\Client\Model\ResponseOpenAPITokensCountResult', + $e->getResponseHeaders() + ); + $e->setResponseObject($data); + break; + } + throw $e; + } + } + + /** + * Operation tokenCountAsync + * + * 元梦ai-token统计 + * + * @param \OpenAPI\Client\Model\TokenCountParam $token_count_param (optional) + * @param string $contentType The value for the Content-Type header. Check self::contentTypes['tokenCount'] to see the possible values for this operation + * + * @throws \InvalidArgumentException + * @return \GuzzleHttp\Promise\PromiseInterface + */ + public function tokenCountAsync($token_count_param = null, string $contentType = self::contentTypes['tokenCount'][0]) + { + return $this->tokenCountAsyncWithHttpInfo($token_count_param, $contentType) + ->then( + function ($response) { + return $response[0]; + } + ); + } + + /** + * Operation tokenCountAsyncWithHttpInfo + * + * 元梦ai-token统计 + * + * @param \OpenAPI\Client\Model\TokenCountParam $token_count_param (optional) + * @param string $contentType The value for the Content-Type header. Check self::contentTypes['tokenCount'] to see the possible values for this operation + * + * @throws \InvalidArgumentException + * @return \GuzzleHttp\Promise\PromiseInterface + */ + public function tokenCountAsyncWithHttpInfo($token_count_param = null, string $contentType = self::contentTypes['tokenCount'][0]) + { + $returnType = '\OpenAPI\Client\Model\ResponseOpenAPITokensCountResult'; + $request = $this->tokenCountRequest($token_count_param, $contentType); + + return $this->client + ->sendAsync($request, $this->createHttpClientOption()) + ->then( + function ($response) use ($returnType) { + if ($returnType === '\SplFileObject') { + $content = $response->getBody(); //stream goes to serializer + } else { + $content = (string) $response->getBody(); + if ($returnType !== 'string') { + $content = json_decode($content); + } + } + + return [ + ObjectSerializer::deserialize($content, $returnType, []), + $response->getStatusCode(), + $response->getHeaders() + ]; + }, + function ($exception) { + $response = $exception->getResponse(); + $statusCode = $response->getStatusCode(); + throw new ApiException( + sprintf( + '[%d] Error connecting to the API (%s)', + $statusCode, + $exception->getRequest()->getUri() + ), + $statusCode, + $response->getHeaders(), + (string) $response->getBody() + ); + } + ); + } + + /** + * Create request for operation 'tokenCount' + * + * @param \OpenAPI\Client\Model\TokenCountParam $token_count_param (optional) + * @param string $contentType The value for the Content-Type header. Check self::contentTypes['tokenCount'] to see the possible values for this operation + * + * @throws \InvalidArgumentException + * @return \GuzzleHttp\Psr7\Request + */ + public function tokenCountRequest($token_count_param = null, string $contentType = self::contentTypes['tokenCount'][0]) + { + + + + $resourcePath = '/v1/ai/tokenCount'; + $formParams = []; + $queryParams = []; + $headerParams = []; + $httpBody = ''; + $multipart = false; + + + + + + $headers = $this->headerSelector->selectHeaders( + ['*/*', ], + $contentType, + $multipart + ); + + // for model (json/xml) + if (isset($token_count_param)) { + if (stripos($headers['Content-Type'], 'application/json') !== false) { + # if Content-Type contains "application/json", json_encode the body + $httpBody = \GuzzleHttp\Utils::jsonEncode(ObjectSerializer::sanitizeForSerialization($token_count_param)); + } else { + $httpBody = $token_count_param; + } + } elseif (count($formParams) > 0) { + if ($multipart) { + $multipartContents = []; + foreach ($formParams as $formParamName => $formParamValue) { + $formParamValueItems = is_array($formParamValue) ? $formParamValue : [$formParamValue]; + foreach ($formParamValueItems as $formParamValueItem) { + $multipartContents[] = [ + 'name' => $formParamName, + 'contents' => $formParamValueItem + ]; + } + } + // for HTTP post (form) + $httpBody = new MultipartStream($multipartContents); + + } elseif (stripos($headers['Content-Type'], 'application/json') !== false) { + # if Content-Type contains "application/json", json_encode the form parameters + $httpBody = \GuzzleHttp\Utils::jsonEncode($formParams); + } else { + // for HTTP post (form) + $httpBody = ObjectSerializer::buildQuery($formParams); + } + } + + + // 初始化额外的参数 + $additionalParams = [ + 'payload' => json_decode($httpBody, true), + 'path' => $resourcePath, + 'charset' => $this->config->getCharset(), + 'time' => date($this->config->getDataFormat(), time()), + 'sign_type' => $this->config->getSignType(), + 'access_token' => '', + 'app_id' => $this->config->getAppid(), + 'sign' => '' + ]; + + $additionalParams['sign'] = $this->apiClient->requestSign($additionalParams); + + // 根据Content-Type决定如何合并额外的参数 + if (stripos($headers['Content-Type'], 'application/json') !== false) { + // 如果是application/json，将额外的参数合并到现有的JSON对象中 + $existingParams = json_decode($httpBody, true); + if ($existingParams === null) { + $existingParams = []; + } + $mergedParams = array_merge($existingParams, $additionalParams); + $httpBody = json_encode($mergedParams, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); + } else { + // 如果不是application/json，将额外的参数合并到现有的查询字符串中 + $existingParams = []; + if ($httpBody != null) { + parse_str($httpBody, $existingParams); + } + $mergedParams = array_merge($existingParams, $additionalParams); + $httpBody = ObjectSerializer::buildQuery($mergedParams); + } + + $defaultHeaders = []; + if ($this->config->getUserAgent()) { + $defaultHeaders['User-Agent'] = $this->config->getUserAgent(); + } + + $headers = array_merge( + $defaultHeaders, + $headerParams, + $headers + ); + + $operationHost = $this->config->getHost(); + $query = ObjectSerializer::buildQuery($queryParams); + return new Request( + 'POST', + $operationHost . $resourcePath . ($query ? "?{$query}" : ''), + $headers, + $httpBody + ); + } + /** * Create http client option * diff --git a/lib/Configuration.php b/lib/Configuration.php index 83332d5..f8b61da 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -100,7 +100,7 @@ class Configuration * * @var string */ - protected $userAgent = 'OpenAPI-Generator/1.1/PHP'; + protected $userAgent = 'OpenAPI-Generator/1.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.1' . PHP_EOL; + $report .= ' SDK Package Version: 1.1.1' . PHP_EOL; $report .= ' Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL; return $report; diff --git a/test/Api/AiApiTest.php b/test/Api/AiApiTest.php index 5b3f454..bdbe50b 100644 --- a/test/Api/AiApiTest.php +++ b/test/Api/AiApiTest.php @@ -82,4 +82,16 @@ class AiApiTest extends TestCase // TODO: implement $this->markTestIncomplete('Not implemented'); } + + /** + * Test case for tokenCount + * + * 元梦ai-token统计. + * + */ + public function testTokenCount() + { + // TODO: implement + $this->markTestIncomplete('Not implemented'); + } }