diff --git a/api/settings.py b/api/settings.py index 5b3783b45..f5577361b 100644 --- a/api/settings.py +++ b/api/settings.py @@ -70,7 +70,7 @@ REGISTER_ENABLED = 1 # sandbox-executor-manager SANDBOX_ENABLED = 0 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"] diff --git a/rag/llm/cv_model.py b/rag/llm/cv_model.py index 2060da624..2fa312b4a 100644 --- a/rag/llm/cv_model.py +++ b/rag/llm/cv_model.py @@ -60,7 +60,7 @@ class Base(ABC): if not images: return text - if isinstance(images, str): + if isinstance(images, str) or "bytes" in type(images).__name__: images = [images] pmpt = [{"type": "text", "text": text}] diff --git a/rag/utils/s3_conn.py b/rag/utils/s3_conn.py index 85367e580..9b18d59bd 100644 --- a/rag/utils/s3_conn.py +++ b/rag/utils/s3_conn.py @@ -31,7 +31,7 @@ class RAGFlowS3: self.access_key = self.s3_config.get('access_key', None) self.secret_key = self.s3_config.get('secret_key', 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.signature_version = self.s3_config.get('signature_version', 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_session_token': self.session_token, } - if self.region: - s3_params['region_name'] = self.region + if self.region_name: + s3_params['region_name'] = self.region_name if self.endpoint_url: s3_params['endpoint_url'] = self.endpoint_url if self.signature_version: @@ -89,7 +89,7 @@ class RAGFlowS3: self.conn = [boto3.client('s3', **s3_params)] 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): del self.conn[0]