Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/citrine/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "4.2.0"
__version__ = "4.3.0"
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from citrine._rest.resource import Resource
from citrine._serialization import properties
from citrine.informatics.data_sources import DataSource
from citrine.informatics.descriptors import Descriptor
from citrine.informatics.design_spaces.subspace import DesignSubspace

__all__ = ['DataSourceDesignSpace']
Expand All @@ -17,10 +18,15 @@ class DataSourceDesignSpace(Resource['DataSourceDesignSpace'], DesignSubspace):
the description of the design space
data_source: DataSource
the source of data for this design space
descriptors: list[Descriptor]
the descriptors that the platform derives from the data source. This is
populated by the platform and is read-only.

"""

data_source = properties.Object(DataSource, 'data_source')
descriptors = properties.List(
properties.Object(Descriptor), 'descriptors', serializable=False, default=[])

typ = properties.String('type', default='DataSourceDesignSpace', deserializable=False)

Expand Down
13 changes: 9 additions & 4 deletions tests/informatics/test_design_spaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,15 @@ def test_hierarchical_initialization(hierarchical_design_space):


def test_data_source_build(valid_data_source_design_space_dict):
ds = DataSourceDesignSpace.build(valid_data_source_design_space_dict)
assert ds.name == valid_data_source_design_space_dict["name"]
assert ds.description == valid_data_source_design_space_dict["description"]
assert ds.data_source == DataSource.build(valid_data_source_design_space_dict["data_source"])
descriptor = RealDescriptor("x", lower_bound=0, upper_bound=1, units="")
data = dict(valid_data_source_design_space_dict, descriptors=[descriptor.dump()])
ds = DataSourceDesignSpace.build(data)
assert ds.name == data["name"]
assert ds.description == data["description"]
assert ds.data_source == DataSource.build(data["data_source"])
assert str(ds) == f"<DataSourceDesignSpace '{ds.name}'>"
assert ds.descriptors == [descriptor]
assert "descriptors" not in ds.dump()


def test_data_source_initialization(valid_data_source_design_space_dict):
Expand All @@ -142,3 +146,4 @@ def test_data_source_initialization(valid_data_source_design_space_dict):
assert ds.name == data["name"]
assert ds.description == data["description"]
assert ds.data_source.dump() == data["data_source"]
assert ds.descriptors == []
Loading