refac
This commit is contained in:
@@ -646,15 +646,11 @@ LICENSE_PUBLIC_KEY = os.environ.get("LICENSE_PUBLIC_KEY", "")
|
||||
|
||||
pk = None
|
||||
if LICENSE_PUBLIC_KEY:
|
||||
pk = serialization.load_pem_public_key(
|
||||
f"""
|
||||
pk = serialization.load_pem_public_key(f"""
|
||||
-----BEGIN PUBLIC KEY-----
|
||||
{LICENSE_PUBLIC_KEY}
|
||||
-----END PUBLIC KEY-----
|
||||
""".encode(
|
||||
"utf-8"
|
||||
)
|
||||
)
|
||||
""".encode("utf-8"))
|
||||
|
||||
|
||||
####################################
|
||||
|
||||
@@ -325,14 +325,11 @@ class FunctionsTable:
|
||||
.filter(Function.id.in_(ids))
|
||||
.all()
|
||||
)
|
||||
return {
|
||||
f.id: (f.valves if f.valves else {}) for f in functions
|
||||
}
|
||||
return {f.id: (f.valves if f.valves else {}) for f in functions}
|
||||
except Exception as e:
|
||||
log.exception(f"Error batch-fetching function valves: {e}")
|
||||
return {}
|
||||
|
||||
|
||||
def update_function_valves_by_id(
|
||||
self, id: str, valves: dict, db: Optional[Session] = None
|
||||
) -> Optional[FunctionValves]:
|
||||
|
||||
@@ -1059,19 +1059,23 @@ async def update_rag_config(
|
||||
# None means "don't change", int means "set to this value"
|
||||
if form_data.FILE_MAX_SIZE is not None:
|
||||
request.app.state.config.FILE_MAX_SIZE = (
|
||||
None if form_data.FILE_MAX_SIZE == '' else form_data.FILE_MAX_SIZE
|
||||
None if form_data.FILE_MAX_SIZE == "" else form_data.FILE_MAX_SIZE
|
||||
)
|
||||
if form_data.FILE_MAX_COUNT is not None:
|
||||
request.app.state.config.FILE_MAX_COUNT = (
|
||||
None if form_data.FILE_MAX_COUNT == '' else form_data.FILE_MAX_COUNT
|
||||
None if form_data.FILE_MAX_COUNT == "" else form_data.FILE_MAX_COUNT
|
||||
)
|
||||
if form_data.FILE_IMAGE_COMPRESSION_WIDTH is not None:
|
||||
request.app.state.config.FILE_IMAGE_COMPRESSION_WIDTH = (
|
||||
None if form_data.FILE_IMAGE_COMPRESSION_WIDTH == '' else form_data.FILE_IMAGE_COMPRESSION_WIDTH
|
||||
None
|
||||
if form_data.FILE_IMAGE_COMPRESSION_WIDTH == ""
|
||||
else form_data.FILE_IMAGE_COMPRESSION_WIDTH
|
||||
)
|
||||
if form_data.FILE_IMAGE_COMPRESSION_HEIGHT is not None:
|
||||
request.app.state.config.FILE_IMAGE_COMPRESSION_HEIGHT = (
|
||||
None if form_data.FILE_IMAGE_COMPRESSION_HEIGHT == '' else form_data.FILE_IMAGE_COMPRESSION_HEIGHT
|
||||
None
|
||||
if form_data.FILE_IMAGE_COMPRESSION_HEIGHT == ""
|
||||
else form_data.FILE_IMAGE_COMPRESSION_HEIGHT
|
||||
)
|
||||
|
||||
request.app.state.config.ALLOWED_FILE_EXTENSIONS = (
|
||||
|
||||
@@ -333,9 +333,7 @@ async def get_all_models(request, refresh: bool = False, user: UserModel = None)
|
||||
|
||||
# Batch-fetch all function valves in one query to avoid N+1 DB hits
|
||||
# inside get_action_priority (previously called per action × per model).
|
||||
all_function_valves = Functions.get_function_valves_by_ids(
|
||||
list(all_function_ids)
|
||||
)
|
||||
all_function_valves = Functions.get_function_valves_by_ids(list(all_function_ids))
|
||||
|
||||
def get_action_priority(action_id):
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user