fix: simplify Data creation
This commit is contained in:
parent
3dced5f16e
commit
a3ec5a465f
1 changed files with 11 additions and 10 deletions
|
|
@ -144,7 +144,8 @@ async def ingest_data(
|
||||||
data_point.content_hash = file_metadata["content_hash"]
|
data_point.content_hash = file_metadata["content_hash"]
|
||||||
data_point.external_metadata = ext_metadata
|
data_point.external_metadata = ext_metadata
|
||||||
data_point.node_set = json.dumps(node_set) if node_set else None
|
data_point.node_set = json.dumps(node_set) if node_set else None
|
||||||
await session.merge(data_point)
|
|
||||||
|
session.add(data_point)
|
||||||
else:
|
else:
|
||||||
data_point = Data(
|
data_point = Data(
|
||||||
id=data_id,
|
id=data_id,
|
||||||
|
|
@ -161,17 +162,17 @@ async def ingest_data(
|
||||||
session.add(data_point)
|
session.add(data_point)
|
||||||
|
|
||||||
# Check if data is already in dataset
|
# Check if data is already in dataset
|
||||||
dataset_data = (
|
# dataset_data = (
|
||||||
await session.execute(
|
# await session.execute(
|
||||||
select(DatasetData).filter(
|
# select(DatasetData).filter(
|
||||||
DatasetData.data_id == data_id, DatasetData.dataset_id == dataset.id
|
# DatasetData.data_id == data_id, DatasetData.dataset_id == dataset.id
|
||||||
)
|
# )
|
||||||
)
|
# )
|
||||||
).scalar_one_or_none()
|
# ).scalar_one_or_none()
|
||||||
# If data is not present in dataset add it
|
# If data is not present in dataset add it
|
||||||
if dataset_data is None:
|
# if dataset_data is None:
|
||||||
dataset.data.append(data_point)
|
dataset.data.append(data_point)
|
||||||
await session.merge(dataset)
|
session.add(dataset)
|
||||||
|
|
||||||
await session.commit()
|
await session.commit()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue