hdx-python-country 3.6.4__tar.gz → 3.6.6__tar.gz

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/.config/pre-commit-config.yaml

@@ -2,23 +2,22 @@ default_language_version:
     python: python3.11
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-ast
-  - repo: https://github.com/psf/black
-    rev: 23.3.0
-    hooks:
-      - id: black
-        args: [--config, .config/black.toml]
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.267
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.3.0
     hooks:
+      # Run the linter.
       - id: ruff
-        args: [--config, .config/ruff.toml, --fix, --exit-non-zero-on-fix]
+        args: [--config, .config/ruff.toml, --fix]
+      # Run the formatter.
+      - id: ruff-format
+        args: [--config, .config/ruff.toml]
   - repo: https://github.com/jazzband/pip-tools
-    rev: 6.13.0
+    rev: 7.4.0
     hooks:
       - id: pip-compile
         name: pip-compile requirements.txt

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/.config/ruff.toml

@@ -1,14 +1,17 @@
 line-length = 79
 exclude = ["_version.py"]
-ignore = [
-    "E501" # Line too long
-]
-# List of rules: https://beta.ruff.rs/docs/rules/
+
+[lint]
+# List of rules: https://docs.astral.sh/ruff/rules/
 select = [
   "E",   # pycodestyle - default
   "F",   # pyflakes - default
   "I"    # isort
 ]
+ignore = [
+    "E501" # Line too long
+]
+
 
-[isort]
+[lint.isort]
 known-local-folder = ["hdx"]

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/.github/workflows/run-python-tests.yaml

@@ -28,6 +28,9 @@ jobs:
         python -m pip install --upgrade pip
         pip install --upgrade hatch
     - name: Test with hatch/pytest
+      env:
+        WFP_KEY: ${{ secrets.WFP_KEY }}
+        WFP_SECRET: ${{ secrets.WFP_SECRET }}
       run: |
         hatch run test:test
     - name: Check styling

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hdx-python-country
-Version: 3.6.4
+Version: 3.6.6
 Summary: HDX Python country code and exchange rate (fx) utilities
 Project-URL: Homepage, https://github.com/OCHA-DAP/hdx-python-country
 Author-email: Michael Rans <rans@email.com>
@@ -25,8 +25,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
-Requires-Dist: hdx-python-utilities>=3.6.4
-Requires-Dist: libhxl>=5.1
+Requires-Dist: hdx-python-utilities>=3.6.5
+Requires-Dist: libhxl>=5.2
 Requires-Dist: pyphonetics
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == 'dev'
@@ -58,10 +58,10 @@ Dem. for Democratic and Rep. for Republic.
 Mapping administration level names from a source to a given base set is also handled
 including phonetic fuzzy name matching.
 
-It also provides foreign exchange rates and conversion from amounts in local currency to
-USD and vice-versa. The conversion relies on Yahoo Finance, falling back on
-[currency-api](https://github.com/fawazahmed0/currency-api) for current rates,
-and Yahoo Finance falling back on IMF data via IATI for historic rates.
+It also provides foreign exchange rates and conversion from amounts in local
+currency to USD and vice-versa. The conversion relies on Yahoo Finance, falling
+back on [currency-api](https://github.com/fawazahmed0/currency-api) for current rates, and Yahoo Finance falling back
+on IMF data via IATI (with interpolation) for historic daily rates.
 
 For more information, please read the [documentation](https://hdx-python-country.readthedocs.io/en/latest/).
 

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/README.md

@@ -21,10 +21,10 @@ Dem. for Democratic and Rep. for Republic.
 Mapping administration level names from a source to a given base set is also handled
 including phonetic fuzzy name matching.
 
-It also provides foreign exchange rates and conversion from amounts in local currency to
-USD and vice-versa. The conversion relies on Yahoo Finance, falling back on
-[currency-api](https://github.com/fawazahmed0/currency-api) for current rates,
-and Yahoo Finance falling back on IMF data via IATI for historic rates.
+It also provides foreign exchange rates and conversion from amounts in local
+currency to USD and vice-versa. The conversion relies on Yahoo Finance, falling
+back on [currency-api](https://github.com/fawazahmed0/currency-api) for current rates, and Yahoo Finance falling back
+on IMF data via IATI (with interpolation) for historic daily rates.
 
 For more information, please read the [documentation](https://hdx-python-country.readthedocs.io/en/latest/).
 

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/documentation/main.md

@@ -29,10 +29,10 @@ Dem. for Democratic and Rep. for Republic.
 Mapping administration level names from a source to a given base set is also handled
 including phonetic fuzzy name matching.
 
-It also provides foreign exchange rates and conversion from amounts in local currency to
-USD and vice-versa. The conversion relies on Yahoo Finance, falling back on
-[currency-api](https://github.com/fawazahmed0/currency-api) for current rates,
-and Yahoo Finance falling back on IMF data via IATI for historic rates.
+It also provides foreign exchange rates and conversion from amounts in local
+currency to USD and vice-versa. The conversion relies on Yahoo Finance, falling
+back on [currency-api](https://github.com/fawazahmed0/currency-api) for current rates, and Yahoo Finance falling back
+on IMF data via IATI (with interpolation) for historic daily rates.
 
 This library is part of the [Humanitarian Data Exchange](https://data.humdata.org/)
 (HDX) project. If you have humanitarian related data, please upload your datasets to
@@ -185,9 +185,10 @@ unsuited for use where rates are expected to update while the program is running
                                timezone_handling=2), ignore_timeinfo=False)
     # == 0.76910001039505
 
-Historic rates can be made to fall back to current rates if desired (this is not the
-default). It is possible to pass in a Retrieve object to Currency.setup() to allow the
-downloaded files from the secondary sources to be saved or previously downloaded files
-to be reused and to allow fallbacks from current rates to a static file eg.
+Historic daily rates can be made to fall back to current rates if desired (this
+is not the default). It is possible to pass in a Retrieve object to
+Currency.setup() to allow the downloaded files from the secondary sources to be
+saved or previously downloaded files to be reused and to allow fallbacks from
+current rates to a static file eg.
 
     Currency.setup(retriever, ..., fallback_historic_to_current=True, fallback_current_to_static=True)

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/pyproject.toml

@@ -34,8 +34,8 @@ classifiers = [
 requires-python = ">=3.8"
 
 dependencies = [
-    "hdx-python-utilities>=3.6.4",
-    "libhxl>=5.1",
+    "hdx-python-utilities>=3.6.5",
+    "libhxl>=5.2",
     "pyphonetics",
 ]
 dynamic = ["version"]
@@ -50,12 +50,16 @@ Homepage = "https://github.com/OCHA-DAP/hdx-python-country"
 [project.optional-dependencies]
 test = ["pytest", "pytest-cov"]
 dev = ["pre-commit"]
+#wfp = ["data-bridges-client@git+https://github.com/WFP-VAM/DataBridgesAPI@dev#egg=data-bridges-client"]
 
 
 #########
 # Hatch #
 #########
 
+#[tool.hatch.metadata]
+#allow-direct-references = true
+
 # Build
 
 [tool.hatch.build.targets.wheel]
@@ -76,7 +80,7 @@ version_scheme = "python-simplified-semver"
 # Tests
 
 [tool.hatch.envs.test]
-features = ["test"]
+features = ["test"]#, "wfp"]
 
 [tool.hatch.envs.test.scripts]
 test = """
@@ -90,18 +94,10 @@ python = ["3.12"]
 
 [tool.hatch.envs.lint]
 detached = true
-dependencies = [
-  "black",
-  "ruff",
-]
+dependencies = ["ruff"]
 
 [tool.hatch.envs.lint.scripts]
 style = [
-  "ruff --config .config/ruff.toml {args:.}",
-  "black --config .config/black.toml --check --diff {args:.}",
-]
-# Not used for anything at the moment
-fmt = [
-  "black --config .config/black.toml {args:.}",
-  "ruff --config .config/ruff.toml --fix {args:.}",
+  "ruff check --config .config/ruff.toml --diff {args:.}",
+  "ruff format --config .config/ruff.toml --diff {args:.}",
 ]

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --all-extras --output-file=requirements.txt --resolver=backtracking pyproject.toml
+#    pip-compile --all-extras --output-file=requirements.txt pyproject.toml
 #
 annotated-types==0.6.0
     # via pydantic
@@ -11,7 +11,7 @@ attrs==23.2.0
     #   frictionless
     #   jsonlines
     #   jsonschema
-certifi==2023.11.17
+certifi==2024.2.2
     # via requests
 cfgv==3.4.0
     # via pre-commit
@@ -23,7 +23,7 @@ click==8.1.7
     # via typer
 colorama==0.4.6
     # via typer
-coverage[toml]==7.4.0
+coverage[toml]==7.4.3
     # via pytest-cov
 distlib==0.3.8
     # via virtualenv
@@ -31,13 +31,13 @@ et-xmlfile==1.1.0
     # via openpyxl
 filelock==3.13.1
     # via virtualenv
-frictionless==5.16.0
+frictionless==5.16.1
     # via hdx-python-utilities
-hdx-python-utilities==3.6.4
+hdx-python-utilities==3.6.5
     # via hdx-python-country (pyproject.toml)
 humanize==4.9.0
     # via frictionless
-identify==2.5.33
+identify==2.5.35
     # via pre-commit
 idna==3.6
     # via requests
@@ -51,21 +51,21 @@ jinja2==3.1.3
     # via frictionless
 jsonlines==4.0.0
     # via hdx-python-utilities
-jsonpath-ng==1.6.0
+jsonpath-ng==1.6.1
     # via libhxl
 jsonschema==4.17.3
     # via
     #   frictionless
     #   tableschema-to-template
-libhxl==5.2
+libhxl==5.2.1
     # via hdx-python-country (pyproject.toml)
 loguru==0.7.2
     # via hdx-python-utilities
 markdown-it-py==3.0.0
     # via rich
-marko==2.0.2
+marko==2.0.3
     # via frictionless
-markupsafe==2.1.3
+markupsafe==2.1.5
     # via jinja2
 mdurl==0.1.2
     # via markdown-it-py
@@ -77,19 +77,19 @@ packaging==23.2
     # via pytest
 petl==1.7.14
     # via frictionless
-platformdirs==4.1.0
+platformdirs==4.2.0
     # via virtualenv
-pluggy==1.3.0
+pluggy==1.4.0
     # via pytest
 ply==3.11
     # via
     #   jsonpath-ng
     #   libhxl
-pre-commit==3.6.0
+pre-commit==3.6.2
     # via hdx-python-country (pyproject.toml)
-pydantic==2.5.3
+pydantic==2.6.3
     # via frictionless
-pydantic-core==2.14.6
+pydantic-core==2.16.3
     # via pydantic
 pygments==2.17.2
     # via rich
@@ -97,7 +97,7 @@ pyphonetics==0.5.3
     # via hdx-python-country (pyproject.toml)
 pyrsistent==0.20.0
     # via jsonschema
-pytest==7.4.4
+pytest==8.1.0
     # via
     #   hdx-python-country (pyproject.toml)
     #   pytest-cov
@@ -110,7 +110,7 @@ python-dateutil==2.8.2
     #   libhxl
 python-io-wrapper==0.3.1
     # via libhxl
-python-slugify==8.0.1
+python-slugify==8.0.4
     # via frictionless
 pyyaml==6.0.1
     # via
@@ -124,13 +124,13 @@ requests==2.31.0
     #   frictionless
     #   libhxl
     #   requests-file
-requests-file==1.5.1
+requests-file==2.0.0
     # via hdx-python-utilities
 rfc3986==2.0.0
     # via frictionless
-rich==13.7.0
+rich==13.7.1
     # via typer
-ruamel-yaml==0.18.5
+ruamel-yaml==0.18.6
     # via hdx-python-utilities
 ruamel-yaml-clib==0.2.8
     # via ruamel-yaml
@@ -142,7 +142,6 @@ six==1.16.0
     # via
     #   isodate
     #   python-dateutil
-    #   requests-file
 stringcase==1.2.0
     # via frictionless
 structlog==24.1.0
@@ -155,23 +154,23 @@ text-unidecode==1.3
     # via python-slugify
 typer[all]==0.9.0
     # via frictionless
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via
     #   frictionless
     #   pydantic
     #   pydantic-core
     #   typer
-unidecode==1.3.7
+unidecode==1.3.8
     # via
     #   libhxl
     #   pyphonetics
-urllib3==2.1.0
+urllib3==2.2.1
     # via
     #   libhxl
     #   requests
 validators==0.22.0
     # via frictionless
-virtualenv==20.25.0
+virtualenv==20.25.1
     # via pre-commit
 wheel==0.42.0
     # via libhxl
@@ -179,7 +178,7 @@ xlrd==2.0.1
     # via hdx-python-utilities
 xlrd3==1.1.0
     # via libhxl
-xlsxwriter==3.1.9
+xlsxwriter==3.2.0
     # via tableschema-to-template
 xlwt==1.3.0
     # via hdx-python-utilities

hdx_python_country-3.6.6/src/hdx/location/__init__.py

@@ -0,0 +1,17 @@
+from datetime import datetime
+
+from ._version import version as __version__  # noqa: F401
+from hdx.utilities.dateparse import get_timestamp_from_datetime
+
+
+def get_int_timestamp(date: datetime) -> int:
+    """
+    Get integer timestamp from datetime object
+
+    Args:
+        date (datetime): datetime object
+
+    Returns:
+        int: Integer timestamp
+    """
+    return int(round(get_timestamp_from_datetime(date)))

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/src/hdx/location/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.6.4'
-__version_tuple__ = version_tuple = (3, 6, 4)
+__version__ = version = '3.6.6'
+__version_tuple__ = version_tuple = (3, 6, 6)

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/src/hdx/location/adminlevel.py

@@ -58,7 +58,7 @@ class AdminLevel:
             "admin_name_replacements", {}
         )
         self.admin_fuzzy_dont = admin_config.get("admin_fuzzy_dont", list())
-        self.pcodes = list()
+        self.pcodes = []
         self.pcode_lengths = {}
         self.name_to_pcode = {}
         self.pcode_to_name = {}
@@ -634,7 +634,7 @@ class AdminLevel:
         Returns:
             List[str]: List of matches
         """
-        output = list()
+        output = []
         for match in sorted(self.matches):
             line = f"{match[0]} - {match[1]}: Matching ({match[4]}) {match[2]} to {match[3]} on map"
             logger.info(line)
@@ -647,7 +647,7 @@ class AdminLevel:
         Returns:
             List[str]: List of ignored
         """
-        output = list()
+        output = []
         for ignored in sorted(self.ignored):
             if len(ignored) == 2:
                 line = f"{ignored[0]} - Ignored {ignored[1]}!"
@@ -663,7 +663,7 @@ class AdminLevel:
         Returns:
             List[str]: List of errors
         """
-        output = list()
+        output = []
         for error in sorted(self.errors):
             if len(error) == 2:
                 line = f"{error[0]} - Could not find {error[1]} in map names!"

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/src/hdx/location/country.py

@@ -1,4 +1,5 @@
 """Country location"""
+
 import copy
 import logging
 import re
@@ -69,8 +70,8 @@ class Country:
     _countriesdata = None
     _ochaurl_default = "https://docs.google.com/spreadsheets/d/1NjSI2LaS3SqbgYc0HdD8oIb7lofGtiHgoKKATCpwVdY/export?format=csv&gid=1088874596"
     _ochaurl = _ochaurl_default
-    _country_name_overrides = dict()
-    _country_name_mappings = dict()
+    _country_name_overrides = {}
+    _country_name_mappings = {}
 
     @classmethod
     def _add_countriesdata(cls, iso3: str, hxlcountry: hxl.Row) -> Dict:
@@ -131,24 +132,24 @@ class Country:
         if regionname:
             add_country_to_set("regioncodes2countries", regionid, iso3)
             cls._countriesdata["regioncodes2names"][regionid] = regionname
-            cls._countriesdata["regionnames2codes"][
-                regionname.upper()
-            ] = regionid
+            cls._countriesdata["regionnames2codes"][regionname.upper()] = (
+                regionid
+            )
         if sub_regionname:
             add_country_to_set("regioncodes2countries", sub_regionid, iso3)
-            cls._countriesdata["regioncodes2names"][
+            cls._countriesdata["regioncodes2names"][sub_regionid] = (
+                sub_regionname
+            )
+            cls._countriesdata["regionnames2codes"][sub_regionname.upper()] = (
                 sub_regionid
-            ] = sub_regionname
-            cls._countriesdata["regionnames2codes"][
-                sub_regionname.upper()
-            ] = sub_regionid
+            )
         if intermediate_regionname:
             add_country_to_set(
                 "regioncodes2countries", intermediate_regionid, iso3
             )
-            cls._countriesdata["regioncodes2names"][
-                intermediate_regionid
-            ] = intermediate_regionname
+            cls._countriesdata["regioncodes2names"][intermediate_regionid] = (
+                intermediate_regionname
+            )
             cls._countriesdata["regionnames2codes"][
                 intermediate_regionname.upper()
             ] = intermediate_regionid
@@ -167,21 +168,21 @@ class Country:
         Returns:
             None
         """
-        cls._countriesdata = dict()
-        cls._countriesdata["countries"] = dict()
-        cls._countriesdata["iso2iso3"] = dict()
-        cls._countriesdata["m49iso3"] = dict()
-        cls._countriesdata["countrynames2iso3"] = dict()
-        cls._countriesdata["regioncodes2countries"] = dict()
-        cls._countriesdata["regioncodes2names"] = dict()
-        cls._countriesdata["regionnames2codes"] = dict()
-        cls._countriesdata["aliases"] = dict()
-        cls._countriesdata["currencies"] = dict()
+        cls._countriesdata = {}
+        cls._countriesdata["countries"] = {}
+        cls._countriesdata["iso2iso3"] = {}
+        cls._countriesdata["m49iso3"] = {}
+        cls._countriesdata["countrynames2iso3"] = {}
+        cls._countriesdata["regioncodes2countries"] = {}
+        cls._countriesdata["regioncodes2names"] = {}
+        cls._countriesdata["regionnames2codes"] = {}
+        cls._countriesdata["aliases"] = {}
+        cls._countriesdata["currencies"] = {}
 
         for key, value in cls._country_name_mappings.items():
-            cls._countriesdata["countrynames2iso3"][
-                key.upper()
-            ] = value.upper()
+            cls._countriesdata["countrynames2iso3"][key.upper()] = (
+                value.upper()
+            )
 
         for country in countries:
             iso3 = country.get("#country+code+v_iso3")
@@ -891,4 +892,4 @@ class Country:
 
         if exception is not None:
             raise exception
-        return list()
+        return []

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/src/hdx/location/currency.py

@@ -1,10 +1,12 @@
 """Currency conversion"""
+
 import logging
+from copy import copy
 from datetime import datetime, timezone
 from typing import Dict, Optional, Union
 
+from . import get_int_timestamp
 from hdx.utilities.dateparse import (
-    get_timestamp_from_datetime,
     now_utc,
     parse_date,
 )
@@ -27,7 +29,7 @@ class Currency:
     """
 
     _primary_rates_url = "https://query2.finance.yahoo.com/v8/finance/chart/{currency}=X?period1={date}&period2={date}&interval=1d&events=div%2Csplit&formatted=false&lang=en-US&region=US&corsDomain=finance.yahoo.com"
-    _secondary_rates_url = "https://cdn.jsdelivr.net/gh/fawazahmed0/currency-api@1/latest/currencies/usd.min.json"
+    _secondary_rates_url = "https://cdn.jsdelivr.net/npm/@fawazahmed0/currency-api@latest/v1/currencies/usd.min.json"
     _secondary_historic_url = (
         "https://codeforiati.org/imf-exchangerates/imf_exchangerates.csv"
     )
@@ -44,19 +46,6 @@ class Currency:
     _fixed_now = None
     _threshold = 1.3
 
-    @classmethod
-    def _get_int_timestamp(cls, date: datetime) -> int:
-        """
-        Get integer timestamp from datetime object
-
-        Args:
-            date (datetime): datetime object
-
-        Returns:
-            int: Integer timestamp
-        """
-        return int(round(get_timestamp_from_datetime(date)))
-
     @classmethod
     def setup(
         cls,
@@ -69,6 +58,8 @@ class Currency:
         no_historic: bool = False,
         fixed_now: Optional[datetime] = None,
         log_level: int = logging.DEBUG,
+        current_rates_cache: Dict = {"USD": 1},
+        historic_rates_cache: Dict = {},
     ) -> None:
         """
         Setup the sources. If you wish to use a static fallback file by setting
@@ -85,13 +76,15 @@ class Currency:
             no_historic (bool): Do not set up historic rates. Defaults to False.
             fixed_now (Optional[datetime]): Use a fixed datetime for now. Defaults to None (use datetime.now()).
             log_level (int): Level at which to log messages. Defaults to logging.DEBUG.
+            current_rates_cache (Dict): Pre-populate current rates cache with given values. Defaults to {"USD": 1}.
+            historic_rates_cache (Dict): Pre-populate historic rates cache with given values. Defaults to {}.
 
         Returns:
             None
         """
 
-        cls._cached_current_rates = {"USD": 1}
-        cls._cached_historic_rates = dict()
+        cls._cached_current_rates = copy(current_rates_cache)
+        cls._cached_historic_rates = copy(historic_rates_cache)
         cls._rates_api = primary_rates_url
         cls._secondary_rates = None
         cls._secondary_historic = None
@@ -131,10 +124,10 @@ class Currency:
                 filename="historic_rates.csv",
                 logstr="secondary historic exchange rates",
             )
-            cls._secondary_historic = dict()
+            cls._secondary_historic = {}
             for row in iterator:
                 currency = row["Currency"]
-                date = cls._get_int_timestamp(parse_date(row["Date"]))
+                date = get_int_timestamp(parse_date(row["Date"]))
                 rate = float(row["Rate"])
                 dict_of_dicts_add(
                     cls._secondary_historic, currency, date, rate
@@ -281,7 +274,7 @@ class Currency:
             else:
                 now = now_utc()
                 get_close = False
-            timestamp = cls._get_int_timestamp(now)
+            timestamp = get_int_timestamp(now)
         else:
             get_close = True
         data = cls._get_primary_rates_data(currency, timestamp)
@@ -479,7 +472,7 @@ class Currency:
             )
         else:
             date = date.astimezone(timezone.utc)
-        timestamp = cls._get_int_timestamp(date)
+        timestamp = get_int_timestamp(date)
         if currency_data is not None:
             fx_rate = currency_data.get(timestamp)
             if fx_rate is not None:

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/src/hdx/location/names.py

@@ -3,7 +3,7 @@ import unicodedata
 
 from unidecode import unidecode
 
-non_ascii = "([^\x00-\x7F])+"
+non_ascii = "([^\x00-\x7f])+"
 
 
 def clean_name(name: str) -> str:

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/src/hdx/location/phonetics.py

@@ -11,7 +11,7 @@ class Phonetics(pyphonetics.RefinedSoundex):
         possible_names: ListTuple,
         name: str,
         alternative_name: Optional[str] = None,
-        transform_possible_names: ListTuple[Callable] = list(),
+        transform_possible_names: ListTuple[Callable] = [],
         threshold: int = 2,
     ) -> Optional[int]:
         """

hdx_python_country-3.6.6/src/hdx/location/wfp_exchangerates.py

@@ -0,0 +1,102 @@
+import logging
+from datetime import timezone
+from typing import Dict, List
+
+from . import get_int_timestamp
+from hdx.utilities.typehint import ListTuple
+
+try:
+    from data_bridges_client import ApiClient, Configuration, CurrencyApi
+    from data_bridges_client.exceptions import ApiException
+    from data_bridges_client.token import WfpApiToken
+except ImportError:
+    WfpApiToken = None
+
+logger = logging.getLogger(__name__)
+
+
+class WFPExchangeRates:
+    """Obtain WFP official exchange rates. Requires WFP credentials amd
+    installation of the WFP extra eg. `pip install hdx-python-country[wfp]`
+
+    Args:
+        key: WFP API key
+        secret: WFP API secret
+    """
+
+    def __init__(self, key: str, secret: str):
+        # Configure OAuth2 access token for authorization: default
+        self.token = WfpApiToken(api_key=key, api_secret=secret)
+        configuration = Configuration()
+        configuration.access_token = self.token.refresh()
+        api_client = ApiClient(configuration)
+        self.api_instance = CurrencyApi(api_client)
+
+    def get_currencies(self) -> List[str]:
+        """Get list of currencies in WFP API
+
+        Returns:
+            List[str]: List of currencies in WFP API
+        """
+        currencies = []
+        for currencydto in self.api_instance.currency_list_get().items:
+            currencies.append(currencydto.name)
+        return currencies
+
+    def get_currency_historic_rates(self, currency: str) -> Dict[int, float]:
+        """Get historic rates for currency from WFP API
+
+        Args:
+            currency (str): Currency
+
+        Returns:
+            Dict[int, float]: Mapping from timestamp to rate
+        """
+        historic_rates = {}
+        page = 1
+        while True:
+            try:
+                usdquotations = (
+                    self.api_instance.currency_usd_indirect_quotation_get(
+                        currency_name=currency, page=page
+                    ).items
+                )
+            except ApiException as ex:
+                if ex.status not in (104, 401, 403):
+                    raise
+                self.token.refresh()
+                usdquotations = (
+                    self.api_instance.currency_usd_indirect_quotation_get(
+                        currency_name=currency, page=page
+                    ).items
+                )
+            if not usdquotations:
+                break
+            for usdquotation in usdquotations:
+                if not usdquotation.is_official:
+                    continue
+                date = usdquotation.var_date.replace(tzinfo=timezone.utc)
+                timestamp = get_int_timestamp(date)
+                historic_rates[timestamp] = usdquotation.value
+            page = page + 1
+        return historic_rates
+
+    def get_historic_rates(
+        self, currencies: ListTuple[str]
+    ) -> Dict[str, Dict]:
+        """Get historic rates for a list of currencies from WFP API
+
+        Args:
+            currencies (List[str]): List of currencies
+
+        Returns:
+            Dict[str, Dict]: Mapping from currency to mapping from timestamp to rate
+        """
+        historic_rates = {}
+        for currency in currencies:
+            logger.info(f"Getting WFP historic rates for {currency}")
+            currency_historic_rates = self.get_currency_historic_rates(
+                currency
+            )
+            historic_rates[currency.upper()] = currency_historic_rates
+        return historic_rates

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/tests/hdx/location/test_adminlevel.py

@@ -1,4 +1,5 @@
 """location Tests"""
+
 from os.path import join
 
 import pytest

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/tests/hdx/location/test_country.py

@@ -1,4 +1,5 @@
 """location Tests"""
+
 import hxl
 import pytest
 from hxl import InputOptions

{hdx_python_country-3.6.4 → hdx_python_country-3.6.6}/tests/hdx/location/test_currency.py

@@ -1,8 +1,10 @@
 """Currency Tests"""
+
 from os.path import join
 
 import pytest
 
+from hdx.location import get_int_timestamp
 from hdx.location.currency import Currency, CurrencyError
 from hdx.utilities.dateparse import parse_date
 from hdx.utilities.downloader import Download
@@ -333,7 +335,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2017-02-15"))
+        timestamp = get_int_timestamp(parse_date("2017-02-15"))
         assert Currency._get_adjclose(indicators, "NGN", timestamp) == 314.5
         indicators = {
             "adjclose": [{"adjclose": [33.13999938964844]}],
@@ -347,7 +349,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2015-12-15"))
+        timestamp = get_int_timestamp(parse_date("2015-12-15"))
         assert Currency._get_adjclose(indicators, "COP", timestamp) is None
         indicators = {
             "adjclose": [{"adjclose": [605.5509643554688]}],
@@ -361,7 +363,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2022-04-14"))
+        timestamp = get_int_timestamp(parse_date("2022-04-14"))
         assert (
             Currency._get_adjclose(indicators, "XAF", timestamp)
             == 605.5509643554688
@@ -378,7 +380,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2022-04-15"))
+        timestamp = get_int_timestamp(parse_date("2022-04-15"))
         assert (
             Currency._get_adjclose(indicators, "XAF", timestamp)
             == 601.632568359375
@@ -395,7 +397,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2017-02-15"))
+        timestamp = get_int_timestamp(parse_date("2017-02-15"))
         assert Currency._get_adjclose(indicators, "XXX", timestamp) == 3.145
 
         Currency.setup(secondary_historic_url=secondary_historic_url)
@@ -411,7 +413,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2017-02-15"))
+        timestamp = get_int_timestamp(parse_date("2017-02-15"))
         assert Currency._get_adjclose(indicators, "NGN", timestamp) == 314.5
         indicators = {
             "adjclose": [{"adjclose": [33.13999938964844]}],
@@ -425,7 +427,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2015-12-15"))
+        timestamp = get_int_timestamp(parse_date("2015-12-15"))
         assert (
             Currency._get_adjclose(indicators, "COP", timestamp)
             == 3269.199951171875
@@ -442,7 +444,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2022-04-14"))
+        timestamp = get_int_timestamp(parse_date("2022-04-14"))
         assert (
             Currency._get_adjclose(indicators, "XAF", timestamp)
             == 605.5509643554688
@@ -459,7 +461,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2022-04-15"))
+        timestamp = get_int_timestamp(parse_date("2022-04-15"))
         assert (
             Currency._get_adjclose(indicators, "XAF", timestamp)
             == 601.632568359375
@@ -476,7 +478,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2017-02-15"))
+        timestamp = get_int_timestamp(parse_date("2017-02-15"))
         assert Currency._get_adjclose(indicators, "XXX", timestamp) == 3.145
         indicators = {
             "adjclose": [{"adjclose": [33.13999938964844]}],
@@ -490,7 +492,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2015-12-15"))
+        timestamp = get_int_timestamp(parse_date("2015-12-15"))
         assert Currency._get_adjclose(indicators, "COP", timestamp) == 3320.0
         indicators = {
             "adjclose": [{"adjclose": [33.13999938964844]}],
@@ -504,7 +506,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2015-12-15"))
+        timestamp = get_int_timestamp(parse_date("2015-12-15"))
         assert (
             Currency._get_adjclose(indicators, "COP", timestamp)
             == 3313.999938964844
@@ -523,7 +525,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2015-12-15"))
+        timestamp = get_int_timestamp(parse_date("2015-12-15"))
         assert (
             Currency._get_adjclose(indicators, "COP", timestamp)
             == 33.13999938964844
@@ -542,7 +544,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2015-12-15"))
+        timestamp = get_int_timestamp(parse_date("2015-12-15"))
         assert (
             Currency._get_adjclose(indicators, "COP", timestamp)
             == 3124.504838709677
@@ -561,7 +563,7 @@ class TestCurrency:
                 }
             ],
         }
-        timestamp = Currency._get_int_timestamp(parse_date("2015-12-15"))
+        timestamp = get_int_timestamp(parse_date("2015-12-15"))
         assert Currency._get_adjclose(indicators, "COP", timestamp) == 3270
 
         Currency._no_historic = True

hdx_python_country-3.6.6/tests/hdx/location/test_wfp_exchangerates.py

@@ -0,0 +1,42 @@
+from os import environ
+
+import pytest
+
+from hdx.location import get_int_timestamp
+from hdx.location.currency import Currency
+from hdx.location.wfp_exchangerates import WfpApiToken, WFPExchangeRates
+from hdx.utilities.dateparse import parse_date
+
+if WfpApiToken is not None:
+
+    class TestWFPExchangeRates:
+        @pytest.fixture(scope="class")
+        def wfp_fx(self):
+            key = environ.get("WFP_KEY")
+            secret = environ.get("WFP_SECRET")
+            return WFPExchangeRates(key, secret)
+
+        @pytest.fixture(scope="class")
+        def currency(self):
+            return "afn"
+
+        @pytest.fixture(scope="class")
+        def date(self):
+            return parse_date("2020-02-20")
+
+        def test_get_currencies(self, wfp_fx):
+            currencies = wfp_fx.get_currencies()
+            assert len(currencies) == 126
+
+        def test_get_historic_rates(self, wfp_fx, currency, date):
+            assert (
+                Currency.get_historic_rate(currency, date) == 76.80000305175781
+            )
+            timestamp = get_int_timestamp(date)
+            historic_rates = wfp_fx.get_currency_historic_rates(currency)
+            assert historic_rates[timestamp] == 77.01
+
+        def test_get_all_historic_rates(self, wfp_fx, currency, date):
+            all_historic_rates = wfp_fx.get_historic_rates([currency])
+            Currency.setup(historic_rates_cache=all_historic_rates)
+            assert Currency.get_historic_rate(currency, date) == 77.01

hdx_python_country-3.6.4/.config/black.toml

@@ -1,2 +0,0 @@
-[tool.black]
-line-length = 79

hdx_python_country-3.6.4/src/hdx/location/__init__.py

@@ -1 +0,0 @@
-from ._version import version as __version__  # noqa: F401