diff --git a/.gitignore b/.gitignore index 1f4cab9c..8273b179 100644 --- a/.gitignore +++ b/.gitignore @@ -267,7 +267,7 @@ hs_err_pid* ### JetBrains template # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -python/.idea +python/**/.idea # User-specific stuff .idea/**/workspace.xml diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java index 4b4c3f40..64b64548 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java @@ -46,7 +46,7 @@ public class SubGraphMappingProcessor extends BaseMappingProcessor mappingConfigs; private final Map semanticEntityFusing; + private final RecordLinking recordLinking; - public SubGraphFusingImpl(List mappingConfigs) { + public SubGraphFusingImpl( + List mappingConfigs, RecordLinking recordLinking) { this.mappingConfigs = mappingConfigs; this.semanticEntityFusing = new HashMap<>(mappingConfigs.size()); + this.recordLinking = recordLinking; } @Override @@ -54,6 +58,7 @@ public class SubGraphFusingImpl implements SubGraphFusing { continue; } List advancedRecords = toAdvancedRecords(propertyRecord); + advancedRecords.forEach(recordLinking::propertyLinking); List fusedRecords = entityFusing.entityFusing(advancedRecords); modifyPropertyRecord(propertyRecord, fusedRecords); results.addAll(fusedRecords); diff --git a/python/knext/requirements.txt b/python/knext/requirements.txt index 813edfa2..1ef8f248 100644 --- a/python/knext/requirements.txt +++ b/python/knext/requirements.txt @@ -10,7 +10,7 @@ six==1.16.0 click==8.1.7 dateutils==0.6.12 pemja==0.4.0 -certifi==2023.11.17wq +certifi==2023.11.17 urllib3==2.1.0 python-dateutil==2.8.2 networkx==3.1