Skip to content

♻️ VIP models introduce licensed versioning (🗃️) #7215

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
Merged
merged 44 commits into from
Feb 13, 2025
Merged

♻️ VIP models introduce licensed versioning (🗃️) #7215

merged 44 commits into from
Feb 13, 2025

Conversation

@matusdrobuliak66
Copy link
Collaborator

@matusdrobuliak66 matusdrobuliak66 commented Feb 12, 2025 •
edited
Loading

What do these changes do?

  • ♻️ Introduce licensed versioning to comply with pricing requirements (different pricing plans are based on versions; if you buy a specific version, you automatically gain access to all previous versions). 🗃️
  • As discussed introducing breaking change for both frontend client (@odeimaiz) and public api (@mguidon) on pricing licenses endpoints
  • licensed_item_id = key + version (unique)

Next steps/improvements:

  • Refactor Pricing Units so they can have num_of_seats field to be used for offering 1, 5 or 10 seats pricing options.
  • Add version/key data type

Related issue/s

How to test

Dev-ops checklist

@matusdrobuliak66 matusdrobuliak66 self-assigned this Feb 12, 2025
@codecov
Copy link

codecov bot commented Feb 12, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 94.38202% with 10 lines in your changes missing coverage. Please review.

Project coverage is 86.90%. Comparing base (5f92eca) to head (be8b5c6).
Report is 1 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #7215      +/-   ##
==========================================
- Coverage   87.02%   86.90%   -0.13%     
==========================================
  Files        1654     1596      -58     
  Lines       64468    62888    -1580     
  Branches     1095     1005      -90     
==========================================
- Hits        56106    54650    -1456     
+ Misses       8049     7946     -103     
+ Partials      313      292      -21
Flag Coverage Δ
integrationtests 65.29% <43.13%> (-0.01%) ⬇️
unittests 85.86% <94.38%> (-0.16%) ⬇️
Components Coverage Δ
api 76.84% <ø> (ø)
pkg_aws_library ∅ <ø> (∅)
pkg_dask_task_models_library ∅ <ø> (∅)
pkg_models_library 91.58% <100.00%> (+0.03%) ⬆️
pkg_notifications_library 84.57% <ø> (ø)
pkg_postgres_database 88.28% <100.00%> (+0.03%) ⬆️
pkg_service_integration 70.03% <ø> (ø)
pkg_service_library 72.48% <ø> (ø)
pkg_settings_library ∅ <ø> (∅)
pkg_simcore_sdk 85.46% <ø> (ø)
agent 96.46% <ø> (ø)
api_server 90.56% <100.00%> (+0.01%) ⬆️
autoscaling 96.08% <ø> (ø)
catalog 91.71% <ø> (ø)
clusters_keeper 99.24% <ø> (ø)
dask_sidecar 91.25% <ø> (ø)
datcore_adapter 93.19% <ø> (ø)
director 76.59% <ø> (ø)
director_v2 91.30% <ø> (ø)
dynamic_scheduler 97.33% <ø> (ø)
dynamic_sidecar 89.77% <ø> (ø)
efs_guardian 90.25% <ø> (ø)
invitations 93.28% <ø> (ø)
osparc_gateway_server ∅ <ø> (∅)
payments 92.66% <ø> (ø)
resource_usage_tracker 89.19% <100.00%> (+0.23%) ⬆️
storage 86.34% <ø> (+0.11%) ⬆️
webclient ∅ <ø> (∅)
webserver 84.83% <90.19%> (+0.02%) ⬆️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5f92eca...be8b5c6. Read the comment docs.

@matusdrobuliak66 matusdrobuliak66 changed the title WIP ♻️ VIP models introduce licensed versioning ♻️ VIP models introduce licensed versioning Feb 12, 2025
@matusdrobuliak66 matusdrobuliak66 marked this pull request as ready for review February 12, 2025 16:11
@pcrespov pcrespov added a:apiserver api-server service a:resource-usage-tracker resource usage tracker service labels Feb 12, 2025
pcrespov
pcrespov approved these changes Feb 12, 2025
View reviewed changes
Copy link
Member

@pcrespov pcrespov left a comment

Choose a reason for hiding this comment

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

thx. Please consider my suggestions before merging. Otherwise go ahead! :-)

I added this time the corresponding attributes to the PR
image

sanderegg
sanderegg approved these changes Feb 13, 2025
View reviewed changes
Copy link
Member

@sanderegg sanderegg left a comment

Choose a reason for hiding this comment

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

All good, but I would definitely strongly suggest to at least define the TypeAliases LicensedItemKey and LicensedItemVersion to prevent confusion with ServiceKey and ServiceVersion all over the place.
Also the minimum is a TypeAlias.

@matusdrobuliak66 matusdrobuliak66 enabled auto-merge (squash) February 13, 2025 08:54
@sonarqubecloud
Copy link

sonarqubecloud bot commented Feb 13, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.4% Duplication on New Code

See analysis details on SonarQube Cloud

@matusdrobuliak66 matusdrobuliak66 merged commit e35a13f into ITISFoundation:master Feb 13, 2025
94 of 95 checks passed
@matusdrobuliak66 matusdrobuliak66 mentioned this pull request Mar 6, 2025
Closed
63 tasks
mrnicegyu11 pushed a commit to mrnicegyu11/osparc-simcore that referenced this pull request Mar 26, 2025
@matusdrobuliak66 @mrnicegyu11
♻️ VIP models introduce licensed versioning (🗃️) (ITISFoundation#7215)
39cc44d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@giancarloromeo giancarloromeo giancarloromeo approved these changes

@GitHK GitHK GitHK approved these changes

@pcrespov pcrespov pcrespov approved these changes

@sanderegg sanderegg sanderegg approved these changes

@odeimaiz odeimaiz Awaiting requested review from odeimaiz

@mguidon mguidon Awaiting requested review from mguidon

@bisgaard-itis bisgaard-itis Awaiting requested review from bisgaard-itis bisgaard-itis is a code owner

Assignees

@matusdrobuliak66 matusdrobuliak66

Labels

a:apiserver api-server service a:resource-usage-tracker resource usage tracker service a:webserver webserver's codebase. Assigning the area is particularly useful for bugs

Projects

None yet

Milestone

Singularity

Development

Successfully merging this pull request may close these issues.

6 participants

@matusdrobuliak66 @giancarloromeo @GitHK @pcrespov @sanderegg @odeimaiz