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.

Sign up for GitHub

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

Jump to bottom

feat: upgrade matchmaking agent to interact with edc 0.7; complete chart/deployment #120

Merged
merged 32 commits into from
May 22, 2024
Merged

feat: upgrade matchmaking agent to interact with edc 0.7; complete chart/deployment #120

merged 32 commits into from
May 22, 2024

Conversation

drcgjung
Copy link
Contributor

@drcgjung drcgjung commented May 8, 2024 •
edited
Loading

WHAT

The Matchmaking Agent is now able to interact with

  • TX EDC Control Plane 0.7.*
  • Knowledge Agent Plane 1.12.>19

WHY

The Matchmaking Agent has been carved out of Knowledge Agent Plane 1.11.16 (24.03) which run against TX EDC 0.5.*
This PR contains the necessary adaptions and bugfixes following the 24.05 E2E Test phase.

FURTHER NOTES

List other areas of code that have changed but are not necessarily linked to the main feature. This could be method signature changes, package declarations, bugs that were encountered and were fixed inline, etc.

Closes #54
Closes #53

drcgjung added 15 commits April 18, 2024 09:16
@drcgjung
feat: upgrade to EDC 0.6 and port the service patterns from embedded …
e4a7442 
…matchmaking.
@drcgjung
chore: upgrade version with EDC 0.6 support.
8320f7b
@drcgjung
fix: unused import and stale reference to renamed implementation class.
aa2ad83
@drcgjung
feat: upgrade to jena 4.9 and align with agent plane versions.
57087fa
@drcgjung
feature: switch to EDC 0.7.0 management and transfer callback.
0dc166e
@drcgjung
feat: use the EDC 0.7 management peculiarities including the transfer…
8383b88 
… process callback.
@drcgjung
fix: debug the transfer process/callback mechanism.
8d8ad83
@drcgjung
style: javadoc problem
b910cd5
@drcgjung
fix: correct logging and shutting down of callbacks.
d4d2d1d
@drcgjung
fix: correct graph asset registration template.
9c79adb
@drcgjung
fix: skill update/creation needs to escape regexes.
971c58c
@drcgjung
fix: add default runMode=ALL for skill registration. remove redundant…
8648d0a 
… edc version property.
@drcgjung
Merge remote-tracking branch 'eclipse/main' into feature/upgrade-tx-e…
449796d 
…dc-060
@drcgjung
feat: upgrade chart to the EDC 0.7 interaction pattern-
f0613f9
@drcgjung
fix: do not use temporary images in chart testing workflow.
204e9d1
@drcgjung drcgjung requested a review from obalandi May 8, 2024 05:35
obalandi
obalandi approved these changes May 8, 2024
View reviewed changes
Copy link

@obalandi obalandi left a comment

Choose a reason for hiding this comment

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

LGTM

@drcgjung drcgjung requested a review from almadigabor May 13, 2024 07:03
@drcgjung drcgjung added the enhancement New feature or request label May 13, 2024
@drcgjung drcgjung marked this pull request as ready for review May 13, 2024 10:46
@drcgjung
Copy link
Contributor Author

@almadigabor Here is the list of upgraded dependencies (Apache Jena -> 4.9.0) which may need an IP check

maven/mavencentral/org.apache.jena/jena-arq/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-base/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-core/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-dboe-base/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-dboe-index/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-dboe-storage/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-dboe-trans-data/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-dboe-transaction/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-fuseki-core/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-rdfconnection/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-rdfpatch/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-shacl/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-shex/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-tdb/4.9.0, Apache-2.0, restricted, clearlydefined
maven/mavencentral/org.apache.jena/jena-tdb2/4.9.0, Apache-2.0, restricted, clearlydefined

Source Code and Deployment double-checked by Oz.

Would be great if you could review/commit this before the 15th of May (SAST check should run before the 17th Q-Gates)

@almadigabor
Copy link
Contributor

Hi @drcgjung, I've ran the dash tool and got the following output:

[INFO] This content is either not correctly mapped by the system, or requires review.
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-rdfpatch/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14714 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-core/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14700 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-tdb2/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14701 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-fuseki-core/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14702 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-rdfconnection/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14703 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-dboe-storage/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14704 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-dboe-base/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14705 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-shacl/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14706 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-dboe-trans-data/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14707 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-tdb/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14708 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-shex/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14709 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-dboe-index/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14710 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-arq/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14711 .
[INFO] A review is required for maven/mavencentral/org.apache.jena/jena-dboe-transaction/4.9.0.
[INFO] A review request already exists https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/14712 .

Let's wait until the afternoon for these to be resolved then I can review and merge your PR. You might need a DEPENDENCIES file update once the IP issues are closed.

@almadigabor
Copy link
Contributor

Hey @drcgjung, can you update the dependencies file? If I see it correctly, all issues have been approved.

@drcgjung
Copy link
Contributor Author

Hey @drcgjung, can you update the dependencies file? If I see it correctly, all issues have been approved.

@almadigabor done and successful. thx.

@almadigabor
Copy link
Contributor

I opened an IP review issue due to the large number of changes. Please track the status here.

@drcgjung drcgjung mentioned this pull request May 16, 2024
Merged
@drcgjung
Copy link
Contributor Author

actually the current lint test failure is a fluke: https://github.com/catenax-ng/tx-knowledge-agents/actions/runs/9110519613/job/25045730604
seems like some rare timing/kind issue occured - could not reproduce it. so maybe simply restart the failted check/job and it should go through.

@almadigabor
Copy link
Contributor

The IP check issue have been approved.

@almadigabor almadigabor merged commit 05827e2 into eclipse-tractusx:main May 22, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@obalandi obalandi obalandi approved these changes

@almadigabor almadigabor almadigabor approved these changes

Assignees

@almadigabor almadigabor

Labels
enhancement New feature or request
Projects
Knowledge Agent Kanban Board
Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Story "Define Matchmaking Agent API" Story "Implement Matchmaking Agent API"
3 participants
@drcgjung @almadigabor @obalandi