diff --git a/rag/utils/azure_sas_conn.py b/rag/utils/azure_sas_conn.py index 78edc458c32..1a9e5e7fd1c 100644 --- a/rag/utils/azure_sas_conn.py +++ b/rag/utils/azure_sas_conn.py @@ -54,7 +54,7 @@ def health(self): def put(self, bucket, fnm, binary, tenant_id=None): for _ in range(3): try: - return self.conn.upload_blob(name=fnm, data=BytesIO(binary), length=len(binary)) + return self.conn.upload_blob(name=f"{bucket}/{fnm}", data=BytesIO(binary), length=len(binary)) except Exception: logging.exception(f"Fail put {bucket}/{fnm}") self.__open__() @@ -62,14 +62,14 @@ def put(self, bucket, fnm, binary, tenant_id=None): def rm(self, bucket, fnm): try: - self.conn.delete_blob(fnm) + self.conn.delete_blob(f"{bucket}/{fnm}") except Exception: logging.exception(f"Fail rm {bucket}/{fnm}") def get(self, bucket, fnm): for _ in range(1): try: - r = self.conn.download_blob(fnm) + r = self.conn.download_blob(f"{bucket}/{fnm}") return r.read() except Exception: logging.exception(f"fail get {bucket}/{fnm}") @@ -79,7 +79,7 @@ def get(self, bucket, fnm): def obj_exist(self, bucket, fnm): try: - return self.conn.get_blob_client(fnm).exists() + return self.conn.get_blob_client(f"{bucket}/{fnm}").exists() except Exception: logging.exception(f"Fail put {bucket}/{fnm}") return False diff --git a/rag/utils/azure_spn_conn.py b/rag/utils/azure_spn_conn.py index 418b3ee6af6..691e4027ca9 100644 --- a/rag/utils/azure_spn_conn.py +++ b/rag/utils/azure_spn_conn.py @@ -71,7 +71,7 @@ def health(self): def put(self, bucket, fnm, binary, tenant_id=None): for _ in range(3): try: - f = self.conn.create_file(fnm) + f = self.conn.create_file(f"{bucket}/{fnm}") f.append_data(binary, offset=0, length=len(binary)) return f.flush_data(len(binary)) except Exception: @@ -83,14 +83,14 @@ def put(self, bucket, fnm, binary, tenant_id=None): def rm(self, bucket, fnm): try: - self.conn.delete_file(fnm) + self.conn.delete_file(f"{bucket}/{fnm}") except Exception: logging.exception(f"Fail rm {bucket}/{fnm}") def get(self, bucket, fnm): for _ in range(1): try: - client = self.conn.get_file_client(fnm) + client = self.conn.get_file_client(f"{bucket}/{fnm}") r = client.download_file() return r.read() except Exception: @@ -101,7 +101,7 @@ def get(self, bucket, fnm): def obj_exist(self, bucket, fnm): try: - client = self.conn.get_file_client(fnm) + client = self.conn.get_file_client(f"{bucket}/{fnm}") return client.exists() except Exception: logging.exception(f"Fail put {bucket}/{fnm}")