Sourcery refactored main branch #1

sourcery-ai · 2023-11-30T02:46:18Z

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

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

Help us improve this pull request!

sourcery-ai · 2023-11-30T02:46:20Z

docs/user_guide/jupyterutils.py

- # HTML table header
- html = '<table><tr><th>'
- html += '</th><th>'.join(columns)
+ html = '<table><tr><th>' + '</th><th>'.join(columns)


Function table_print refactored with the following changes:

Replace assignment and augmented assignment with single assignment (merge-assign-and-aug-assign)

This removes the following comments ( why? ):

# HTML table header

sourcery-ai · 2023-11-30T02:46:20Z

redisvl/index.py

- results = self._redis_conn.ft(self._name).search( # type: ignore
+ return self._redis_conn.ft(self._name).search( # type: ignore
 *args, **kwargs
 )
- return results


Function SearchIndex.search refactored with the following changes:

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

sourcery-ai · 2023-11-30T02:46:20Z

redisvl/index.py

- results = await self._redis_conn.ft(self._name).search(*args, **kwargs) # type: ignore
- return results
+ return await self._redis_conn.ft(self._name).search(*args, **kwargs)


Function AsyncSearchIndex.search refactored with the following changes:

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

This removes the following comments ( why? ):

# type: ignore

sourcery-ai · 2023-11-30T02:46:20Z

redisvl/schema.py

- for field in field_group:
- redis_fields.append(field.as_field())
+ redis_fields.extend(field.as_field() for field in field_group)


Function SchemaModel.index_fields refactored with the following changes:

Replace a for append loop with list extend (for-append-to-extend)

sourcery-ai · 2023-11-30T02:46:20Z

redisvl/schema.py

- field_class = field_classes.get(field_type)
- if field_class:
+ if field_class := field_classes.get(field_type):


Function SchemaGenerator.generate refactored with the following changes:

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

sourcery-ai · 2023-11-30T02:46:21Z

redisvl/query/query.py

- _filter = "*"
- if self._filter:
- _filter = str(self._filter)
+ _filter = str(self._filter) if self._filter else "*"
 base_query = f"{_filter}=>[KNN {self._num_results} @{self._field} ${self.VECTOR_PARAM} AS {self.DISTANCE_ID}]"
- query = (
+ return (
 Query(base_query)
 .return_fields(*self._return_fields)
 .sort_by(self.DISTANCE_ID)
 .paging(0, self._num_results)
 .dialect(2)
 )
- return query


Function VectorQuery.query refactored with the following changes:

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

Move setting of default value for variable into else branch (introduce-default-else)

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

sourcery-ai · 2023-11-30T02:46:22Z

redisvl/query/query.py

- _filter = "*"
- if self._filter:
- _filter = str(self._filter)
-
+ _filter = str(self._filter) if self._filter else "*"
 # Avoid appending a filter that yields '*' as it will cause a syntax error in Redis query language
 if _filter != "*":
 base_query = (
- "("
- + base_query
+ f"({base_query}"


Function RangeQuery.query refactored with the following changes:

Move setting of default value for variable into else branch (introduce-default-else)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

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

sourcery-ai · 2023-11-30T02:46:22Z

redisvl/utils/connection.py

- addr = os.getenv("REDIS_URL", None)
- if not addr:
+ if addr := os.getenv("REDIS_URL", None):
+ return addr
+ else:
 raise ValueError("REDIS_URL env var not set")
- return addr


Function get_address_from_env refactored with the following changes:

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

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

Swap if/else branches (swap-if-else-branches)

sourcery-ai · 2023-11-30T02:46:22Z

redisvl/utils/utils.py

- if isinstance(data, tuple):
- return map(convert_bytes, data)
- return data
+ return map(convert_bytes, data) if isinstance(data, tuple) else data


Function convert_bytes 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-30T02:46:22Z

redisvl/vectorize/base.py

- if as_buffer:
- return array_to_buffer(embedding)
- return embedding
+ return array_to_buffer(embedding) if as_buffer else embedding


Function BaseVectorizer._process_embedding 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-30T02:46:24Z

redisvl/vectorize/text/huggingface.py

- if len(texts) > 0 and not isinstance(texts[0], str):
+ if texts and not isinstance(texts[0], str):


Function HFTextVectorizer.embed_many refactored with the following changes:

Simplify sequence length comparison (simplify-len-comparison)

sourcery-ai · 2023-11-30T02:46:24Z

redisvl/vectorize/text/openai.py

- if len(texts) > 0 and not isinstance(texts[0], str):
+ if texts and not isinstance(texts[0], str):


Function OpenAITextVectorizer.embed_many refactored with the following changes:

Simplify sequence length comparison (simplify-len-comparison)

sourcery-ai · 2023-11-30T02:46:24Z

redisvl/vectorize/text/openai.py

- if len(texts) > 0 and not isinstance(texts[0], str):
+ if texts and not isinstance(texts[0], str):


Function OpenAITextVectorizer.aembed_many refactored with the following changes:

Simplify sequence length comparison (simplify-len-comparison)

sourcery-ai · 2023-11-30T02:46:24Z

redisvl/vectorize/text/vertexai.py

- if len(texts) > 0 and not isinstance(texts[0], str):
+ if texts and not isinstance(texts[0], str):


Function VertexAITextVectorizer.embed_many refactored with the following changes:

Simplify sequence length comparison (simplify-len-comparison)

sourcery-ai · 2023-11-30T02:46:25Z

tests/integration/test_query.py

- assert int(doc.age) in [18, 14, 94, 100, 12, 15, 35]
+ assert int(doc.age) in {18, 14, 94, 100, 12, 15, 35}


Function test_simple refactored with the following changes:

Use set when checking membership of a collection of literals (collection-into-set)

sourcery-ai · 2023-11-30T02:46:25Z

tests/integration/test_simple_async.py

- users = [doc for doc in results.docs]
+ users = list(results.docs)


Function test_simple refactored with the following changes:

Replace identity comprehension with call to collection constructor (identity-comprehension)

sourcery-ai · 2023-11-30T02:46:25Z

tests/unit/test_filter.py

- tag = Tag("tag_field") == None
+ tag = Tag("tag_field") is None


Function test_nullable refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2023-11-30T02:46:25Z

tests/unit/test_filter.py

- nf = Num("numeric_field") == None
+ nf = Num("numeric_field") is None


Function test_numeric_filter refactored with the following changes:

Use x is None rather than x == None (none-compare)

sourcery-ai · 2023-11-30T02:46:25Z

tests/unit/test_filter.py

- tf1 = Tag("tag_field") == None
+ tf1 = Tag("tag_field") is None
 tf2 = Tag("tag_field") == ""
 assert str(tf1 & tf2) == "*"

- tf1 = Tag("tag_field") == None
+ tf1 = Tag("tag_field") is None
 tf2 = Tag("tag_field") == "tag"
 assert str(tf1 & tf2) == str(tf2)

- tf1 = Tag("tag_field") == None
+ tf1 = Tag("tag_field") is None
 tf2 = Tag("tag_field") == ["tag1", "tag2"]
 assert str(tf1 & tf2) == str(tf2)

- tf1 = Tag("tag_field") == None
+ tf1 = Tag("tag_field") is None


Function test_filters_combination refactored with the following changes:

Use x is None rather than x == None [×10] (none-compare)

sourcery-ai · 2023-11-30T02:46:25Z

tests/unit/test_storage.py

- instance = StorageClass(prefix="test", key_separator=":")
- return instance
+ return StorageClass(prefix="test", key_separator=":")


Function storage_instance refactored with the following changes:

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

pep8speaks · 2023-11-30T02:46:35Z

Hello @sourcery-ai[bot]! Thanks for opening this PR. We checked the lines you've touched for PEP 8 issues, and found:

In the file redisvl/query/filter.py:

Line 504:80: E501 line too long (86 > 79 characters)

In the file redisvl/storage.py:

Line 43:80: E501 line too long (81 > 79 characters)

'Refactored by Sourcery'

44996e7

sourcery-ai bot requested a review from tuhinmallick November 30, 2023 02:46

pull-request-attention bot assigned tuhinmallick Nov 30, 2023

sourcery-ai bot commented Nov 30, 2023

View reviewed changes

pull-request-size bot added the size/L label Nov 30, 2023

sourcery-ai bot commented Nov 30, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored main branch #1

Sourcery refactored main branch #1

sourcery-ai bot commented Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

sourcery-ai bot Nov 30, 2023

pep8speaks commented Nov 30, 2023

		if len(texts) > 0 and not isinstance(texts[0], str):
		if texts and not isinstance(texts[0], str):

		assert int(doc.age) in [18, 14, 94, 100, 12, 15, 35]
		assert int(doc.age) in {18, 14, 94, 100, 12, 15, 35}

		users = [doc for doc in results.docs]
		users = list(results.docs)

		tag = Tag("tag_field") == None
		tag = Tag("tag_field") is None

		nf = Num("numeric_field") == None
		nf = Num("numeric_field") is None

Sourcery refactored main branch #1

Are you sure you want to change the base?

Sourcery refactored main branch #1

Conversation

sourcery-ai bot commented Nov 30, 2023

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

sourcery-ai bot Nov 30, 2023

Choose a reason for hiding this comment

pep8speaks commented Nov 30, 2023