Skip to content

Resolve upstream conflicts and harden FunASR S3 handling - #1

Closed
LauraGPT wants to merge 2 commits into
ikelvingo:pr/funasr-connectorfrom
LauraGPT:codex/funasr-353-review-fixes
Closed

Resolve upstream conflicts and harden FunASR S3 handling#1
LauraGPT wants to merge 2 commits into
ikelvingo:pr/funasr-connectorfrom
LauraGPT:codex/funasr-353-review-fixes

Conversation

@LauraGPT

Copy link
Copy Markdown

This collaboration PR prepares murtaza-nasir#353 for another upstream review.

Changes:

  • merge current upstream master while preserving both FunASR and Mossland connectors
  • keep pre-signed S3 URLs task-local (no database/API persistence and no signed query strings in logs)
  • sign existing S3 recordings directly instead of duplicating them
  • restore the generic S3 upload implementation to avoid AWS/MinIO regressions
  • stop polling immediately on terminal provider failures and preserve ProviderError metadata
  • keep FunASR preparation scoped to the single-file connector path
  • document that the S3 endpoint must be reachable by DashScope

Validation:

  • full suite: 1504 passed, 11 subtests passed
  • focused FunASR + S3 suite: 53 passed
  • connector/processing/queue/storage suite: 264 passed
  • compileall and git diff --check passed

The one full-suite warning is an existing SQLAlchemy test-cleanup warning in tests/test_api_v1_users_me.py.

@github-actions

Copy link
Copy Markdown

Thank you for your contribution!

By submitting this pull request, you agree to the terms of our Contributor License Agreement (CLA).

Key points:

  • You retain copyright ownership of your contribution
  • You grant us permission to use your contribution under our dual-license model (AGPLv3 and Commercial)
  • This allows us to include your contribution in both the open source and commercial versions of Speakr

If you have any questions about the CLA, please let us know!

@ikelvingo

Copy link
Copy Markdown
Owner

Closing — merged the useful changes directly into pr/funasr-connector with Aliyun OSS compat and intranet S3 endpoint preserved.

@ikelvingo ikelvingo closed this Jul 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants