defined 'ConfigType' for configuration file type hinting

This commit is contained in:
2023-08-12 10:21:09 +02:00
parent 056bf4c6b5
commit bc5e6228a6
3 changed files with 19 additions and 17 deletions
+9 -9
View File
@@ -1,7 +1,7 @@
import yaml
import io
import pathlib
from .utils import terminal_width, append_message, message_to_chat
from .utils import terminal_width, append_message, message_to_chat, ConfigType
from typing import List, Dict, Any, Optional
@@ -41,11 +41,11 @@ def save_answers(question: str,
answers: list[str],
tags: list[str],
otags: Optional[list[str]],
config: Dict[str, Any]
config: ConfigType
) -> None:
wtags = otags or tags
num, inum = 0, 0
next_fname = pathlib.Path(config['db']) / '.next'
next_fname = pathlib.Path(str(config['db'])) / '.next'
try:
with open(next_fname, 'r') as f:
num = int(f.read())
@@ -66,14 +66,14 @@ def save_answers(question: str,
def create_chat_hist(question: Optional[str],
tags: Optional[List[str]],
extags: Optional[List[str]],
config: Dict[str, Any],
config: ConfigType,
match_all_tags: bool = False,
with_tags: bool = False,
with_file: bool = False
) -> List[Dict[str, str]]:
chat: List[Dict[str, str]] = []
append_message(chat, 'system', config['system'].strip())
for file in sorted(pathlib.Path(config['db']).iterdir()):
append_message(chat, 'system', str(config['system']).strip())
for file in sorted(pathlib.Path(str(config['db'])).iterdir()):
if file.suffix == '.yaml':
with open(file, 'r') as f:
data = yaml.load(f, Loader=yaml.FullLoader)
@@ -97,9 +97,9 @@ def create_chat_hist(question: Optional[str],
return chat
def get_tags(config: Dict[str, Any], prefix: Optional[str]) -> List[str]:
def get_tags(config: ConfigType, prefix: Optional[str]) -> List[str]:
result = []
for file in sorted(pathlib.Path(config['db']).iterdir()):
for file in sorted(pathlib.Path(str(config['db'])).iterdir()):
if file.suffix == '.yaml':
with open(file, 'r') as f:
data = yaml.load(f, Loader=yaml.FullLoader)
@@ -116,5 +116,5 @@ def get_tags(config: Dict[str, Any], prefix: Optional[str]) -> List[str]:
return result
def get_tags_unique(config: Dict[str, Any], prefix: Optional[str]) -> List[str]:
def get_tags_unique(config: ConfigType, prefix: Optional[str]) -> List[str]:
return list(set(get_tags(config, prefix)))