Skip to content

Commit a9c7080

Browse files
dormant-userdormant-user
committed
Prioritize environment variables from dotenv files over system env vars
Fix a bug with downloading ``filebrowser`` executable from GitHub releases
1 parent 25a73cd commit a9c7080

File tree

13 files changed

+115
-50
lines changed

13 files changed

+115
-50
lines changed

‎doc_gen/index.rst‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Settings
5757

5858
====
5959

60-
.. autoclass:: pyfilebrowser.proxy.settings.EnvConfig(pydantic_settings.BaseSettings)
60+
.. autoclass:: pyfilebrowser.proxy.settings.EnvConfig(PydanticEnvConfig)
6161
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
6262

6363
====
@@ -79,40 +79,46 @@ Main Module
7979

8080
Modals
8181
======
82+
PydanticEnvConfig
83+
=================
84+
85+
.. autoclass:: pyfilebrowser.modals.pydantic_config.PydanticEnvConfig(pydantic_settings.BaseSettings)
86+
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
87+
8288
Configuration
8389
=============
8490

85-
.. autoclass:: pyfilebrowser.modals.settings.ServerSettings(pydantic_settings.BaseSettings)
91+
.. autoclass:: pyfilebrowser.modals.settings.ServerSettings(PydanticEnvConfig)
8692
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
8793

8894
====
8995

90-
.. autoclass:: pyfilebrowser.modals.config.Server(pydantic_settings.BaseSettings)
96+
.. autoclass:: pyfilebrowser.modals.config.Server(PydanticEnvConfig)
9197
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
9298

9399
====
94100

95-
.. autoclass:: pyfilebrowser.modals.config.Branding(pydantic_settings.BaseSettings)
101+
.. autoclass:: pyfilebrowser.modals.config.Branding(PydanticEnvConfig)
96102
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
97103

98104
====
99105

100-
.. autoclass:: pyfilebrowser.modals.config.Tus(pydantic_settings.BaseSettings)
106+
.. autoclass:: pyfilebrowser.modals.config.Tus(PydanticEnvConfig)
101107
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
102108

103109
====
104110

105-
.. autoclass:: pyfilebrowser.modals.config.Defaults(pydantic_settings.BaseSettings)
111+
.. autoclass:: pyfilebrowser.modals.config.Defaults(PydanticEnvConfig)
106112
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
107113

108114
====
109115

110-
.. autoclass:: pyfilebrowser.modals.config.Commands(pydantic_settings.BaseSettings)
116+
.. autoclass:: pyfilebrowser.modals.config.Commands(PydanticEnvConfig)
111117
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
112118

113119
====
114120

115-
.. autoclass:: pyfilebrowser.modals.config.Config(pydantic_settings.BaseSettings)
121+
.. autoclass:: pyfilebrowser.modals.config.Config(PydanticEnvConfig)
116122
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
117123

118124
====
@@ -122,7 +128,7 @@ Configuration
122128

123129
====
124130

125-
.. autoclass:: pyfilebrowser.modals.config.Auther(pydantic_settings.BaseSettings)
131+
.. autoclass:: pyfilebrowser.modals.config.Auther(PydanticEnvConfig)
126132
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
127133

128134
====
@@ -170,7 +176,7 @@ Users
170176

171177
====
172178

173-
.. autoclass:: pyfilebrowser.modals.users.UserSettings(pydantic_settings.BaseSettings)
179+
.. autoclass:: pyfilebrowser.modals.users.UserSettings(PydanticEnvConfig)
174180
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
175181

176182
Squire

‎docs/_sources/index.rst.txt‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Settings
5757

5858
====
5959

60-
.. autoclass:: pyfilebrowser.proxy.settings.EnvConfig(pydantic_settings.BaseSettings)
60+
.. autoclass:: pyfilebrowser.proxy.settings.EnvConfig(PydanticEnvConfig)
6161
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
6262

6363
====
@@ -79,40 +79,46 @@ Main Module
7979

8080
Modals
8181
======
82+
PydanticEnvConfig
83+
=================
84+
85+
.. autoclass:: pyfilebrowser.modals.pydantic_config.PydanticEnvConfig(pydantic_settings.BaseSettings)
86+
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
87+
8288
Configuration
8389
=============
8490

85-
.. autoclass:: pyfilebrowser.modals.settings.ServerSettings(pydantic_settings.BaseSettings)
91+
.. autoclass:: pyfilebrowser.modals.settings.ServerSettings(PydanticEnvConfig)
8692
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
8793

8894
====
8995

90-
.. autoclass:: pyfilebrowser.modals.config.Server(pydantic_settings.BaseSettings)
96+
.. autoclass:: pyfilebrowser.modals.config.Server(PydanticEnvConfig)
9197
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
9298

9399
====
94100

95-
.. autoclass:: pyfilebrowser.modals.config.Branding(pydantic_settings.BaseSettings)
101+
.. autoclass:: pyfilebrowser.modals.config.Branding(PydanticEnvConfig)
96102
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
97103

98104
====
99105

100-
.. autoclass:: pyfilebrowser.modals.config.Tus(pydantic_settings.BaseSettings)
106+
.. autoclass:: pyfilebrowser.modals.config.Tus(PydanticEnvConfig)
101107
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
102108

103109
====
104110

105-
.. autoclass:: pyfilebrowser.modals.config.Defaults(pydantic_settings.BaseSettings)
111+
.. autoclass:: pyfilebrowser.modals.config.Defaults(PydanticEnvConfig)
106112
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
107113

108114
====
109115

110-
.. autoclass:: pyfilebrowser.modals.config.Commands(pydantic_settings.BaseSettings)
116+
.. autoclass:: pyfilebrowser.modals.config.Commands(PydanticEnvConfig)
111117
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
112118

113119
====
114120

115-
.. autoclass:: pyfilebrowser.modals.config.Config(pydantic_settings.BaseSettings)
121+
.. autoclass:: pyfilebrowser.modals.config.Config(PydanticEnvConfig)
116122
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
117123

118124
====
@@ -122,7 +128,7 @@ Configuration
122128

123129
====
124130

125-
.. autoclass:: pyfilebrowser.modals.config.Auther(pydantic_settings.BaseSettings)
131+
.. autoclass:: pyfilebrowser.modals.config.Auther(PydanticEnvConfig)
126132
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
127133

128134
====
@@ -170,7 +176,7 @@ Users
170176

171177
====
172178

173-
.. autoclass:: pyfilebrowser.modals.users.UserSettings(pydantic_settings.BaseSettings)
179+
.. autoclass:: pyfilebrowser.modals.users.UserSettings(PydanticEnvConfig)
174180
:exclude-members: _abc_impl, model_config, model_fields, model_computed_fields, Config
175181

176182
Squire

‎docs/genindex.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,8 @@ <h2 id="P">P</h2>
519519
<li><a href="index.html#pyfilebrowser.proxy.server.proxy_server">proxy_server() (in module pyfilebrowser.proxy.server)</a>
520520
</li>
521521
<li><a href="index.html#pyfilebrowser.proxy.server.ProxyServer">ProxyServer (class in pyfilebrowser.proxy.server)</a>
522+
</li>
523+
<li><a href="index.html#pyfilebrowser.modals.pydantic_config.PydanticEnvConfig">PydanticEnvConfig (class in pyfilebrowser.modals.pydantic_config)</a>
522524
</li>
523525
<li>
524526
pyfilebrowser.__init__
@@ -689,17 +691,19 @@ <h2 id="S">S</h2>
689691
<li><a href="index.html#pyfilebrowser.proxy.settings.Session">Session (class in pyfilebrowser.proxy.settings)</a>
690692
</li>
691693
<li><a href="index.html#pyfilebrowser.modals.config.ConfigSettings.settings">settings (pyfilebrowser.modals.config.ConfigSettings attribute)</a>
694+
</li>
695+
<li><a href="index.html#pyfilebrowser.modals.pydantic_config.PydanticEnvConfig.settings_customise_sources">settings_customise_sources() (pyfilebrowser.modals.pydantic_config.PydanticEnvConfig class method)</a>
692696
</li>
693697
<li><a href="index.html#pyfilebrowser.squire.steward.FileIO.settings_dir">settings_dir (pyfilebrowser.squire.steward.FileIO attribute)</a>
694698
</li>
695699
<li><a href="index.html#pyfilebrowser.modals.models.Perm.share">share (pyfilebrowser.modals.models.Perm attribute)</a>
696700
</li>
697701
<li><a href="index.html#pyfilebrowser.modals.config.Config.shell_">shell_ (pyfilebrowser.modals.config.Config attribute)</a>
698-
</li>
699-
<li><a href="index.html#pyfilebrowser.modals.config.Config.signup">signup (pyfilebrowser.modals.config.Config attribute)</a>
700702
</li>
701703
</ul></td>
702704
<td style="width: 33%; vertical-align: top;"><ul>
705+
<li><a href="index.html#pyfilebrowser.modals.config.Config.signup">signup (pyfilebrowser.modals.config.Config attribute)</a>
706+
</li>
703707
<li><a href="index.html#pyfilebrowser.modals.config.Defaults.singleClick">singleClick (pyfilebrowser.modals.config.Defaults attribute)</a>
704708

705709
<ul>

0 commit comments

Comments
 (0)