alibabacloud-iqs20241111 1.5.1__tar.gz → 1.6.0__tar.gz

{alibabacloud_iqs20241111-1.5.1 → alibabacloud_iqs20241111-1.6.0}/ChangeLog.md

@@ -1,3 +1,9 @@
+2025-10-10 Version: 1.5.2
+- Generated python 2024-11-11 for IQS.
+
+2025-10-10 Version: 1.5.1
+- Generated python 2024-11-11 for IQS.
+
 2025-10-10 Version: 1.5.0
 - Support API ReadPageBasic.
 - Update API GenericSearch: add request parameters returnRichMainBody.

{alibabacloud_iqs20241111-1.5.1 → alibabacloud_iqs20241111-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibabacloud_iqs20241111
-Version: 1.5.1
+Version: 1.6.0
 Summary: Alibaba Cloud IQS (20241111) SDK Library for Python
 Home-page: https://github.com/aliyun/alibabacloud-python-sdk
 Author: Alibaba Cloud SDK

alibabacloud_iqs20241111-1.6.0/alibabacloud_iqs20241111/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.6.0'

{alibabacloud_iqs20241111-1.5.1 → alibabacloud_iqs20241111-1.6.0}/alibabacloud_iqs20241111/client.py

@@ -279,20 +279,26 @@ class Client(OpenApiClient):
 
     def generic_search_with_options(
         self,
-        request: iqs20241111_models.GenericSearchRequest,
+        tmp_req: iqs20241111_models.GenericSearchRequest,
         headers: Dict[str, str],
         runtime: util_models.RuntimeOptions,
     ) -> iqs20241111_models.GenericSearchResponse:
         """
         @summary 通用搜索
         
-        @param request: GenericSearchRequest
+        @param tmp_req: GenericSearchRequest
         @param headers: map
         @param runtime: runtime options for this request RuntimeOptions
         @return: GenericSearchResponse
         """
-        UtilClient.validate_model(request)
+        UtilClient.validate_model(tmp_req)
+        request = iqs20241111_models.GenericSearchShrinkRequest()
+        OpenApiUtilClient.convert(tmp_req, request)
+        if not UtilClient.is_unset(tmp_req.advanced_params):
+            request.advanced_params_shrink = OpenApiUtilClient.array_to_string_with_specified_style(tmp_req.advanced_params, 'advancedParams', 'json')
         query = {}
+        if not UtilClient.is_unset(request.advanced_params_shrink):
+            query['advancedParams'] = request.advanced_params_shrink
         if not UtilClient.is_unset(request.enable_rerank):
             query['enableRerank'] = request.enable_rerank
         if not UtilClient.is_unset(request.industry):
@@ -335,20 +341,26 @@ class Client(OpenApiClient):
 
     async def generic_search_with_options_async(
         self,
-        request: iqs20241111_models.GenericSearchRequest,
+        tmp_req: iqs20241111_models.GenericSearchRequest,
         headers: Dict[str, str],
         runtime: util_models.RuntimeOptions,
     ) -> iqs20241111_models.GenericSearchResponse:
         """
         @summary 通用搜索
         
-        @param request: GenericSearchRequest
+        @param tmp_req: GenericSearchRequest
         @param headers: map
         @param runtime: runtime options for this request RuntimeOptions
         @return: GenericSearchResponse
         """
-        UtilClient.validate_model(request)
+        UtilClient.validate_model(tmp_req)
+        request = iqs20241111_models.GenericSearchShrinkRequest()
+        OpenApiUtilClient.convert(tmp_req, request)
+        if not UtilClient.is_unset(tmp_req.advanced_params):
+            request.advanced_params_shrink = OpenApiUtilClient.array_to_string_with_specified_style(tmp_req.advanced_params, 'advancedParams', 'json')
         query = {}
+        if not UtilClient.is_unset(request.advanced_params_shrink):
+            query['advancedParams'] = request.advanced_params_shrink
         if not UtilClient.is_unset(request.enable_rerank):
             query['enableRerank'] = request.enable_rerank
         if not UtilClient.is_unset(request.industry):
@@ -739,6 +751,104 @@ class Client(OpenApiClient):
         headers = {}
         return await self.read_page_basic_with_options_async(request, headers, runtime)
 
+    def read_page_scrape_with_options(
+        self,
+        request: iqs20241111_models.ReadPageScrapeRequest,
+        headers: Dict[str, str],
+        runtime: util_models.RuntimeOptions,
+    ) -> iqs20241111_models.ReadPageScrapeResponse:
+        """
+        @summary 动态页面解析
+        
+        @param request: ReadPageScrapeRequest
+        @param headers: map
+        @param runtime: runtime options for this request RuntimeOptions
+        @return: ReadPageScrapeResponse
+        """
+        UtilClient.validate_model(request)
+        req = open_api_models.OpenApiRequest(
+            headers=headers,
+            body=OpenApiUtilClient.parse_to_map(request.body)
+        )
+        params = open_api_models.Params(
+            action='ReadPageScrape',
+            version='2024-11-11',
+            protocol='HTTPS',
+            pathname=f'/linked-retrieval/linked-retrieval-entry/v1/iqs/readpage/scrape',
+            method='POST',
+            auth_type='AK',
+            style='ROA',
+            req_body_type='json',
+            body_type='json'
+        )
+        return TeaCore.from_map(
+            iqs20241111_models.ReadPageScrapeResponse(),
+            self.call_api(params, req, runtime)
+        )
+
+    async def read_page_scrape_with_options_async(
+        self,
+        request: iqs20241111_models.ReadPageScrapeRequest,
+        headers: Dict[str, str],
+        runtime: util_models.RuntimeOptions,
+    ) -> iqs20241111_models.ReadPageScrapeResponse:
+        """
+        @summary 动态页面解析
+        
+        @param request: ReadPageScrapeRequest
+        @param headers: map
+        @param runtime: runtime options for this request RuntimeOptions
+        @return: ReadPageScrapeResponse
+        """
+        UtilClient.validate_model(request)
+        req = open_api_models.OpenApiRequest(
+            headers=headers,
+            body=OpenApiUtilClient.parse_to_map(request.body)
+        )
+        params = open_api_models.Params(
+            action='ReadPageScrape',
+            version='2024-11-11',
+            protocol='HTTPS',
+            pathname=f'/linked-retrieval/linked-retrieval-entry/v1/iqs/readpage/scrape',
+            method='POST',
+            auth_type='AK',
+            style='ROA',
+            req_body_type='json',
+            body_type='json'
+        )
+        return TeaCore.from_map(
+            iqs20241111_models.ReadPageScrapeResponse(),
+            await self.call_api_async(params, req, runtime)
+        )
+
+    def read_page_scrape(
+        self,
+        request: iqs20241111_models.ReadPageScrapeRequest,
+    ) -> iqs20241111_models.ReadPageScrapeResponse:
+        """
+        @summary 动态页面解析
+        
+        @param request: ReadPageScrapeRequest
+        @return: ReadPageScrapeResponse
+        """
+        runtime = util_models.RuntimeOptions()
+        headers = {}
+        return self.read_page_scrape_with_options(request, headers, runtime)
+
+    async def read_page_scrape_async(
+        self,
+        request: iqs20241111_models.ReadPageScrapeRequest,
+    ) -> iqs20241111_models.ReadPageScrapeResponse:
+        """
+        @summary 动态页面解析
+        
+        @param request: ReadPageScrapeRequest
+        @return: ReadPageScrapeResponse
+        """
+        runtime = util_models.RuntimeOptions()
+        headers = {}
+        return await self.read_page_scrape_with_options_async(request, headers, runtime)
+
     def unified_search_with_options(
         self,
         request: iqs20241111_models.UnifiedSearchRequest,

{alibabacloud_iqs20241111-1.5.1 → alibabacloud_iqs20241111-1.6.0}/alibabacloud_iqs20241111/models.py

@@ -1101,6 +1101,7 @@ class ReadPageItem(TeaModel):
         html: str = None,
         markdown: str = None,
         raw_html: str = None,
+        screenshot: str = None,
         status_code: int = None,
         text: str = None,
     ):
@@ -1108,6 +1109,7 @@ class ReadPageItem(TeaModel):
         self.html = html
         self.markdown = markdown
         self.raw_html = raw_html
+        self.screenshot = screenshot
         self.status_code = status_code
         self.text = text
 
@@ -1128,6 +1130,8 @@ class ReadPageItem(TeaModel):
             result['markdown'] = self.markdown
         if self.raw_html is not None:
             result['rawHtml'] = self.raw_html
+        if self.screenshot is not None:
+            result['screenshot'] = self.screenshot
         if self.status_code is not None:
             result['statusCode'] = self.status_code
         if self.text is not None:
@@ -1144,6 +1148,8 @@ class ReadPageItem(TeaModel):
             self.markdown = m.get('markdown')
         if m.get('rawHtml') is not None:
             self.raw_html = m.get('rawHtml')
+        if m.get('screenshot') is not None:
+            self.screenshot = m.get('screenshot')
         if m.get('statusCode') is not None:
             self.status_code = m.get('statusCode')
         if m.get('text') is not None:
@@ -1151,6 +1157,117 @@ class ReadPageItem(TeaModel):
         return self
 
 
+class ReadPageScrapeBodyReadability(TeaModel):
+    def __init__(
+        self,
+        exclude_all_images: bool = None,
+        exclude_all_links: bool = None,
+        excluded_tags: List[str] = None,
+        readability_mode: str = None,
+    ):
+        self.exclude_all_images = exclude_all_images
+        self.exclude_all_links = exclude_all_links
+        self.excluded_tags = excluded_tags
+        self.readability_mode = readability_mode
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.exclude_all_images is not None:
+            result['excludeAllImages'] = self.exclude_all_images
+        if self.exclude_all_links is not None:
+            result['excludeAllLinks'] = self.exclude_all_links
+        if self.excluded_tags is not None:
+            result['excludedTags'] = self.excluded_tags
+        if self.readability_mode is not None:
+            result['readabilityMode'] = self.readability_mode
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('excludeAllImages') is not None:
+            self.exclude_all_images = m.get('excludeAllImages')
+        if m.get('excludeAllLinks') is not None:
+            self.exclude_all_links = m.get('excludeAllLinks')
+        if m.get('excludedTags') is not None:
+            self.excluded_tags = m.get('excludedTags')
+        if m.get('readabilityMode') is not None:
+            self.readability_mode = m.get('readabilityMode')
+        return self
+
+
+class ReadPageScrapeBody(TeaModel):
+    def __init__(
+        self,
+        formats: List[str] = None,
+        location: str = None,
+        max_age: int = None,
+        page_timeout: int = None,
+        readability: ReadPageScrapeBodyReadability = None,
+        timeout: int = None,
+        url: str = None,
+    ):
+        self.formats = formats
+        self.location = location
+        self.max_age = max_age
+        self.page_timeout = page_timeout
+        self.readability = readability
+        self.timeout = timeout
+        # This parameter is required.
+        self.url = url
+
+    def validate(self):
+        if self.readability:
+            self.readability.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.formats is not None:
+            result['formats'] = self.formats
+        if self.location is not None:
+            result['location'] = self.location
+        if self.max_age is not None:
+            result['maxAge'] = self.max_age
+        if self.page_timeout is not None:
+            result['pageTimeout'] = self.page_timeout
+        if self.readability is not None:
+            result['readability'] = self.readability.to_map()
+        if self.timeout is not None:
+            result['timeout'] = self.timeout
+        if self.url is not None:
+            result['url'] = self.url
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('formats') is not None:
+            self.formats = m.get('formats')
+        if m.get('location') is not None:
+            self.location = m.get('location')
+        if m.get('maxAge') is not None:
+            self.max_age = m.get('maxAge')
+        if m.get('pageTimeout') is not None:
+            self.page_timeout = m.get('pageTimeout')
+        if m.get('readability') is not None:
+            temp_model = ReadPageScrapeBodyReadability()
+            self.readability = temp_model.from_map(m['readability'])
+        if m.get('timeout') is not None:
+            self.timeout = m.get('timeout')
+        if m.get('url') is not None:
+            self.url = m.get('url')
+        return self
+
+
 class RequestContents(TeaModel):
     def __init__(
         self,
@@ -1351,6 +1468,7 @@ class UnifiedPageItem(TeaModel):
         markdown_text: str = None,
         published_time: str = None,
         rerank_score: float = None,
+        rich_main_body: str = None,
         snippet: str = None,
         summary: str = None,
         title: str = None,
@@ -1364,6 +1482,7 @@ class UnifiedPageItem(TeaModel):
         self.markdown_text = markdown_text
         self.published_time = published_time
         self.rerank_score = rerank_score
+        self.rich_main_body = rich_main_body
         self.snippet = snippet
         self.summary = summary
         self.title = title
@@ -1395,6 +1514,8 @@ class UnifiedPageItem(TeaModel):
             result['publishedTime'] = self.published_time
         if self.rerank_score is not None:
             result['rerankScore'] = self.rerank_score
+        if self.rich_main_body is not None:
+            result['richMainBody'] = self.rich_main_body
         if self.snippet is not None:
             result['snippet'] = self.snippet
         if self.summary is not None:
@@ -1423,6 +1544,8 @@ class UnifiedPageItem(TeaModel):
             self.published_time = m.get('publishedTime')
         if m.get('rerankScore') is not None:
             self.rerank_score = m.get('rerankScore')
+        if m.get('richMainBody') is not None:
+            self.rich_main_body = m.get('richMainBody')
         if m.get('snippet') is not None:
             self.snippet = m.get('snippet')
         if m.get('summary') is not None:
@@ -2105,6 +2228,95 @@ class GenericAdvancedSearchResponse(TeaModel):
 class GenericSearchRequest(TeaModel):
     def __init__(
         self,
+        advanced_params: Dict[str, Any] = None,
+        enable_rerank: bool = None,
+        industry: str = None,
+        page: int = None,
+        query: str = None,
+        return_main_text: bool = None,
+        return_markdown_text: bool = None,
+        return_rich_main_body: bool = None,
+        return_summary: bool = None,
+        session_id: str = None,
+        time_range: str = None,
+    ):
+        self.advanced_params = advanced_params
+        self.enable_rerank = enable_rerank
+        self.industry = industry
+        self.page = page
+        # This parameter is required.
+        self.query = query
+        self.return_main_text = return_main_text
+        self.return_markdown_text = return_markdown_text
+        self.return_rich_main_body = return_rich_main_body
+        self.return_summary = return_summary
+        self.session_id = session_id
+        self.time_range = time_range
+
+    def validate(self):
+        pass
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.advanced_params is not None:
+            result['advancedParams'] = self.advanced_params
+        if self.enable_rerank is not None:
+            result['enableRerank'] = self.enable_rerank
+        if self.industry is not None:
+            result['industry'] = self.industry
+        if self.page is not None:
+            result['page'] = self.page
+        if self.query is not None:
+            result['query'] = self.query
+        if self.return_main_text is not None:
+            result['returnMainText'] = self.return_main_text
+        if self.return_markdown_text is not None:
+            result['returnMarkdownText'] = self.return_markdown_text
+        if self.return_rich_main_body is not None:
+            result['returnRichMainBody'] = self.return_rich_main_body
+        if self.return_summary is not None:
+            result['returnSummary'] = self.return_summary
+        if self.session_id is not None:
+            result['sessionId'] = self.session_id
+        if self.time_range is not None:
+            result['timeRange'] = self.time_range
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('advancedParams') is not None:
+            self.advanced_params = m.get('advancedParams')
+        if m.get('enableRerank') is not None:
+            self.enable_rerank = m.get('enableRerank')
+        if m.get('industry') is not None:
+            self.industry = m.get('industry')
+        if m.get('page') is not None:
+            self.page = m.get('page')
+        if m.get('query') is not None:
+            self.query = m.get('query')
+        if m.get('returnMainText') is not None:
+            self.return_main_text = m.get('returnMainText')
+        if m.get('returnMarkdownText') is not None:
+            self.return_markdown_text = m.get('returnMarkdownText')
+        if m.get('returnRichMainBody') is not None:
+            self.return_rich_main_body = m.get('returnRichMainBody')
+        if m.get('returnSummary') is not None:
+            self.return_summary = m.get('returnSummary')
+        if m.get('sessionId') is not None:
+            self.session_id = m.get('sessionId')
+        if m.get('timeRange') is not None:
+            self.time_range = m.get('timeRange')
+        return self
+
+
+class GenericSearchShrinkRequest(TeaModel):
+    def __init__(
+        self,
+        advanced_params_shrink: str = None,
         enable_rerank: bool = None,
         industry: str = None,
         page: int = None,
@@ -2116,6 +2328,7 @@ class GenericSearchRequest(TeaModel):
         session_id: str = None,
         time_range: str = None,
     ):
+        self.advanced_params_shrink = advanced_params_shrink
         self.enable_rerank = enable_rerank
         self.industry = industry
         self.page = page
@@ -2137,6 +2350,8 @@ class GenericSearchRequest(TeaModel):
             return _map
 
         result = dict()
+        if self.advanced_params_shrink is not None:
+            result['advancedParams'] = self.advanced_params_shrink
         if self.enable_rerank is not None:
             result['enableRerank'] = self.enable_rerank
         if self.industry is not None:
@@ -2161,6 +2376,8 @@ class GenericSearchRequest(TeaModel):
 
     def from_map(self, m: dict = None):
         m = m or dict()
+        if m.get('advancedParams') is not None:
+            self.advanced_params_shrink = m.get('advancedParams')
         if m.get('enableRerank') is not None:
             self.enable_rerank = m.get('enableRerank')
         if m.get('industry') is not None:
@@ -2504,6 +2721,124 @@ class ReadPageBasicResponse(TeaModel):
         return self
 
 
+class ReadPageScrapeRequest(TeaModel):
+    def __init__(
+        self,
+        body: ReadPageScrapeBody = None,
+    ):
+        # post body
+        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.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('body') is not None:
+            temp_model = ReadPageScrapeBody()
+            self.body = temp_model.from_map(m['body'])
+        return self
+
+
+class ReadPageScrapeResponseBody(TeaModel):
+    def __init__(
+        self,
+        data: ReadPageItem = None,
+        error_code: str = None,
+        error_message: str = None,
+        request_id: str = None,
+    ):
+        self.data = data
+        self.error_code = error_code
+        self.error_message = error_message
+        self.request_id = request_id
+
+    def validate(self):
+        if self.data:
+            self.data.validate()
+
+    def to_map(self):
+        _map = super().to_map()
+        if _map is not None:
+            return _map
+
+        result = dict()
+        if self.data is not None:
+            result['data'] = self.data.to_map()
+        if self.error_code is not None:
+            result['errorCode'] = self.error_code
+        if self.error_message is not None:
+            result['errorMessage'] = self.error_message
+        if self.request_id is not None:
+            result['requestId'] = self.request_id
+        return result
+
+    def from_map(self, m: dict = None):
+        m = m or dict()
+        if m.get('data') is not None:
+            temp_model = ReadPageItem()
+            self.data = temp_model.from_map(m['data'])
+        if m.get('errorCode') is not None:
+            self.error_code = m.get('errorCode')
+        if m.get('errorMessage') is not None:
+            self.error_message = m.get('errorMessage')
+        if m.get('requestId') is not None:
+            self.request_id = m.get('requestId')
+        return self
+
+
+class ReadPageScrapeResponse(TeaModel):
+    def __init__(
+        self,
+        headers: Dict[str, str] = None,
+        status_code: int = None,
+        body: ReadPageScrapeResponseBody = 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 = ReadPageScrapeResponseBody()
+            self.body = temp_model.from_map(m['body'])
+        return self
+
+
 class UnifiedSearchRequest(TeaModel):
     def __init__(
         self,

{alibabacloud_iqs20241111-1.5.1 → alibabacloud_iqs20241111-1.6.0}/alibabacloud_iqs20241111.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: alibabacloud-iqs20241111
-Version: 1.5.1
+Version: 1.6.0
 Summary: Alibaba Cloud IQS (20241111) SDK Library for Python
 Home-page: https://github.com/aliyun/alibabacloud-python-sdk
 Author: Alibaba Cloud SDK

{alibabacloud_iqs20241111-1.5.1 → alibabacloud_iqs20241111-1.6.0}/setup.py

@@ -24,7 +24,7 @@ from setuptools import setup, find_packages
 """
 setup module for alibabacloud_iqs20241111.
 
-Created on 10/10/2025
+Created on 29/10/2025
 
 @author: Alibaba Cloud SDK
 """

alibabacloud_iqs20241111-1.5.1/alibabacloud_iqs20241111/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.5.1'