arrdem/source
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: arrdem:c6ba7bde1fd391ffa59a76b37d3560d8355af131
Branches Tags
arrdem:trunk
..
compare: arrdem:a4f9af10b5a0408083f014de44e03d19f0ad3cc7
Branches Tags
arrdem:trunk

No commits in common. "c6ba7bde1fd391ffa59a76b37d3560d8355af131" and "a4f9af10b5a0408083f014de44e03d19f0ad3cc7" have entirely different histories.
c6ba7bde1f ... a4f9af10b5

1 changed files with 48 additions and 39 deletions
Show stats Expand all files Collapse all files

87
projects/tentacles/src/python/tentacles/workers.py
View file

@ -80,7 +80,7 @@ def poll_printers(app: App, db: Db) -> None:
): ):
return True # Assume the bed is ready return True # Assume the bed is ready
status: dict = client._post( status = client._post(
"/api/plugin/bedready", "/api/plugin/bedready",
json={ json={
"command": "check_bed", "command": "check_bed",
@ -114,8 +114,6 @@ def poll_printers(app: App, db: Db) -> None:
elif printer_state.get("printing"): elif printer_state.get("printing"):
_set_status("running") _set_status("running")
if mapped_job:
db.start_job(jid=mapped_job.id)
elif printer_job.get("state").lower() == "connecting": elif printer_job.get("state").lower() == "connecting":
_set_status("connecting") _set_status("connecting")
@ -225,18 +223,25 @@ def revoke_jobs(app: App, db: Db) -> None:
if job.printer_id: if job.printer_id:
printer = db.fetch_printer(pid=job.printer_id) printer = db.fetch_printer(pid=job.printer_id)
log.info(f"Cancelling running job {job.id}")
client = get_client(printer.url, printer.api_key)
try: try:
client.cancel() log.info(f"Cancelling running job {job.id}")
except HTTPError as e: client = get_client(printer.url, printer.api_key)
if e.response.status_code == 409: try:
pass client.cancel()
else: except HTTPError as e:
raise if e.response.status_code == 409:
pass
else:
raise
log.info(f"Job {job.id} -> cancelled") log.info(f"Job {job.id} -> cancelled")
db.finish_job(jid=job.id, state="cancelled") db.finish_job(jid=job.id, state="cancelled")
except TimeoutError:
pass
except Exception:
log.exception("Oop")
else: else:
log.info(f"Unmapped job {job.id} became cancelled") log.info(f"Unmapped job {job.id} became cancelled")
@ -248,33 +253,40 @@ def pull_jobs(app: App, db: Db) -> None:
for job in db.list_running_jobs(): for job in db.list_running_jobs():
printer = db.fetch_printer(pid=job.printer_id) printer = db.fetch_printer(pid=job.printer_id)
client = get_client(printer.url, printer.api_key)
job_state = client.job_info()
try: try:
printer_state = client.printer().get("state").get("flags", {}) client = get_client(printer.url, printer.api_key)
except HTTPError: job_state = client.job_info()
printer_state = {"disconnected": True, "error": True} try:
printer_state = client.printer().get("state").get("flags", {})
except HTTPError:
printer_state = {"disconnected": True, "error": True}
if job_state.get("progress", {}).get("completion", 0.0) == 100.0: if job_state.get("progress", {}).get("completion", 0.0) == 100.0:
log.info(f"Job {job.id} has succeeded") log.info(f"Job {job.id} has succeeded")
db.finish_job(jid=job.id, state="success") db.finish_job(jid=job.id, state="success")
elif printer_state.get("error"): elif printer_state.get("error"):
log.warn(f"Job {job.id} has failed") log.warn(f"Job {job.id} has failed")
db.finish_job(jid=job.id, state="failed") db.finish_job(jid=job.id, state="failed")
elif printer_state.get("cancelling"): elif printer_state.get("cancelling"):
log.info(f"Job {job.id} has been acknowledged as cancelled") log.info(f"Job {job.id} has been acknowledged as cancelled")
db.finish_job(jid=job.id, state="cancelled") db.finish_job(jid=job.id, state="cancelled")
elif printer_state.get("printing"): elif printer_state.get("printing"):
db.start_job(jid=job.id) db.start_job(jid=job.id)
else: else:
log.warn( log.warn(
f"Job {job.id} is in a weird state; assuming error\n{pformat(job_state.get('progress'))}\n{pformat(printer_state)}" f"Job {job.id} is in a weird state; assuming error\n{pformat(job_state.get('progress'))}\n{pformat(printer_state)}"
) )
db.finish_job(jid=job.id, state="failed") db.finish_job(jid=job.id, state="failed")
except TimeoutError:
pass
except Exception:
log.exception("Oop")
def send_emails(app, db: Db): def send_emails(app, db: Db):
@ -381,8 +393,5 @@ class Worker(Monitor):
) )
def callback(self): def callback(self):
try: with closing(self._db_factory(self._app)) as db:
with closing(self._db_factory(self._app)) as db: self._callback(self._app, db)
self._callback(self._app, db)
except:
log.exception("Worker tick failed; exception swallowed")