Skip to content

debug annotation order - #686

Closed
will-moore wants to merge 2 commits into
ome:masterfrom
will-moore:debug_annotation_order
Closed

debug annotation order#686
will-moore wants to merge 2 commits into
ome:masterfrom
will-moore:debug_annotation_order

Conversation

@will-moore

Copy link
Copy Markdown
Member

TEMP PR to debug #684 on merge-ci

@will-moore

Copy link
Copy Markdown
Member Author

Looking for changes from #684 in the code running on omero-web merge-ci...

The last commit on scc merge-ci at snoopycrimecop@d9e4341

has:

Merged PRs:
  - PR 602 Tom-TBT 'Inherit all annotations'
  - PR 604 will-moore 'Right panel perf'
  - PR 643 will-moore 'Don't disable the histogram for big images'
  - PR 644 jo-mueller 'Add some install instructions for windows'
  - PR 677 will-moore 'Add table_histogram endpoint'
  - PR 682 will-moore 'Initial support for JSON api /annotations endpoint'
  - PR 684 JoshuaFortriede 'add config "omero.web.annotation_order"'
  - PR 685 will-moore 'Prepare chgrp 'update' response before chgrp submission'
  - PR 686 will-moore 'debug annotation order'

showing that both THIS PR and #684 are merged.

Connect to merge-ci...

ssh 10.0.48.11
sudo su
docker exec -it devspace-web-1 bash
source /home/omero/workspace/OMERO-web/.venv3/bin/activate
$ python
Python 3.11.13 (main, Jun  1 2026, 00:00:00) [GCC 11.5.0 20240719 (Red Hat 11.5.0-14)] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> import omeroweb
>>> omeroweb.__file__
'/home/omero/workspace/OMERO-web/.venv3/lib64/python3.11/site-packages/omeroweb/__init__.py'

Now we check the omeroweb/settings.py file for "annotation_order" (finds nothing)

$ grep "omero.web.annotation_order" /home/omero/workspace/OMERO-web/.venv3/lib64/python3.11/site-packages/omeroweb/settings.py

We use the following line and include 10 lines before and after shows that changes in https://github.com/ome/omero-web/pull/684/changes are clearly missing

$ grep "omero.web.ui.top_links" /home/omero/workspace/OMERO-web/.venv3/lib64/python3.11/site-packages/omeroweb/settings.py -A 10 -B 10
    ],
    "omero.web.search.default_group": [
        "SEARCH_DEFAULT_GROUP",
        0,
        int,
        (
            "ID of the group to pre-select in search form. "
            "A value of 0 or -1 pre-selects All groups."
        ),
    ],
    "omero.web.ui.top_links": [
        "TOP_LINKS",
        (
            "["
            '["Data", "webindex", {"title": "Browse Data via Projects, Tags'
            ' etc"}],'
            '["History", "history", {"title": "History"}],'
            '["Help", "https://help.openmicroscopy.org/",'
            '{"title":"Open OMERO user guide in a new tab", "target":"new"}]'
            "]"
        ),

Let's check the contents of zips...

$ pwd
/home/omero/workspace/OMERO-web
$ mkdir omero_web_unzipped
$ tar -xzf omero_web-5.32.1.dev0.tar.gz --directory omero_web_unzipped/
$ cd omero_web_unzipped/omero_web-5.32.1.dev0
$ pwd
/home/omero/workspace/OMERO-web/omero_web_unzipped/omero_web-5.32.1.dev0

$ grep "omero.web.ui.top_links" omeroweb/settings.py -A 10 -B 10
    "omero.web.annotation_order": [
        "ANNOTATION_ORDER",
        "namespace",
        parse_annotation_order,
        (
            "Controls annotation ordering. "
            "Allowed values are 'namespace', 'date', or a JSON list "
            "of namespaces defining a custom order"
        ),
    ],
    "omero.web.ui.top_links": [
        "TOP_LINKS",
        (
            "["
            '["Data", "webindex", {"title": "Browse Data via Projects, Tags'
            ' etc"}],'
            '["History", "history", {"title": "History"}],'
            '["Help", "https://help.openmicroscopy.org/",'
            '{"title":"Open OMERO user guide in a new tab", "target":"new"}]'
            "]"
        ),

So, the /home/omero/workspace/OMERO-web/omero_web-5.32.1.dev0.tar.gz DOES have the changes.

@will-moore

Copy link
Copy Markdown
Member Author

@pwalczysko AFAICT, None of the "merged PRs" above are included in merge-ci.

E.g. #682 should show additional URLs on the https://merge-ci.openmicroscopy.org/web/api/v0/ page, but they're missing.
#602 should show parent annotations (e.g. ratings, tags etc), but I'm not seeing any.

@will-moore

Copy link
Copy Markdown
Member Author

Fixed it!

In the logs at https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-web/66/consoleFull we see:

03:08:01 Successfully built omero-web
03:08:02 Installing collected packages: omero-web
03:08:02   Attempting uninstall: omero-web
03:08:02     Found existing installation: omero-web 5.33.0
03:08:04     Uninstalling omero-web-5.33.0:
03:08:04       Successfully uninstalled omero-web-5.33.0
03:08:14 ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.
03:08:14 omero-iviewer 0.18.0.dev0 requires omero-web>=5.33.0, but you have omero-web 5.32.1.dev0 which is incompatible.
03:08:14 Successfully installed omero-web-5.32.1.dev0

and later:

03:13:21 Processing ./omero_iviewer-0.18.0.dev0.tar.gz
03:13:22   Installing build dependencies: started
03:13:31   Installing build dependencies: finished with status 'done'
03:13:31   Getting requirements to build wheel: started
03:13:31   Getting requirements to build wheel: finished with status 'done'
03:13:31   Preparing metadata (pyproject.toml): started
03:13:32   Preparing metadata (pyproject.toml): finished with status 'done'
03:13:32 Collecting omero-web>=5.33.0 (from omero-iviewer==0.18.0.dev0)
03:13:32   Using cached omero_web-5.33.0-py3-none-any.whl.metadata (8.2 kB)
...
03:14:07 Installing collected packages: omero-web, omero-iviewer
03:14:07   Attempting uninstall: omero-web
03:14:07     Found existing installation: omero-web 5.32.1.dev0
03:14:07     Uninstalling omero-web-5.32.1.dev0:
03:14:07       Successfully uninstalled omero-web-5.32.1.dev0
03:14:07   Attempting uninstall: omero-iviewer
03:14:07     Found existing installation: omero-iviewer 0.18.0.dev0
03:14:07     Uninstalling omero-iviewer-0.18.0.dev0:
03:14:07       Successfully uninstalled omero-iviewer-0.18.0.dev0
03:14:07 
03:14:07 Successfully installed omero-iviewer-0.18.0.dev0 omero-web-5.33.0

So, because iviewer PR ome/omero-iviewer#563 bumped it's requirement for omero-web 5.33.0 AND the 5.33.0 tag and version omero-web==5.33.1.dev0 hadn't been pushed, the omero-web build still had older 5.32.1.dev0 version and this was uninstalled and replaced with the last release of omero-web-5.33.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant