[OTA-2089] fall back to local source for plc_lookup by ankitathomas · Pull Request #45 · openshift/agentic-skills

ankitathomas · 2026-07-29T15:03:08Z

Include product lifecycle data as a file in agentic-skills image and have plc_lookup.py use the local file if the products lifecycle API is unreachable, such as in a disconnected environment.

jrangelramos

Just a few nits. Also perhaps data/product.json should be back to the repo (and later addressed/updated via PR with github action or something similar)

jrangelramos

Hi Ankita! Thanks for the fallback code. I've tested with many combinations using both live and fallback data and it looks it mirrors the search logic properly. Nice job! Just a note about connectivity check, it looks redundant and can be simplified.

jrangelramos · 2026-08-13T01:33:06Z

 API_BASE = "https://access.redhat.com/product-life-cycles/api/v2/products"
+PRODUCTS_PATH = os.path.join(os.path.dirname(__file__), "data", "products.json")

+def check_connectivity(url, timeout=5):


I think this could be simplified. The same checks are already performed on the api_search so maybe you can just call the fallback function in the exception handling of the api_search. Having this check also makes the live api to be called twice in a happy path where API is available. So perhaps, consider removing it.

Good catch, moved the fallback logic to when the api is unreachable

jrangelramos · 2026-08-13T12:07:19Z

Hello @ankitathomas the test test_url_error_produces_json is failing. With the new fallback logic you may need to mock search_local as well (to simulate missing the local products file). Other than that it looks good to me

jrangelramos · 2026-08-13T13:32:53Z

/lgtm

jrangelramos

lgtm

jrangelramos · 2026-08-17T12:23:00Z

/verified by @jrangelramos

Ran locally a bunch of lookup test and compared results with live api.

openshift-ci-robot · 2026-08-17T12:23:11Z

@jrangelramos: This PR has been marked as verified by @jrangelramos.

Details

In response to this:

/verified by @jrangelramos

Ran locally a bunch of lookup test and compared results with live api.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

openshift-ci · 2026-08-17T17:29:50Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ankitathomas
Once this PR has been reviewed and has the lgtm label, please assign hongkailiu for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

cluster-update/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2026-08-17T17:37:04Z

@ankitathomas: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/eval	`cb21827`	link	true	`/test eval`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

jrangelramos · 2026-08-18T18:42:09Z

/lgtm

Cali0707 · 2026-08-19T21:50:56Z

 import urllib.request

 API_BASE = "https://access.redhat.com/product-life-cycles/api/v2/products"
+PRODUCTS_PATH = os.path.join(os.path.dirname(__file__), "data", "products.json")


This file isn't committed so wouldn't be in the final image built from this repo. Is there any plan for this to be committed and/or mounted into wherever this will be run?

Cali0707 · 2026-08-19T21:53:09Z

+            if "name" in i and n in i["name"].lower():
+                names.append(i)


let's do some deduplication here, otherwise we can end up with the same product twice (or maybe there is some structure to this data that prevents this, but it is not clear from this PR/comment that there is).

For example, something like name="mcp,openshift" with a product name `"MCP Server for Red Hat OpenShift" would end up matching twice

Cali0707 · 2026-08-19T21:53:35Z

-    url = API_BASE
    if name:
-        url = f"{url}?{urllib.parse.urlencode({'name': name})}"
+        url = f"{url}?{urllib.parse.urlencode({'name': name})}&match_mode=contains"


shouldn't we urlencode the match_mode=contains as well?

Cali0707 · 2026-08-19T21:54:26Z

+                self.assertEqual(result[0]["name"], "logging for Red Hat OpenShift")
+        finally:
+            os.unlink(temp_path)
+    def test_former_names_fallback_logic(self):


doesn't this test case make more sense in TestSearchLocal ?

Cali0707 · 2026-08-19T21:55:14Z


-
-def api_search(name=None):
+def search_local(name=None, path=PRODUCTS_PATH):


nit: we should add one more blank line above this function, PEP 8 requires two blank lines between top-level function definitions

openshift-ci Bot requested review from Cali0707 and PratikMahajan July 29, 2026 15:05

ankitathomas force-pushed the plcc-products-json branch from 65e5b71 to ee6eb76 Compare July 29, 2026 15:09

wking reviewed Jul 29, 2026

View reviewed changes

Comment thread Containerfile Outdated

ankitathomas force-pushed the plcc-products-json branch 2 times, most recently from caf8fcf to c6b66eb Compare July 29, 2026 15:35

ankitathomas requested a review from wking July 29, 2026 15:41

ankitathomas force-pushed the plcc-products-json branch from c6b66eb to a8fabb4 Compare July 29, 2026 15:56

jrangelramos reviewed Jul 29, 2026

View reviewed changes

Comment thread cluster-update/product-lifecycle/scripts/plc_lookup.py Outdated

Comment thread cluster-update/product-lifecycle/scripts/plc_lookup.py Outdated

Comment thread cluster-update/product-lifecycle/scripts/plc_lookup.py Outdated

ankitathomas force-pushed the plcc-products-json branch 4 times, most recently from 1471a6f to 384507c Compare August 12, 2026 14:45

jrangelramos suggested changes Aug 13, 2026

View reviewed changes

openshift-ci Bot assigned jrangelramos Aug 13, 2026

ankitathomas requested a review from jrangelramos August 13, 2026 05:37

ankitathomas force-pushed the plcc-products-json branch from cc4a71c to abb7269 Compare August 13, 2026 13:30

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 13, 2026

jrangelramos reviewed Aug 13, 2026

View reviewed changes

openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 17, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Aug 17, 2026

ankitathomas added 2 commits August 17, 2026 13:29

fall back to local source for plc_lookup

f365590

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

remove duplicate connectivity check

cb21827

Signed-off-by: Ankita Thomas <ankithom@redhat.com>

ankitathomas force-pushed the plcc-products-json branch from abb7269 to cb21827 Compare August 17, 2026 17:29

openshift-ci Bot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 17, 2026

ankitathomas requested a review from jrangelramos August 18, 2026 13:00

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2026

Cali0707 reviewed Aug 19, 2026

View reviewed changes



		def api_search(name=None):
		def search_local(name=None, path=PRODUCTS_PATH):

Uh oh!

Conversation

ankitathomas commented Jul 29, 2026

Uh oh!

Uh oh!

jrangelramos left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jrangelramos left a comment

Choose a reason for hiding this comment

Uh oh!

jrangelramos Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

ankitathomas Aug 13, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jrangelramos commented Aug 13, 2026

Uh oh!

jrangelramos commented Aug 13, 2026

Uh oh!

jrangelramos left a comment

Choose a reason for hiding this comment

Uh oh!

jrangelramos commented Aug 17, 2026

Uh oh!

openshift-ci-robot commented Aug 17, 2026

Uh oh!

openshift-ci Bot commented Aug 17, 2026

Uh oh!

openshift-ci Bot commented Aug 17, 2026

Uh oh!

jrangelramos commented Aug 18, 2026

Uh oh!

Cali0707 Aug 19, 2026

Choose a reason for hiding this comment

Uh oh!

Cali0707 Aug 19, 2026

Choose a reason for hiding this comment

Uh oh!

Cali0707 Aug 19, 2026

Choose a reason for hiding this comment

Uh oh!

Cali0707 Aug 19, 2026

Choose a reason for hiding this comment

Uh oh!

Cali0707 Aug 19, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants