Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Extraction improvements (resolved conflicts from #76)#82

Open
Copilot wants to merge 2 commits into
mainfrom
copilot/resolve-merge-conflict
Open

Extraction improvements (resolved conflicts from #76)#82
Copilot wants to merge 2 commits into
mainfrom
copilot/resolve-merge-conflict

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 3, 2026

This PR resolves the merge conflicts from #76 (Extraction improvements) and prepares it for review.

What's included

All changes from PR #76 (extraction-improvements) merged cleanly with the latest main:

Extraction improvements (from #76)

  • Extraction-to-Storage Bridge: ShortTermMemory now wires to LongTermMemory.ingest_extracted_entities_batch() so extracted entities get embeddings, deduplication, and entity resolution
  • Extraction Result Deduplication: ExtractionResult.deduplicate_entities() deduplicates by normalized_name::type and filters orphaned relations
  • Source-Weighted Confidence Merge: Pipeline applies source weights (LLM=1.0, GLiNER=0.9, spaCy=0.7) with cross-extractor consensus boost
  • Subtype-Aware Entity Key: _entity_key() includes subtype to prevent incorrect merging of same-name entities with different subtypes
  • Type-Aware Resolution Wiring: Resolvers now accept existing_entity_types for type-constrained resolution

Conflict resolution

  • CLAUDE.md: Merged both sets of implementation notes (extraction notes 28-32 + MCP notes 33-38)
  • README.md: Kept main's restructured README layout while discarding HEAD's superseded documentation sections

Changed files (from #76)

  • src/neo4j_agent_memory/extraction/base.py – entity deduplication
  • src/neo4j_agent_memory/extraction/pipeline.py – source weights, subtype key
  • src/neo4j_agent_memory/memory/long_term.py – ingest batch, type-aware resolution
  • src/neo4j_agent_memory/memory/short_term.py – long_term wiring
  • src/neo4j_agent_memory/resolution/*.pyexisting_entity_types parameter
  • tests/unit/test_entity_ingest_pipeline.py – new tests
  • tests/unit/test_entity_deduplication.py – updated tests
  • docs updates

Closes #76

@vercel
Copy link
Copy Markdown

vercel Bot commented Apr 3, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
agent-memory Ready Ready Preview, Comment Apr 3, 2026 0:37am

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants