Skip to content
Snippets Groups Projects
Commit 4c8ba355 authored by Alexander Schlemmer's avatar Alexander Schlemmer
Browse files

STY: fixed autopep8 style

parent 5bfc0fd2
No related branches found
No related tags found
2 merge requests!57RELEASE 0.7.3,!52F refactor high level api
Pipeline #20521 passed
This commit is part of merge request !52. Comments created here will be created in the context of that merge request.
...@@ -659,7 +659,6 @@ class CaosDBPythonEntity(object): ...@@ -659,7 +659,6 @@ class CaosDBPythonEntity(object):
else: else:
entity.__setattr__(p, prop) entity.__setattr__(p, prop)
# if there is no metadata in the yaml file just initialize an empty metadata object # if there is no metadata in the yaml file just initialize an empty metadata object
if "metadata" in serialization and p in serialization["metadata"]: if "metadata" in serialization and p in serialization["metadata"]:
metadata = serialization["metadata"][p] metadata = serialization["metadata"][p]
...@@ -673,7 +672,6 @@ class CaosDBPythonEntity(object): ...@@ -673,7 +672,6 @@ class CaosDBPythonEntity(object):
return entity return entity
def serialize(self, without_metadata: bool = False, visited: dict = None): def serialize(self, without_metadata: bool = False, visited: dict = None):
""" """
Serialize necessary information into a dict. Serialize necessary information into a dict.
...@@ -832,6 +830,7 @@ def _single_convert_to_python_object(robj: CaosDBPythonEntity, ...@@ -832,6 +830,7 @@ def _single_convert_to_python_object(robj: CaosDBPythonEntity,
return robj return robj
def _convert_property_value(propval): def _convert_property_value(propval):
if isinstance(propval, CaosDBPythonUnresolvedReference): if isinstance(propval, CaosDBPythonUnresolvedReference):
propval = propval.id propval = propval.id
...@@ -845,6 +844,7 @@ def _convert_property_value(propval): ...@@ -845,6 +844,7 @@ def _convert_property_value(propval):
return propval return propval
def _single_convert_to_entity(entity: db.Entity, def _single_convert_to_entity(entity: db.Entity,
robj: CaosDBPythonEntity): robj: CaosDBPythonEntity):
""" """
......
...@@ -168,8 +168,6 @@ hide circle\n ...@@ -168,8 +168,6 @@ hide circle\n
else: else:
raise ValueError("Unknown style.") raise ValueError("Unknown style.")
if add_properties: if add_properties:
result += "package Properties #DDDDDD {\n" result += "package Properties #DDDDDD {\n"
for p in properties: for p in properties:
......
...@@ -32,7 +32,6 @@ from caosdb.apiutils import (apply_to_ids, compare_entities, create_id_query, ...@@ -32,7 +32,6 @@ from caosdb.apiutils import (apply_to_ids, compare_entities, create_id_query,
resolve_reference, copy_entity, merge_entities) resolve_reference, copy_entity, merge_entities)
def test_apply_to_ids(): def test_apply_to_ids():
parent = db.RecordType(id=3456) parent = db.RecordType(id=3456)
rec = db.Record(id=23) rec = db.Record(id=23)
...@@ -234,4 +233,3 @@ def test_copy_entities(): ...@@ -234,4 +233,3 @@ def test_copy_entities():
assert c.properties[i] != r.properties[i] assert c.properties[i] != r.properties[i]
assert c.properties[i].value == r.properties[i].value assert c.properties[i].value == r.properties[i].value
assert c.get_importance(c.properties[i]) == r.get_importance(r.properties[i]) assert c.get_importance(c.properties[i]) == r.get_importance(r.properties[i])
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
# A. Schlemmer, 02/2022 # A. Schlemmer, 02/2022
import caosdb as db import caosdb as db
from caosdb.high_level_api import (convert_to_entity, convert_to_python_object, from caosdb.high_level_api import (convert_to_entity, convert_to_python_object,
new_high_level_entity) new_high_level_entity)
...@@ -46,7 +45,10 @@ import os ...@@ -46,7 +45,10 @@ import os
import tempfile import tempfile
import pickle import pickle
import sys, traceback, pdb import sys
import traceback
import pdb
@pytest.fixture @pytest.fixture
def testrecord(): def testrecord():
...@@ -237,6 +239,7 @@ def test_resolve_references(): ...@@ -237,6 +239,7 @@ def test_resolve_references():
obj.resolve_references(True, references) obj.resolve_references(True, references)
assert obj.ref.ref.ref == obj.ref assert obj.ref.ref.ref == obj.ref
def equal_entities(r1, r2): def equal_entities(r1, r2):
res = compare_entities(r1, r2) res = compare_entities(r1, r2)
if len(res) != 2: if len(res) != 2:
...@@ -246,6 +249,7 @@ def equal_entities(r1, r2): ...@@ -246,6 +249,7 @@ def equal_entities(r1, r2):
return False return False
return True return True
def test_conversion_to_entity(): def test_conversion_to_entity():
r = db.Record() r = db.Record()
r.add_parent("bla") r.add_parent("bla")
...@@ -255,7 +259,6 @@ def test_conversion_to_entity(): ...@@ -255,7 +259,6 @@ def test_conversion_to_entity():
rconv = convert_to_entity(obj) rconv = convert_to_entity(obj)
assert equal_entities(r, rconv) assert equal_entities(r, rconv)
# With a reference: # With a reference:
r_ref = db.Record() r_ref = db.Record()
r_ref.add_parent("bla") r_ref.add_parent("bla")
...@@ -269,6 +272,7 @@ def test_conversion_to_entity(): ...@@ -269,6 +272,7 @@ def test_conversion_to_entity():
== r.get_property("ref").value.get_property("a").value) == r.get_property("ref").value.get_property("a").value)
# TODO: add more tests here # TODO: add more tests here
def test_base_properties(): def test_base_properties():
r = db.Record(id=5, name="test", description="ok") r = db.Record(id=5, name="test", description="ok")
r.add_property(name="v", value=15, datatype=db.INTEGER, unit="kpx", r.add_property(name="v", value=15, datatype=db.INTEGER, unit="kpx",
...@@ -295,6 +299,7 @@ def test_base_properties(): ...@@ -295,6 +299,7 @@ def test_base_properties():
assert prop.description == "description" assert prop.description == "description"
assert rconv.get_importance("v") == "RECOMMENDED" assert rconv.get_importance("v") == "RECOMMENDED"
def test_empty(): def test_empty():
r = db.Record() r = db.Record()
obj = convert_to_python_object(r) obj = convert_to_python_object(r)
...@@ -305,6 +310,7 @@ def test_empty(): ...@@ -305,6 +310,7 @@ def test_empty():
rconv = convert_to_entity(obj) rconv = convert_to_entity(obj)
assert len(rconv.properties) == 0 assert len(rconv.properties) == 0
def test_wrong_entity_for_file(): def test_wrong_entity_for_file():
r = db.Record() r = db.Record()
r.path = "test.dat" r.path = "test.dat"
...@@ -572,7 +578,6 @@ def test_deserialization(): ...@@ -572,7 +578,6 @@ def test_deserialization():
assert obj_des.file == "bla.test" assert obj_des.file == "bla.test"
assert obj_des.path == "/test/n/bla.test" assert obj_des.path == "/test/n/bla.test"
r = db.Record(id=17, name="test") r = db.Record(id=17, name="test")
r.add_parent("bla") r.add_parent("bla")
r.add_property(name="a", value=42) r.add_property(name="a", value=42)
...@@ -591,6 +596,7 @@ def test_deserialization(): ...@@ -591,6 +596,7 @@ def test_deserialization():
obj_des = CaosDBPythonEntity.deserialize(serial) obj_des = CaosDBPythonEntity.deserialize(serial)
assert obj.serialize() == obj_des.serialize() assert obj.serialize() == obj_des.serialize()
@pytest.fixture @pytest.fixture
def get_record_container(): def get_record_container():
record_xml = """ record_xml = """
...@@ -612,6 +618,7 @@ def get_record_container(): ...@@ -612,6 +618,7 @@ def get_record_container():
c = db.Container.from_xml(record_xml) c = db.Container.from_xml(record_xml)
return c return c
def test_recursion(get_record_container): def test_recursion(get_record_container):
r = convert_to_python_object(get_record_container[0]) r = convert_to_python_object(get_record_container[0])
r.resolve_references(r, get_record_container) r.resolve_references(r, get_record_container)
...@@ -624,6 +631,7 @@ def test_recursion(get_record_container): ...@@ -624,6 +631,7 @@ def test_recursion(get_record_container):
d = r.serialize(True) d = r.serialize(True)
assert r.sources[0] == r.sources[0].sources[0] assert r.sources[0] == r.sources[0].sources[0]
@pytest.mark.xfail @pytest.mark.xfail
def test_recursion_advanced(get_record_container): def test_recursion_advanced(get_record_container):
# TODO: # TODO:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment