yujunjun/openspg
1
0
Fork 0
mirror of https://github.com/OpenSPG/openspg.git synced 2025-12-18 10:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
baifuyu 2023-12-24 15:00:38 +08:00
parent 9e331d89f9
commit 950b8327a5
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -267,7 +267,7 @@ hs_err_pid*
### JetBrains template ### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # 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 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
python/.idea python/**/.idea
# User-specific stuff # User-specific stuff
.idea/**/workspace.xml .idea/**/workspace.xml

2
builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java
View File

@ -46,7 +46,7 @@ public class SubGraphMappingProcessor extends BaseMappingProcessor<SubGraphMappi
this.recordLinking.setDefaultPropertyLinking(IdEqualsLinking.INSTANCE); this.recordLinking.setDefaultPropertyLinking(IdEqualsLinking.INSTANCE);
this.recordLinking.init(context); this.recordLinking.init(context);
this.subGraphFusing = new SubGraphFusingImpl(config.getMappingConfigs()); this.subGraphFusing = new SubGraphFusingImpl(config.getMappingConfigs(), recordLinking);
this.subGraphFusing.init(context); this.subGraphFusing.init(context);
this.subjectFusing = new SubjectFusingImpl(config.getSubjectFusingConfig()); this.subjectFusing = new SubjectFusingImpl(config.getSubjectFusingConfig());

7
builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java
View File

@ -1,6 +1,7 @@
package com.antgroup.openspg.builder.core.strategy.fusing; package com.antgroup.openspg.builder.core.strategy.fusing;
import com.antgroup.openspg.builder.core.runtime.BuilderContext; import com.antgroup.openspg.builder.core.runtime.BuilderContext;
import com.antgroup.openspg.builder.core.strategy.linking.RecordLinking;
import com.antgroup.openspg.builder.model.exception.BuilderException; import com.antgroup.openspg.builder.model.exception.BuilderException;
import com.antgroup.openspg.builder.model.exception.FusingException; import com.antgroup.openspg.builder.model.exception.FusingException;
import com.antgroup.openspg.builder.model.pipeline.config.BaseMappingNodeConfig; import com.antgroup.openspg.builder.model.pipeline.config.BaseMappingNodeConfig;
@ -19,10 +20,13 @@ public class SubGraphFusingImpl implements SubGraphFusing {
private BuilderContext context; private BuilderContext context;
private final List<BaseMappingNodeConfig.MappingConfig> mappingConfigs; private final List<BaseMappingNodeConfig.MappingConfig> mappingConfigs;
private final Map<String, EntityFusing> semanticEntityFusing; private final Map<String, EntityFusing> semanticEntityFusing;
private final RecordLinking recordLinking;
public SubGraphFusingImpl(List<BaseMappingNodeConfig.MappingConfig> mappingConfigs) { public SubGraphFusingImpl(
List<BaseMappingNodeConfig.MappingConfig> mappingConfigs, RecordLinking recordLinking) {
this.mappingConfigs = mappingConfigs; this.mappingConfigs = mappingConfigs;
this.semanticEntityFusing = new HashMap<>(mappingConfigs.size()); this.semanticEntityFusing = new HashMap<>(mappingConfigs.size());
this.recordLinking = recordLinking;
} }
@Override @Override
@ -54,6 +58,7 @@ public class SubGraphFusingImpl implements SubGraphFusing {
continue; continue;
} }
List<BaseAdvancedRecord> advancedRecords = toAdvancedRecords(propertyRecord); List<BaseAdvancedRecord> advancedRecords = toAdvancedRecords(propertyRecord);
advancedRecords.forEach(recordLinking::propertyLinking);
List<BaseAdvancedRecord> fusedRecords = entityFusing.entityFusing(advancedRecords); List<BaseAdvancedRecord> fusedRecords = entityFusing.entityFusing(advancedRecords);
modifyPropertyRecord(propertyRecord, fusedRecords); modifyPropertyRecord(propertyRecord, fusedRecords);
results.addAll(fusedRecords); results.addAll(fusedRecords);

2
python/knext/requirements.txt
View File

@ -10,7 +10,7 @@ six==1.16.0
click==8.1.7 click==8.1.7
dateutils==0.6.12 dateutils==0.6.12
pemja==0.4.0 pemja==0.4.0
certifi==2023.11.17wq certifi==2023.11.17
urllib3==2.1.0 urllib3==2.1.0
python-dateutil==2.8.2 python-dateutil==2.8.2
networkx==3.1 networkx==3.1