entari-plugin-hyw 4.0.0rc2__py3-none-any.whl → 4.0.0rc4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of entari-plugin-hyw might be problematic. Click here for more details.
- entari_plugin_hyw/__init__.py +1 -1
- entari_plugin_hyw/pipeline.py +1 -20
- entari_plugin_hyw/search.py +3 -1
- {entari_plugin_hyw-4.0.0rc2.dist-info → entari_plugin_hyw-4.0.0rc4.dist-info}/METADATA +1 -1
- {entari_plugin_hyw-4.0.0rc2.dist-info → entari_plugin_hyw-4.0.0rc4.dist-info}/RECORD +7 -7
- {entari_plugin_hyw-4.0.0rc2.dist-info → entari_plugin_hyw-4.0.0rc4.dist-info}/WHEEL +0 -0
- {entari_plugin_hyw-4.0.0rc2.dist-info → entari_plugin_hyw-4.0.0rc4.dist-info}/top_level.txt +0 -0
entari_plugin_hyw/__init__.py
CHANGED
|
@@ -135,7 +135,7 @@ class HywConfig(BasicConfModel):
|
|
|
135
135
|
search_retries: int = 2
|
|
136
136
|
fetch_timeout: float = 15.0
|
|
137
137
|
fetch_max_results: int = 5
|
|
138
|
-
fetch_blocked_domains: List[str] =
|
|
138
|
+
fetch_blocked_domains: Optional[List[str]] = None
|
|
139
139
|
|
|
140
140
|
# Fetch Model Config
|
|
141
141
|
fetch_model_name: Optional[str] = None
|
entari_plugin_hyw/pipeline.py
CHANGED
|
@@ -196,15 +196,8 @@ class ProcessingPipeline:
|
|
|
196
196
|
|
|
197
197
|
# Deduplicate while preserving order and filter blocked domains
|
|
198
198
|
final_fetch_urls = []
|
|
199
|
-
blocked_domains = getattr(self.config, "fetch_blocked_domains", ["wikipedia.org", "csdn.net", "sohu.com", "sogou.com"])
|
|
200
|
-
if isinstance(blocked_domains, str):
|
|
201
|
-
blocked_domains = [d.strip() for d in blocked_domains.split(",")]
|
|
202
|
-
|
|
203
199
|
for url in raw_fetch_urls:
|
|
204
200
|
if url and url not in final_fetch_urls:
|
|
205
|
-
# Check blocklist
|
|
206
|
-
if any(domain in url.lower() for domain in blocked_domains):
|
|
207
|
-
continue
|
|
208
201
|
final_fetch_urls.append(url)
|
|
209
202
|
|
|
210
203
|
fetch_urls = final_fetch_urls
|
|
@@ -572,19 +565,7 @@ class ProcessingPipeline:
|
|
|
572
565
|
self._search_error = str(e)
|
|
573
566
|
raise e
|
|
574
567
|
|
|
575
|
-
# Filter blocked domains
|
|
576
|
-
blocked_domains = getattr(self.config, "fetch_blocked_domains", ["wikipedia.org", "csdn.net", "baidu.com"])
|
|
577
|
-
if isinstance(blocked_domains, str):
|
|
578
|
-
blocked_domains = [d.strip() for d in blocked_domains.split(",")]
|
|
579
|
-
|
|
580
|
-
# Use list comprehension for filtering
|
|
581
|
-
original_count = len(web)
|
|
582
|
-
web = [
|
|
583
|
-
item for item in web
|
|
584
|
-
if not any(blocked in item.get("url", "").lower() for blocked in blocked_domains)
|
|
585
|
-
]
|
|
586
|
-
if len(web) < original_count:
|
|
587
|
-
logger.info(f"Filtered {original_count - len(web)} blocked search results.")
|
|
568
|
+
# Filter blocked domains removed per user request (handled in search query)
|
|
588
569
|
|
|
589
570
|
# Cache results and assign global IDs
|
|
590
571
|
for item in web:
|
entari_plugin_hyw/search.py
CHANGED
|
@@ -66,7 +66,9 @@ class SearchService:
|
|
|
66
66
|
self._jina_api_key = getattr(config, "jina_api_key", None)
|
|
67
67
|
|
|
68
68
|
# Blocked domains for search filtering
|
|
69
|
-
self._blocked_domains = getattr(config, "fetch_blocked_domains",
|
|
69
|
+
self._blocked_domains = getattr(config, "fetch_blocked_domains", None)
|
|
70
|
+
if self._blocked_domains is None:
|
|
71
|
+
self._blocked_domains = ["wikipedia.org", "csdn.net", "sohu.com", "sogou.com"]
|
|
70
72
|
if isinstance(self._blocked_domains, str):
|
|
71
73
|
self._blocked_domains = [d.strip() for d in self._blocked_domains.split(",")]
|
|
72
74
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
entari_plugin_hyw/__init__.py,sha256=
|
|
1
|
+
entari_plugin_hyw/__init__.py,sha256=XRjnYDWX-dfMi33yD1CcfejHcQyySXTrQVlo95dVfis,17118
|
|
2
2
|
entari_plugin_hyw/history.py,sha256=zYtON0FgkA_AcXerLV335OzpIP30eAxDEp7NHCFFXis,7016
|
|
3
3
|
entari_plugin_hyw/image_cache.py,sha256=t8pr1kgH2ngK9IhrBAhzUqhBWERNztUywMzgCFZEtQk,9899
|
|
4
4
|
entari_plugin_hyw/misc.py,sha256=b0KPCUrf1GuCY0Mx29Sn5sREg1fxR1OyYEl4O4Omsys,4553
|
|
5
|
-
entari_plugin_hyw/pipeline.py,sha256=
|
|
5
|
+
entari_plugin_hyw/pipeline.py,sha256=CFp8D9OAJ3nfDsJwKNHb42ZLHYoUL5k9wykrcWC_Tno,52501
|
|
6
6
|
entari_plugin_hyw/prompts.py,sha256=BqX8MNdBG7M6_oRAe1jCiSCgcbRchFAoWpgF9WB3-0o,2348
|
|
7
7
|
entari_plugin_hyw/render_vue.py,sha256=cdIsvuGIC-01Nmc9vgYnGQIY5CGh_ZdqphAhFP4h0Qo,12426
|
|
8
|
-
entari_plugin_hyw/search.py,sha256=
|
|
8
|
+
entari_plugin_hyw/search.py,sha256=bN958sSXYIz7fMmH_ZoS1777c1wXatV05-rvfEq_YHQ,30383
|
|
9
9
|
entari_plugin_hyw/assets/card-dist/index.html,sha256=B5U91hlLEVK_zPNmMoB5daj475ncdRKbVxR35Xgb-Ns,2016492
|
|
10
10
|
entari_plugin_hyw/assets/card-dist/vite.svg,sha256=SnSK_UQ5GLsWWRyDTEAdrjPoeGGrXbrQgRw6O0qSFPs,1497
|
|
11
11
|
entari_plugin_hyw/assets/card-dist/logos/anthropic.svg,sha256=ASsy1ypo3osNc3n-B0R81tk_dIFsVgg7qQORrd5T2kA,558
|
|
@@ -82,7 +82,7 @@ entari_plugin_hyw/card-ui/src/components/HelloWorld.vue,sha256=yvBIzJua9BfikUOR1
|
|
|
82
82
|
entari_plugin_hyw/card-ui/src/components/MarkdownContent.vue,sha256=JO1sKThQB42bVl5382BkxpDEyRpAK7oGcmdj1LY5P64,13190
|
|
83
83
|
entari_plugin_hyw/card-ui/src/components/SectionCard.vue,sha256=owcDNx2JYVmF2J5SYCroR2gvg_cPApQsNunjK1WJpVI,1433
|
|
84
84
|
entari_plugin_hyw/card-ui/src/components/StageCard.vue,sha256=cC0TeJ4AhtN3sJEXenVpl2Eq5901GKC59qpDUNH2SZE,10964
|
|
85
|
-
entari_plugin_hyw-4.0.
|
|
86
|
-
entari_plugin_hyw-4.0.
|
|
87
|
-
entari_plugin_hyw-4.0.
|
|
88
|
-
entari_plugin_hyw-4.0.
|
|
85
|
+
entari_plugin_hyw-4.0.0rc4.dist-info/METADATA,sha256=0Ytj2E6tpljuG281p44mEEusfc3V-ZUB1V5rvEswwos,3746
|
|
86
|
+
entari_plugin_hyw-4.0.0rc4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
|
|
87
|
+
entari_plugin_hyw-4.0.0rc4.dist-info/top_level.txt,sha256=TIDsn6XPs6KA5e3ezsE65JoXsy03ejDdrB41I4SPjmo,18
|
|
88
|
+
entari_plugin_hyw-4.0.0rc4.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|