Jupyter notebook API typo (Sourcery refactored) by sourcery-ai[bot] · Pull Request #129 · dataiku/dataiku-api-client-python

sourcery-ai · 2021-03-24T14:21:05Z

Pull Request #128 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 fix/dss90-jupyter-typo branch, then run:

git fetch origin sourcery/fix/dss90-jupyter-typo
git merge --ff-only FETCH_HEAD
git reset HEAD^

sourcery-ai · 2021-03-24T14:21:07Z

-        definition = {}
-        definition['name'] = cluster_name
-        definition['type'] = cluster_type
-        definition['params'] = params if params is not None else {}
+        definition = {
+            'name': cluster_name,
+            'type': cluster_type,
+            'params': params if params is not None else {},
+        }
+


Function DSSClient.create_cluster refactored with the following changes:

Merge dictionary assignment with declaration (merge-dict-assign)

sourcery-ai · 2021-03-24T14:21:08Z

-            if isinstance(v, str) or isinstance(v, unicode):
+            if isinstance(v, (str, unicode)):


Function DSSClient.make_entry refactored with the following changes:

Merge isinstance calls (merge-is-instance)

sourcery-ai · 2021-03-24T14:21:08Z

-        if not feature_name in self.mltask_settings["preprocessing"]["per_feature"]:
+        if (
+            feature_name
+            not in self.mltask_settings["preprocessing"]["per_feature"]
+        ):


Function PredictionSplitParamsHandler.set_time_ordering refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

sourcery-ai · 2021-03-24T14:21:08Z

-        if len(diagnostic) == 0:
+        if not diagnostic:


Function DSSMLTaskSettings.set_diagnostic_type_enabled refactored with the following changes:

Simplify sequence comparison (simplify-len-comparison)

sourcery-ai · 2021-03-24T14:21:08Z

-        pretty_hyperparam = dict()
+        pretty_hyperparam = {}


Function NumericalHyperparameterSettings._pretty_repr refactored with the following changes:

Replace dict() with {} (dict-literal)

sourcery-ai · 2021-03-24T14:21:09Z

+        if self.gt is not None:
+            repr_gt = "%s<" % self.gt
+        elif self.gte is not None:
+            repr_gt = "%s<=" % self.gte
        else:
-            if self.gt is not None:
-                repr_gt = "%s<" % self.gt
-            elif self.gte is not None:
-                repr_gt = "%s<=" % self.gte
-            else:
-                repr_gt = ""
+            repr_gt = ""

-            if self.lte is not None:
-                repr_lt = "<=%s" % self.lte
-            else:
-                repr_lt = ""
-
-            return "DSSSubpopulationNumericModalityDefinition(%s%s%s)" % (repr_gt, self.feature_name, repr_lt)
+        repr_lt = "<=%s" % self.lte if self.lte is not None else ""
+        return "DSSSubpopulationNumericModalityDefinition(%s%s%s)" % (repr_gt, self.feature_name, repr_lt)


Function DSSSubpopulationNumericModalityDefinition.__repr__ refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

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

sourcery-ai · 2021-03-24T14:21:09Z

-            if len(modality_candidates) == 0:
+            if not modality_candidates:
                raise ValueError("Modality with index '%s' not found" % definition.index)
            return modality_candidates[0]
-        
+


Function DSSSubpopulationAnalysis.get_modality_data refactored with the following changes:

Simplify sequence comparison (simplify-len-comparison)

sourcery-ai · 2021-03-24T14:21:09Z

-        else:
-            if project_key is None:
-                project_key = match.group(1)
-            return DSSMLTask(client, project_key, match.group(2), match.group(3))
+        if project_key is None:
+            project_key = match.group(1)
+        return DSSMLTask(client, project_key, match.group(2), match.group(3))


Function DSSMLTask.from_full_model_id refactored with the following changes:

Remove unnecessary else after guard condition (remove-unnecessary-else)

sourcery-ai · 2021-03-24T14:21:09Z

-        ref = self.client._perform_json("POST", "/projects/%s/duplicate/" % self.project_key, body = obj)
-        return ref
+        return self.client._perform_json(
+            "POST", "/projects/%s/duplicate/" % self.project_key, body=obj
+        )


Function DSSProject.duplicate refactored with the following changes:

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

sourcery-ai · 2021-03-24T14:21:09Z

-        if as_type == "listitems" or as_type == "listitem":
+        if as_type in ["listitems", "listitem"]:
            return [DSSDatasetListItem(self.client, item) for item in items]
-        elif as_type == "objects" or as_type == "object":
+        elif as_type in ["objects", "object"]:


Function DSSProject.list_datasets refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-24T14:21:12Z

-        if as_type == "listitems" or as_type == "listitem":
+        if as_type in ["listitems", "listitem"]:
            return [DSSStreamingEndpointListItem(self.client, item) for item in items]
-        elif as_type == "objects" or as_type == "object":
+        elif as_type in ["objects", "object"]:


Function DSSProject.list_streaming_endpoints refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-24T14:21:12Z

-        if as_type == "objects" or as_type == "object":
+        if as_type in ["objects", "object"]:


Function DSSProject.list_model_evaluation_stores refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-24T14:21:13Z

-        if not "standard" in obj:
+        if "standard" not in obj:
            raise ValueError("Missing 'standard' key in argument")
-        if not "local" in obj:
+        if "local" not in obj:


Function DSSProject.set_variables refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

sourcery-ai · 2021-03-24T14:21:13Z

-        if as_type == "listitems" or as_type == "listitem":
+        if as_type in ["listitems", "listitem"]:
            return [DSSRecipeListItem(self.client, item) for item in items]
-        elif as_type == "objects" or as_type == "object":
+        elif as_type in ["objects", "object"]:


Function DSSProject.list_recipes refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-24T14:21:13Z

-        elif type == "prepare" or type == "shaker":
+        elif type in ["prepare", "shaker"]:


Function DSSProject.new_recipe refactored with the following changes:

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2021-03-24T14:21:13Z

-        already_exists = False
-        for rule in found_eo["rules"]:
-            if rule["targetProject"] == target_project:
-                already_exists = True
-                break
+        already_exists = any(
+            rule["targetProject"] == target_project for rule in found_eo["rules"]
+        )


Function DSSProjectSettings.add_exposed_object refactored with the following changes:

Use any() instead of for loop (use-any)

sourcery-ai · 2021-03-24T14:21:13Z

-            params = None
-        else:
-            params = {
+        params = None if project_key is None else {


Function DSSProjectDeployer.upload_bundle refactored with the following changes:

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

sourcery-ai · 2021-03-24T14:22:03Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 0.39%.

Quality metrics	Before	After	Change
Complexity	2.16 ⭐	1.97 ⭐	-0.19 👍
Method Length	29.77 ⭐	29.56 ⭐	-0.21 👍
Working memory	8.30 🙂	8.27 🙂	-0.03 👍
Quality	80.23% ⭐	80.62% ⭐	0.39% 👍

Other metrics	Before	After	Change
Lines	2380	2381	1

Changed files	Quality Before	Quality After	Quality Change
dataikuapi/dssclient.py	81.22% ⭐	81.53% ⭐	0.31% 👍
dataikuapi/dss/project.py	79.64% ⭐	80.08% ⭐	0.44% 👍

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
dataikuapi/dss/project.py	DSSProject.new_recipe	16 🙂	178 😞	28 ⛔	30.13% 😞	Try splitting into smaller methods. Extract out complex expressions
dataikuapi/dssclient.py	DSSClient.create_meaning	5 ⭐	116 🙂	14 😞	55.31% 🙂	Extract out complex expressions
dataikuapi/dss/project.py	DSSProject.duplicate	2 ⭐	70 🙂	18 ⛔	60.50% 🙂	Extract out complex expressions
dataikuapi/dssclient.py	DSSClient.sql_query	1 ⭐	60 ⭐	20 ⛔	61.62% 🙂	Extract out complex expressions
dataikuapi/dssclient.py	DSSClient._perform_http	5 ⭐	94 🙂	11 😞	62.98% 🙂	Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Let us know what you think of it by mentioning @sourcery-ai in a comment.

sourcery-ai Bot requested a review from pbailly March 24, 2021 14:21

sourcery-ai Bot commented Mar 24, 2021

View reviewed changes

'Refactored by Sourcery'

08b4ab3

sourcery-ai Bot force-pushed the sourcery/fix/dss90-jupyter-typo branch from defb145 to 08b4ab3 Compare March 24, 2021 14:21

sourcery-ai Bot closed this Mar 24, 2021

		if isinstance(v, str) or isinstance(v, unicode):
		if isinstance(v, (str, unicode)):

		if as_type == "objects" or as_type == "object":
		if as_type in ["objects", "object"]:

		elif type == "prepare" or type == "shaker":
		elif type in ["prepare", "shaker"]:

Uh oh!

Conversation

sourcery-ai Bot commented Mar 24, 2021

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot Mar 24, 2021

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot commented Mar 24, 2021

Sourcery Code Quality Report

Legend and Explanation

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

0 participants