From 5656f81bde8da0629f0b2522b1e912c0d58fe7be Mon Sep 17 00:00:00 2001 From: crazywoola <100913391+crazywoola@users.noreply.github.com> Date: Mon, 11 Nov 2024 08:56:19 +0800 Subject: [PATCH] Revert "fix the error of unable to retrieve url from file" (#10511) --- api/core/file/file_manager.py | 2 +- .../podcast_generator/podcast_generator.yaml | 15 --------------- .../tools/podcast_audio_generator.py | 13 +------------ 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/api/core/file/file_manager.py b/api/core/file/file_manager.py index 389659c29..eb260a8f8 100644 --- a/api/core/file/file_manager.py +++ b/api/core/file/file_manager.py @@ -26,7 +26,7 @@ def get_attr(*, file: File, attr: FileAttribute): case FileAttribute.TRANSFER_METHOD: return file.transfer_method.value case FileAttribute.URL: - return _to_url(file) + return file.remote_url case FileAttribute.EXTENSION: return file.extension case _: diff --git a/api/core/tools/provider/builtin/podcast_generator/podcast_generator.yaml b/api/core/tools/provider/builtin/podcast_generator/podcast_generator.yaml index bbae1f81b..bd02b3202 100644 --- a/api/core/tools/provider/builtin/podcast_generator/podcast_generator.yaml +++ b/api/core/tools/provider/builtin/podcast_generator/podcast_generator.yaml @@ -32,18 +32,3 @@ credentials_for_provider: placeholder: en_US: Enter your TTS service API key zh_Hans: 输入您的 TTS 服务 API 密钥 - openai_base_url: - type: text-input - required: false - label: - en_US: OpenAI base URL - zh_Hans: OpenAI base URL - pt_BR: OpenAI base URL - help: - en_US: Please input your OpenAI base URL - zh_Hans: 请输入你的 OpenAI base URL - pt_BR: Please input your OpenAI base URL - placeholder: - en_US: Please input your OpenAI base URL - zh_Hans: 请输入你的 OpenAI base URL - pt_BR: Please input your OpenAI base URL diff --git a/api/core/tools/provider/builtin/podcast_generator/tools/podcast_audio_generator.py b/api/core/tools/provider/builtin/podcast_generator/tools/podcast_audio_generator.py index 8f7d4712c..476e2d01e 100644 --- a/api/core/tools/provider/builtin/podcast_generator/tools/podcast_audio_generator.py +++ b/api/core/tools/provider/builtin/podcast_generator/tools/podcast_audio_generator.py @@ -5,7 +5,6 @@ import warnings from typing import Any, Literal, Optional, Union import openai -from yarl import URL from core.tools.entities.tool_entities import ToolInvokeMessage from core.tools.errors import ToolParameterValidationError, ToolProviderCredentialValidationError @@ -61,18 +60,8 @@ class PodcastAudioGeneratorTool(BuiltinTool): if not api_key: raise ToolProviderCredentialValidationError("OpenAI API key is missing") - # Get OpenAI base URL - openai_base_url = self.runtime.credentials.get("openai_base_url", None) - if not openai_base_url: - openai_base_url = None - else: - openai_base_url = str(URL(openai_base_url) / "v1") - # Initialize OpenAI client - client = openai.OpenAI( - api_key=api_key, - base_url=openai_base_url, - ) + client = openai.OpenAI(api_key=api_key) # Create a thread pool max_workers = 5