diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py index 23fe2e2d81c12b7ca9efb23e02ce381122a41ac1..cf54983e5a5232d9186d01f2bc4d03d562d05411 100644 --- a/src/caosdb/common/models.py +++ b/src/caosdb/common/models.py @@ -426,7 +426,7 @@ class Entity(object): return self - def add_parent(self, parent=None, **kwargs): # @ReservedAssignment + def add_parent(self, parent=None, id=None, name=None, inheritance=None): # @ReservedAssignment """Add a parent to this entity. Parameters @@ -463,8 +463,8 @@ class Entity(object): parameter is passed to this method. """ - name = (kwargs['name'] if 'name' in kwargs else None) - pid = (kwargs['id'] if 'id' in kwargs else None) + + pid = id parent_entity = None if isinstance(parent, Entity): @@ -478,9 +478,6 @@ class Entity(object): raise UserWarning( "This method expects you to pass at least an entity, a name or an id.") - inheritance = (kwargs['inheritance'] - if 'inheritance' in kwargs else None) - addp = Parent(id=pid, name=name, inheritance=inheritance) if parent_entity is not None: @@ -1467,7 +1464,7 @@ class Property(Entity): return super(Property, self).add_property( property=property, value=value, **copy_kwargs) - def add_parent(self, parent=None, **kwargs): + def add_parent(self, parent=None, id=None, name=None, inheritance=FIX): """Add a parent Entity to this Property. Parameters @@ -1485,13 +1482,8 @@ class Property(Entity): Entity.add_parent """ - copy_kwargs = kwargs.copy() - if 'inheritance' not in copy_kwargs: - # set default importance - copy_kwargs['inheritance'] = FIX - - return super(Property, self).add_parent(parent=parent, **copy_kwargs) + return super(Property, self).add_parent(parent=parent, id=id, name=name, inheritance=inheritance) def __init__(self, name=None, id=None, description=None, datatype=None, value=None, unit=None): @@ -1598,7 +1590,7 @@ class RecordType(Entity): return super().add_property(property=property, value=value, **copy_kwargs) - def add_parent(self, parent=None, **kwargs): + def add_parent(self, parent=None, id=None, name=None, inheritance=OBLIGATORY): """Add a parent to this RecordType Parameters @@ -1617,13 +1609,8 @@ class RecordType(Entity): Entity.add_parent """ - copy_kwargs = kwargs.copy() - - if 'inheritance' not in copy_kwargs: - # set default importance - copy_kwargs['inheritance'] = OBLIGATORY - return super().add_parent(parent=parent, **copy_kwargs) + return super().add_parent(parent=parent, id=id, name=name, inheritance=inheritance) def __init__(self, name=None, id=None, description=None, datatype=None): # @ReservedAssignment Entity.__init__(self, name=name, id=id, description=description,