NXDRIVE-2711: Show that upload is still alive for very large files (Sourcery refactored) #4228

sourcery-ai · 2023-10-10T07:08:31Z

Pull Request #4227 refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch, then run:

git fetch origin sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

…NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files

CLAassistant · 2023-10-10T07:08:37Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

Sourcery AI seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

codecov · 2023-10-10T07:11:05Z

Codecov Report

Attention: 14 lines in your changes are missing coverage. Please review.

Comparison is base (c21d4f1) 47.79% compared to head (893d1aa) 47.79%.

Additional details and impacted files

@@                                          Coverage Diff                                           @@
##           wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files    #4228   +/-   ##
======================================================================================================
  Coverage                                                                  47.79%   47.79%           
======================================================================================================
  Files                                                                         94       94           
  Lines                                                                      15677    15657   -20     
======================================================================================================
- Hits                                                                        7493     7484    -9     
+ Misses                                                                      8184     8173   -11

Flag	Coverage Δ
functional	`36.75% <17.39%> (+<0.01%)`	⬆️
integration	`2.06% <0.00%> (?)`
unit	`37.43% <34.78%> (+0.02%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
nxdrive/engine/activity.py	`97.77% <100.00%> (-0.05%)`	⬇️
nxdrive/client/uploader/__init__.py	`30.63% <0.00%> (+0.27%)`	⬆️
nxdrive/dao/engine.py	`62.22% <77.77%> (-0.02%)`	⬇️
nxdrive/gui/view.py	`40.07% <0.00%> (+0.86%)`	⬆️

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

…NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files

sourcery-ai · 2023-11-02T09:12:23Z

nxdrive/client/uploader/__init__.py

-                    # Handle status changes every time a chunk is sent
-                    _transfer = self.get_upload(
+                    if _transfer := self.get_upload(
                        doc_pair=transfer.doc_pair, path=transfer.path
-                    )
-                    if _transfer:
+                    ):


Function BaseUploader.upload_chunks refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

This removes the following comments ( why? ):

# Handle status changes every time a chunk is sent

sourcery-ai · 2023-11-02T09:12:23Z

nxdrive/client/uploader/__init__.py

-        res = self.remote.fetch(
+        return self.remote.fetch(
            f"{self.remote.client.api_path}/path{transfer.remote_parent_path}",
            headers=headers,
        )
-        return res


Function BaseUploader._transfer_docType_file refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-11-02T09:12:23Z

nxdrive/dao/engine.py

-            return bool(c.rowcount > 0)
+            return c.rowcount > 0


Function EngineDAO.release_processor refactored with the following changes:

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

sourcery-ai · 2023-11-02T09:12:24Z

nxdrive/dao/engine.py

-            return bool(c.rowcount == 1)
+            return c.rowcount == 1


Function EngineDAO.acquire_processor refactored with the following changes:

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

sourcery-ai · 2023-11-02T09:12:24Z

nxdrive/dao/engine.py

-                    update + " " + self._get_recursive_remote_condition(doc_pair),
+                    f"{update} {self._get_recursive_remote_condition(doc_pair)}",


Function EngineDAO.delete_remote_state refactored with the following changes:

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

sourcery-ai · 2023-11-02T09:12:24Z

nxdrive/engine/activity.py

-            signal = getattr(reporter, f"action_{evt}", None)
-            if signal:
+            if signal := getattr(reporter, f"action_{evt}", None):


Function FileAction._connect_reporter refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2023-11-02T09:12:25Z

nxdrive/gui/view.py

-        if not engine:
-            return ""
-
-        return getattr(engine, self.names[role].decode())
+        return "" if not engine else getattr(engine, self.names[role].decode())


Function EngineModel.data refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-11-02T09:12:25Z

nxdrive/gui/view.py

-        if not engine:
-            return ""
-
-        return getattr(engine, role)
+        return "" if not engine else getattr(engine, role)


Function EngineModel.get refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-11-02T09:12:25Z

nxdrive/gui/view.py

-            datetime = get_date_from_sqlite(row["created_on"])
-            if datetime:
+            if datetime := get_date_from_sqlite(row["created_on"]):
                label += "_ON"
-                # As date_time is in UTC
-                offset = tzlocal().utcoffset(datetime)
-                if offset:
+                if offset := tzlocal().utcoffset(datetime):
                    datetime += offset
                args.append(Translator.format_datetime(datetime))
            return self.tr(label, values=args)
        elif role == self.COMPLETED_ON:
            label = "COMPLETED" if row["status"].name == "DONE" else "CANCELLED"
            args = []
-            datetime = get_date_from_sqlite(row["completed_on"])
-            if datetime:
+            if datetime := get_date_from_sqlite(row["completed_on"]):
                label += "_ON"
-                offset = tzlocal().utcoffset(datetime)
-                if offset:
+                if offset := tzlocal().utcoffset(datetime):


Function ActiveSessionModel.data refactored with the following changes:

Use named expression to simplify assignment and conditional [×4] (use-named-expression)

This removes the following comments ( why? ):

# As date_time is in UTC

sourcery-ai · 2023-11-02T09:12:25Z

nxdrive/gui/view.py

-            datetime = get_date_from_sqlite(row["created_on"])
-            if datetime:
+            if datetime := get_date_from_sqlite(row["created_on"]):
                label += "_ON"
-                # As date_time is in UTC
-                offset = tzlocal().utcoffset(datetime)
-                if offset:
+                if offset := tzlocal().utcoffset(datetime):
                    datetime += offset
                args.append(Translator.format_datetime(datetime))
            return self.tr(label, values=args)
        elif role == self.COMPLETED_ON:
            label = "COMPLETED" if row["status"].name == "DONE" else "CANCELLED"
            args = []
-            datetime = get_date_from_sqlite(row["completed_on"])
-            if datetime:
+            if datetime := get_date_from_sqlite(row["completed_on"]):
                label += "_ON"
-                offset = tzlocal().utcoffset(datetime)
-                if offset:
+                if offset := tzlocal().utcoffset(datetime):


Function CompletedSessionModel.data refactored with the following changes:

Use named expression to simplify assignment and conditional [×4] (use-named-expression)

This removes the following comments ( why? ):

# As date_time is in UTC

gitofanindya and others added 9 commits September 14, 2023 10:52

14-sept

b90806e

NXDRIVE-2711:Show thta upload is still alive for very large file

ea94e57

NXDRIVE-2711:Show thta upload is still alive for very large file

273e923

NXDRIVE-2711: Show that upload is still alive for very large files

915f44d

NXDRIVE-2711: Upload is still alive

d7308ca

NXDRIVE-2711: Show that upload is still alive for very large files

d82ddbb

NXDRIVE-2711: Show that upload is still alive for very large files

cf30aaa

Merge branch 'master' of https://github.com/nuxeo/nuxeo-drive into wip-…

3382d47

…NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files

NXDRIVE-2711: Show that upload is still alive for very large files

9664a78

sourcery-ai bot requested a review from swetayadav1 October 10, 2023 07:08

NXDRIVE-2711: Show that upload is still alive for very large files

70481e6

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from 8939f22 to f7c4888 Compare October 11, 2023 07:17

NXDRIVE-2711: Show that upload is still alive for very large files

7524f02

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from f7c4888 to 2ad7584 Compare October 11, 2023 07:40

NXDRIVE-2711: Show that upload is still alive for very large files

bd016cd

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from 2ad7584 to 64c5e7f Compare October 12, 2023 07:05

NXDRIVE-2711: Show that upload is still alive for very large files

2968e81

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from 64c5e7f to 64b67b9 Compare October 12, 2023 11:07

NXDRIVE-2711: Show that upload is still alive for very large files

7a400a7

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from 64b67b9 to e8dad39 Compare October 17, 2023 06:48

NXDRIVE-2711: Show that upload is still alive for very large files

900dab5

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from e8dad39 to 52c56f7 Compare October 17, 2023 11:52

NXDRIVE-2711: update testcase

643f317

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from 52c56f7 to 399aa9c Compare October 18, 2023 12:32

Merge branch 'master' of https://github.com/nuxeo/nuxeo-drive into wip-…

ab433bb

…NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from 399aa9c to a124e61 Compare October 18, 2023 12:49

NXDRIVE-2711:Show that upload is still alive for very large files

894e6a6

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from a124e61 to f44f4df Compare October 25, 2023 11:42

NXDRIVE-2711:Show that upload is still alive for very large files

3fda071

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from f44f4df to 21f9bbc Compare October 25, 2023 11:51

NXDRIVE-2711:Show that upload is still alive for very large files

2de2bf4

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from 21f9bbc to 625754b Compare October 25, 2023 12:41

NXDRIVE-2711:Show that upload is still alive for very large files

1c921c4

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from 625754b to b686f2a Compare October 25, 2023 12:43

Merge branch 'master' of https://github.com/nuxeo/nuxeo-drive into wip-…

8d90b25

…NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from b686f2a to b95782a Compare October 25, 2023 14:35

NXDRIVE-2711:Show that upload is still alive for very large files

7cb3f27

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from b95782a to daf2480 Compare October 26, 2023 06:40

NXDRIVE-2711:Show that upload is still alive for very large files

e8501e3

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from daf2480 to 380b4da Compare October 26, 2023 08:49

NXDRIVE-2711:Show that upload is still alive for very large files

ae9a1a8

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from 380b4da to a5a9fe2 Compare October 26, 2023 09:08

swetayadav1 and others added 3 commits October 26, 2023 15:12

NXDRIVE-2711:Show that upload is still alive for very large files

345078c

NXDRIVE-2711: Sourcery refactored

c21d4f1

'Refactored by Sourcery'

893d1aa

sourcery-ai bot force-pushed the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch from a5a9fe2 to 893d1aa Compare November 2, 2023 09:11

sourcery-ai bot commented Nov 2, 2023

View reviewed changes

Base automatically changed from wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files to master November 2, 2023 13:45

sourcery-ai bot closed this Nov 2, 2023

sourcery-ai bot deleted the sourcery/wip-NXDRIVE-2711-Show-that-upload-is-still-alive-for-very-large-files branch November 2, 2023 13:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NXDRIVE-2711: Show that upload is still alive for very large files (Sourcery refactored) #4228

NXDRIVE-2711: Show that upload is still alive for very large files (Sourcery refactored) #4228

sourcery-ai bot commented Oct 10, 2023 •

edited

Loading

CLAassistant commented Oct 10, 2023

codecov bot commented Oct 10, 2023 •

edited

Loading

sourcery-ai bot Nov 2, 2023

sourcery-ai bot Nov 2, 2023

sourcery-ai bot Nov 2, 2023

sourcery-ai bot Nov 2, 2023

sourcery-ai bot Nov 2, 2023

sourcery-ai bot Nov 2, 2023

sourcery-ai bot Nov 2, 2023

sourcery-ai bot Nov 2, 2023

sourcery-ai bot Nov 2, 2023

sourcery-ai bot Nov 2, 2023

		update + " " + self._get_recursive_remote_condition(doc_pair),
		f"{update} {self._get_recursive_remote_condition(doc_pair)}",

NXDRIVE-2711: Show that upload is still alive for very large files (Sourcery refactored) #4228

NXDRIVE-2711: Show that upload is still alive for very large files (Sourcery refactored) #4228

Conversation

sourcery-ai bot commented Oct 10, 2023 • edited Loading

CLAassistant commented Oct 10, 2023

codecov bot commented Oct 10, 2023 • edited Loading

Codecov Report

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 2, 2023

Choose a reason for hiding this comment

sourcery-ai bot commented Oct 10, 2023 •

edited

Loading

codecov bot commented Oct 10, 2023 •

edited

Loading