estel/dify
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor(models&tools): switch to dify_config in models and tools. (#6394)

Browse Source 
Co-authored-by: Poorandy <andymonicamua1@gmail.com>
This commit is contained in:
Poorandy
2024-07-17 22:26:18 +08:00
committed by GitHub
parent 35f4a264d6
commit 8a80af39c9
5 changed files with 103 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/models/model.py
View File

@@ -4,10 +4,11 @@ import uuid
from enum import Enum
from typing import Optional
from flask import current_app, request
from flask import request
from flask_login import UserMixin
from sqlalchemy import Float, func, text
from configs import dify_config
from core.file.tool_file_parser import ToolFileParser
from core.file.upload_file_parser import UploadFileParser
from extensions.ext_database import db
@@ -111,7 +112,7 @@ class App(db.Model):
@property
def api_base_url(self):
return (current_app.config['SERVICE_API_URL'] if current_app.config['SERVICE_API_URL']
return (dify_config.SERVICE_API_URL if dify_config.SERVICE_API_URL
else request.host_url.rstrip('/')) + '/v1'
@property
@@ -1113,7 +1114,7 @@ class Site(db.Model):
@property
def app_base_url(self):
return (
current_app.config['APP_WEB_URL'] if current_app.config['APP_WEB_URL'] else request.host_url.rstrip('/'))
dify_config.APP_WEB_URL if dify_config.APP_WEB_URL else request.host_url.rstrip('/'))
class ApiToken(db.Model):