mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-12-08 20:42:30 +08:00
Fix: bytes style image issue. (#9304)
### What problem does this PR solve? #9302 ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
@ -70,7 +70,7 @@ REGISTER_ENABLED = 1
|
|||||||
# sandbox-executor-manager
|
# sandbox-executor-manager
|
||||||
SANDBOX_ENABLED = 0
|
SANDBOX_ENABLED = 0
|
||||||
SANDBOX_HOST = None
|
SANDBOX_HOST = None
|
||||||
STRONG_TEST_COUNT = int(os.environ.get("STRONG_TEST_COUNT", "32"))
|
STRONG_TEST_COUNT = int(os.environ.get("STRONG_TEST_COUNT", "8"))
|
||||||
|
|
||||||
BUILTIN_EMBEDDING_MODELS = ["BAAI/bge-large-zh-v1.5@BAAI", "maidalun1020/bce-embedding-base_v1@Youdao"]
|
BUILTIN_EMBEDDING_MODELS = ["BAAI/bge-large-zh-v1.5@BAAI", "maidalun1020/bce-embedding-base_v1@Youdao"]
|
||||||
|
|
||||||
|
|||||||
@ -60,7 +60,7 @@ class Base(ABC):
|
|||||||
if not images:
|
if not images:
|
||||||
return text
|
return text
|
||||||
|
|
||||||
if isinstance(images, str):
|
if isinstance(images, str) or "bytes" in type(images).__name__:
|
||||||
images = [images]
|
images = [images]
|
||||||
|
|
||||||
pmpt = [{"type": "text", "text": text}]
|
pmpt = [{"type": "text", "text": text}]
|
||||||
|
|||||||
@ -31,7 +31,7 @@ class RAGFlowS3:
|
|||||||
self.access_key = self.s3_config.get('access_key', None)
|
self.access_key = self.s3_config.get('access_key', None)
|
||||||
self.secret_key = self.s3_config.get('secret_key', None)
|
self.secret_key = self.s3_config.get('secret_key', None)
|
||||||
self.session_token = self.s3_config.get('session_token', None)
|
self.session_token = self.s3_config.get('session_token', None)
|
||||||
self.region = self.s3_config.get('region', None)
|
self.region_name = self.s3_config.get('region_name', None)
|
||||||
self.endpoint_url = self.s3_config.get('endpoint_url', None)
|
self.endpoint_url = self.s3_config.get('endpoint_url', None)
|
||||||
self.signature_version = self.s3_config.get('signature_version', None)
|
self.signature_version = self.s3_config.get('signature_version', None)
|
||||||
self.addressing_style = self.s3_config.get('addressing_style', None)
|
self.addressing_style = self.s3_config.get('addressing_style', None)
|
||||||
@ -76,8 +76,8 @@ class RAGFlowS3:
|
|||||||
'aws_secret_access_key': self.secret_key,
|
'aws_secret_access_key': self.secret_key,
|
||||||
'aws_session_token': self.session_token,
|
'aws_session_token': self.session_token,
|
||||||
}
|
}
|
||||||
if self.region:
|
if self.region_name:
|
||||||
s3_params['region_name'] = self.region
|
s3_params['region_name'] = self.region_name
|
||||||
if self.endpoint_url:
|
if self.endpoint_url:
|
||||||
s3_params['endpoint_url'] = self.endpoint_url
|
s3_params['endpoint_url'] = self.endpoint_url
|
||||||
if self.signature_version:
|
if self.signature_version:
|
||||||
@ -89,7 +89,7 @@ class RAGFlowS3:
|
|||||||
|
|
||||||
self.conn = [boto3.client('s3', **s3_params)]
|
self.conn = [boto3.client('s3', **s3_params)]
|
||||||
except Exception:
|
except Exception:
|
||||||
logging.exception(f"Fail to connect at region {self.region} or endpoint {self.endpoint_url}")
|
logging.exception(f"Fail to connect at region {self.region_name} or endpoint {self.endpoint_url}")
|
||||||
|
|
||||||
def __close__(self):
|
def __close__(self):
|
||||||
del self.conn[0]
|
del self.conn[0]
|
||||||
|
|||||||
Reference in New Issue
Block a user