Skip to content

Conversation

@pcrespov
Copy link
Member

@pcrespov pcrespov commented Oct 14, 2025

What do these changes do?

Fixes to ensure that make up-devel works again

  • renamed docker-api-network to docker_api_subnet
    • removed local condition on this network because the override was done wrong. WARNING: check with WSL users (e.g. @odeimaiz and @sanderegg )
  • "main" modules (i.e. modules used as entry-points for either setup or any other launcher such as uvicorn etc) must have absolute imports
image

In detail (AI generated)

This pull request makes several improvements and fixes to Docker Compose configurations and Python service entrypoints, focusing on standardizing naming conventions and import styles. The most significant changes are grouped below:

Docker Compose Naming and Configuration Fixes:

  • Renamed the Docker Compose YAML anchor and reference from x-common-environment/*common-environment to x-common_environment/*common_environment in docker-compose.devel.yml, and updated all service environment references accordingly. This fixes consistency issues with YAML anchors and references. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18] [19] [20]
  • Standardized network names in docker-compose.yml from docker-api-network to docker_api_subnet, ensuring all network names use only letters and underscores to avoid Docker Compose resolution issues. [1] [2] [3]
  • Removed the explicit networks section for docker-api-network in docker-compose.local.yml and ensured consistency in network naming.
  • Added a test to enforce that all network names in Compose files contain only letters and underscores, preventing future misconfiguration.

Python Service Entrypoint Import Cleanup:

  • Updated import style for APP_NAME in the main entrypoint of several services (agent, api-server, autoscaling, dynamic-scheduler, notifications, storage) to use absolute imports instead of relative imports, improving clarity and consistency. [1] [2] [3] [4] [5] [6]

Testing and Linting Improvements:

  • Adjusted pylint disables and function signatures for clarity and correctness in test_used_docker_compose.py, and improved subprocess call safety by adding # noqa: S602. [1] [2] [3]

Other Minor Fixes:

  • Added extra newlines for readability in docker-compose.local.yml.

These changes collectively improve maintainability, enforce best practices, and prevent common configuration errors in the development environment.

Related issue/s

  • @alexpargon reported failures on his local deployment

How to test

  • added extra test to limit naming in docker-compose files

Dev-ops

  • ⚠️ renamed docker-api-network to docker_api_subnet. Might have implications in the ops compose files!!! Please double check !!!
  • remove (clean) old network @YuryHrytsuk

@pcrespov pcrespov self-assigned this Oct 14, 2025
@pcrespov pcrespov changed the title WIP: 🔨 Mai/devel mode WIP: 🔨 Make devel-mode work again Oct 14, 2025
@pcrespov pcrespov changed the title WIP: 🔨 Make devel-mode work again WIP: 🔨 Make devel-mode work again ⚠️ Oct 14, 2025
@codecov
Copy link

codecov bot commented Oct 14, 2025

Codecov Report

❌ Patch coverage is 33.33333% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 87.49%. Comparing base (098f490) to head (84bda31).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8515      +/-   ##
==========================================
- Coverage   87.52%   87.49%   -0.03%     
==========================================
  Files        2011     2011              
  Lines       78591    78591              
  Branches     1349     1349              
==========================================
- Hits        68785    68767      -18     
- Misses       9402     9420      +18     
  Partials      404      404              
Flag Coverage Δ
integrationtests 63.88% <ø> (-0.05%) ⬇️
unittests 86.22% <33.33%> (-0.02%) ⬇️
Components Coverage Δ
pkg_aws_library 93.61% <ø> (ø)
pkg_celery_library 83.22% <ø> (ø)
pkg_dask_task_models_library 79.33% <ø> (ø)
pkg_models_library 92.88% <ø> (ø)
pkg_notifications_library 85.20% <ø> (ø)
pkg_postgres_database 87.96% <ø> (ø)
pkg_service_integration 70.17% <ø> (ø)
pkg_service_library 70.94% <ø> (ø)
pkg_settings_library 90.29% <ø> (ø)
pkg_simcore_sdk 84.95% <ø> (-0.06%) ⬇️
agent 93.10% <0.00%> (ø)
api_server 91.62% <100.00%> (ø)
autoscaling 95.00% <100.00%> (ø)
catalog 92.06% <ø> (ø)
clusters_keeper 99.14% <ø> (ø)
dask_sidecar 92.38% <ø> (ø)
datcore_adapter 97.95% <ø> (ø)
director 75.72% <ø> (ø)
director_v2 90.97% <ø> (+0.09%) ⬆️
dynamic_scheduler 96.66% <0.00%> (ø)
dynamic_sidecar 90.44% <ø> (ø)
efs_guardian 89.83% <ø> (ø)
invitations 90.90% <ø> (ø)
payments 92.80% <ø> (ø)
resource_usage_tracker 92.11% <ø> (-0.06%) ⬇️
storage 86.56% <0.00%> (-0.41%) ⬇️
webclient ∅ <ø> (∅)
webserver 87.01% <ø> (-0.06%) ⬇️

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 098f490...84bda31. Read the comment docs.

🚀 New features to boost your workflow:
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@pcrespov pcrespov added the t:maintenance Some planned maintenance work label Oct 14, 2025
@pcrespov pcrespov added this to the Imparable milestone Oct 14, 2025
@mergify
Copy link
Contributor

mergify bot commented Oct 14, 2025

🧪 CI Insights

Here's what we observed from your CI run for 84bda31.

✅ Passed Jobs With Interesting Signals

Pipeline Job Signal Health on master Retries 🔍 CI Insights 📄 Logs
CI integration-tests Base branch is broken, but the job passed. Looks like this might be a real fix 💪 Broken 0 View View
unit-tests Base branch is broken, but the job passed. Looks like this might be a real fix 💪 Broken 0 View View

@pcrespov pcrespov marked this pull request as ready for review October 21, 2025 14:32
@pcrespov pcrespov changed the title WIP: 🔨 Make devel-mode work again ⚠️ 🔨 Make devel-mode work again and importing in main modules ⚠️ Oct 21, 2025
@pcrespov pcrespov changed the title 🔨 Make devel-mode work again and importing in main modules ⚠️ 🔨 Make devel-mode work again and importing in main modules ⚠️ Oct 21, 2025
@pcrespov pcrespov enabled auto-merge (squash) October 21, 2025 14:33
Copy link
Collaborator

@matusdrobuliak66 matusdrobuliak66 left a comment

Choose a reason for hiding this comment

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

thanks

Copy link
Contributor

@GitHK GitHK left a comment

Choose a reason for hiding this comment

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

I see, if this works then it's good

Copy link
Contributor

@giancarloromeo giancarloromeo left a comment

Choose a reason for hiding this comment

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

Thanks

@odeimaiz
Copy link
Member

It looks like it works for me. I managed to start the backend in devel mode, which I never do, and since the catalog was complaining about two services, I couldn't go into the dashboard. But that's a different story, all good from my side 👍.

@pcrespov
Copy link
Member Author

@mergify queue

@mergify
Copy link
Contributor

mergify bot commented Oct 21, 2025

queue

🟠 Waiting for conditions to match

  • -closed [📌 queue requirement]
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • label=🤖-automerge
      • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
      • #approved-reviews-by>=2
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by=0
      • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
      • #review-threads-unresolved=0
      • -conflict
      • -draft
      • base=master
      • branch-protection-review-decision = APPROVED [🛡 GitHub branch protection]
      • label!=🤖-do-not-merge
      • any of: [🛡 GitHub branch protection]
        • check-skipped = deploy to dockerhub
        • check-neutral = deploy to dockerhub
        • check-success = deploy to dockerhub
      • any of: [🛡 GitHub branch protection]
        • check-success = system-tests
        • check-neutral = system-tests
        • check-skipped = system-tests
      • any of: [🛡 GitHub branch protection]
        • check-success = unit-tests
        • check-neutral = unit-tests
        • check-skipped = unit-tests
      • any of: [🛡 GitHub branch protection]
        • check-success = check OAS' are up to date
        • check-neutral = check OAS' are up to date
        • check-skipped = check OAS' are up to date
      • any of: [🛡 GitHub branch protection]
        • check-success = integration-tests
        • check-neutral = integration-tests
        • check-skipped = integration-tests
      • any of: [🛡 GitHub branch protection]
        • check-success = build-test-images (frontend) / build-test-images
        • check-neutral = build-test-images (frontend) / build-test-images
        • check-skipped = build-test-images (frontend) / build-test-images
      • any of: [🛡 GitHub branch protection]
        • check-success = SonarCloud Code Analysis
        • check-neutral = SonarCloud Code Analysis
        • check-skipped = SonarCloud Code Analysis
  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed

Copy link
Contributor

@YuryHrytsuk YuryHrytsuk left a comment

Choose a reason for hiding this comment

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

Thanks.

This should work as is.

Once deployed, we shall clean the old network as it is not used anymore

@sonarqubecloud
Copy link

Copy link
Member

@mrnicegyu11 mrnicegyu11 left a comment

Choose a reason for hiding this comment

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

lgtm thx, no issues found from my side

@pcrespov pcrespov merged commit 63f2847 into ITISFoundation:master Oct 22, 2025
94 of 95 checks passed
@pcrespov pcrespov deleted the mai/devel-mode branch October 22, 2025 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

t:maintenance Some planned maintenance work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants