Skip to content

Commit d2b51a7

Browse files
committed
fix config path and envs
1 parent 83060de commit d2b51a7

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

veadk/config.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,18 @@
2121
from veadk.configs.database_configs import (
2222
MysqlConfig,
2323
OpensearchConfig,
24-
PrometheusConfig,
2524
RedisConfig,
2625
TOSConfig,
2726
VikingKnowledgebaseConfig,
2827
)
2928
from veadk.configs.model_configs import ModelConfig
3029
from veadk.configs.tool_configs import BuiltinToolConfigs, PromptPilotConfig
31-
from veadk.configs.tracing_configs import APMPlusConfig, CozeloopConfig, TLSConfig
30+
from veadk.configs.tracing_configs import (
31+
APMPlusConfig,
32+
CozeloopConfig,
33+
PrometheusConfig,
34+
TLSConfig,
35+
)
3236
from veadk.utils.misc import set_envs
3337

3438

veadk/configs/database_configs.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import os
1616
from functools import cached_property
1717

18-
from pydantic import BaseModel
1918
from pydantic_settings import BaseSettings, SettingsConfigDict
2019

2120
from veadk.consts import DEFAULT_TOS_BUCKET_NAME
@@ -60,15 +59,9 @@ class RedisConfig(BaseSettings):
6059
db: int = 0
6160

6261

63-
class PrometheusConfig(BaseSettings):
64-
pushgateway_url: str = ""
62+
class VikingKnowledgebaseConfig(BaseSettings):
63+
model_config = SettingsConfigDict(env_prefix="DATABASE_VIKING_")
6564

66-
pushgateway_username: str = ""
67-
68-
pushgateway_password: str = ""
69-
70-
71-
class VikingKnowledgebaseConfig(BaseModel):
7265
project: str = "default"
7366
"""User project in Volcengine console web."""
7467

veadk/configs/tracing_configs.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from functools import cached_property
1717

1818
from pydantic import Field
19-
from pydantic_settings import BaseSettings
19+
from pydantic_settings import BaseSettings, SettingsConfigDict
2020

2121
from veadk.auth.veauth.apmplus_veauth import APMPlusVeAuth
2222
from veadk.consts import (
@@ -81,3 +81,13 @@ def otel_exporter_topic_id(self) -> str:
8181
or VeTLS().get_trace_topic_id()
8282
)
8383
return _topic_id
84+
85+
86+
class PrometheusConfig(BaseSettings):
87+
model_config = SettingsConfigDict(env_prefix="OBSERVABILITY_PROMETHEUS_")
88+
89+
pushgateway_url: str = ""
90+
91+
pushgateway_username: str = ""
92+
93+
pushgateway_password: str = ""

0 commit comments

Comments
 (0)