Speakr is a personal, self-hosted web application designed for transcribing audio recordings
Python
fix: restore put_object for Aliyun OSS compat and S3_INTRANET_ENDPOINT_URL
ikelvingo2dba421d593e
diff --git a/src/config/app_config.py b/src/config/app_config.pyindex 99f66238..42e1f911 100644--- a/src/config/app_config.py+++ b/src/config/app_config.py@@ -95,6 +95,11 @@ FILE_STORAGE_STAGING_DIR = os.environ.get('FILE_STORAGE_STAGING_DIR', '').strip(S3_BUCKET_NAME = os.environ.get('S3_BUCKET_NAME', '').strip() or NoneS3_REGION = os.environ.get('S3_REGION', '').strip() or NoneS3_ENDPOINT_URL = os.environ.get('S3_ENDPOINT_URL', '').strip() or None+if S3_ENDPOINT_URL and not S3_ENDPOINT_URL.startswith(('http://', 'https://')):+ S3_ENDPOINT_URL = f'https://{S3_ENDPOINT_URL}'+S3_INTRANET_ENDPOINT_URL = os.environ.get('S3_INTRANET_ENDPOINT_URL', '').strip() or None+if S3_INTRANET_ENDPOINT_URL and not S3_INTRANET_ENDPOINT_URL.startswith(('http://', 'https://')):+ S3_INTRANET_ENDPOINT_URL = f'https://{S3_INTRANET_ENDPOINT_URL}'S3_ACCESS_KEY_ID = os.environ.get('S3_ACCESS_KEY_ID', '').strip() or NoneS3_SECRET_ACCESS_KEY = os.environ.get('S3_SECRET_ACCESS_KEY', '').strip() or NoneS3_SESSION_TOKEN = os.environ.get('S3_SESSION_TOKEN', '').strip() or Nonediff --git a/src/services/storage/s3.py b/src/services/storage/s3.pyindex 3d0bf498..6b25fd53 100644--- a/src/services/storage/s3.py+++ b/src/services/storage/s3.py@@ -92,10 +92,10 @@ class S3StorageBackend:extra['ContentType'] = content_typeif metadata:extra['Metadata'] = metadata- if extra:- client.upload_file(local_path, self.bucket, key, ExtraArgs=extra)- else:- client.upload_file(local_path, self.bucket, key)+ # Use put_object (single PUT) instead of upload_file (multipart with chunked encoding)+ # Aliyun OSS rejects aws-chunked encoding used by boto3's multipart upload+ with open(local_path, 'rb') as body:+ client.put_object(Bucket=self.bucket, Key=key, Body=body, **extra)if delete_source:try:os.remove(local_path)diff --git a/src/services/transcription/connectors/alibaba_funasr.py b/src/services/transcription/connectors/alibaba_funasr.pyindex 3f8faf5c..a0e38a17 100644--- a/src/services/transcription/connectors/alibaba_funasr.py+++ b/src/services/transcription/connectors/alibaba_funasr.py@@ -529,6 +529,7 @@ def prepare_funasr_file_url(recording) -> tuple:tuple: (bool, list) - (success, file URLs)"""from flask import current_app+ from src.config.app_config import S3_INTRANET_ENDPOINT_URLfrom src.services.storage import get_storage_servicefrom src.services.storage.locator import parse_locator@@ -590,5 +591,10 @@ def prepare_funasr_file_url(recording) -> tuple:)url = storage.s3.presign_get_url(s3_locator, expires_seconds=86400)++ if S3_INTRANET_ENDPOINT_URL:+ from src.config.app_config import S3_ENDPOINT_URL+ url = url.replace(S3_ENDPOINT_URL, S3_INTRANET_ENDPOINT_URL)+current_app.logger.info(f"FunASR URL ready for recording {recording.id}")return True, [url]