Skip to content

Commit

Permalink
refactor name of duckduckgo (#1496)
Browse files Browse the repository at this point in the history
### What problem does this PR solve?


### Type of change

- [x] Refactoring
  • Loading branch information
KevinHuSh authored Jul 12, 2024
1 parent 4eeb535 commit eecec7b
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion graph/component/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from .rewrite import RewriteQuestion, RewriteQuestionParam
from .keyword import KeywordExtract, KeywordExtractParam
from .baidu import Baidu, BaiduParam
from .duckduckgosearch import DuckDuckGoSearch, DuckDuckGoSearchParam
from .duckduckgo import DuckDuckGo, DuckDuckGoParam


def component_class(class_name):
Expand Down
124 changes: 62 additions & 62 deletions graph/component/duckduckgosearch.py → graph/component/duckduckgo.py
Original file line number Diff line number Diff line change
@@ -1,62 +1,62 @@
#
# Copyright 2024 The InfiniFlow Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import random
from abc import ABC
from functools import partial
from duckduckgo_search import DDGS
import pandas as pd

from graph.component.base import ComponentBase, ComponentParamBase


class DuckDuckGoSearchParam(ComponentParamBase):
"""
Define the DuckDuckGoSearch component parameters.
"""

def __init__(self):
super().__init__()
self.top_n = 10
self.channel = "text"

def check(self):
self.check_positive_integer(self.top_n, "Top N")
self.check_valid_value(self.channel, "Web Search or News", ["text", "news"])


class DuckDuckGoSearch(ComponentBase, ABC):
component_name = "DuckDuckGoSearch"

def _run(self, history, **kwargs):
ans = self.get_input()
ans = " - ".join(ans["content"]) if "content" in ans else ""
if not ans:
return DuckDuckGoSearch.be_output(self._param.no)

if self.channel == "text":
with DDGS() as ddgs:
# {'title': '', 'href': '', 'body': ''}
duck_res = [{"content": '<a href="' + i["href"] + '">' + i["title"] + '</a> ' + i["body"]} for i in
ddgs.text(ans, max_results=self._param.top_n)]
elif self.channel == "news":
with DDGS() as ddgs:
# {'date': '', 'title': '', 'body': '', 'url': '', 'image': '', 'source': ''}
duck_res = [{"content": '<a href="' + i["url"] + '">' + i["title"] + '</a> ' + i["body"]} for i in
ddgs.news(ans, max_results=self._param.top_n)]

df = pd.DataFrame(duck_res)
print(df, ":::::::::::::::::::::::::::::::::")
return df
#
# Copyright 2024 The InfiniFlow Authors. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import random
from abc import ABC
from functools import partial
from duckduckgo_search import DDGS
import pandas as pd

from graph.component.base import ComponentBase, ComponentParamBase


class DuckDuckGoParam(ComponentParamBase):
"""
Define the DuckDuckGo component parameters.
"""

def __init__(self):
super().__init__()
self.top_n = 10
self.channel = "text"

def check(self):
self.check_positive_integer(self.top_n, "Top N")
self.check_valid_value(self.channel, "Web Search or News", ["text", "news"])


class DuckDuckGo(ComponentBase, ABC):
component_name = "DuckDuckGo"

def _run(self, history, **kwargs):
ans = self.get_input()
ans = " - ".join(ans["content"]) if "content" in ans else ""
if not ans:
return DuckDuckGo.be_output(self._param.no)

if self.channel == "text":
with DDGS() as ddgs:
# {'title': '', 'href': '', 'body': ''}
duck_res = [{"content": '<a href="' + i["href"] + '">' + i["title"] + '</a> ' + i["body"]} for i in
ddgs.text(ans, max_results=self._param.top_n)]
elif self.channel == "news":
with DDGS() as ddgs:
# {'date': '', 'title': '', 'body': '', 'url': '', 'image': '', 'source': ''}
duck_res = [{"content": '<a href="' + i["url"] + '">' + i["title"] + '</a> ' + i["body"]} for i in
ddgs.news(ans, max_results=self._param.top_n)]

df = pd.DataFrame(duck_res)
print(df, ":::::::::::::::::::::::::::::::::")
return df

0 comments on commit eecec7b

Please sign in to comment.