Skip to content

Commit db51192

Browse files
committed
refactor: drop level prefixes now supplied by the log formatter
- 22 messages lose a leading 'Error: ', 'Warning: ' or 'Info: ' that the formatter now emits as the level - ontology.py: two calls passed a tuple as the message, a stray pair of parens that logged "('remove value...', 'de')"; collapsed to one string - left where the level word is sentence text, e.g. 'Error creating entity'
1 parent 42d5fe6 commit db51192

4 files changed

Lines changed: 28 additions & 38 deletions

File tree

‎src/osw/core.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ def register_schema(self, schema_registration: SchemaRegistration):
384384

385385
page.set_slot_content("jsonschema", schema)
386386
else:
387-
_logger.error("Error: Unsupported entity type")
387+
_logger.error("Unsupported entity type")
388388
return
389389

390390
page.edit()
@@ -421,7 +421,7 @@ def unregister_schema(self, schema_unregistration: SchemaUnregistration):
421421
):
422422
uuid = schema_unregistration.model_cls.__uuid__
423423
else:
424-
_logger.error("Error: Neither model nor model id provided")
424+
_logger.error("Neither model nor model id provided")
425425

426426
entity_title = "Category:" + OSW.get_osw_id(uuid)
427427
page = self.site.get_page(WtSite.GetPageParam(titles=[entity_title])).pages[0]
@@ -615,7 +615,7 @@ def _fetch_schema(
615615
0
616616
]
617617
if not page.exists:
618-
_logger.error(f"Error: Page {schema_title} does not exist")
618+
_logger.error(f"Page {schema_title} does not exist")
619619
# the $ref that led here was already rewritten to this file name
620620
write_schema_stub(get_model_dir_path(), schema_name)
621621
return OSW.FetchSchemaResult(
@@ -637,7 +637,7 @@ def _fetch_schema(
637637
)
638638
schema_str = json.dumps(schema)
639639
if (schema_str is None) or (schema_str == ""):
640-
_logger.warning(f"Warning: Schema slot of {schema_title} is empty")
640+
_logger.warning(f"Schema slot of {schema_title} is empty")
641641
schema_str = "{}" # empty schema to make reference work
642642
if fetchSchemaParam.warning_messages is None:
643643
fetchSchemaParam.warning_messages = []
@@ -1267,7 +1267,7 @@ def load_entity(
12671267
if not hasattr(model, cls_name):
12681268
schemas_fetched = False
12691269
_logger.error(
1270-
f"Error: Model {cls_name} not found. Schema {category} "
1270+
f"Model {cls_name} not found. Schema {category} "
12711271
f"needs to be fetched first."
12721272
)
12731273
if not schemas_fetched:
@@ -1278,7 +1278,7 @@ def load_entity(
12781278
entity: model.OswBaseModel = param.model_to_use(**jsondata)
12791279

12801280
elif len(schemas) == 0:
1281-
_logger.error("Error: no schema defined")
1281+
_logger.error("no schema defined")
12821282

12831283
elif len(schemas) == 1:
12841284
cls: Type[model.Entity] = getattr(model, schemas[0]["title"])
@@ -1409,7 +1409,7 @@ def validate_entity(cls, entity, values):
14091409
uuid_from_title = get_uuid(title)
14101410
except ValueError:
14111411
_logger.error(
1412-
f"Error: UUID could not be determined from title: '{title}', "
1412+
f"UUID could not be determined from title: '{title}', "
14131413
f"nor fromjsondata: {jsondata}"
14141414
)
14151415
return entity
@@ -1980,7 +1980,7 @@ def delete_entity_(entity_, comment_: str = None):
19801980
if title_ is None:
19811981
title_ = OSW.get_osw_id(entity_.uuid)
19821982
if namespace_ is None or title_ is None:
1983-
_logger.error("Error: Unsupported entity type")
1983+
_logger.error("Unsupported entity type")
19841984
return
19851985
entity_title = namespace_ + ":" + title_
19861986
page = self.site.get_page(WtSite.GetPageParam(titles=[entity_title])).pages[

‎src/osw/ontology.py‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -609,10 +609,10 @@ def _apply_osw_structure(self):
609609
"de",
610610
]:
611611
# ToDo: Support all/more languages
612-
_logger.warning((
613-
"Warning: remove value with unsupported language: ",
614-
f"{node[key]['lang']}",
615-
))
612+
_logger.warning(
613+
"remove value with unsupported language: "
614+
f"{node[key]['lang']}"
615+
)
616616
del node[key]
617617
continue
618618
elif isinstance(node[key], list):
@@ -626,22 +626,19 @@ def _apply_osw_structure(self):
626626
"lang"
627627
] not in ["en", "de"]:
628628
# ToDo: Support all/more languages
629-
_logger.warning((
630-
"Warning: remove value with unsupported language: ",
631-
f"{node[key][i]['lang']}",
632-
))
629+
_logger.warning(
630+
"remove value with unsupported language: "
631+
f"{node[key][i]['lang']}"
632+
)
633633
del node[key][i]
634634
continue
635635
else:
636636
_logger.warning(
637-
"Warning: remove invalide multilang value: "
638-
f"{node[key][i]}"
637+
f"remove invalide multilang value: {node[key][i]}"
639638
)
640639
del node[key][i]
641640
else:
642-
_logger.warning(
643-
f"Warning: remove invalide multilang value: {node[key]}"
644-
)
641+
_logger.warning(f"remove invalide multilang value: {node[key]}")
645642
del node[key]
646643
for key in ps.ensure_array:
647644
if key in node and not isinstance(node[key], list):
@@ -823,7 +820,7 @@ def _store_ontology(self, param: StoreOntologyParam):
823820
)
824821
text += f"\n {new_iri}|{smw_import_type}"
825822
else:
826-
_logger.error("Error: Entity has not iri/uri property")
823+
_logger.error("Entity has not iri/uri property")
827824

828825
import_page.set_slot_content("main", text)
829826
import_page.edit("import ontology")
@@ -887,7 +884,7 @@ def _store_ontologies(
887884
if o.prefix == prefix or o.prefix_name == prefix:
888885
onto = o
889886
if onto is None:
890-
_logger.error(f"Error: No ontology defined for prefix {prefix}")
887+
_logger.error(f"No ontology defined for prefix {prefix}")
891888
else:
892889
if not dry_run:
893890
self._store_ontology(

‎src/osw/utils/wikitext.py‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,7 @@ def find_dependencies(wikitext, debug=False):
300300
# see https://www.semantic-mediawiki.org/wiki/Help:Special_properties
301301
if "Property:" in dependency and (" " in dependency or "_" in dependency):
302302
if debug:
303-
_logger.debug(
304-
f"Info: Remove presumptive built-in property {dependency}"
305-
)
303+
_logger.debug(f"Remove presumptive built-in property {dependency}")
306304
else:
307305
filtered_dependencies.append(dependency)
308306
return filtered_dependencies
@@ -404,7 +402,7 @@ def get_wikitext_from_flat_content_dict(d: dict) -> str:
404402
else:
405403
if string_index != index:
406404
_logger.warning(
407-
f"Warning: template param '{key}' has mixed template/"
405+
f"template param '{key}' has mixed template/"
408406
f"string values: {value}"
409407
)
410408
if string_index > 0 and element and not element.strip().isspace():
@@ -440,9 +438,7 @@ def get_wikitext_from_flat_content_structure(content):
440438
elif isinstance(content_element, str):
441439
wt += content_element # "\n" + content_element
442440
else:
443-
_logger.error(
444-
f"Error: content element is not dict or string: {content_element}"
445-
)
441+
_logger.error(f"content element is not dict or string: {content_element}")
446442
return wt
447443

448444

@@ -473,7 +469,7 @@ def wikiJson2SchemaJson(schema, wikiJson):
473469
or not isinstance(wikiJson[1], str)
474470
or not isinstance(wikiJson[2], dict)
475471
):
476-
_logger.error(f"Error: Invalid wikiJson: {wikiJson}")
472+
_logger.error(f"Invalid wikiJson: {wikiJson}")
477473
return schemaJson
478474

479475
schemaJson = wikiJson2SchemaJsonRecursion(schema, wikiJson[0], wikiJson[2])
@@ -623,8 +619,7 @@ def schemaJson2WikiJson(schemaJson, isRoot=True):
623619
wikiJson[0][template] = {}
624620
else:
625621
_logger.error(
626-
f"Error: Mandatory property 'osl_template' not found in schemaJson "
627-
f"{schemaJson}"
622+
f"Mandatory property 'osl_template' not found in schemaJson {schemaJson}"
628623
)
629624
return
630625

‎src/osw/wtsite.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ def create_page_package(self, param: CreatePagePackageParam):
875875
shutil.rmtree(config.content_path)
876876
except OSError as e:
877877
if debug:
878-
_logger.error(f"Error: {e.filename} - {e.strerror}.")
878+
_logger.error(f"{e.filename} - {e.strerror}.")
879879
# Create a dump config
880880
if dump_config is None:
881881
dump_config = WtPage.PageDumpConfig(
@@ -890,7 +890,7 @@ def create_page_package(self, param: CreatePagePackageParam):
890890
added_titles = [] # keep track of added pages, prevent duplicates
891891

892892
if config.name not in bundle.packages:
893-
_logger.error(f"Error: package {config.name} does not exist in bundle")
893+
_logger.error(f"package {config.name} does not exist in bundle")
894894
return
895895
if not bundle.packages[config.name].pages:
896896
bundle.packages[config.name].pages = []
@@ -2191,9 +2191,7 @@ def find_file_page_refs_in_slots(self, slots: List[str] = None) -> List[str]:
21912191
if ft is not None:
21922192
file_page_refs.append(ft)
21932193
except ValueError:
2194-
_logger.warning(
2195-
"Warning: Error while parsing uuid in editor template"
2196-
)
2194+
_logger.warning("Error while parsing uuid in editor template")
21972195
return list(set(file_page_refs))
21982196

21992197
@try_and_renew_token

0 commit comments

Comments
 (0)