From e60c02bb727fa6e35b3d9c5911dc0347e058bb4a Mon Sep 17 00:00:00 2001
From: Alexander Schlemmer <alexander@mail-schlemmer.de>
Date: Tue, 12 Apr 2022 14:23:15 +0200
Subject: [PATCH] MAINT: moved copy_entity to member function in models
---
src/caosdb/apiutils.py | 48 +------------------------------------
src/caosdb/common/models.py | 46 +++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/caosdb/apiutils.py b/src/caosdb/apiutils.py
index 5e45c8dd..a5f10c6e 100644
--- a/src/caosdb/apiutils.py
+++ b/src/caosdb/apiutils.py
@@ -37,7 +37,7 @@ from caosdb.common.datatype import (BOOLEAN, DATETIME, DOUBLE, FILE, INTEGER,
REFERENCE, TEXT, is_reference)
from caosdb.common.models import (Container, Entity, File, Property, Query,
Record, RecordType, execute_query,
- get_config)
+ get_config, SPECIAL_ATTRIBUTES)
def new_record(record_type, name=None, description=None,
@@ -565,10 +565,6 @@ def getCommitIn(folder):
return t.readline().strip()
-SPECIAL_ATTRIBUTES = ["name", "role", "datatype", "description",
- "id", "path", "checksum", "size"]
-
-
def compare_entities(old_entity: Entity, new_entity: Entity):
"""
Compare two entites.
@@ -681,48 +677,6 @@ def compare_entities(old_entity: Entity, new_entity: Entity):
return (olddiff, newdiff)
-def copy_entity(entity: Entity):
- """
- Return a copy of entity.
-
- If deep == True return a deep copy, recursively copying all sub entities.
-
- Standard properties are copied using add_property.
- Special attributes, as defined by the global variable SPECIAL_ATTRIBUTES and additionaly
- the "value" are copied using setattr.
- """
- if entity.role == "File":
- new = File()
- elif entity.role == "Property":
- new = Property()
- elif entity.role == "RecordType":
- new = RecordType()
- elif entity.role == "Record":
- new = Record()
- elif entity.role == "Entity":
- new = Entity()
- else:
- raise RuntimeError("Unkonwn role.")
-
- # Copy special attributes:
- # TODO: this might rise an exception when copying
- # special file attributes like checksum and size.
- for attribute in SPECIAL_ATTRIBUTES + ["value"]:
- val = getattr(entity, attribute)
- if val is not None:
- setattr(new, attribute, val)
-
- # Copy parents:
- for p in entity.parents:
- new.add_parent(p)
-
- # Copy properties:
- for p in entity.properties:
- new.add_property(p, importance=entity.get_importance(p))
-
- return new
-
-
def merge_entities(entity_a: Entity, entity_b: Entity):
"""
Merge entity_b into entity_a such that they have the same parents and properties.
diff --git a/src/caosdb/common/models.py b/src/caosdb/common/models.py
index 80a6ee11..3c510635 100644
--- a/src/caosdb/common/models.py
+++ b/src/caosdb/common/models.py
@@ -72,6 +72,10 @@ ALL = "ALL"
NONE = "NONE"
+SPECIAL_ATTRIBUTES = ["name", "role", "datatype", "description",
+ "id", "path", "checksum", "size"]
+
+
class Entity(object):
"""Entity is a generic CaosDB object.
@@ -114,6 +118,48 @@ class Entity(object):
self.id = id
self.state = None
+
+ def copy_entity(self):
+ """
+ Return a copy of entity.
+
+ If deep == True return a deep copy, recursively copying all sub entities.
+
+ Standard properties are copied using add_property.
+ Special attributes, as defined by the global variable SPECIAL_ATTRIBUTES and additionaly
+ the "value" are copied using setattr.
+ """
+ if self.role == "File":
+ new = File()
+ elif self.role == "Property":
+ new = Property()
+ elif self.role == "RecordType":
+ new = RecordType()
+ elif self.role == "Record":
+ new = Record()
+ elif self.role == "Entity":
+ new = Entity()
+ else:
+ raise RuntimeError("Unkonwn role.")
+
+ # Copy special attributes:
+ # TODO: this might rise an exception when copying
+ # special file attributes like checksum and size.
+ for attribute in SPECIAL_ATTRIBUTES + ["value"]:
+ val = getattr(self, attribute)
+ if val is not None:
+ setattr(new, attribute, val)
+
+ # Copy parents:
+ for p in self.parents:
+ new.add_parent(p)
+
+ # Copy properties:
+ for p in self.properties:
+ new.add_property(p, importance=self.get_importance(p))
+
+ return new
+
@property
def version(self):
if self._version is not None or self._wrapped_entity is None:
--
GitLab