Skip to content

Commit 42b1cc8

Browse files
authored
Predicate modifier fix (#389)
* Add `predicate_modifier` as blank column if absent while `remove_mappings` * formatted * fixed flake8 error * Add predicate_modifier check wherever KEY_FEATURES are used. * replaced previous logic * fixed error * mkdir sssom before copying into via workflow * moved from makefile to workflow * install dependencies * removed poetry just installed black * removed extra optional column
1 parent 810e69e commit 42b1cc8

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

.github/workflows/update_context.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,18 @@ jobs:
1313
- name: Work around permission issue
1414
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
1515

16+
- name: Install Black
17+
run: |
18+
pip install --upgrade pip
19+
pip install black
20+
1621
- name: Update schema files
1722
run: make all_schema
1823

1924
- name: Update sssom context
20-
run: make deploy-dm
25+
run: |
26+
mkdir -p sssom
27+
make deploy-dm
2128
2229
- name: Create Pull Request
2330
uses: peter-evans/create-pull-request@v3

src/sssom/util.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,16 +189,20 @@ def clean_prefix_map(self, strict: bool = True) -> None:
189189
# self.df = filter_out_prefixes(self.df, missing_prefixes)
190190
self.prefix_map = new_prefixes
191191

192-
def remove_mappings(self, msdf: "MappingSetDataFrame"):
192+
def remove_mappings(self, msdf: "MappingSetDataFrame") -> None:
193193
"""Remove mappings in right msdf from left msdf.
194194
195195
:param msdf: MappingSetDataframe object to be removed from primary msdf object.
196196
"""
197+
merge_on = KEY_FEATURES.copy()
198+
if self.df is not None and PREDICATE_MODIFIER not in self.df.columns:
199+
merge_on.remove(PREDICATE_MODIFIER)
200+
197201
self.df = (
198202
pd.merge(
199203
self.df,
200204
msdf.df,
201-
on=KEY_FEATURES,
205+
on=merge_on,
202206
how="outer",
203207
suffixes=("", "_2"),
204208
indicator=True,

0 commit comments

Comments
 (0)