inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-28 19:46:46 +00:00
Code

Backport of https://github.com/inventree/InvenTree/pull/5632 (#5650)

Browse Source 
Co-authored-by: Matthias Mair <code@mjmair.com>
This commit is contained in:
Oliver 2023-10-03 12:55:15 +11:00 committed by GitHub
parent 5725a9e271
commit a7487ff842
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
InvenTree/InvenTree/exchange.py
View File

@ -1,12 +1,11 @@
"""Exchangerate backend to use `exchangerate.host` to get rates.""" """Exchangerate backend to use `frankfurter.app` to get rates."""
import ssl from decimal import Decimal
from urllib.error import URLError from urllib.error import URLError
from urllib.request import urlopen
from django.db.utils import OperationalError from django.db.utils import OperationalError
import certifi import requests
from djmoney.contrib.exchange.backends.base import SimpleExchangeBackend from djmoney.contrib.exchange.backends.base import SimpleExchangeBackend
from common.settings import currency_code_default, currency_codes from common.settings import currency_code_default, currency_codes
@ -15,19 +14,19 @@ from common.settings import currency_code_default, currency_codes
class InvenTreeExchange(SimpleExchangeBackend): class InvenTreeExchange(SimpleExchangeBackend):
"""Backend for automatically updating currency exchange rates. """Backend for automatically updating currency exchange rates.
Uses the `exchangerate.host` service API Uses the `frankfurter.app` service API
""" """
name = "InvenTreeExchange" name = "InvenTreeExchange"
def __init__(self): def __init__(self):
"""Set API url.""" """Set API url."""
self.url = "https://api.exchangerate.host/latest" self.url = "https://api.frankfurter.app/latest"
super().__init__() super().__init__()
def get_params(self): def get_params(self):
"""Placeholder to set API key. Currently not required by `exchangerate.host`.""" """Placeholder to set API key. Currently not required by `frankfurter.app`."""
# No API key is required # No API key is required
return { return {
} }
@ -40,14 +39,22 @@ class InvenTreeExchange(SimpleExchangeBackend):
url = self.get_url(**kwargs) url = self.get_url(**kwargs)
try: try:
context = ssl.create_default_context(cafile=certifi.where()) response = requests.get(url=url, timeout=5)
response = urlopen(url, timeout=5, context=context) return response.content
return response.read()
except Exception: except Exception:
# Something has gone wrong, but we can just try again next time # Something has gone wrong, but we can just try again next time
# Raise a TypeError so the outer function can handle this # Raise a TypeError so the outer function can handle this
raise TypeError raise TypeError
def get_rates(self, **params):
"""Intersect the requested currency codes with the available codes."""
rates = super().get_rates(**params)
# Add the base currency to the rates
rates[params["base_currency"]] = Decimal("1.0")
return rates
def update_rates(self, base_currency=None): def update_rates(self, base_currency=None):
"""Set the requested currency codes and get rates.""" """Set the requested currency codes and get rates."""
# Set default - see B008 # Set default - see B008

1
InvenTree/InvenTree/tests.py
View File

@ -745,6 +745,7 @@ class CurrencyTests(TestCase):
else: # pragma: no cover else: # pragma: no cover
print("Exchange rate update failed - retrying") print("Exchange rate update failed - retrying")
print(f'Expected {currency_codes()}, got {[a.currency for a in rates]}')
time.sleep(1) time.sleep(1)
self.assertTrue(update_successful) self.assertTrue(update_successful)