Skip to content

Updates to top level Cli#1450

Merged
prasadtalasila merged 2 commits intoINTO-CPS-Association:feature/distributed-demofrom
8ohamed:feature/distributed-demo
Jan 12, 2026
Merged

Updates to top level Cli#1450
prasadtalasila merged 2 commits intoINTO-CPS-Association:feature/distributed-demofrom
8ohamed:feature/distributed-demo

Conversation

@8ohamed
Copy link
Contributor

@8ohamed 8ohamed commented Jan 9, 2026

Upgrade dependencies for DTaaS CLI and fixes qlty issues

Type of Change

  • New feature
  • [] Bug fix
  • Documentation update
  • Refactoring
  • Security patch
  • UI/UX improvement

Description

This PR ports changes of the toml file in DTaaS\cli from #1420 and fixes qlty and pylint Issues

Copilot AI review requested due to automatic review settings January 9, 2026 17:40
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the DTaaS CLI package dependencies from version 0.2.0 to 0.2.1. However, several of the specified dependency versions appear to be from the future and may not exist yet, which will prevent successful installation and could break the build.

Key changes:

  • Updates package version from 0.2.0 to 0.2.1
  • Updates multiple dependencies to potentially nonexistent future versions (pytest 9.x, pylint 4.x, pytest-cov 7.x, and others)
  • Removes psutil dependency from safety package dependencies

Reviewed changes

Copilot reviewed 1 out of 2 changed files in this pull request and generated no comments.

File Description
cli/pyproject.toml Updates package version to 0.2.1 and specifies new versions for main and dev dependencies, including several potentially nonexistent versions
cli/poetry.lock Updates the lock file to reflect new dependency versions and their transitive dependencies, including several potentially nonexistent versions

@codecov
Copy link

codecov bot commented Jan 9, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 96.96%. Comparing base (4e51b69) to head (fe1437b).
⚠️ Report is 1 commits behind head on feature/distributed-demo.

⚠️ Current head fe1437b differs from pull request most recent head e45c457

Please upload reports for the commit e45c457 to get more accurate results.

Additional details and impacted files
@@                     Coverage Diff                      @@
##           feature/distributed-demo    #1450      +/-   ##
============================================================
+ Coverage                     92.94%   96.96%   +4.02%     
============================================================
  Files                           151        5     -146     
  Lines                          4590      264    -4326     
  Branches                        608        0     -608     
============================================================
- Hits                           4266      256    -4010     
+ Misses                          321        8     -313     
+ Partials                          3        0       -3     
Files with missing lines Coverage Δ
cli/src/cmd.py 100.00% <100.00%> (ø)
cli/src/pkg/users.py 98.16% <100.00%> (ø)
cli/src/pkg/utils.py 96.61% <100.00%> (ø)

... and 153 files with indirect coverage changes

Components Coverage Δ
Website ∅ <ø> (∅)
Lib Microservice ∅ <ø> (∅)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copilot AI review requested due to automatic review settings January 9, 2026 18:06
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 9 out of 10 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (1)

cli/tests/test_users.py:185

  • The del mock_user_operations pattern is awkward and unclear. Since the fixture is not used in this test, it should be removed from the function signature entirely. The fixture appears to mock operations that aren't needed for testing delete functionality specifically.
def test_delete_user(mock_config, mock_utils, mock_user_operations, export_error):
    """Test delete_user removes users from compose"""
    del mock_user_operations  # Fixture present but unused
    compose = {"version": "3", "services": {"user1": {}, "user2": {}}}
    mock_config.get_delete_users_list.return_value = (["user1"], None)
    mock_utils["import"].return_value = (compose, None)
    mock_utils["export"].return_value = Exception("Failed") if export_error else None

    err = users.delete_user(mock_config)
    assert (err is not None) if export_error else err is None

Copilot AI review requested due to automatic review settings January 9, 2026 18:30
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 8 out of 9 changed files in this pull request and generated 3 comments.

@8ohamed
Copy link
Contributor Author

8ohamed commented Jan 9, 2026

Hi @prasadtalasila I have made this PR that updates the dependencies like #1420 PR, and solved the pylint and qlty issues.

@prasadtalasila
Copy link
Contributor

@8ohamed please rebase your branch from the latest commit on feature/distributed-demo branch.

Copilot AI review requested due to automatic review settings January 9, 2026 20:48
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 11 out of 12 changed files in this pull request and generated 2 comments.

@8ohamed
Copy link
Contributor Author

8ohamed commented Jan 9, 2026

Hi @prasadtalasila it should be rebased now. For the next PR "thingsboard" I will make a fresh new fork to my github so I don't face merging conflict.

Copilot AI review requested due to automatic review settings January 10, 2026 22:23
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 9 out of 11 changed files in this pull request and generated no new comments.

@prasadtalasila
Copy link
Contributor

@8ohamed Thanks for the PR. The poetry.lock file is different from the one generated by copilot. Please see the diff

diff --git a/cli/poetry.lock b/cli/poetry.lock
index 3a722a0..3c60f91 100644
--- a/cli/poetry.lock
+++ b/cli/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.2.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.1.3 and should not be changed by hand.

 [[package]]
 name = "annotated-types"
@@ -14,34 +14,35 @@ files = [

 [[package]]
 name = "anyio"
-version = "4.12.0"
+version = "4.11.0"
 description = "High-level concurrency and networking framework on top of asyncio or Trio"
 optional = false
 python-versions = ">=3.9"
 groups = ["dev"]
 files = [
-    {file = "anyio-4.12.0-py3-none-any.whl", hash = "sha256:dad2376a628f98eeca4881fc56cd06affd18f659b17a747d3ff0307ced94b1bb"},
-    {file = "anyio-4.12.0.tar.gz", hash = "sha256:73c693b567b0c55130c104d0b43a9baf3aa6a31fc6110116509f27bf75e21ec0"},
+    {file = "anyio-4.11.0-py3-none-any.whl", hash = "sha256:0287e96f4d26d4149305414d4e3bc32f0dcd0862365a4bddea19d7a1ec38c4fc"},
+    {file = "anyio-4.11.0.tar.gz", hash = "sha256:82a8d0b81e318cc5ce71a5f1f8b5c4e63619620b63141ef8c995fa0db95a57c4"},
 ]
```

Can you please upgrade your poetry package to latest one (>=2.2.1) and generate a fresh `poetry.lock`? Thanks.

@prasadtalasila
Copy link
Contributor

@8ohamed I have made a clean rebase of your pull request onto the feature/distributed-demo branch and placed it in PR-1450 branch of my fork. It has a single commit for all the improvements you made. You can pull this branch and (if you want) force push to your feature/distributed-demo branch to have a clean PR.

The poetry.lock file has been freshly generated so that the dependency versions in it are newer than what copilot has suggested.

There are some formatting issues with the tests. The qlty is reporting incorrect formatting issues in test_cli.py and test_cmd.py. Please run qlty fmt on your machine to resolve these issues. The pytest is reformatting the compose.users.exp.yml; please check to make sure that the file remains unmodified. Please see the diff below.

--- a/cli/tests/data/compose.users.exp.yml
+++ b/cli/tests/data/compose.users.exp.yml
@@ -3,19 +3,19 @@ services:
   testuser:
     image: mltooling/ml-workspace-minimal:0.13.2
     volumes:
-      - /home/testuser/DTaaS/files/common:/workspace/common
-      - /home/testuser/DTaaS/files/testuser:/workspace
+    - /home/testuser/DTaaS/files/common:/workspace/common
+    - /home/testuser/DTaaS/files/testuser:/workspace
     environment:
-      - AUTHENTICATE_VIA_JUPYTER=
-      - WORKSPACE_BASE_URL=testuser
-    shm_size: "512m"
+    - AUTHENTICATE_VIA_JUPYTER=
+    - WORKSPACE_BASE_URL=testuser
+    shm_size: 512m
     labels:
-      - traefik.enable=true
-      - traefik.http.routers.testuser.entryPoints=web
-      - traefik.http.routers.testuser.rule=PathPrefix(`/testuser`)
-      - traefik.http.routers.testuser.middlewares=traefik-forward-auth
+    - traefik.enable=true
+    - traefik.http.routers.testuser.entryPoints=web
+    - traefik.http.routers.testuser.rule=PathPrefix(`/testuser`)
+    - traefik.http.routers.testuser.middlewares=traefik-forward-auth
     networks:
-      - users
+    - users

Thanks

@8ohamed 8ohamed force-pushed the feature/distributed-demo branch from 79fec29 to f58df9d Compare January 12, 2026 10:58
Copilot AI review requested due to automatic review settings January 12, 2026 11:34
@sonarqubecloud
Copy link

@8ohamed
Copy link
Contributor Author

8ohamed commented Jan 12, 2026

@prasadtalasila thanks for the rebase. I have runned qlty fmt and stopped pytest from reformatting the compose file.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 9 out of 10 changed files in this pull request and generated no new comments.

@prasadtalasila prasadtalasila merged commit 314c367 into INTO-CPS-Association:feature/distributed-demo Jan 12, 2026
12 of 15 checks passed
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