diff --git a/rag/utils/azure_sas_conn.py b/rag/utils/azure_sas_conn.py index 1a9e5e7fd1c..96442a2f077 100644 --- a/rag/utils/azure_sas_conn.py +++ b/rag/utils/azure_sas_conn.py @@ -52,11 +52,12 @@ def health(self): return self.conn.upload_blob(name=fnm, data=BytesIO(binary), length=len(binary)) def put(self, bucket, fnm, binary, tenant_id=None): + blob_name = f"{bucket}/{fnm}" for _ in range(3): try: - return self.conn.upload_blob(name=f"{bucket}/{fnm}", data=BytesIO(binary), length=len(binary)) + return self.conn.upload_blob(name=blob_name, data=BytesIO(binary), length=len(binary)) except Exception: - logging.exception(f"Fail put {bucket}/{fnm}") + logging.exception(f"Fail put {blob_name}") self.__open__() time.sleep(1) @@ -67,12 +68,13 @@ def rm(self, bucket, fnm): logging.exception(f"Fail rm {bucket}/{fnm}") def get(self, bucket, fnm): + blob_name = f"{bucket}/{fnm}" for _ in range(1): try: - r = self.conn.download_blob(f"{bucket}/{fnm}") + r = self.conn.download_blob(blob_name) return r.read() except Exception: - logging.exception(f"fail get {bucket}/{fnm}") + logging.exception(f"fail get {blob_name}") self.__open__() time.sleep(1) return @@ -85,11 +87,12 @@ def obj_exist(self, bucket, fnm): return False def get_presigned_url(self, bucket, fnm, expires): + blob_name = f"{bucket}/{fnm}" for _ in range(10): try: - return self.conn.get_presigned_url("GET", bucket, fnm, expires) + return self.conn.get_presigned_url("GET", bucket, blob_name, expires) except Exception: - logging.exception(f"fail get {bucket}/{fnm}") + logging.exception(f"fail get {blob_name}") self.__open__() time.sleep(1) return diff --git a/rag/utils/azure_spn_conn.py b/rag/utils/azure_spn_conn.py index 691e4027ca9..e19c2e1fe1c 100644 --- a/rag/utils/azure_spn_conn.py +++ b/rag/utils/azure_spn_conn.py @@ -69,13 +69,14 @@ def health(self): return f.flush_data(len(binary)) def put(self, bucket, fnm, binary, tenant_id=None): + blob = f"{bucket}/{fnm}" for _ in range(3): try: - f = self.conn.create_file(f"{bucket}/{fnm}") + f = self.conn.create_file(f"{blob}") f.append_data(binary, offset=0, length=len(binary)) return f.flush_data(len(binary)) except Exception: - logging.exception(f"Fail put {bucket}/{fnm}") + logging.exception(f"Fail put {blob}") self.__open__() time.sleep(1) return None @@ -88,13 +89,14 @@ def rm(self, bucket, fnm): logging.exception(f"Fail rm {bucket}/{fnm}") def get(self, bucket, fnm): + blob = f"{bucket}/{fnm}" for _ in range(1): try: - client = self.conn.get_file_client(f"{bucket}/{fnm}") + client = self.conn.get_file_client(f"{blob}") r = client.download_file() return r.read() except Exception: - logging.exception(f"fail get {bucket}/{fnm}") + logging.exception(f"fail get {blob}") self.__open__() time.sleep(1) return None @@ -108,9 +110,10 @@ def obj_exist(self, bucket, fnm): return False def get_presigned_url(self, bucket, fnm, expires): + f_path = f"{bucket}/{fnm}" for _ in range(10): try: - return self.conn.get_presigned_url("GET", bucket, fnm, expires) + return self.conn.get_presigned_url("GET", bucket, f_path, expires) except Exception: logging.exception(f"fail get {bucket}/{fnm}") self.__open__()