From 4bc762c014b8da46c0e43ba96d19dcb0ee1e9045 Mon Sep 17 00:00:00 2001 From: KanatSeytov Date: Sun, 27 Aug 2023 19:37:51 +0600 Subject: [PATCH 1/3] set default path to Configuration model --- parser_2gis/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parser_2gis/config.py b/parser_2gis/config.py index b93d639d..807c2b2c 100644 --- a/parser_2gis/config.py +++ b/parser_2gis/config.py @@ -21,13 +21,13 @@ class Configuration(BaseModel): writer: WriterOptions = WriterOptions() chrome: ChromeOptions = ChromeOptions() parser: ParserOptions = ParserOptions() - path: Optional[pathlib.Path] + path: Optional[pathlib.Path] = None version: str = config_version def __init__(self, *args, **kwargs) -> None: def setup_config(model: BaseModel) -> None: """Recursively setup config.""" - self.Config.validate_assignment = True + # self.Config.validate_assignment = True for field in model.__fields__: attr = getattr(model, field) if isinstance(attr, BaseModel): From f62a5e75b7721f6fbae1e572632f267b20c47f95 Mon Sep 17 00:00:00 2001 From: KanatSeytov Date: Sun, 27 Aug 2023 19:44:19 +0600 Subject: [PATCH 2/3] remove old field from CatalogItem model --- parser_2gis/writer/models/catalog_item.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser_2gis/writer/models/catalog_item.py b/parser_2gis/writer/models/catalog_item.py index bae2e4d7..f4bfc9b1 100644 --- a/parser_2gis/writer/models/catalog_item.py +++ b/parser_2gis/writer/models/catalog_item.py @@ -74,7 +74,7 @@ class CatalogItem(BaseModel): type: str # Признак удаленного объекта - is_deleted: Optional[bool] + # is_deleted: Optional[bool] @property def url(self) -> str: From d240071350ea6e892658c1618c2ffc10abe7f317 Mon Sep 17 00:00:00 2001 From: KanatSeytov Date: Sun, 27 Aug 2023 19:50:38 +0600 Subject: [PATCH 3/3] Fix AttributeError --- parser_2gis/writer/models/schedule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parser_2gis/writer/models/schedule.py b/parser_2gis/writer/models/schedule.py index 04b04de6..652556a6 100644 --- a/parser_2gis/writer/models/schedule.py +++ b/parser_2gis/writer/models/schedule.py @@ -67,7 +67,7 @@ def to_str(self, join_char: str, add_comment: bool = False) -> str: Returns: Schedule as a string. """ - days_names = [x.name for x in self.__fields__.values() if x.type_ == ScheduleDay] + days_names = [x.name for x in self.__fields__.values() if type(x) == ScheduleDay] days_mapping = dict(Mon='Пн', Tue='Вт', Wed='Ср', Thu='Чт', Fri='Пт', Sat='Сб', Sun='Вс') slots_list = []