Browse Source

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)
tags/v0.20.1
Kevin Hu 2 months ago
parent
commit
a2e1f5618d
No account linked to committer's email address
3 changed files with 6 additions and 6 deletions
  1. 1
    1
      api/settings.py
  2. 1
    1
      rag/llm/cv_model.py
  3. 4
    4
      rag/utils/s3_conn.py

+ 1
- 1
api/settings.py View File

# 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"]



+ 1
- 1
rag/llm/cv_model.py View File

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}]

+ 4
- 4
rag/utils/s3_conn.py View File

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)
'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:
s3_params['region_name'] = self.region
if self.region_name:
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:
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]

Loading…
Cancel
Save