datamarket 0.9.33__py3-none-any.whl → 0.9.35__py3-none-any.whl

datamarket/interfaces/alchemy.py

@@ -3,7 +3,7 @@
 
 import logging
 from collections.abc import MutableMapping
-from typing import Any, Iterator, List, Optional, Type, TypeVar
+from typing import Any, Iterator, List, Optional, Type, TypeVar, Union
 from urllib.parse import quote_plus
 
 from sqlalchemy import DDL, FrozenResult, Result, Select, SQLColumnExpression, create_engine, text
@@ -12,7 +12,7 @@ from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import DeclarativeMeta
 from sqlalchemy.orm import Session, sessionmaker
 from sqlalchemy.sql.expression import ClauseElement
-from enum import Enum
+from enum import Enum, auto
 
 ########################################################################################################################
 # CLASSES
@@ -23,8 +23,8 @@ ModelType = TypeVar("ModelType", bound=DeclarativeMeta)
 
 
 class CommitStrategy(Enum):
-    COMMIT_ON_SUCCESS = "commit_on_success"
-    FORCE_COMMIT = "force_commit"
+    COMMIT_ON_SUCCESS = auto()
+    FORCE_COMMIT = auto()
 
 
 class MockContext:
@@ -278,7 +278,7 @@ class AlchemyInterface:
         stmt: Select[Any],
         order_by: List[SQLColumnExpression[Any]],
         windowsize: int,
-        commit_strategy: CommitStrategy = CommitStrategy.COMMIT_ON_SUCCESS,
+        commit_strategy: Union[CommitStrategy, str] = CommitStrategy.COMMIT_ON_SUCCESS,
     ) -> Iterator[Result[Any]]:
         """
         Executes a windowed query, fetching each window in a separate, short-lived session.
@@ -288,7 +288,7 @@ class AlchemyInterface:
             order_by: The columns to use for ordering.
             windowsize: The number of rows to fetch in each window.
             commit_strategy: The strategy to use for committing the session after each window.
-                             Defaults to CommitStrategy.COMMIT_ON_SUCCESS.
+                             Defaults to `CommitStrategy.COMMIT_ON_SUCCESS`.
 
         Returns:
             An iterator of Result objects, each containing a window of data.
@@ -296,6 +296,9 @@ class AlchemyInterface:
 
         More info: https://github.com/sqlalchemy/sqlalchemy/wiki/RangeQuery-and-WindowedRangeQuery
         """
+        # Parameter mapping
+        if isinstance(commit_strategy, str):
+            commit_strategy = CommitStrategy[commit_strategy.upper()]
 
         # Find id column in stmt
         if not any(column.get("entity").id for column in stmt.column_descriptions):

datamarket/interfaces/nominatim.py

@@ -10,7 +10,7 @@ import requests
 from geopy.distance import geodesic
 from jellyfish import jaro_winkler_similarity
 
-from ..params.nominatim import POSTCODES
+from ..params.nominatim import CITY_TO_PROVINCE, POSTCODES
 from ..utils.strings import normalize
 
 ########################################################################################################################
@@ -88,7 +88,7 @@ class Nominatim:
             "country": raw_address.get("country"),
             "country_code": (raw_address.get("country_code") or "").lower(),
             "state": raw_address.get("state"),
-            "province": raw_address.get("province"),
+            "province": raw_address.get("province") or CITY_TO_PROVINCE.get(city),
             "city": city,
             "postcode": postcode,
             "district": district,

datamarket/params/nominatim.py

@@ -1,3 +1,5 @@
+CITY_TO_PROVINCE = {"Madrid": "Madrid"}
+
 POSTCODES = {
     "01": "Álava",
     "02": "Albacete",

datamarket/utils/strings/normalization.py

@@ -3,7 +3,7 @@
 
 import unicodedata
 from enum import Enum, auto
-from typing import Any, Optional, Set
+from typing import Any, Optional, Set, Union
 
 import numpy as np
 from inflection import camelize, parameterize, titleize, underscore
@@ -93,8 +93,8 @@ def transliterate_symbols(s: str, allowed_symbols_set: Optional[Set[str]] = None
 
 def normalize(
     s: Any,
-    mode: NormalizationMode = NormalizationMode.BASIC,
-    naming: NamingConvention = NamingConvention.LOWER,
+    mode: Union[NormalizationMode, str] = NormalizationMode.BASIC,
+    naming: Union[NamingConvention, str] = NamingConvention.LOWER,
     allowed_symbols: Optional[str] = None,
 ) -> str:
     """
@@ -136,9 +136,9 @@ def normalize(
     """
     # Parameter mapping
     if isinstance(mode, str):
-        mode = NormalizationMode[mode]
+        mode = NormalizationMode[mode.upper()]
     if isinstance(naming, str):
-        naming = NamingConvention[naming]
+        naming = NamingConvention[naming.upper()]
 
     _allowed_symbols_set: Set[str] = set(allowed_symbols) if allowed_symbols else set()
 

{datamarket-0.9.33.dist-info → datamarket-0.9.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamarket
-Version: 0.9.33
+Version: 0.9.35
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 Home-page: https://datamarket.es
 License: GPL-3.0-or-later

{datamarket-0.9.33.dist-info → datamarket-0.9.35.dist-info}/RECORD

@@ -1,15 +1,15 @@
 datamarket/__init__.py,sha256=FHS77P9qNewKMoN-p0FLEUEC60oWIYup1QkbJZP4ays,12
 datamarket/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datamarket/interfaces/alchemy.py,sha256=4q_gLKCKPK437VKOpdBKSrCyy42P_yWxIhE7KuvHXMY,14515
+datamarket/interfaces/alchemy.py,sha256=mQwjDqBpz1QHRV2JTCALvn5iK_ky69oE2Gw-EtRXsqQ,14664
 datamarket/interfaces/aws.py,sha256=7KLUeBxmPN7avEMPsu5HC_KHB1N7W6Anp2X8fo43mlw,2383
 datamarket/interfaces/drive.py,sha256=shbV5jpQVe_KPE-8Idx6Z9te5Zu1SmVfrvSAyd9ZIgE,2915
 datamarket/interfaces/ftp.py,sha256=o0KlJxtksbop9OjCiQRzyAa2IeG_ExVXagS6apwrAQo,1881
-datamarket/interfaces/nominatim.py,sha256=xrVADpWiNRKcshDVw75i-8phrql_6sBYf8Wre8mQZk4,12419
+datamarket/interfaces/nominatim.py,sha256=xTMI7hUZ778xUZ0iCT6LA4pmiaWEJq3F_AC-dXcS1nc,12467
 datamarket/interfaces/peerdb.py,sha256=cwYwvO740GyaPo9zLAwJsf3UeJDGDiYzjQVM9Q6s-_g,23652
 datamarket/interfaces/proxy.py,sha256=updoOStKd8-nQBbxWbnD9eOt6HksnYi-5dQ0rEySf5M,3152
 datamarket/interfaces/tinybird.py,sha256=AYrcRGNOCoCt7ojilkWa27POROee9sTCwZ61GGHEPeM,2698
 datamarket/params/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datamarket/params/nominatim.py,sha256=pBYRfoBkkLBg2INbFymefmYSzaAVujQSpEro5c1hD_I,1143
+datamarket/params/nominatim.py,sha256=XrCru3yEbs-X3ueOaCeSTBZwi4CWHW7oNhEyexBleMw,1184
 datamarket/utils/__init__.py,sha256=8D5a8oKgqd6WA1RUkiKCn4l_PVemtyuckxQut0vDHXM,20
 datamarket/utils/airflow.py,sha256=al0vc0YUikNu3Oy51VSn52I7pMU40akFBOl_UlHa2E4,795
 datamarket/utils/alchemy.py,sha256=SRq6kgh1aANXVShBPgAuglmNhZssPWwWEY503gKSia8,635
@@ -17,11 +17,11 @@ datamarket/utils/main.py,sha256=j8wnAxeLvijdRU9M4V6HunWH7vgWWHP4u4xamzkWcUU,7009
 datamarket/utils/selenium.py,sha256=IMKlbLzXABFhACnWzhHmB0l2hhVzNwHGZwbo14nEewQ,2499
 datamarket/utils/soda.py,sha256=eZTXFbI1P3WoMd1MM-YjoVTpdjTcDSWuvBb7ViBMhSQ,941
 datamarket/utils/strings/__init__.py,sha256=RmyN3hKGXmUym8w5tn28yWkw2uM-b5OvntB4D0lU1eo,84
-datamarket/utils/strings/normalization.py,sha256=z2dDXFVQ-nVqPDRR1T4HWmELpJuXUVt_P6leHqPVheY,8666
+datamarket/utils/strings/normalization.py,sha256=QLZ-THzjGOK9eWPPR1PrsffwQkSOx_Mgha4IYaJPrR0,8713
 datamarket/utils/strings/obfuscation.py,sha256=8gMepfjPq0N4_IpKR6i2dy_9VJugQ3qJiRiRvKavB3s,5246
 datamarket/utils/typer.py,sha256=FDF3l6gh3UlAFPsHCtesnekvct2rKz0oFn3uKARBQvE,814
 datamarket/utils/types.py,sha256=vxdQZdwdXrfPR4Es52gBgol-tMRIOD6oK9cBo3rB0JQ,74
-datamarket-0.9.33.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-datamarket-0.9.33.dist-info/METADATA,sha256=c_d4K0XDa0CrfvdMWnmRFQZPOzTENQAfiMhIIjzhhuo,6871
-datamarket-0.9.33.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-datamarket-0.9.33.dist-info/RECORD,,
+datamarket-0.9.35.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+datamarket-0.9.35.dist-info/METADATA,sha256=RNtstcJHXMjzSc_ZekIxbh86C9AwKlqQdwUSn908a0k,6871
+datamarket-0.9.35.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+datamarket-0.9.35.dist-info/RECORD,,