Merge remote-tracking branch 'origin/dev' into dataset-permissions-auth-refactor-simplify-data-creation

This reverts commit bcb5b12964.

cognee/modules/users/methods/get_user.py

@@ -1,7 +1,6 @@
 from uuid import UUID
 from sqlalchemy import select
 from sqlalchemy.orm import selectinload
-import sqlalchemy.exc
 from cognee.infrastructure.databases.relational import get_relational_engine
 from cognee.infrastructure.databases.exceptions import EntityNotFoundError
 from ..models import User

cognee/tasks/ingestion/ingest_data.py

@@ -144,7 +144,12 @@ async def ingest_data(
                         data_point.content_hash = file_metadata["content_hash"]
                         data_point.external_metadata = ext_metadata
                         data_point.node_set = json.dumps(node_set) if node_set else None
-                        await session.merge(data_point)
+
+                        session.add(data_point)
+
+                        if not any([data.id == data_id for data in dataset.data]):
+                            dataset.data.append(data_point)
+                            session.add(dataset)
                     else:
                         data_point = Data(
                             id=data_id,
@@ -160,18 +165,8 @@ async def ingest_data(
                         )
                         session.add(data_point)
 
-                    # Check if data is already in dataset
-                    dataset_data = (
-                        await session.execute(
-                            select(DatasetData).filter(
-                                DatasetData.data_id == data_id, DatasetData.dataset_id == dataset.id
-                            )
-                        )
-                    ).scalar_one_or_none()
-                    # If data is not present in dataset add it
-                    if dataset_data is None:
                         dataset.data.append(data_point)
-                        await session.merge(dataset)
+                        session.add(dataset)
 
                     await session.commit()