alibabacloud-quanmiaolightapp20240801 2.11.1__py3-none-any.whl → 2.12.1__py3-none-any.whl

alibabacloud_quanmiaolightapp20240801/__init__.py

@@ -1 +1 @@
-__version__ = '2.11.1'
+__version__ = '2.12.1'

alibabacloud_quanmiaolightapp20240801/client.py

@@ -3410,6 +3410,8 @@ class Client(OpenApiClient):
             body['snapshotInterval'] = request.snapshot_interval
         if not UtilClient.is_unset(request.split_interval):
             body['splitInterval'] = request.split_interval
+        if not UtilClient.is_unset(request.split_type):
+            body['splitType'] = request.split_type
         if not UtilClient.is_unset(request.task_id):
             body['taskId'] = request.task_id
         if not UtilClient.is_unset(request.text_process_tasks_shrink):
@@ -3503,6 +3505,8 @@ class Client(OpenApiClient):
             body['snapshotInterval'] = request.snapshot_interval
         if not UtilClient.is_unset(request.split_interval):
             body['splitInterval'] = request.split_interval
+        if not UtilClient.is_unset(request.split_type):
+            body['splitType'] = request.split_type
         if not UtilClient.is_unset(request.task_id):
             body['taskId'] = request.task_id
         if not UtilClient.is_unset(request.text_process_tasks_shrink):
@@ -4082,6 +4086,8 @@ class Client(OpenApiClient):
             body['snapshotInterval'] = request.snapshot_interval
         if not UtilClient.is_unset(request.split_interval):
             body['splitInterval'] = request.split_interval
+        if not UtilClient.is_unset(request.split_type):
+            body['splitType'] = request.split_type
         if not UtilClient.is_unset(request.text_process_tasks_shrink):
             body['textProcessTasks'] = request.text_process_tasks_shrink
         if not UtilClient.is_unset(request.video_caption_info_shrink):
@@ -4173,6 +4179,8 @@ class Client(OpenApiClient):
             body['snapshotInterval'] = request.snapshot_interval
         if not UtilClient.is_unset(request.split_interval):
             body['splitInterval'] = request.split_interval
+        if not UtilClient.is_unset(request.split_type):
+            body['splitType'] = request.split_type
         if not UtilClient.is_unset(request.text_process_tasks_shrink):
             body['textProcessTasks'] = request.text_process_tasks_shrink
         if not UtilClient.is_unset(request.video_caption_info_shrink):
@@ -4458,3 +4466,123 @@ class Client(OpenApiClient):
         runtime = util_models.RuntimeOptions()
         headers = {}
         return await self.update_video_analysis_task_with_options_async(workspace_id, request, headers, runtime)
+
+    def update_video_analysis_tasks_with_options(
+        self,
+        workspace_id: str,
+        tmp_req: quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksRequest,
+        headers: Dict[str, str],
+        runtime: util_models.RuntimeOptions,
+    ) -> quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksResponse:
+        """
+        @summary 视频理解-批量修改任务状态
+        
+        @param tmp_req: UpdateVideoAnalysisTasksRequest
+        @param headers: map
+        @param runtime: runtime options for this request RuntimeOptions
+        @return: UpdateVideoAnalysisTasksResponse
+        """
+        UtilClient.validate_model(tmp_req)
+        request = quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksShrinkRequest()
+        OpenApiUtilClient.convert(tmp_req, request)
+        if not UtilClient.is_unset(tmp_req.task_ids):
+            request.task_ids_shrink = OpenApiUtilClient.array_to_string_with_specified_style(tmp_req.task_ids, 'taskIds', 'json')
+        body = {}
+        if not UtilClient.is_unset(request.task_ids_shrink):
+            body['taskIds'] = request.task_ids_shrink
+        if not UtilClient.is_unset(request.task_status):
+            body['taskStatus'] = request.task_status
+        req = open_api_models.OpenApiRequest(
+            headers=headers,
+            body=OpenApiUtilClient.parse_to_map(body)
+        )
+        params = open_api_models.Params(
+            action='UpdateVideoAnalysisTasks',
+            version='2024-08-01',
+            protocol='HTTPS',
+            pathname=f'/{OpenApiUtilClient.get_encode_param(workspace_id)}/quanmiao/lightapp/videoAnalysis/updateVideoAnalysisTasks',
+            method='PUT',
+            auth_type='AK',
+            style='ROA',
+            req_body_type='formData',
+            body_type='json'
+        )
+        return TeaCore.from_map(
+            quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksResponse(),
+            self.call_api(params, req, runtime)
+        )
+
+    async def update_video_analysis_tasks_with_options_async(
+        self,
+        workspace_id: str,
+        tmp_req: quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksRequest,
+        headers: Dict[str, str],
+        runtime: util_models.RuntimeOptions,
+    ) -> quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksResponse:
+        """
+        @summary 视频理解-批量修改任务状态
+        
+        @param tmp_req: UpdateVideoAnalysisTasksRequest
+        @param headers: map
+        @param runtime: runtime options for this request RuntimeOptions
+        @return: UpdateVideoAnalysisTasksResponse
+        """
+        UtilClient.validate_model(tmp_req)
+        request = quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksShrinkRequest()
+        OpenApiUtilClient.convert(tmp_req, request)
+        if not UtilClient.is_unset(tmp_req.task_ids):
+            request.task_ids_shrink = OpenApiUtilClient.array_to_string_with_specified_style(tmp_req.task_ids, 'taskIds', 'json')
+        body = {}
+        if not UtilClient.is_unset(request.task_ids_shrink):
+            body['taskIds'] = request.task_ids_shrink
+        if not UtilClient.is_unset(request.task_status):
+            body['taskStatus'] = request.task_status
+        req = open_api_models.OpenApiRequest(
+            headers=headers,
+            body=OpenApiUtilClient.parse_to_map(body)
+        )
+        params = open_api_models.Params(
+            action='UpdateVideoAnalysisTasks',
+            version='2024-08-01',
+            protocol='HTTPS',
+            pathname=f'/{OpenApiUtilClient.get_encode_param(workspace_id)}/quanmiao/lightapp/videoAnalysis/updateVideoAnalysisTasks',
+            method='PUT',
+            auth_type='AK',
+            style='ROA',
+            req_body_type='formData',
+            body_type='json'
+        )
+        return TeaCore.from_map(
+            quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksResponse(),
+            await self.call_api_async(params, req, runtime)
+        )
+
+    def update_video_analysis_tasks(
+        self,
+        workspace_id: str,
+        request: quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksRequest,
+    ) -> quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksResponse:
+        """
+        @summary 视频理解-批量修改任务状态
+        
+        @param request: UpdateVideoAnalysisTasksRequest
+        @return: UpdateVideoAnalysisTasksResponse
+        """
+        runtime = util_models.RuntimeOptions()
+        headers = {}
+        return self.update_video_analysis_tasks_with_options(workspace_id, request, headers, runtime)
+
+    async def update_video_analysis_tasks_async(
+        self,
+        workspace_id: str,
+        request: quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksRequest,
+    ) -> quan_miao_light_app_20240801_models.UpdateVideoAnalysisTasksResponse:
+        """
+        @summary 视频理解-批量修改任务状态
+        
+        @param request: UpdateVideoAnalysisTasksRequest
+        @return: UpdateVideoAnalysisTasksResponse
+        """
+        runtime = util_models.RuntimeOptions()
+        headers = {}
+        return await self.update_video_analysis_tasks_with_options_async(workspace_id, request, headers, runtime)

alibabacloud_quanmiaolightapp20240801/models.py

@@ -10241,6 +10241,7 @@ class RunVideoAnalysisRequest(TeaModel):
         original_session_id: str = None,
         snapshot_interval: float = None,
         split_interval: int = None,
+        split_type: str = None,
         task_id: str = None,
         text_process_tasks: List[RunVideoAnalysisRequestTextProcessTasks] = None,
         video_caption_info: RunVideoAnalysisRequestVideoCaptionInfo = None,
@@ -10263,6 +10264,7 @@ class RunVideoAnalysisRequest(TeaModel):
         self.original_session_id = original_session_id
         self.snapshot_interval = snapshot_interval
         self.split_interval = split_interval
+        self.split_type = split_type
         self.task_id = task_id
         self.text_process_tasks = text_process_tasks
         self.video_caption_info = video_caption_info
@@ -10317,6 +10319,8 @@ class RunVideoAnalysisRequest(TeaModel):
             result['snapshotInterval'] = self.snapshot_interval
         if self.split_interval is not None:
             result['splitInterval'] = self.split_interval
+        if self.split_type is not None:
+            result['splitType'] = self.split_type
         if self.task_id is not None:
             result['taskId'] = self.task_id
         result['textProcessTasks'] = []
@@ -10368,6 +10372,8 @@ class RunVideoAnalysisRequest(TeaModel):
             self.snapshot_interval = m.get('snapshotInterval')
         if m.get('splitInterval') is not None:
             self.split_interval = m.get('splitInterval')
+        if m.get('splitType') is not None:
+            self.split_type = m.get('splitType')
         if m.get('taskId') is not None:
             self.task_id = m.get('taskId')
         self.text_process_tasks = []
@@ -10411,6 +10417,7 @@ class RunVideoAnalysisShrinkRequest(TeaModel):
         original_session_id: str = None,
         snapshot_interval: float = None,
         split_interval: int = None,
+        split_type: str = None,
         task_id: str = None,
         text_process_tasks_shrink: str = None,
         video_caption_info_shrink: str = None,
@@ -10433,6 +10440,7 @@ class RunVideoAnalysisShrinkRequest(TeaModel):
         self.original_session_id = original_session_id
         self.snapshot_interval = snapshot_interval
         self.split_interval = split_interval
+        self.split_type = split_type
         self.task_id = task_id
         self.text_process_tasks_shrink = text_process_tasks_shrink
         self.video_caption_info_shrink = video_caption_info_shrink
@@ -10476,6 +10484,8 @@ class RunVideoAnalysisShrinkRequest(TeaModel):
             result['snapshotInterval'] = self.snapshot_interval
         if self.split_interval is not None:
             result['splitInterval'] = self.split_interval
+        if self.split_type is not None:
+            result['splitType'] = self.split_type
         if self.task_id is not None:
             result['taskId'] = self.task_id
         if self.text_process_tasks_shrink is not None:
@@ -10522,6 +10532,8 @@ class RunVideoAnalysisShrinkRequest(TeaModel):
             self.snapshot_interval = m.get('snapshotInterval')
         if m.get('splitInterval') is not None:
             self.split_interval = m.get('splitInterval')
+        if m.get('splitType') is not None:
+            self.split_type = m.get('splitType')
         if m.get('taskId') is not None:
             self.task_id = m.get('taskId')
         if m.get('textProcessTasks') is not None:
@@ -13215,6 +13227,7 @@ class SubmitVideoAnalysisTaskRequest(TeaModel):
         model_id: str = None,
         snapshot_interval: float = None,
         split_interval: int = None,
+        split_type: str = None,
         text_process_tasks: List[SubmitVideoAnalysisTaskRequestTextProcessTasks] = None,
         video_caption_info: SubmitVideoAnalysisTaskRequestVideoCaptionInfo = None,
         video_extra_info: str = None,
@@ -13236,6 +13249,7 @@ class SubmitVideoAnalysisTaskRequest(TeaModel):
         self.model_id = model_id
         self.snapshot_interval = snapshot_interval
         self.split_interval = split_interval
+        self.split_type = split_type
         self.text_process_tasks = text_process_tasks
         self.video_caption_info = video_caption_info
         self.video_extra_info = video_extra_info
@@ -13290,6 +13304,8 @@ class SubmitVideoAnalysisTaskRequest(TeaModel):
             result['snapshotInterval'] = self.snapshot_interval
         if self.split_interval is not None:
             result['splitInterval'] = self.split_interval
+        if self.split_type is not None:
+            result['splitType'] = self.split_type
         result['textProcessTasks'] = []
         if self.text_process_tasks is not None:
             for k in self.text_process_tasks:
@@ -13339,6 +13355,8 @@ class SubmitVideoAnalysisTaskRequest(TeaModel):
             self.snapshot_interval = m.get('snapshotInterval')
         if m.get('splitInterval') is not None:
             self.split_interval = m.get('splitInterval')
+        if m.get('splitType') is not None:
+            self.split_type = m.get('splitType')
         self.text_process_tasks = []
         if m.get('textProcessTasks') is not None:
             for k in m.get('textProcessTasks'):
@@ -13380,6 +13398,7 @@ class SubmitVideoAnalysisTaskShrinkRequest(TeaModel):
         model_id: str = None,
         snapshot_interval: float = None,
         split_interval: int = None,
+        split_type: str = None,
         text_process_tasks_shrink: str = None,
         video_caption_info_shrink: str = None,
         video_extra_info: str = None,
@@ -13401,6 +13420,7 @@ class SubmitVideoAnalysisTaskShrinkRequest(TeaModel):
         self.model_id = model_id
         self.snapshot_interval = snapshot_interval
         self.split_interval = split_interval
+        self.split_type = split_type
         self.text_process_tasks_shrink = text_process_tasks_shrink
         self.video_caption_info_shrink = video_caption_info_shrink
         self.video_extra_info = video_extra_info
@@ -13444,6 +13464,8 @@ class SubmitVideoAnalysisTaskShrinkRequest(TeaModel):
             result['snapshotInterval'] = self.snapshot_interval
         if self.split_interval is not None:
             result['splitInterval'] = self.split_interval
+        if self.split_type is not None:
+            result['splitType'] = self.split_type
         if self.text_process_tasks_shrink is not None:
             result['textProcessTasks'] = self.text_process_tasks_shrink
         if self.video_caption_info_shrink is not None:
@@ -13488,6 +13510,8 @@ class SubmitVideoAnalysisTaskShrinkRequest(TeaModel):
             self.snapshot_interval = m.get('snapshotInterval')
         if m.get('splitInterval') is not None:
             self.split_interval = m.get('splitInterval')
+        if m.get('splitType') is not None:
+            self.split_type = m.get('splitType')
         if m.get('textProcessTasks') is not None:
             self.text_process_tasks_shrink = m.get('textProcessTasks')
         if m.get('videoCaptionInfo') is not None:
@@ -13929,3 +13953,225 @@ class UpdateVideoAnalysisTaskResponse(TeaModel):
         return self
 
 
+class UpdateVideoAnalysisTasksRequest(TeaModel):
+    def __init__(
+        self,
+        task_ids: List[str] = None,
+        task_status: str = None,
+    ):
+        # This parameter is required.
+        self.task_ids = task_ids
+        # This parameter is required.
+        self.task_status = task_status
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.task_ids is not None:
+            result['taskIds'] = self.task_ids
+        if self.task_status is not None:
+            result['taskStatus'] = self.task_status
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('taskIds') is not None:
+            self.task_ids = m.get('taskIds')
+        if m.get('taskStatus') is not None:
+            self.task_status = m.get('taskStatus')
+        return self
+
+
+class UpdateVideoAnalysisTasksShrinkRequest(TeaModel):
+    def __init__(
+        self,
+        task_ids_shrink: str = None,
+        task_status: str = None,
+    ):
+        # This parameter is required.
+        self.task_ids_shrink = task_ids_shrink
+        # This parameter is required.
+        self.task_status = task_status
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.task_ids_shrink is not None:
+            result['taskIds'] = self.task_ids_shrink
+        if self.task_status is not None:
+            result['taskStatus'] = self.task_status
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('taskIds') is not None:
+            self.task_ids_shrink = m.get('taskIds')
+        if m.get('taskStatus') is not None:
+            self.task_status = m.get('taskStatus')
+        return self
+
+
+class UpdateVideoAnalysisTasksResponseBodyData(TeaModel):
+    def __init__(
+        self,
+        task_error_code: str = None,
+        task_error_message: str = None,
+        task_id: str = None,
+        task_status: str = None,
+    ):
+        self.task_error_code = task_error_code
+        self.task_error_message = task_error_message
+        self.task_id = task_id
+        self.task_status = task_status
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.task_error_code is not None:
+            result['taskErrorCode'] = self.task_error_code
+        if self.task_error_message is not None:
+            result['taskErrorMessage'] = self.task_error_message
+        if self.task_id is not None:
+            result['taskId'] = self.task_id
+        if self.task_status is not None:
+            result['taskStatus'] = self.task_status
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('taskErrorCode') is not None:
+            self.task_error_code = m.get('taskErrorCode')
+        if m.get('taskErrorMessage') is not None:
+            self.task_error_message = m.get('taskErrorMessage')
+        if m.get('taskId') is not None:
+            self.task_id = m.get('taskId')
+        if m.get('taskStatus') is not None:
+            self.task_status = m.get('taskStatus')
+        return self
+
+
+class UpdateVideoAnalysisTasksResponseBody(TeaModel):
+    def __init__(
+        self,
+        code: str = None,
+        data: List[UpdateVideoAnalysisTasksResponseBodyData] = None,
+        http_status_code: int = None,
+        message: str = None,
+        request_id: str = None,
+        success: bool = None,
+    ):
+        self.code = code
+        self.data = data
+        self.http_status_code = http_status_code
+        self.message = message
+        # Id of the request
+        self.request_id = request_id
+        self.success = success
+
+    def validate(self):
+        if self.data:
+            for k in self.data:
+                if k:
+                    k.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.code is not None:
+            result['code'] = self.code
+        result['data'] = []
+        if self.data is not None:
+            for k in self.data:
+                result['data'].append(k.to_map() if k else None)
+        if self.http_status_code is not None:
+            result['httpStatusCode'] = self.http_status_code
+        if self.message is not None:
+            result['message'] = self.message
+        if self.request_id is not None:
+            result['requestId'] = self.request_id
+        if self.success is not None:
+            result['success'] = self.success
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('code') is not None:
+            self.code = m.get('code')
+        self.data = []
+        if m.get('data') is not None:
+            for k in m.get('data'):
+                temp_model = UpdateVideoAnalysisTasksResponseBodyData()
+                self.data.append(temp_model.from_map(k))
+        if m.get('httpStatusCode') is not None:
+            self.http_status_code = m.get('httpStatusCode')
+        if m.get('message') is not None:
+            self.message = m.get('message')
+        if m.get('requestId') is not None:
+            self.request_id = m.get('requestId')
+        if m.get('success') is not None:
+            self.success = m.get('success')
+        return self
+
+
+class UpdateVideoAnalysisTasksResponse(TeaModel):
+    def __init__(
+        self,
+        headers: Dict[str, str] = None,
+        status_code: int = None,
+        body: UpdateVideoAnalysisTasksResponseBody = None,
+    ):
+        self.headers = headers
+        self.status_code = status_code
+        self.body = body
+
+    def validate(self):
+        if self.body:
+            self.body.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.headers is not None:
+            result['headers'] = self.headers
+        if self.status_code is not None:
+            result['statusCode'] = self.status_code
+        if self.body is not None:
+            result['body'] = self.body.to_map()
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('headers') is not None:
+            self.headers = m.get('headers')
+        if m.get('statusCode') is not None:
+            self.status_code = m.get('statusCode')
+        if m.get('body') is not None:
+            temp_model = UpdateVideoAnalysisTasksResponseBody()
+            self.body = temp_model.from_map(m['body'])
+        return self
+
+

{alibabacloud_quanmiaolightapp20240801-2.11.1.dist-info → alibabacloud_quanmiaolightapp20240801-2.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibabacloud-quanmiaolightapp20240801
-Version: 2.11.1
+Version: 2.12.1
 Summary: Alibaba Cloud QuanMiaoLightApp (20240801) SDK Library for Python
 Home-page: https://github.com/aliyun/alibabacloud-python-sdk
 Author: Alibaba Cloud SDK

alibabacloud_quanmiaolightapp20240801-2.12.1.dist-info/RECORD

@@ -0,0 +1,8 @@
+alibabacloud_quanmiaolightapp20240801/__init__.py,sha256=rtmNKcIFEk8U_KEro50ecPj4EoxFWGsF66wtEh75DSk,22
+alibabacloud_quanmiaolightapp20240801/client.py,sha256=EgZrtGn62hOdKAj31_GqiVPGux3gakQW7MTUx7p83jQ,202211
+alibabacloud_quanmiaolightapp20240801/models.py,sha256=NVcIHbm7s3vI-mvrMmrqCuPEme6HREwGDQr_yHDNkKU,472657
+alibabacloud_quanmiaolightapp20240801-2.12.1.dist-info/LICENSE,sha256=0CFItL6bHvxqS44T6vlLoW2R4Zaic304OO3WxN0oXF0,600
+alibabacloud_quanmiaolightapp20240801-2.12.1.dist-info/METADATA,sha256=_4KNbt-kg9TClG23rr6lE07NE_C5aVoLj5F52ujh2F0,2404
+alibabacloud_quanmiaolightapp20240801-2.12.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+alibabacloud_quanmiaolightapp20240801-2.12.1.dist-info/top_level.txt,sha256=8OeD8NiIhtrm1c4lX_9fGb1YEX3tX01Q8FcLZMKbXlE,38
+alibabacloud_quanmiaolightapp20240801-2.12.1.dist-info/RECORD,,

alibabacloud_quanmiaolightapp20240801-2.11.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-alibabacloud_quanmiaolightapp20240801/__init__.py,sha256=rWME_42XD6Gfttla18Ulg4geAN5QI-FeSJBg2S6fMoA,22
-alibabacloud_quanmiaolightapp20240801/client.py,sha256=1pM69GyCY2pARwKSIzDjG7jc7p-TWa3Q2F20Xfc8BQs,196517
-alibabacloud_quanmiaolightapp20240801/models.py,sha256=xIB8fd3RbjZNBq1VzZWHkZV9dx5xOQjmTVdD_6Z8fuU,464835
-alibabacloud_quanmiaolightapp20240801-2.11.1.dist-info/LICENSE,sha256=0CFItL6bHvxqS44T6vlLoW2R4Zaic304OO3WxN0oXF0,600
-alibabacloud_quanmiaolightapp20240801-2.11.1.dist-info/METADATA,sha256=1QpKbB0d1ZpDaDi7BrBQnFZ70eZUoF_iYrvz4QTY0n0,2404
-alibabacloud_quanmiaolightapp20240801-2.11.1.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-alibabacloud_quanmiaolightapp20240801-2.11.1.dist-info/top_level.txt,sha256=8OeD8NiIhtrm1c4lX_9fGb1YEX3tX01Q8FcLZMKbXlE,38
-alibabacloud_quanmiaolightapp20240801-2.11.1.dist-info/RECORD,,