theroyallab/tabbyAPI
1
0
Fork 0
mirror of https://github.com/theroyallab/tabbyAPI.git synced 2026-04-29 10:42:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix model names

Browse Source
This commit is contained in:
TerminalMan
2024-09-12 17:00:07 +01:00
parent 05f1c3e293
commit 8b48f00271
2 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/tabby_config.py
View File

@@ -5,11 +5,10 @@ from typing import Optional
from os import getenv
from common.utils import unwrap, merge_dicts
from common.config_models import tabby_config_model
import common.config_models
from common.config_models import TabbyConfigModel
class TabbyConfig(tabby_config_model):
class TabbyConfig(TabbyConfigModel):
# Persistent defaults
# TODO: make this pydantic?
model_defaults: dict = {}
@@ -26,11 +25,11 @@ class TabbyConfig(tabby_config_model):
merged_config = merge_dicts(*configs)
for field in tabby_config_model.model_fields.keys():
value = unwrap(merged_config.get(field), {})
model = getattr(common.config_models, f"{field}_config_model")
setattr(self, field, model.parse_obj(value))
# validate and update config
merged_config_model = TabbyConfigModel.model_validate(merged_config)
for field in TabbyConfigModel.model_fields.keys():
value = getattr(merged_config_model, field)
setattr(self, field, value)
# Set model defaults dict once to prevent on-demand reconstruction
# TODO: clean this up a bit
@@ -71,7 +70,7 @@ class TabbyConfig(tabby_config_model):
config = self._from_file(pathlib.Path(config_override))
return config # Return early if loading from file
for key in tabby_config_model.model_fields.keys():
for key in TabbyConfigModel.model_fields.keys():
override = args.get(key)
if override:
if key == "logging":
@@ -86,10 +85,10 @@ class TabbyConfig(tabby_config_model):
config = {}
for field_name in tabby_config_model.model_fields.keys():
for field_name in TabbyConfigModel.model_fields.keys():
section_config = {}
for sub_field_name in getattr(
tabby_config_model(), field_name
TabbyConfigModel(), field_name
).model_fields.keys():
setting = getenv(f"TABBY_{field_name}_{sub_field_name}".upper(), None)
if setting is not None: