-
Notifications
You must be signed in to change notification settings - Fork 32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add new script Compare_Ome_Xml.py #201
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,177 @@ | ||
# !/usr/bin/env python | ||
# -*- coding: utf-8 -*- | ||
|
||
# ----------------------------------------------------------------------------- | ||
# Copyright (C) 2022 University of Dundee. All rights reserved. | ||
|
||
# This program is free software; you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation; either version 2 of the License, or | ||
# (at your option) any later version. | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
|
||
# You should have received a copy of the GNU General Public License along | ||
# with this program; if not, write to the Free Software Foundation, Inc., | ||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
|
||
# This script exports the OME.xml from all Images in a Dataset. | ||
# The OME.xml from Images with the same Name is compared and | ||
# any differences are shown in the printed log. | ||
|
||
from xml.etree import ElementTree | ||
|
||
import omero.scripts as scripts | ||
from omero.gateway import BlitzGateway | ||
from omero.rtypes import rlong, rstring | ||
|
||
elements_by_id = {} | ||
|
||
def get_image_ome_xml(conn, image_id): | ||
|
||
exporter = conn.createExporter() | ||
exporter.addImage(image_id) | ||
size = exporter.generateXml() | ||
xml = exporter.read(0, size) | ||
exporter.close() | ||
return xml | ||
|
||
|
||
def compare_xml(xml1, xml2): | ||
tree1 = ElementTree.ElementTree(ElementTree.fromstring(xml1)) | ||
tree2 = ElementTree.ElementTree(ElementTree.fromstring(xml2)) | ||
|
||
mismatch = False | ||
for child1, child2 in zip(tree1.iter(), tree2.iter()): | ||
if nodes_mismatch(child1, child2): | ||
mismatch = True | ||
|
||
return mismatch | ||
|
||
|
||
def nodes_mismatch(node1, node2): | ||
# Ignore IDs which will be unique | ||
node1.attrib.pop("ID", None) | ||
node2.attrib.pop("ID", None) | ||
|
||
print("Checking element", node1) | ||
if node1.tag != node2.tag: | ||
print("Node names mismatch:", node1.tag, node2.tag) | ||
return False | ||
|
||
print("TAGS", node1.tag, node2.tag) | ||
# if node comes in List, compare identical nodes | ||
if node1.tag.endswith("Plane"): | ||
for node in [node1, node2]: | ||
theZ = node.attrib.get("TheZ") | ||
theC = node.attrib.get("TheC") | ||
theT = node.attrib.get("TheT") | ||
plane_id = f"Plane:{theZ}:{theC}:{theT}" | ||
print("plane_id", plane_id) | ||
if plane_id in elements_by_id: | ||
nodeA = elements_by_id[plane_id] | ||
nodeB = node | ||
print("Comparing planes", plane_id) | ||
if nodeA.attrib != nodeB.attrib: | ||
print("-------- ** difference... ** --------------") | ||
print("nodeA", nodeA.attrib) | ||
print("nodeB", nodeB.attrib) | ||
print("...----------------------") | ||
return True | ||
else: | ||
elements_by_id[plane_id] = node | ||
return False | ||
|
||
# Directly compare nodes | ||
if node1.attrib != node2.attrib: | ||
print("-------- ** difference... ** --------------") | ||
print("node1", node1.attrib) | ||
print("node2", node2.attrib) | ||
print("...----------------------") | ||
return True | ||
return False | ||
|
||
|
||
|
||
|
||
def process_data(conn, script_params): | ||
"""Main entry point. Get images, process them and return result.""" | ||
|
||
dtype = script_params['Data_Type'] | ||
ids = script_params['IDs'] | ||
|
||
comparison_count = 0 | ||
mismatch_count = 0 | ||
|
||
if dtype == "Dataset": | ||
|
||
for dataset in conn.getObjects("Dataset", ids): | ||
xml_by_image_name = {} | ||
for image in dataset.listChildren(): | ||
# reset elements registry | ||
elements_by_id = {} | ||
xml = get_image_ome_xml(conn, image.id) | ||
name = image.name | ||
print("Image...", image.id, image.name) | ||
if name in xml_by_image_name: | ||
print("\n\nChecking images named", name) | ||
prev_img = xml_by_image_name[name]["image"] | ||
print("Compare image ----------", image.id) | ||
print(xml) | ||
print("with image -----------", prev_img.id) | ||
xml2 = xml_by_image_name[name]["xml"] | ||
print(xml2) | ||
# assert xml == xml2 | ||
comparison_count += 1 | ||
|
||
print("xml1 from image", image.id) | ||
print("xml2 from image", prev_img.id) | ||
mismatch = compare_xml(xml, xml2) | ||
if mismatch: | ||
mismatch_count += 1 | ||
else: | ||
xml_by_image_name[name] = {"xml": xml, "image": image} | ||
|
||
return mismatch_count, comparison_count | ||
|
||
|
||
def run_script(): | ||
data_types = [rstring(s) for s in | ||
['Dataset']] | ||
|
||
client = scripts.client( | ||
'Compare_Ome_Xml.py', | ||
"""Compares OME.xml for Images with the same Names in each Dataset""", | ||
|
||
scripts.String( | ||
"Data_Type", optional=False, grouping="1", | ||
description="The data you want to work with.", values=data_types, | ||
default="Dataset"), | ||
|
||
scripts.List( | ||
"IDs", optional=False, grouping="2", | ||
description="List of Dataset IDs or Image IDs").ofType(rlong(0)), | ||
) | ||
|
||
try: | ||
conn = BlitzGateway(client_obj=client) | ||
|
||
script_params = client.getInputs(unwrap=True) | ||
print("script_params:") | ||
print(script_params) | ||
|
||
# call the main script | ||
mismatch_count, comparison_count = process_data(conn, script_params) | ||
message = (f"Compared OME.xml for {comparison_count} images," + | ||
f" found {mismatch_count} diffs") | ||
|
||
client.setOutput("Message", rstring(message)) | ||
|
||
finally: | ||
client.closeSession() | ||
|
||
|
||
if __name__ == "__main__": | ||
run_script() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See ome/ZarrReader#31 (comment) for a potential concern about the diffing of the trees
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
9213cfe compares Planes only with other planes of the same Z/C/T index.
This doesn't check that there are the same number of Plane elements in both XML docs - It simply stores the Plane in a dict with
Z/C/T
key, and if there's a Plane already stored with that key then we compare them (assumes they are from the 2 different XML docs, but doesn't check that).For multi-T image (that was previously flagged as non-matching XML) this now passes: https://merge-ci.openmicroscopy.org/web/webclient/?show=image-231218
For multi Z/C/T image, this still fails https://merge-ci.openmicroscopy.org/web/webclient/?show=image-230717
with output like: