Sourcery refactored master branch by sourcery-ai[bot] · Pull Request #1 · edson-github/python-machine-learning-book-2nd-edition

sourcery-ai · 2022-05-10T11:12:21Z

Branch master refactored by Sourcery.

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

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 master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2022-05-10T11:12:23Z

-                else:
-                    if line.strip() not in existing_imports:
-                        imports.append(line)
-                        existing_imports.add(line.strip())
+                elif line.strip() not in existing_imports:
+                    imports.append(line)
+                    existing_imports.add(line.strip())


Function cleanup refactored with the following changes:

Merge else clause's nested if statement into elif (merge-else-if-into-elif)

sourcery-ai · 2022-05-10T11:12:24Z

        self.cost_ = []

-        for i in range(self.n_iter):
+        for _ in range(self.n_iter):


Function AdalineGD.fit refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-05-10T11:12:24Z

-        for i in range(self.n_iter):
+        for _ in range(self.n_iter):
            if self.shuffle:
                X, y = self._shuffle(X, y)
-            cost = []
-            for xi, target in zip(X, y):
-                cost.append(self._update_weights(xi, target))
+            cost = [self._update_weights(xi, target) for xi, target in zip(X, y)]


Function AdalineSGD.fit refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2022-05-10T11:12:24Z

-        cost = 0.5 * error**2
-        return cost
+        return 0.5 * error**2


Function AdalineSGD._update_weights refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:24Z

-        for i in range(self.n_iter):
+        for _ in range(self.n_iter):
            net_input = self.net_input(X)
            output = self.activation(net_input)
            errors = (y - output)
            self.w_[1:] += self.eta * X.T.dot(errors)
            self.w_[0] += self.eta * errors.sum()
-            
+


Function LogisticRegressionGD.fit refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-05-10T11:12:26Z

                   + ' '.join(emoticons).replace('-', '')
-    tokenized = [w for w in text.split() if w not in stop]
-    return tokenized
+    return [w for w in text.split() if w not in stop]


Function tokenizer refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:26Z


-    results = c.fetchmany(batch_size)
-    while results:
+    while results := c.fetchmany(batch_size):


Function update_model refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:27Z

                   + ' '.join(emoticons).replace('-', '')
-    tokenized = [w for w in text.split() if w not in stop]
-    return tokenized
+    return [w for w in text.split() if w not in stop]


Function tokenizer refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:27Z

        ' '.join(emoticons).replace('-', '')
-    tokenized = [w for w in text.split() if w not in stop]
-    return tokenized
+    return [w for w in text.split() if w not in stop]


Function tokenizer refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:27Z

        ' '.join(emoticons).replace('-', '')
-    tokenized = [w for w in text.split() if w not in stop]
-    return tokenized
+    return [w for w in text.split() if w not in stop]


Function tokenizer refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:31Z

        self.cost_ = []

-        for i in range(self.n_iter):
+        for _ in range(self.n_iter):


Function LinearRegressionGD.fit refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-05-10T11:12:32Z

    yticks.append((y_ax_lower + y_ax_upper) / 2.)
    y_ax_lower += len(c_silhouette_vals)
-    
+


Lines 191-413 refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-05-10T11:12:32Z

-else:
-    writemode = 'w'
-
+writemode = 'wb' if (sys.version_info > (3, 0)) else 'w'


Lines 105-109 refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:32Z

-    labels_path = os.path.join(path, 
-                               '%s-labels-idx1-ubyte' % kind)
-    images_path = os.path.join(path, 
-                               '%s-images-idx3-ubyte' % kind)
-
+    labels_path = os.path.join(path, f'{kind}-labels-idx1-ubyte')
+    images_path = os.path.join(path, f'{kind}-images-idx3-ubyte')
+


Function load_mnist refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-05-10T11:12:32Z

-        cost = np.sum(term1 - term2) + L2_term
-


Function NeuralNetMLP._compute_cost refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:34Z

-    res = []
-    for i in range(0, int(len(x)/s),s):
-        res.append(np.sum(x_padded[i:i+w_rot.shape[0]] * w_rot))
+    res = [
+        np.sum(x_padded[i : i + w_rot.shape[0]] * w_rot)
+        for i in range(0, int(len(x) / s), s)
+    ]
+


Function conv1d refactored with the following changes:

Convert for loop into list comprehension (list-comprehension)

sourcery-ai · 2022-05-10T11:12:34Z

-    
-    
+
+


Lines 191-241 refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:34Z

-    labels_path = os.path.join(path,
-                               '%s-labels-idx1-ubyte'
-                                % kind)
-    images_path = os.path.join(path,
-                               '%s-images-idx3-ubyte'
-                               % kind)
+    labels_path = os.path.join(path, f'{kind}-labels-idx1-ubyte')
+    images_path = os.path.join(path, f'{kind}-images-idx3-ubyte')


Function load_mnist refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-05-10T11:12:34Z

-    print('Saving model in %s' % path)
+    print(f'Saving model in {path}')


Function save refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-05-10T11:12:34Z

-    print('Loading model from %s' % path)
+    print(f'Loading model from {path}')


Function load refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-05-10T11:12:38Z

-        print('Saving model in %s' % path)
+        print(f'Saving model in {path}')


Function ConvNN.save refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-05-10T11:12:38Z

-        print('Loading model from %s' % path)
+        print(f'Loading model from {path}')


Function ConvNN.load refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-05-10T11:12:39Z

-            for i, (batch_x,batch_y) in                 enumerate(batch_gen):
+            for batch_x, batch_y in batch_gen:


Function ConvNN.train refactored with the following changes:

Remove unnecessary calls to enumerate when the index is not used (remove-unused-enumerate)

sourcery-ai · 2022-05-10T11:12:39Z

-                [tf.contrib.rnn.DropoutWrapper(
-                   tf.contrib.rnn.BasicLSTMCell(self.lstm_size),
-                   output_keep_prob=tf_keepprob)
-                 for i in range(self.num_layers)])
+            [
+                tf.contrib.rnn.DropoutWrapper(
+                    tf.contrib.rnn.BasicLSTMCell(self.lstm_size),
+                    output_keep_prob=tf_keepprob,
+                )
+                for _ in range(self.num_layers)
+            ]
+        )
+


Function SentimentRNN.build refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

sourcery-ai · 2022-05-10T11:12:39Z

-        num_batches = num_batches - 1
+        num_batches -= 1
    ## Truncate the sequence at the end to get rid of 
    ## remaining charcaters that do not make a full batch
-    x = sequence[0 : num_batches*mini_batch_length]
+    x = sequence[:num_batches*mini_batch_length]


Function reshape_data refactored with the following changes:

Replace assignment with augmented assignment (aug-assign)

Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (remove-redundant-slice-index)

sourcery-ai · 2022-05-10T11:12:39Z

-    ch_id = np.random.choice(char_size, 1, p=p)[0]
-    return ch_id
+    return np.random.choice(char_size, 1, p=p)[0]


Function get_top_char refactored with the following changes:

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

sourcery-ai · 2022-05-10T11:12:39Z

-    if (sys.version_info >= (3, 0)):
-        kernel_name = 'python3'
-    else:
-        kernel_name = 'python2'
+    kernel_name = 'python3' if (sys.version_info >= (3, 0)) else 'python2'
    #  error_cells = []

-    args = ["jupyter", "nbconvert",
-            "--execute", "--inplace",
-            "--debug",
-            "--ExecutePreprocessor.timeout=5000",
-            "--ExecutePreprocessor.kernel_name=%s" % kernel_name,
-            nb_path]
+    args = [
+        "jupyter",
+        "nbconvert",
+        "--execute",
+        "--inplace",
+        "--debug",
+        "--ExecutePreprocessor.timeout=5000",
+        f"--ExecutePreprocessor.kernel_name={kernel_name}",
+        nb_path,
+    ]
+


Function run_ipynb refactored with the following changes:

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

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

sourcery-ai · 2022-05-10T11:12:39Z

-        this_dir = os.path.dirname(os.path.abspath(__file__))
-
        # run only on Py3, because of Py2 unicode handling
        if (sys.version_info >= (3, 0)):
+            this_dir = os.path.dirname(os.path.abspath(__file__))
+


Function TestNotebooks.test_ch08 refactored with the following changes:

Move assignments closer to their usage (move-assign)

sourcery-ai · 2022-05-10T11:12:40Z

-        this_dir = os.path.dirname(os.path.abspath(__file__))
-
        # run only on Py3, because of the Py3 specific pickle files
        if (sys.version_info >= (3, 0)):
+            this_dir = os.path.dirname(os.path.abspath(__file__))
+
            run_ipynb(os.path.join(this_dir, '../ch09/ch09.ipynb'))
-        else:
-            pass


Function TestNotebooks.test_ch09 refactored with the following changes:

Move assignments closer to their usage (move-assign)

Remove redundant pass statement (remove-redundant-pass)

sourcery-ai · 2022-05-10T11:12:40Z

-        this_dir = os.path.dirname(os.path.abspath(__file__))
        # run only on Py3, because of Py2 unicode handling
        if (sys.version_info >= (3, 0)):
+            this_dir = os.path.dirname(os.path.abspath(__file__))


Function TestNotebooks.test_ch16 refactored with the following changes:

Move assignments closer to their usage (move-assign)

sourcery-ai · 2022-05-10T11:15:30Z

Sourcery Code Quality Report

❌ Merging this PR will decrease code quality in the affected files by 0.12%.

Quality metrics	Before	After	Change
Complexity	2.85 ⭐	2.79 ⭐	-0.06 👍
Method Length	126.44 😞	126.21 😞	-0.23 👍
Working memory	14.39 😞	14.46 😞	0.07 👎
Quality	54.21% 🙂	54.09% 🙂	-0.12% 👎

Other metrics	Before	After	Change
Lines	9664	9613	-51

Changed files	Quality Before	Quality After	Quality Change
code/.convert_notebook_to_script.py	55.29% 🙂	57.71% 🙂	2.42% 👍
code/ch02/ch02.py	72.66% 🙂	72.61% 🙂	-0.05% 👎
code/ch03/ch03.py	60.74% 🙂	60.74% 🙂	0.00%
code/ch04/ch04.py	47.12% 😞	46.90% 😞	-0.22% 👎
code/ch05/ch05.py	47.51% 😞	47.42% 😞	-0.09% 👎
code/ch06/ch06.py	28.44% 😞	28.44% 😞	0.00%
code/ch07/ch07.py	41.45% 😞	41.56% 😞	0.11% 👍
code/ch08/ch08.py	56.68% 🙂	56.52% 🙂	-0.16% 👎
code/ch09/movieclassifier/vectorizer.py	85.12% ⭐	85.75% ⭐	0.63% 👍
code/ch09/movieclassifier_with_update/update.py	72.38% 🙂	73.70% 🙂	1.32% 👍
code/ch09/movieclassifier_with_update/vectorizer.py	85.12% ⭐	85.75% ⭐	0.63% 👍
code/ch09/pickle-test-scripts/pickle-dump-test.py	81.28% ⭐	81.36% ⭐	0.08% 👍
code/ch09/pickle-test-scripts/vectorizer.py	85.29% ⭐	86.03% ⭐	0.74% 👍
code/ch10/ch10.py	45.71% 😞	45.71% 😞	0.00%
code/ch11/ch11.py	29.82% 😞	29.82% 😞	0.00%
code/ch12/ch12.py	54.56% 🙂	53.99% 🙂	-0.57% 👎
code/ch12/neuralnet.py	52.17% 🙂	51.37% 🙂	-0.80% 👎
code/ch13/ch13.py	63.72% 🙂	63.64% 🙂	-0.08% 👎
code/ch14/ch14.py	45.65% 😞	45.65% 😞	0.00%
code/ch15/ch15.py	65.35% 🙂	65.48% 🙂	0.13% 👍
code/ch16/ch16.py	61.81% 🙂	61.90% 🙂	0.09% 👍
code/tests/test_notebooks.py	89.34% ⭐	89.84% ⭐	0.50% 👍

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

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
code/ch12/ch12.py	NeuralNetMLP.fit	5 ⭐	386 ⛔	25 ⛔	31.80% 😞	Try splitting into smaller methods. Extract out complex expressions
code/ch12/neuralnet.py	NeuralNetMLP.fit	5 ⭐	386 ⛔	25 ⛔	31.80% 😞	Try splitting into smaller methods. Extract out complex expressions
code/ch03/ch03.py	plot_decision_regions	2 ⭐	245 ⛔	16 ⛔	44.54% 😞	Try splitting into smaller methods. Extract out complex expressions
code/.convert_notebook_to_script.py	cleanup	17 🙂	128 😞	12 😞	46.11% 😞	Try splitting into smaller methods. Extract out complex expressions
code/ch02/ch02.py	plot_decision_regions	1 ⭐	200 😞	15 😞	49.53% 😞	Try splitting into smaller methods. 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!

Help us improve this quality report!

'Refactored by Sourcery'

8e9968f

sourcery-ai Bot requested a review from edson-github May 10, 2022 11:12

sourcery-ai Bot commented May 10, 2022

View reviewed changes

		yticks.append((y_ax_lower + y_ax_upper) / 2.)
		y_ax_lower += len(c_silhouette_vals)

		print('Saving model in %s' % path)
		print(f'Saving model in {path}')

		print('Loading model from %s' % path)
		print(f'Loading model from {path}')

		for i, (batch_x,batch_y) in enumerate(batch_gen):
		for batch_x, batch_y in batch_gen:

Conversation

sourcery-ai Bot commented May 10, 2022

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment

Uh oh!

sourcery-ai Bot May 10, 2022

Choose a reason for hiding this comment