Skip to content

Commit d8912d8

Browse files
authored
Code cleanup (#8)
* decrease identation * no mutable data as default argument * Update changelog * Add type hint
1 parent f9315e4 commit d8912d8

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1010
## [v0.2.3] - 2025-08-26
1111

1212
- Better support for merging schemas
13+
- Small code improvements
1314

1415
## [v0.2.2] - 2025-08-25
1516

vecorel_cli/conversion/base.py

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -243,27 +243,24 @@ def read_data(self, paths, **kwargs):
243243
return pd.concat(gdfs)
244244

245245
def filter_rows(self, gdf):
246-
if len(self.column_filters) > 0:
247-
self.info("Applying filters")
248-
for key, fn in self.column_filters.items():
249-
if key in gdf.columns:
250-
result = fn(gdf[key])
246+
if len(self.column_filters) == 0:
247+
return gdf
248+
249+
self.info("Applying filters")
250+
for key, fn in self.column_filters.items():
251+
if key in gdf.columns:
252+
result = fn(gdf[key])
253+
if isinstance(result, tuple):
251254
# If the result is a tuple, the second value is a flag to potentially invert the mask
252-
if isinstance(result, tuple):
253-
if result[1]:
254-
# Invert mask
255-
mask = ~result[0]
256-
else:
257-
# Use mask as is
258-
mask = result[0]
259-
else:
260-
# Just got a mask, proceed
261-
mask = result
262-
263-
# Filter columns based on the mask
264-
gdf = gdf[mask]
255+
mask = ~result[0] if result[1] else result[0]
265256
else:
266-
self.warning(f"Column '{key}' not found in dataset, skipping filter")
257+
# Just got a mask, proceed
258+
mask = result
259+
260+
# Filter columns based on the mask
261+
gdf = gdf[mask]
262+
else:
263+
self.warning(f"Column '{key}' not found in dataset, skipping filter")
267264
return gdf
268265

269266
def get_title(self):

vecorel_cli/converters.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import importlib
22
import os
3+
from typing import Sequence
34

45
import click
56
import pandas as pd
@@ -111,7 +112,7 @@ def list_ids(self) -> list:
111112
ids = [f[:-3] for f in files if self.is_converter(f)]
112113
return ids
113114

114-
def list_all(self, keys=["short_name", "license"]) -> dict:
115+
def list_all(self, keys: Sequence[str] = ("short_name", "license")) -> dict:
115116
converters = {}
116117
for id in self.list_ids():
117118
obj = {}

0 commit comments

Comments
 (0)