From 47664f8fd395bdb3f9be58ed300d71c63aa765c4 Mon Sep 17 00:00:00 2001 From: jyong <718720800@qq.com> Date: Mon, 9 Jun 2025 14:00:34 +0800 Subject: [PATCH 1/2] r2 --- .../entities/datasource_entities.py | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/api/core/datasource/entities/datasource_entities.py b/api/core/datasource/entities/datasource_entities.py index 647d8f9a8c..4aa8bf75c8 100644 --- a/api/core/datasource/entities/datasource_entities.py +++ b/api/core/datasource/entities/datasource_entities.py @@ -213,15 +213,6 @@ class GetOnlineDocumentPagesRequest(BaseModel): """ -class OnlineDocumentPageIcon(BaseModel): - """ - Online document page icon - """ - - type: str = Field(..., description="The type of the icon") - url: str = Field(..., description="The url of the icon") - - class OnlineDocumentPage(BaseModel): """ Online document page @@ -229,7 +220,7 @@ class OnlineDocumentPage(BaseModel): page_id: str = Field(..., description="The page id") page_title: str = Field(..., description="The page title") - page_icon: Optional[OnlineDocumentPageIcon] = Field(None, description="The page icon") + page_icon: Optional[dict] = Field(None, description="The page icon") type: str = Field(..., description="The type of the page") last_edited_time: str = Field(..., description="The last edited time") @@ -288,22 +279,27 @@ class GetWebsiteCrawlRequest(BaseModel): crawl_parameters: dict = Field(..., description="The crawl parameters") -class WebSiteInfo(BaseModel): - """ - Website info - """ - +class WebSiteInfoDetail(BaseModel): source_url: str = Field(..., description="The url of the website") content: str = Field(..., description="The content of the website") title: str = Field(..., description="The title of the website") description: str = Field(..., description="The description of the website") +class WebSiteInfo(BaseModel): + """ + Website info + """ + job_id: str = Field(..., description="The job id") + status: str = Field(..., description="The status of the job") + web_info_list: Optional[list[WebSiteInfoDetail]] = [] + + + class GetWebsiteCrawlResponse(BaseModel): """ Get website crawl response """ - result: Optional[list[WebSiteInfo]] = [] - job_id: str = Field(..., description="The job id") - status: str = Field(..., description="The status of the job") + result: WebSiteInfo = WebSiteInfo(job_id="", status="", web_info_list=[]) + From ad3d9cf78261539f60b939353199bee59780de98 Mon Sep 17 00:00:00 2001 From: jyong <718720800@qq.com> Date: Tue, 10 Jun 2025 10:00:20 +0800 Subject: [PATCH 2/2] r2 --- api/core/datasource/entities/datasource_entities.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/api/core/datasource/entities/datasource_entities.py b/api/core/datasource/entities/datasource_entities.py index 4aa8bf75c8..adcdcccf83 100644 --- a/api/core/datasource/entities/datasource_entities.py +++ b/api/core/datasource/entities/datasource_entities.py @@ -285,6 +285,7 @@ class WebSiteInfoDetail(BaseModel): title: str = Field(..., description="The title of the website") description: str = Field(..., description="The description of the website") + class WebSiteInfo(BaseModel): """ Website info @@ -294,12 +295,9 @@ class WebSiteInfo(BaseModel): web_info_list: Optional[list[WebSiteInfoDetail]] = [] - - class GetWebsiteCrawlResponse(BaseModel): """ Get website crawl response """ result: WebSiteInfo = WebSiteInfo(job_id="", status="", web_info_list=[]) -