Fix pydantic versioning problem for _base_attrs

Fix encoding in rdf file
BAMresearch · Jan 23, 2025 · d5d7444 · d5d7444 · github-actions · Jan 23, 2025
1 parent d7d8072
commit d5d7444
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/bam_masterdata/cli/cli.py b/bam_masterdata/cli/cli.py
@@ -241,7 +241,7 @@ def export_to_rdf(force_delete, python_path):
     # Saving RDF/XML to file
     rdf_output = graph.serialize(format="pretty-xml")
     masterdata_file = os.path.join(export_dir, "masterdata.owl")
-    with open(masterdata_file, "w") as f:
+    with open(masterdata_file, "w", encoding="utf-8") as f:
         f.write(rdf_output)
 
     click.echo(

diff --git a/bam_masterdata/metadata/entities.py b/bam_masterdata/metadata/entities.py
@@ -45,7 +45,8 @@ def _base_attrs(self) -> list:
             if not (
                 attr_name.startswith("_")
                 or callable(cls_attrs[attr_name])
-                or attr_name in ["defs", "model_config"]
+                or attr_name
+                in ["defs", "model_config", "model_fields", "model_computed_fields"]
             )
         ]
         return [getattr(self, attr_name) for attr_name in base_attrs]
File	Stmts	Miss	Cover	Missing
bam_masterdata
logger.py	8	0	100%
bam_masterdata/cli
cli.py	82	49	49	40%
entities_to_excel.py	54	3	3	94%
entities_to_json.py	36	5	5	86%
entities_to_rdf.py	63	53	53	16%
fill_masterdata.py	188	175	175	7%
bam_masterdata/datamodel
collection_types.py	37	0	100%
dataset_types.py	184	184	184	0%
object_types.py	1515	0	100%
property_types.py	800	0	100%
vocabulary_types.py	13721	0	100%
bam_masterdata/metadata
definitions.py	85	0	100%
entities.py	88	30	30	66%
bam_masterdata/openbis
get_entities.py	53	43	43	19%
login.py	6	3	3	50%
bam_masterdata/utils
utils.py	42	7	7	83%
TOTAL	16962	552	97%