|
8 | 8 | import logging |
9 | 9 | from typing import TYPE_CHECKING, Annotated, Any, Optional, Union |
10 | 10 |
|
11 | | -from pydantic import AnyUrl, BaseModel, Field, StringConstraints |
| 11 | +from pydantic import AliasChoices, AnyUrl, BaseModel, Field, StringConstraints |
12 | 12 | from pydantic_settings import BaseSettings, SettingsConfigDict |
13 | 13 |
|
14 | 14 | _MODELS_MODULE_NAME = "dandischema.models" |
@@ -76,22 +76,38 @@ class Config(BaseSettings): |
76 | 76 | For details, see https://docs.pydantic.dev/latest/concepts/pydantic_settings/ |
77 | 77 | """ |
78 | 78 |
|
79 | | - model_config = SettingsConfigDict(env_prefix="dandi_") |
| 79 | + model_config = SettingsConfigDict( |
| 80 | + validate_by_name=False, |
| 81 | + validate_by_alias=True, |
| 82 | + ) |
80 | 83 |
|
81 | 84 | instance_name: Annotated[ |
82 | | - str, StringConstraints(pattern=rf"^{UNVENDORED_ID_PATTERN}$") |
83 | | - ] = DEFAULT_INSTANCE_NAME |
| 85 | + str, |
| 86 | + StringConstraints(pattern=rf"^{UNVENDORED_ID_PATTERN}$"), |
| 87 | + Field( |
| 88 | + default=DEFAULT_INSTANCE_NAME, |
| 89 | + validation_alias=AliasChoices( |
| 90 | + "DANDI_INSTANCE_NAME", "DJANGO_DANDI_INSTANCE_NAME" |
| 91 | + ), |
| 92 | + ), |
| 93 | + ] |
84 | 94 | """Name of the DANDI instance""" |
85 | 95 |
|
86 | 96 | doi_prefix: Optional[ |
87 | 97 | Annotated[str, StringConstraints(pattern=rf"^{UNVENDORED_DOI_PREFIX_PATTERN}$")] |
88 | | - ] = None |
| 98 | + ] = Field( |
| 99 | + default=None, |
| 100 | + validation_alias=AliasChoices( |
| 101 | + "DANDI_DOI_PREFIX", "DJANGO_DANDI_DOI_API_PREFIX" |
| 102 | + ), |
| 103 | + ) |
89 | 104 | """ |
90 | 105 | The DOI prefix at DataCite |
91 | 106 | """ |
92 | 107 |
|
93 | 108 | licenses: set[License] = Field( |
94 | | - default={License("spdx:CC0-1.0"), License("spdx:CC-BY-4.0")} |
| 109 | + default={License("spdx:CC0-1.0"), License("spdx:CC-BY-4.0")}, |
| 110 | + validation_alias=AliasChoices("DANDI_LICENSES", "DJANGO_DANDI_LICENSES"), |
95 | 111 | ) |
96 | 112 | """ |
97 | 113 | Set of licenses to be supported by the DANDI instance |
|
0 commit comments