mirror of
https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git
synced 2025-05-25 23:58:33 +08:00
189007e44d
### What problem does this PR solve?
Invoke component can be used to call third party services.
Tried GET/POST/PUT from web UI, and found PUT request failed like this:
(test api: api/v1/chats/<assistant_id>)
```
{"code":100,"data":null,"message":"AttributeError("'NoneType' object has
no attribute 'get'")"}
```
Root cause: Invoke PUT with a 'data=args' parameter, which is a form-encoded data, however the default content type setting of request header is application/json. The test api could not deal with such case.
Fix: use the 'json' parameter of reqeusts.put(), same as Invoke POST. Do not use the 'data' parameter.
Another way is to use 'data=json.dumps(args)'.
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
117 lines
4.5 KiB
Python
117 lines
4.5 KiB
Python
#
|
|
# 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
|
|
import re
|
|
from abc import ABC
|
|
import requests
|
|
from deepdoc.parser import HtmlParser
|
|
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
|
|
self.clean_html = False
|
|
|
|
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")
|
|
self.check_boolean(self.clean_html, "Clean HTML")
|
|
|
|
|
|
class Invoke(ComponentBase, ABC):
|
|
component_name = "Invoke"
|
|
|
|
def _run(self, history, **kwargs):
|
|
args = {}
|
|
for para in self._param.variables:
|
|
if para.get("component_id"):
|
|
if '@' in para["component_id"]:
|
|
component = para["component_id"].split('@')[0]
|
|
field = para["component_id"].split('@')[1]
|
|
cpn = self._canvas.get_component(component)["obj"]
|
|
for param in cpn._param.query:
|
|
if param["key"] == field:
|
|
if "value" in param:
|
|
args[para["key"]] = param["value"]
|
|
else:
|
|
cpn = self._canvas.get_component(para["component_id"])["obj"]
|
|
if cpn.component_name.lower() == "answer":
|
|
args[para["key"]] = self._canvas.get_history(1)[0]["content"]
|
|
continue
|
|
_, out = cpn.output(allow_partial=False)
|
|
if not out.empty:
|
|
args[para["key"]] = "\n".join(out["content"])
|
|
else:
|
|
args[para["key"]] = 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 re.sub(r"https?:?/?/?", "", 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)
|
|
if self._param.clean_html:
|
|
sections = HtmlParser()(None, response.content)
|
|
return Invoke.be_output("\n".join(sections))
|
|
|
|
return Invoke.be_output(response.text)
|
|
|
|
if method == 'put':
|
|
response = requests.put(url=url,
|
|
json=args,
|
|
headers=headers,
|
|
proxies=proxies,
|
|
timeout=self._param.timeout)
|
|
if self._param.clean_html:
|
|
sections = HtmlParser()(None, response.content)
|
|
return Invoke.be_output("\n".join(sections))
|
|
return Invoke.be_output(response.text)
|
|
|
|
if method == 'post':
|
|
response = requests.post(url=url,
|
|
json=args,
|
|
headers=headers,
|
|
proxies=proxies,
|
|
timeout=self._param.timeout)
|
|
if self._param.clean_html:
|
|
sections = HtmlParser()(None, response.content)
|
|
return Invoke.be_output("\n".join(sections))
|
|
return Invoke.be_output(response.text)
|