mirror of
https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git
synced 2025-08-14 21:45:55 +08:00
add component invoke (#2967)
### What problem does this PR solve? #2908 ### Type of change - [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
parent
226bdd6e99
commit
adb0a93d95
@ -18,6 +18,7 @@ import asyncio
|
|||||||
from crawl4ai import AsyncWebCrawler
|
from crawl4ai import AsyncWebCrawler
|
||||||
from agent.component.base import ComponentBase, ComponentParamBase
|
from agent.component.base import ComponentBase, ComponentParamBase
|
||||||
|
|
||||||
|
|
||||||
class CrawlerParam(ComponentParamBase):
|
class CrawlerParam(ComponentParamBase):
|
||||||
"""
|
"""
|
||||||
Define the Crawler component parameters.
|
Define the Crawler component parameters.
|
||||||
@ -25,9 +26,11 @@ class CrawlerParam(ComponentParamBase):
|
|||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
self.proxy = None
|
||||||
|
self.extract_type = "markdown"
|
||||||
|
|
||||||
def check(self):
|
def check(self):
|
||||||
return True
|
self.check_valid_value(self.extract_type, "Type of content from the crawler", ['html', 'markdown', 'content'])
|
||||||
|
|
||||||
|
|
||||||
class Crawler(ComponentBase, ABC):
|
class Crawler(ComponentBase, ABC):
|
||||||
@ -46,7 +49,6 @@ class Crawler(ComponentBase, ABC):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
return Crawler.be_output(f"An unexpected error occurred: {str(e)}")
|
return Crawler.be_output(f"An unexpected error occurred: {str(e)}")
|
||||||
|
|
||||||
|
|
||||||
async def get_web(self, url):
|
async def get_web(self, url):
|
||||||
proxy = self._param.proxy if self._param.proxy else None
|
proxy = self._param.proxy if self._param.proxy else None
|
||||||
async with AsyncWebCrawler(verbose=True, proxy=proxy) as crawler:
|
async with AsyncWebCrawler(verbose=True, proxy=proxy) as crawler:
|
||||||
@ -55,16 +57,13 @@ class Crawler(ComponentBase, ABC):
|
|||||||
bypass_cache=True
|
bypass_cache=True
|
||||||
)
|
)
|
||||||
|
|
||||||
match self._param.extract_type:
|
if self._param.extract_type == 'html':
|
||||||
case 'html':
|
|
||||||
return result.cleaned_html
|
return result.cleaned_html
|
||||||
case 'markdown':
|
elif self._param.extract_type == 'markdown':
|
||||||
return result.markdown
|
return result.markdown
|
||||||
case 'content':
|
elif self._param.extract_type == 'content':
|
||||||
return result.extracted_content
|
result.extracted_content
|
||||||
case _:
|
|
||||||
return result.markdown
|
return result.markdown
|
||||||
# print(result.markdown)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
84
agent/component/invoke.py
Normal file
84
agent/component/invoke.py
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
#
|
||||||
|
# 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 json
|
||||||
|
from abc import ABC
|
||||||
|
|
||||||
|
import requests
|
||||||
|
|
||||||
|
from agent.component.base import ComponentBase, ComponentParamBase
|
||||||
|
|
||||||
|
|
||||||
|
class InvokeParam(ComponentParamBase):
|
||||||
|
"""
|
||||||
|
Define the Crawler component parameters.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
super().__init__()
|
||||||
|
self.proxy = None
|
||||||
|
self.headers = ""
|
||||||
|
self.method = "get"
|
||||||
|
self.variables = []
|
||||||
|
self.url = ""
|
||||||
|
self.timeout = 60
|
||||||
|
|
||||||
|
def check(self):
|
||||||
|
self.check_valid_value(self.method.lower(), "Type of content from the crawler", ['get', 'post', 'put'])
|
||||||
|
self.check_empty(self.url, "End point URL")
|
||||||
|
self.check_positive_integer(self.timeout, "Timeout time in second")
|
||||||
|
|
||||||
|
|
||||||
|
class Invoke(ComponentBase, ABC):
|
||||||
|
component_name = "Invoke"
|
||||||
|
|
||||||
|
def _run(self, history, **kwargs):
|
||||||
|
args = {}
|
||||||
|
for para in self._param.variables:
|
||||||
|
if para.get("component_id"):
|
||||||
|
cpn = self._canvas.get_component(para["component_id"])["obj"]
|
||||||
|
_, out = cpn.output(allow_partial=False)
|
||||||
|
args[para["key"]] = "\n".join(out["content"])
|
||||||
|
else:
|
||||||
|
args[para["key"]] = "\n".join(para["value"])
|
||||||
|
|
||||||
|
url = self._param.url.strip()
|
||||||
|
if url.find("http") != 0:
|
||||||
|
url = "http://" + url
|
||||||
|
|
||||||
|
method = self._param.method.lower()
|
||||||
|
headers = {}
|
||||||
|
if self._param.headers:
|
||||||
|
headers = json.loads(self._param.headers)
|
||||||
|
proxies = None
|
||||||
|
if self._param.proxy:
|
||||||
|
proxies = {"http": self._param.proxy, "https": self._param.proxy}
|
||||||
|
|
||||||
|
if method == 'get':
|
||||||
|
response = requests.get(url=url,
|
||||||
|
params=args,
|
||||||
|
headers=headers,
|
||||||
|
proxies=proxies,
|
||||||
|
timeout=self._param.timeout)
|
||||||
|
return Invoke.be_output(response.text)
|
||||||
|
|
||||||
|
if method == 'put':
|
||||||
|
response = requests.put(url=url,
|
||||||
|
data=args,
|
||||||
|
headers=headers,
|
||||||
|
proxies=proxies,
|
||||||
|
timeout=self._param.timeout)
|
||||||
|
|
||||||
|
return Invoke.be_output(response.text)
|
Loading…
x
Reference in New Issue
Block a user