Skip to content
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

feat!: set wdqs concept URI #771

Merged
merged 3 commits into from
Oct 23, 2024
Merged

feat!: set wdqs concept URI #771

merged 3 commits into from
Oct 23, 2024

Conversation

rti
Copy link
Contributor

@rti rti commented Sep 26, 2024

Allow setting the concept URI of entities in WDQS explicitly and distinct from the hostname used to contact wikibase.

This also fixes the problem WDQS not accepting entities when the wikibase host had a DNS name different from wikibase (which should be always the case, because wikibase is not a FQDN).

Note: In deploy, items and properties in WDQS will now have the public wikibase hostname with https protocol as prefix. E.g. https://wikibase.example/

Related:

BREAKING CHANGE: env var WIKIBASE_CONCEPT_URI now mandatory to run wdqs updater

rti added a commit that referenced this pull request Sep 26, 2024
Sets the WIKIBASE_CONCEPT_URI required by WDQS. #771

BREAKING CHANGE: changes the concept URI used in WDQS
@rti rti requested a review from a team September 26, 2024 15:51
@rti rti force-pushed the wdqs-separate-concept-uri branch from 4d7ed10 to d4a0a96 Compare September 27, 2024 08:15
@rti rti changed the title feat(wdqs)!: allow setting of concept URI feat!: set wdqs concept URI Sep 30, 2024
@rti rti marked this pull request as draft October 1, 2024 19:52
@rti rti marked this pull request as ready for review October 2, 2024 12:59
Copy link
Contributor

@lorenjohnson lorenjohnson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it should go forward, and would be nice to backport. However, given the major versioning to 1.x and 2.x issue we've been talking about I wonder if there is any sensible way to maintain the current way it functions (even if not optimal or broken) so that it can be a minor release? 🤷🏼‍♂️

@rti
Copy link
Contributor Author

rti commented Oct 9, 2024

How to handle this versioning, as discussed today with @lorenjohnson

WDQS bumps a major version

  • because the interface changes the API in a breaking way
  • it has a new required environment variable

Deploy bumps a patch

  • deploy bumps to WDQS 2 under the hood - after this PR has been merged, released and published
  • provides the required variable to WDQS
  • for the user, the interface / API of deploy does not change

TODO

  • ✅ clean up commit messages to signify correct version bumps to deploy and WDQS projects
  • ✅ do not squash merge, use merge commits

@rti
Copy link
Contributor Author

rti commented Oct 9, 2024

holding back for #782

@lorenjohnson lorenjohnson self-requested a review October 9, 2024 08:11
Copy link
Contributor

@lorenjohnson lorenjohnson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@rti rti force-pushed the wdqs-separate-concept-uri branch from c233676 to 3516fcb Compare October 21, 2024 10:34
@deepeshaburse deepeshaburse merged commit 82855b1 into main Oct 23, 2024
7 checks passed
@deepeshaburse deepeshaburse deleted the wdqs-separate-concept-uri branch October 23, 2024 12:07
RickiJay-WMDE pushed a commit that referenced this pull request Oct 28, 2024
BREAKING CHANGE: env var WIKIBASE_CONCEPT_URI now mandatory to run wdqs updater; this was implemented in #771, but was not marked as a breaking change
rti added a commit that referenced this pull request Nov 28, 2024
As reported in #798, the "standard prefixes" injected by WDQS do not align with the WIKIBASE_CONCEPT_URI setting introduced in #771, nor do they match the corresponding values for Wikidata. Currently, the WDQS-injected "standard prefixes" (such as wd:) reference http://wikidata/, which is the internal hostname of the wikibase/mediawiki container within the Docker network.

Particularly in the context of federation, it is essential to maintain the "standard prefixes" for referencing Wikidata [1] [2]. To accommodate the local Wikibase instance, prefixes can be set inline, as is currently done on wikibase.cloud [2]. This pull request addresses this and updates the "standard prefixes" to point to Wikidata. Additional context can be found in [3].

[1] https://www.mediawiki.org/wiki/Wikibase/Wikibase.cloud/First_steps#View_your_data_using_the_Query_Service
[2] https://phabricator.wikimedia.org/T335448
[3] https://phabricator.wikimedia.org/T379232
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.

3 participants