Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dify
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
dify
Commits
3ad943a9
Unverified
Commit
3ad943a9
authored
Feb 23, 2024
by
Garfield Dai
Committed by
GitHub
Feb 23, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Feat/openai llm trial paid config (#2545)
parent
30820932
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
24 deletions
+18
-24
.env.example
api/.env.example
+2
-0
config.py
api/config.py
+4
-0
hosting_configuration.py
api/core/hosting_configuration.py
+12
-24
No files found.
api/.env.example
View file @
3ad943a9
...
@@ -111,8 +111,10 @@ HOSTED_OPENAI_API_KEY=
...
@@ -111,8 +111,10 @@ HOSTED_OPENAI_API_KEY=
HOSTED_OPENAI_API_BASE=
HOSTED_OPENAI_API_BASE=
HOSTED_OPENAI_API_ORGANIZATION=
HOSTED_OPENAI_API_ORGANIZATION=
HOSTED_OPENAI_TRIAL_ENABLED=false
HOSTED_OPENAI_TRIAL_ENABLED=false
HOSTED_OPENAI_TRIAL_MODELS=gpt-3.5-turbo,gpt-3.5-turbo-1106,gpt-3.5-turbo-instruct,gpt-3.5-turbo-16k,gpt-3.5-turbo-16k-0613,gpt-3.5-turbo-0613,gpt-3.5-turbo-0125,text-davinci-003
HOSTED_OPENAI_QUOTA_LIMIT=200
HOSTED_OPENAI_QUOTA_LIMIT=200
HOSTED_OPENAI_PAID_ENABLED=false
HOSTED_OPENAI_PAID_ENABLED=false
HOSTED_OPENAI_PAID_MODELS=gpt-4,gpt-4-turbo-preview,gpt-4-32k,gpt-4-1106-preview,gpt-4-0125-preview,gpt-3.5-turbo,gpt-3.5-turbo-16k,gpt-3.5-turbo-16k-0613,gpt-3.5-turbo-1106,gpt-3.5-turbo-0613,gpt-3.5-turbo-0125,gpt-3.5-turbo-instruct,text-davinci-003
HOSTED_AZURE_OPENAI_ENABLED=false
HOSTED_AZURE_OPENAI_ENABLED=false
HOSTED_AZURE_OPENAI_API_KEY=
HOSTED_AZURE_OPENAI_API_KEY=
...
...
api/config.py
View file @
3ad943a9
...
@@ -38,7 +38,9 @@ DEFAULTS = {
...
@@ -38,7 +38,9 @@ DEFAULTS = {
'LOG_LEVEL'
:
'INFO'
,
'LOG_LEVEL'
:
'INFO'
,
'HOSTED_OPENAI_QUOTA_LIMIT'
:
200
,
'HOSTED_OPENAI_QUOTA_LIMIT'
:
200
,
'HOSTED_OPENAI_TRIAL_ENABLED'
:
'False'
,
'HOSTED_OPENAI_TRIAL_ENABLED'
:
'False'
,
'HOSTED_OPENAI_TRIAL_MODELS'
:
''
,
'HOSTED_OPENAI_PAID_ENABLED'
:
'False'
,
'HOSTED_OPENAI_PAID_ENABLED'
:
'False'
,
'HOSTED_OPENAI_PAID_MODELS'
:
''
,
'HOSTED_AZURE_OPENAI_ENABLED'
:
'False'
,
'HOSTED_AZURE_OPENAI_ENABLED'
:
'False'
,
'HOSTED_AZURE_OPENAI_QUOTA_LIMIT'
:
200
,
'HOSTED_AZURE_OPENAI_QUOTA_LIMIT'
:
200
,
'HOSTED_ANTHROPIC_QUOTA_LIMIT'
:
600000
,
'HOSTED_ANTHROPIC_QUOTA_LIMIT'
:
600000
,
...
@@ -261,8 +263,10 @@ class Config:
...
@@ -261,8 +263,10 @@ class Config:
self
.
HOSTED_OPENAI_API_BASE
=
get_env
(
'HOSTED_OPENAI_API_BASE'
)
self
.
HOSTED_OPENAI_API_BASE
=
get_env
(
'HOSTED_OPENAI_API_BASE'
)
self
.
HOSTED_OPENAI_API_ORGANIZATION
=
get_env
(
'HOSTED_OPENAI_API_ORGANIZATION'
)
self
.
HOSTED_OPENAI_API_ORGANIZATION
=
get_env
(
'HOSTED_OPENAI_API_ORGANIZATION'
)
self
.
HOSTED_OPENAI_TRIAL_ENABLED
=
get_bool_env
(
'HOSTED_OPENAI_TRIAL_ENABLED'
)
self
.
HOSTED_OPENAI_TRIAL_ENABLED
=
get_bool_env
(
'HOSTED_OPENAI_TRIAL_ENABLED'
)
self
.
HOSTED_OPENAI_TRIAL_MODELS
=
get_env
(
'HOSTED_OPENAI_TRIAL_MODELS'
)
self
.
HOSTED_OPENAI_QUOTA_LIMIT
=
int
(
get_env
(
'HOSTED_OPENAI_QUOTA_LIMIT'
))
self
.
HOSTED_OPENAI_QUOTA_LIMIT
=
int
(
get_env
(
'HOSTED_OPENAI_QUOTA_LIMIT'
))
self
.
HOSTED_OPENAI_PAID_ENABLED
=
get_bool_env
(
'HOSTED_OPENAI_PAID_ENABLED'
)
self
.
HOSTED_OPENAI_PAID_ENABLED
=
get_bool_env
(
'HOSTED_OPENAI_PAID_ENABLED'
)
self
.
HOSTED_OPENAI_PAID_MODELS
=
get_env
(
'HOSTED_OPENAI_PAID_MODELS'
)
self
.
HOSTED_AZURE_OPENAI_ENABLED
=
get_bool_env
(
'HOSTED_AZURE_OPENAI_ENABLED'
)
self
.
HOSTED_AZURE_OPENAI_ENABLED
=
get_bool_env
(
'HOSTED_AZURE_OPENAI_ENABLED'
)
self
.
HOSTED_AZURE_OPENAI_API_KEY
=
get_env
(
'HOSTED_AZURE_OPENAI_API_KEY'
)
self
.
HOSTED_AZURE_OPENAI_API_KEY
=
get_env
(
'HOSTED_AZURE_OPENAI_API_KEY'
)
...
...
api/core/hosting_configuration.py
View file @
3ad943a9
...
@@ -104,37 +104,17 @@ class HostingConfiguration:
...
@@ -104,37 +104,17 @@ class HostingConfiguration:
if
app_config
.
get
(
"HOSTED_OPENAI_TRIAL_ENABLED"
):
if
app_config
.
get
(
"HOSTED_OPENAI_TRIAL_ENABLED"
):
hosted_quota_limit
=
int
(
app_config
.
get
(
"HOSTED_OPENAI_QUOTA_LIMIT"
,
"200"
))
hosted_quota_limit
=
int
(
app_config
.
get
(
"HOSTED_OPENAI_QUOTA_LIMIT"
,
"200"
))
trial_models
=
self
.
parse_restrict_models_from_env
(
app_config
,
"HOSTED_OPENAI_TRIAL_MODELS"
)
trial_quota
=
TrialHostingQuota
(
trial_quota
=
TrialHostingQuota
(
quota_limit
=
hosted_quota_limit
,
quota_limit
=
hosted_quota_limit
,
restrict_models
=
[
restrict_models
=
trial_models
RestrictModel
(
model
=
"gpt-3.5-turbo"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-1106"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-instruct"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-16k"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-16k-0613"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-0613"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-0125"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"text-davinci-003"
,
model_type
=
ModelType
.
LLM
),
]
)
)
quotas
.
append
(
trial_quota
)
quotas
.
append
(
trial_quota
)
if
app_config
.
get
(
"HOSTED_OPENAI_PAID_ENABLED"
):
if
app_config
.
get
(
"HOSTED_OPENAI_PAID_ENABLED"
):
paid_models
=
self
.
parse_restrict_models_from_env
(
app_config
,
"HOSTED_OPENAI_PAID_MODELS"
)
paid_quota
=
PaidHostingQuota
(
paid_quota
=
PaidHostingQuota
(
restrict_models
=
[
restrict_models
=
paid_models
RestrictModel
(
model
=
"gpt-4"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-4-turbo-preview"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-4-1106-preview"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-4-0125-preview"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-16k"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-16k-0613"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-1106"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-0613"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-0125"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"gpt-3.5-turbo-instruct"
,
model_type
=
ModelType
.
LLM
),
RestrictModel
(
model
=
"text-davinci-003"
,
model_type
=
ModelType
.
LLM
),
]
)
)
quotas
.
append
(
paid_quota
)
quotas
.
append
(
paid_quota
)
...
@@ -258,3 +238,11 @@ class HostingConfiguration:
...
@@ -258,3 +238,11 @@ class HostingConfiguration:
return
HostedModerationConfig
(
return
HostedModerationConfig
(
enabled
=
False
enabled
=
False
)
)
@
staticmethod
def
parse_restrict_models_from_env
(
app_config
:
Config
,
env_var
:
str
)
->
list
[
RestrictModel
]:
models_str
=
app_config
.
get
(
env_var
)
models_list
=
models_str
.
split
(
","
)
if
models_str
else
[]
return
[
RestrictModel
(
model
=
model_name
.
strip
(),
model_type
=
ModelType
.
LLM
)
for
model_name
in
models_list
if
model_name
.
strip
()]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment