Skip to content

Commit 124aeb9

Browse files
committed
Fix request and credit usage counting for datasource
1 parent fad1c16 commit 124aeb9

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

llmstack/data/apis.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,10 @@ def process_entry(self, request, uid):
317317
entry.status = DataSourceEntryStatus.READY if not document.processing_errors else DataSourceEntryStatus.FAILED
318318
entry.save(update_fields=["config", "size", "status", "updated_at"])
319319

320-
return DRFResponse(DataSourceEntrySerializer(instance=entry, context={"request_user": request.user}).data)
320+
context = {}
321+
if request:
322+
context["request_user"] = request.user
323+
return DRFResponse(DataSourceEntrySerializer(instance=entry, context=context).data)
321324

322325
def resync(self, request, uid):
323326
datasource_entry_object = get_object_or_404(DataSourceEntry, uuid=uuid.UUID(uid))
@@ -569,9 +572,7 @@ def add_entry(self, request, uid):
569572
documents = self.process_add_entry_request(datasource, source_data)
570573
for document in documents:
571574
create_result = DataSourceEntryViewSet().create_entry(user=request.user, document=document)
572-
process_result = DataSourceEntryViewSet().process_entry(
573-
request=request, uid=str(create_result.data["uuid"])
574-
)
575+
process_result = DataSourceEntryViewSet().process_entry(request=None, uid=str(create_result.data["uuid"]))
575576
datasource.size += process_result.data["size"]
576577

577578
datasource.save()

llmstack/data/models.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ def pipeline(self):
169169
return self.config.get("pipeline", {})
170170

171171
def has_read_permission(self, user):
172+
if not user:
173+
return False
172174
return (
173175
self.owner == user
174176
or user.email in self.read_accessible_by
@@ -179,6 +181,8 @@ def has_read_permission(self, user):
179181
)
180182

181183
def has_write_permission(self, user):
184+
if not user:
185+
return False
182186
return (
183187
self.owner == user
184188
or user.email in self.write_accessible_by
@@ -280,7 +284,7 @@ def register_data_change(sender, instance: DataSourceEntry, **kwargs):
280284
"uuid": str(instance.uuid),
281285
"old_size": instance.old_size,
282286
"size": instance.size,
283-
"owner": instance.owner_id,
287+
"owner_email": instance.owner_id.email,
284288
},
285289
)
286290

@@ -308,7 +312,7 @@ def register_data_delete(sender, instance: DataSourceEntry, **kwargs):
308312
"uuid": str(instance.uuid),
309313
"old_size": instance.size,
310314
"size": 0,
311-
"owner": instance.owner_id,
315+
"owner_email": instance.owner_id.email,
312316
},
313317
)
314318

0 commit comments

Comments
 (0)