Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Lincoln Stein
2023-09-04 21:13:09 -04:00
parent 57552deab2 8f51adc737
commit ca6d24810c
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
invokeai/app/services/events.py
View File

@ -190,14 +190,8 @@ class EventServiceBase:
),
)
def emit_model_download_event (
self,
job: DownloadJobBase
):
def emit_model_download_event(self, job: DownloadJobBase):
"""Emit event when the status of a download job changes."""
self.dispatch( # use dispatch() directly here because we are not a session event.
event_name="download_job_event",
payload=dict(
job=job
)
event_name="download_job_event", payload=dict(job=job)
)

4
invokeai/backend/model_manager/download/queue.py
View File

@ -51,7 +51,6 @@ class DownloadJobRepoID(DownloadJobBase):
raise ValidationError(f'{v} invalid repo_id')
return v
class DownloadQueue(DownloadQueueBase):
"""Class for queued download of models."""
@ -209,6 +208,7 @@ class DownloadQueue(DownloadQueueBase):
"""Worker thread gets next job on priority queue."""
while True:
job = self._queue.get()
if job == STOP_JOB: # marker that queue is done
print(f'DEBUG: thread {threading.current_thread().native_id} exiting')
break
@ -271,7 +271,7 @@ class DownloadQueue(DownloadQueueBase):
try:
with open(dest, open_mode) as file:
for data in resp.iter_content(chunk_size=1024):
if job.status != DownloadJobStatus.RUNNING: # cancelled, paused or errored
if job.status != DownloadJobStatus.RUNNING: # cancelled, paused or errored
return
job.bytes += file.write(data)
if job.bytes - last_report_bytes >= report_delta: