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 docs/reference/operations.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ example_operation.validate()
| UpdateDropdownOption | Updates the name of an existing option in a dropdown. | 6 |
| ArchiveDropdownOption | Archives an existing option in a dropdown. | 7 |
| ReorderDropdownOptions | Reorders the options in an existing dropdown. | 8 |
| ArchiveDropdown | Archives an existing dropdown. | 18 |
| ArchiveDropdown | Archives an existing dropdown. | 19 |

### Entity Schema Operations

Expand Down
2 changes: 0 additions & 2 deletions docs/theme/announce.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<!-- the following line is displayed in the announcement bar -->
<!-- keep length under 164 characters (less HTML tags) to fit on 1280px desktop window -->
<strong>Liminal v5 release is out, now fully migrated to the v3 Benchling API!! See the release notes <a href="https://dynotx.github.io/liminal-orm/release-notes/#v500">here</a>.</strong>
<br>
<em>Join our online webinar Thursday, October 22nd at 4:30 PM EDT to learn more about Liminal and how it helps perform AI-assisted Benchling schema migrations safely (<a href="https://benchling.zoom.us/j/97578720666?pwd=FkqkIG41Bdi4n01k7OznLPkCdabU2a.1">Link here</a>).</em>
<script>
document.getElementById('close-banner').addEventListener('click', function () {
this.parentElement.style.display = 'none';
Expand Down
7 changes: 3 additions & 4 deletions liminal/base/properties/base_field_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def set_archived(self, value: bool) -> BaseFieldProperties:
self._archived = value
return self

def set_warehouse_name(self, wh_name: str) -> BaseFieldProperties:
def set_warehouse_name(self, wh_name: str | None) -> BaseFieldProperties:
self.warehouse_name = wh_name
return self

Expand All @@ -94,9 +94,8 @@ def unset_unit_name(self) -> BaseFieldProperties:
self.__pydantic_fields_set__.remove("unit_name")
return self

def unset_parent_link(self) -> BaseFieldProperties:
if "parent_link" in self.__pydantic_fields_set__:
self.__pydantic_fields_set__.remove("parent_link")
def set_parent_link(self, value: bool) -> BaseFieldProperties:
self.parent_link = value
return self

def set_type(self, new_type: BenchlingFieldType) -> BaseFieldProperties:
Expand Down
9 changes: 1 addition & 8 deletions liminal/dropdowns/operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
dropdown_exists_in_benchling,
get_benchling_dropdown_by_name,
get_benchling_dropdown_summary_by_name,
get_schemas_with_dropdown,
)

LOGGER = logging.getLogger(__name__)
Expand Down Expand Up @@ -74,7 +73,7 @@ def describe(self) -> str:


class ArchiveDropdown(BaseOperation):
order: ClassVar[int] = 180
order: ClassVar[int] = 190

def __init__(self, dropdown_name: str) -> None:
self.dropdown_name = dropdown_name
Expand All @@ -85,12 +84,6 @@ def execute(self, benchling_service: BenchlingService) -> dict[str, Any]:
raise ValueError(f"Dropdown {self.dropdown_name} is already archived.")
return archive_dropdown(benchling_service, dropdown.id)

def validate(self, benchling_service: BenchlingService) -> None:
if schemas_with_dropdown := get_schemas_with_dropdown(self.dropdown_name):
raise ValueError(
f"Dropdown {self.dropdown_name} is used in schemas {schemas_with_dropdown}. Cannot archive a dropdown that is in use in non-archived fields."
)

def describe_operation(self) -> str:
return f"{self.dropdown_name}: Archiving dropdown."

Expand Down
7 changes: 2 additions & 5 deletions liminal/entity_schemas/compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,11 @@ def compare_entity_schemas(
if (p.parent_link and p.entity_link and p.warehouse_name)
}
field_props = [
f.unset_tooltip()
.unset_entity_link()
.unset_unit_name()
.unset_parent_link()
f.unset_tooltip().unset_entity_link().unset_unit_name()
for f in field_props
]
field_props = [
f.unset_parent_link()
f.set_parent_link(False)
if f.warehouse_name in parent_links_to_update
else f
for f in field_props
Expand Down
10 changes: 7 additions & 3 deletions liminal/entity_schemas/operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ def _execute_create(self, benchling_service: BenchlingService) -> dict[str, Any]
)

def describe_operation(self) -> str:
return f"{self._validated_schema_properties.name}: Creating new entity schema with fields: {', '.join([f.warehouse_name for f in self.fields if f.warehouse_name is not None])}."
return f"{self._validated_schema_properties.warehouse_name}: Creating new entity schema with fields: {', '.join([f.warehouse_name for f in self.fields if f.warehouse_name is not None])}."

def describe(self) -> str:
return f"{self._validated_schema_properties.name}: Schema is defined in code but not in Benchling."
return f"{self._validated_schema_properties.warehouse_name}: Schema is defined in code but not in Benchling."

def validate(self, benchling_service: BenchlingService) -> None:
if (
Expand Down Expand Up @@ -154,9 +154,13 @@ def _validate_unarchive(
schema, entity_schema_id_to_name_map, dropdowns_map, unit_id_to_name_map
)
)
# Warehouse name exists in the Liminal operation definition but not in Benchling converted list.
# Set the warehouse name to None for operation fields to compare properly.
cleaned_op_fields = [f.set_warehouse_name(None) for f in self.fields]
benchling_fields = [f for _, f in benchling_fields_props.items()]
if (
self._validated_schema_properties != benchling_schema_props
or self.fields != [f for _, f in benchling_fields_props.items()]
or cleaned_op_fields != benchling_fields
):
raise ValueError(
f"Entity schema {self._validated_schema_properties.warehouse_name} is different in code versus Benchling. Cannot unarchive."
Expand Down
3 changes: 2 additions & 1 deletion liminal/tests/test_entity_schema_compare.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,8 @@ def test_compare_benchling_schemas_create_link_order( # type: ignore[no-untyped
# The link is created without a target, which is set in the follow-up field update.
created_field = create.fields[0]
assert "entity_link" not in created_field.model_fields_set
assert "parent_link" not in created_field.model_fields_set
# parent_link is created as False, and set to True in the follow-up field update.
assert created_field.parent_link is False

assert rename.wh_schema_name == "cell_line_batch"
assert rename.update_props.model_dump(exclude_unset=True) == {
Expand Down