mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-12-08 20:42:30 +08:00
Minor tweaks (#11060)
### What problem does this PR solve? Minor tweaks ### Type of change - [x] Refactoring --------- Signed-off-by: Jin Hai <haijin.chn@gmail.com>
This commit is contained in:
@ -23,6 +23,7 @@ from Cryptodome.Cipher import PKCS1_v1_5 as Cipher_pkcs1_v1_5
|
|||||||
from typing import Dict, List, Any
|
from typing import Dict, List, Any
|
||||||
from lark import Lark, Transformer, Tree
|
from lark import Lark, Transformer, Tree
|
||||||
import requests
|
import requests
|
||||||
|
import getpass
|
||||||
|
|
||||||
GRAMMAR = r"""
|
GRAMMAR = r"""
|
||||||
start: command
|
start: command
|
||||||
@ -359,7 +360,7 @@ class AdminCLI(Cmd):
|
|||||||
if single_command:
|
if single_command:
|
||||||
admin_passwd = arguments['password']
|
admin_passwd = arguments['password']
|
||||||
else:
|
else:
|
||||||
admin_passwd = input(f"password for {self.admin_account}: ").strip()
|
admin_passwd = getpass.getpass(f"password for {self.admin_account}: ").strip()
|
||||||
try:
|
try:
|
||||||
self.admin_password = encrypt(admin_passwd)
|
self.admin_password = encrypt(admin_passwd)
|
||||||
response = self.session.post(url, json={'email': self.admin_account, 'password': self.admin_password})
|
response = self.session.post(url, json={'email': self.admin_account, 'password': self.admin_password})
|
||||||
|
|||||||
@ -24,7 +24,7 @@ from flask_login import current_user, login_user
|
|||||||
from itsdangerous.url_safe import URLSafeTimedSerializer as Serializer
|
from itsdangerous.url_safe import URLSafeTimedSerializer as Serializer
|
||||||
|
|
||||||
from api.common.exceptions import AdminException, UserNotFoundError
|
from api.common.exceptions import AdminException, UserNotFoundError
|
||||||
from api.db.init_data import encode_to_base64
|
from api.common.base64 import encode_to_base64
|
||||||
from api.db.services import UserService
|
from api.db.services import UserService
|
||||||
from common.constants import ActiveEnum, StatusEnum
|
from common.constants import ActiveEnum, StatusEnum
|
||||||
from api.utils.crypt import decrypt
|
from api.utils.crypt import decrypt
|
||||||
|
|||||||
@ -13,7 +13,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
import logging
|
||||||
import os
|
import os
|
||||||
import importlib
|
import importlib
|
||||||
import inspect
|
import inspect
|
||||||
@ -50,9 +50,10 @@ del _package_path, _import_submodules, _extract_classes_from_module
|
|||||||
|
|
||||||
|
|
||||||
def component_class(class_name):
|
def component_class(class_name):
|
||||||
for mdl in ["agent.component", "agent.tools", "rag.flow"]:
|
for module_name in ["agent.component", "agent.tools", "rag.flow"]:
|
||||||
try:
|
try:
|
||||||
return getattr(importlib.import_module(mdl), class_name)
|
return getattr(importlib.import_module(module_name), class_name)
|
||||||
except Exception:
|
except Exception as e:
|
||||||
|
logging.warning(f"Can't import module: {module_name}, error: {e}")
|
||||||
pass
|
pass
|
||||||
assert False, f"Can't import {class_name}"
|
assert False, f"Can't import {class_name}"
|
||||||
|
|||||||
@ -514,6 +514,7 @@ class ComponentBase(ABC):
|
|||||||
def get_param(self, name):
|
def get_param(self, name):
|
||||||
if hasattr(self._param, name):
|
if hasattr(self._param, name):
|
||||||
return getattr(self._param, name)
|
return getattr(self._param, name)
|
||||||
|
return None
|
||||||
|
|
||||||
def debug(self, **kwargs):
|
def debug(self, **kwargs):
|
||||||
return self._invoke(**kwargs)
|
return self._invoke(**kwargs)
|
||||||
@ -521,7 +522,7 @@ class ComponentBase(ABC):
|
|||||||
def get_parent(self) -> Union[object, None]:
|
def get_parent(self) -> Union[object, None]:
|
||||||
pid = self._canvas.get_component(self._id).get("parent_id")
|
pid = self._canvas.get_component(self._id).get("parent_id")
|
||||||
if not pid:
|
if not pid:
|
||||||
return
|
return None
|
||||||
return self._canvas.get_component(pid)["obj"]
|
return self._canvas.get_component(pid)["obj"]
|
||||||
|
|
||||||
def get_upstream(self) -> List[str]:
|
def get_upstream(self) -> List[str]:
|
||||||
@ -546,7 +547,7 @@ class ComponentBase(ABC):
|
|||||||
|
|
||||||
def exception_handler(self):
|
def exception_handler(self):
|
||||||
if not self._param.exception_method:
|
if not self._param.exception_method:
|
||||||
return
|
return None
|
||||||
return {
|
return {
|
||||||
"goto": self._param.exception_goto,
|
"goto": self._param.exception_goto,
|
||||||
"default_value": self._param.exception_default_value
|
"default_value": self._param.exception_default_value
|
||||||
|
|||||||
Reference in New Issue
Block a user