Introduces APScheduler as 3rd party lib for scheduling tasts. The PR is not yet really polished, especially I'll need to increase coverage. But before getting started on that, I'd like to get feedback on the general design.

My main concern is theJob (already mentioned offline). Unfortunately, simply subclassingaps.Job to add acontext argument doesn't work - we'd have to patchaps.Job to do that. I don't fancy that.
On the other hand, having a customJob class with custom attributes allows to make switching to another lib a bit less breaking, if we have to do that at some point.
So I added ajob attribute to ourJob class, which holds the correspondingaps.Job.

Besides the fact that rescheduling jobs must now be done directly through theaps interface, the main breaking change is, thatJobQueue now can only handlepytz timezones. But personally, I don't see a problem in that. Switching from fixet utc-offset timezones should be easy enough and people who need weird custom timezones should be capable enough of handling the change …

Reragrding tests:

test_official currently fails b/c API 4.9
made the timeout tests forConversationHandler a bit more generous on the timing,aps seems to like that
switched topytzs everywhere in the tests
besides that, I only made the existing tests run. as mentioned above, I'll need to improve coverage, once we're okay with the general design.

EDIT:
That are a lot more failing tests than I'd hoped for … Will need to check on an actual OS locally (yes, I developed on Windows, shame on me …)

EDIT 2:

the updater.idle() test just wasn't executed on windows … fixed it.
APS is a bit pickier on doing things "right now". That's one of the things, we should mention on the release notes. So I just removedtest_run_repeating_first_immediate andtest_run_repeating_first_timezone is now also adapted for APS' needs

First go on refactoring JobQueue

ac6046c

Bibo-Joshi added the 📋 pending-reviewwork status: pending-review label

Jun 5, 2020

Bibo-Joshi added this to the13.0 milestone

Jun 5, 2020

Bibo-Joshi requested a review fromjh0ker

June 5, 2020 21:28

This was referencedJun 5, 2020

Addlast keyword argument torun_repeating#1497

Closed

imlemented crontab based repeating job for jobqueue#1478

Closed

Bibo-Joshi changed the base branch frommaster tov13

June 6, 2020 10:55

Bibo-Joshi added3 commits

June 6, 2020 14:49

Temporarily enable tests for the v13 branch

bc9b05c

Merge remote-tracking branch 'origin/v13' into refactor-job-queue

522558d

Work on tests

2eb198e

Bibo-Joshi force-pushed thev13 branch 3 times, most recently from45fc55e to2a9a5b0Compare

June 15, 2020 16:24

Bibo-Joshi added2 commits

June 15, 2020 18:46

Temporarily enable tests for the v13 branch

8862a32

Merge branch 'v13' into refactor-job-queue

0e02483

# Conflicts:#telegram/ext/jobqueue.py

Bibo-Joshi force-pushed thev13 branch from2a9a5b0 to1fdc197Compare

June 16, 2020 15:08

Bibo-Joshi added2 commits

June 20, 2020 16:35

Increase coverage

e56af1c

Remove JobQueue.tick()

c723f5b

# Was intended for interal use anyways# Fixes tests

Poolitzer requested changes

Jun 24, 2020

View reviewed changes

Copy link

Member

Poolitzer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Looks good to me, I love outsourcing the jobs to the APS.

telegram/ext/jobqueue.py OutdatedShow resolvedHide resolved

tests/test_conversationhandler.py

		@@ -742,8 +735,7 @@ def test_conversation_handler_timeout_state_context(self, cdp, bot, user1):
		message.text = '/startCoding'
		message.entities[0].length = len('/startCoding')
		cdp.process_update(Update(update_id=0, message=message))
		sleep(0.5)
		cdp.job_queue.tick()
		sleep(0.6)

Copy link

Member

PoolitzerJun 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

doesnt it make sense to put this in a constant?

Copy link

MemberAuthor

Bibo-JoshiJun 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Not sure, if that's a good idea. Have one of the tests failing in the future, fiddle with the constant, suddenly everthing fails and it's not obvious why …

Bibo-Joshi added2 commits

June 24, 2020 20:51

Address review

6e1a014

Merge branch 'refactor-job-queue' ofhttps://github.com/python-telegr…

8e587fb

…am-bot/python-telegram-bot into refactor-job-queue

Bibo-Joshi force-pushed thev13 branch from1fdc197 tob3e9be1Compare

June 24, 2020 18:54

jh0ker reviewed

Jun 24, 2020

View reviewed changes

tests/test_jobqueue.py OutdatedShow resolvedHide resolved

jh0ker reviewed

Jun 24, 2020

View reviewed changes

telegram/ext/jobqueue.py Outdated

		return self._tz_now() + time
		if isinstance(time, datetime.time):
		dt = datetime.datetime.combine(datetime.datetime.now().date(), time,
		tzinfo=time.tzinfo or self.scheduler.timezone)

Copy link

Member

jh0kerJun 24, 2020•
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I don't know about this... Are we dropping 3.5 support (or did we already)? Thetzinfo argument tocombine has been added in 3.6.

Apart from that, couldn'tdatetime.datetime.now().date() return the wrong date this way?

Copy link

MemberAuthor

Bibo-JoshiJun 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Uh, you're right. Couldn't tell, because TG messed up our tests again …. But we're dropping py3.5 an#1920 anyway, so we might as well do here.

And right once more. I'll add it back.

Temporarily enable tests for the v13 branch

b7e635b

Bibo-Joshi force-pushed thev13 branch fromb3e9be1 tob7e635bCompare

June 25, 2020 05:56

Bibo-Joshi added2 commits

June 25, 2020 19:23

Merge branch 'v13' into refactor-job-queue

585e5f2

Address review

9171103

Bibo-Joshi mentioned this pull request

Jun 25, 2020

[BUG] Errors in Job callbacks are not passed to error handler#2004

Closed

Dispatch errors

8d22dcf

Bibo-Joshi added2 commits

July 2, 2020 14:24

Fix handling of job_kwargs

d44acb9

Merge branch 'refactor-job-queue' of github.com:/python-telegram-bot/…

271a105

…python-telegram-bot into refactor-job-queue

Bibo-Joshi removed the 📋 pending-reviewwork status: pending-review label

Jul 8, 2020

Bibo-Joshi added2 commits

July 8, 2020 22:17

Remove possibility to pass a Bot to JobQueue

46dcff4

Merge remote-tracking branch 'origin/refactor-job-queue' into refacto…

065ce12

…r-job-queue

Bibo-Joshi force-pushed thev13 branch from20ee6e1 to260b796Compare

July 10, 2020 10:59

Merge branch 'v13' into refactor-job-queue

8867e1c

Copy link

MemberAuthor

Bibo-Joshi commentedJul 10, 2020

py3.7 fail unrelated. Codacy can't check for some reason, but I ran pre-commit locally again and it's fine.
As discussed offline we'll probably need to do some clean up after release anyway, but we need people to actaully use the new JobQueue for that. Merging.

Bibo-Joshi merged commit088e608 intov13

Jul 10, 2020

Bibo-Joshi deleted the refactor-job-queue branch

July 10, 2020 11:11

Bibo-Joshi added a commit that referenced this pull request

Jul 14, 2020

Refactor JobQueue (#1981)

9c38dae

* First go on refactoring JobQueue* Temporarily enable tests for the v13 branch* Work on tests* Temporarily enable tests for the v13 branch* Increase coverage* Remove JobQueue.tick()# Was intended for interal use anyways# Fixes tests* Address review* Temporarily enable tests for the v13 branch* Address review* Dispatch errors* Fix handling of job_kwargs* Remove possibility to pass a Bot to JobQueue

Bibo-Joshi mentioned this pull request

Jul 18, 2020

Refactor JobQueue#1936

Closed

Bibo-Joshi added a commit that referenced this pull request

Jul 19, 2020

Refactor JobQueue (#1981)

176d221

* First go on refactoring JobQueue* Temporarily enable tests for the v13 branch* Work on tests* Temporarily enable tests for the v13 branch* Increase coverage* Remove JobQueue.tick()# Was intended for interal use anyways# Fixes tests* Address review* Temporarily enable tests for the v13 branch* Address review* Dispatch errors* Fix handling of job_kwargs* Remove possibility to pass a Bot to JobQueue

Bibo-Joshi added a commit that referenced this pull request

Jul 19, 2020

Refactor handling of default_quote (#1965)

8e94d0d

* Refactor handling of `default_quote`* Make it a breaking change* Pickle a bots defaults* Temporarily enable tests for the v13 branch* Temporarily enable tests for the v13 branch* Refactor handling of kwargs in Bot methods (#1924)* Unify kwargs handling in Bot methods* Remove Request.get, make api_kwargs an explicit argument, move note to head of Bot class* Fix test_official* Update get_file methods* Refactor JobQueue (#1981)* First go on refactoring JobQueue* Temporarily enable tests for the v13 branch* Work on tests* Temporarily enable tests for the v13 branch* Increase coverage* Remove JobQueue.tick()# Was intended for interal use anyways# Fixes tests* Address review* Temporarily enable tests for the v13 branch* Address review* Dispatch errors* Fix handling of job_kwargs* Remove possibility to pass a Bot to JobQueue* Refactor persistence of Bot instances (#1994)* Refactor persistence of bots* User BP.set_bot in Dispatcher* Temporarily enable tests for the v13 branch* Add documentation* Add warning to Updater for passing both defaults and bot* Address review* Fix test

Bibo-Joshi added a commit that referenced this pull request

Aug 13, 2020

Refactor JobQueue (#1981)

fdc5670

* First go on refactoring JobQueue* Temporarily enable tests for the v13 branch* Work on tests* Temporarily enable tests for the v13 branch* Increase coverage* Remove JobQueue.tick()# Was intended for interal use anyways# Fixes tests* Address review* Temporarily enable tests for the v13 branch* Address review* Dispatch errors* Fix handling of job_kwargs* Remove possibility to pass a Bot to JobQueue

Bibo-Joshi added a commit that referenced this pull request

Aug 13, 2020

Refactor handling of default_quote (#1965)

5ccc1b6

* Refactor handling of `default_quote`* Make it a breaking change* Pickle a bots defaults* Temporarily enable tests for the v13 branch* Temporarily enable tests for the v13 branch* Refactor handling of kwargs in Bot methods (#1924)* Unify kwargs handling in Bot methods* Remove Request.get, make api_kwargs an explicit argument, move note to head of Bot class* Fix test_official* Update get_file methods* Refactor JobQueue (#1981)* First go on refactoring JobQueue* Temporarily enable tests for the v13 branch* Work on tests* Temporarily enable tests for the v13 branch* Increase coverage* Remove JobQueue.tick()# Was intended for interal use anyways# Fixes tests* Address review* Temporarily enable tests for the v13 branch* Address review* Dispatch errors* Fix handling of job_kwargs* Remove possibility to pass a Bot to JobQueue* Refactor persistence of Bot instances (#1994)* Refactor persistence of bots* User BP.set_bot in Dispatcher* Temporarily enable tests for the v13 branch* Add documentation* Add warning to Updater for passing both defaults and bot* Address review* Fix test

Bibo-Joshi added a commit that referenced this pull request

Aug 16, 2020

Refactor JobQueue (#1981)

958a41e

* First go on refactoring JobQueue* Temporarily enable tests for the v13 branch* Work on tests* Temporarily enable tests for the v13 branch* Increase coverage* Remove JobQueue.tick()# Was intended for interal use anyways# Fixes tests* Address review* Temporarily enable tests for the v13 branch* Address review* Dispatch errors* Fix handling of job_kwargs* Remove possibility to pass a Bot to JobQueue

Bibo-Joshi added a commit that referenced this pull request

Aug 16, 2020

Refactor handling of default_quote (#1965)

f74be43

* Refactor handling of `default_quote`* Make it a breaking change* Pickle a bots defaults* Temporarily enable tests for the v13 branch* Temporarily enable tests for the v13 branch* Refactor handling of kwargs in Bot methods (#1924)* Unify kwargs handling in Bot methods* Remove Request.get, make api_kwargs an explicit argument, move note to head of Bot class* Fix test_official* Update get_file methods* Refactor JobQueue (#1981)* First go on refactoring JobQueue* Temporarily enable tests for the v13 branch* Work on tests* Temporarily enable tests for the v13 branch* Increase coverage* Remove JobQueue.tick()# Was intended for interal use anyways# Fixes tests* Address review* Temporarily enable tests for the v13 branch* Address review* Dispatch errors* Fix handling of job_kwargs* Remove possibility to pass a Bot to JobQueue* Refactor persistence of Bot instances (#1994)* Refactor persistence of bots* User BP.set_bot in Dispatcher* Temporarily enable tests for the v13 branch* Add documentation* Add warning to Updater for passing both defaults and bot* Address review* Fix test

github-actionsbot locked asresolvedand limited conversation to collaborators

Aug 17, 2020

Labels

None yet

3 participants

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Refactor JobQueue#1981

Refactor JobQueue#1981

Uh oh!

Conversation

Bibo-Joshi commentedJun 5, 2020•
edited
Loading

Uh oh!

Uh oh!

Poolitzer left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

PoolitzerJun 24, 2020

Choose a reason for hiding this comment

Uh oh!

Bibo-JoshiJun 24, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jh0kerJun 24, 2020•
edited
Loading

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Bibo-JoshiJun 25, 2020

Choose a reason for hiding this comment

Uh oh!

Bibo-Joshi commentedJul 10, 2020

Uh oh!

Uh oh!

Movatterモバイル変換

Refactor JobQueue#1981

Refactor JobQueue#1981

Uh oh!

Conversation

Bibo-Joshi commentedJun 5, 2020• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Uh oh!

Poolitzer left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

PoolitzerJun 24, 2020

Choose a reason for hiding this comment

Uh oh!

Bibo-JoshiJun 24, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jh0kerJun 24, 2020• editedLoading Uh oh!There was an error while loading.Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Bibo-JoshiJun 25, 2020

Choose a reason for hiding this comment

Uh oh!

Bibo-Joshi commentedJul 10, 2020

Uh oh!

Uh oh!

Bibo-Joshi commentedJun 5, 2020•
edited
Loading

jh0kerJun 24, 2020•
edited
Loading