Allow dependency errors to pass through

[Vetchu]

Fixes #13066.

I think this was the author meant in the original issue: I'm not exactly sure how to grab the jwt one though, please advise.

Also mypy threw an error on my side which I do not understand: is there something missing? When removing try/catch the potentially exception-raising part is not visible well.

Signed-off-by: Jacek Kusnierz [email protected]

Pull Request Checklist

• Pull request is based on the develop branch
• Pull request includes a changelog file. The entry should:
  • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
  • Use markdown where necessary, mostly for code blocks.
  • End with either a period (.) or an exclamation mark (!).
  • Start with a capital letter.
  • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
• Pull request includes a sign off
• Code style is correct
  (run the linters)

[babolivier]

Thanks for contributing to Synapse!
As far as I can tell there's one bit that's missing from your PR:

synapse/synapse/config/jwt.py

Lines 45 to 50 in 493c2fc

	try:
	import jwt
	jwt # To stop unused lint.
	except ImportError:
	raise ConfigError(MISSING_JWT)

Which still raises a ConfigError instead of a DependencyException. I believe this one can be fixed by replacing this block with:

check_requirements("jwt")

(and removing the then unused MISSING_AUTHLIB constant)

[DMRobertson]

I think this was the author meant in the original issue: I'm not exactly sure how to grab the jwt one though, please advise.

Thanks for this: these changes are exactly what I had in mind.

[Vetchu]

I'm not sure how to perform check_requirements function on the authlib (which replaced jwt): can you point me to a documentation about how is it checked?

[DMRobertson]

I'm not sure how to perform check_requirements function on the authlib (which replaced jwt): can you point me to a documentation about how is it checked?

#13113 (review) explains what needs to be done.

In a little more detail:

• the argument to check_requirements is the name of a package "extra" feature
• the relevant extra here is jwt, which comes from here
  

  synapse/pyproject.toml

  Line 198 in f33356e

  jwt = ["authlib"]

[babolivier]

Looks good to me apart from this, sorry for not explaining my previous comment enough (and thanks David for jumping in)!

[babolivier]

Suggested change

	from ..util.check_dependencies import check_requirements
	from synapse.util.check_dependencies import check_requirements

When modules aren't in the current directory we usually prefer if the import path is absolute :)

This will need linting (because github's suggestions apparently don't allow me to move the import statement a line above 🙁 )

[babolivier]

Looks good to me now, thanks for your contribution! 🙂