datamarket 0.7.98__py3-none-any.whl → 0.7.99__py3-none-any.whl

datamarket/params/nominatim.py

@@ -412,7 +412,7 @@ COUNTRY_PARSING_RULES = {
         
         "zip_search_pattern": re.compile(r"\b\d{5}\b"), 
         
-        "phone_validate_pattern": re.compile(r"^(\+?34)?[6|7]\d{8}$")
+        "phone_validate_pattern": re.compile(r"^(\+?34)?[67]\d{8}$")
     },
     "pt": {
         "zip_validate_pattern": re.compile(r"^\d{4}[- ]{0,1}\d{3}$|^\d{4}$"),

datamarket/utils/strings/standardization.py

@@ -8,45 +8,6 @@ from ...params.nominatim import COUNTRY_PARSING_RULES
 ########################################################################################################################
 # FUNCTIONS
 
-
-def _standardize_es_phone_number(number: str) -> str | None:
-    """Standardize phone numbers from Spain using regex validation.
-
-    Args:
-        number (str): cleaned, digits-only phone number
-
-    Returns:
-        str | None: standardized 9-digit phone number
-    """
-    # Get the validation regex from params
-    pattern = COUNTRY_PARSING_RULES["es"]["phone_validate_pattern"]
-
-    # Validate and extract in one step
-    match = pattern.match(number)
-
-    # Return the captured group (the 9-digit number)
-    return match.group(1) if match else None
-
-
-def _standardize_pt_phone_number(number: str) -> str | None:
-    """Standardize phone numbers from Portugal using regex validation.
-
-    Args:
-        number (str): cleaned, digits-only phone number
-
-    Returns:
-        str | None: standardized 9-digit phone number
-    """
-    # Get the validation regex from params
-    pattern = COUNTRY_PARSING_RULES["pt"]["phone_validate_pattern"]
-
-    # Validate and extract in one step
-    match = pattern.match(number)
-
-    # Return the captured group (the 9-digit number)
-    return match.group(1) if match else None
-
-
 def parse_phone_number(number: str, country_code: Literal["es", "pt"]) -> str | None:
     """Clean and standardize phone number from a certain country_code
 
@@ -61,9 +22,17 @@ def parse_phone_number(number: str, country_code: Literal["es", "pt"]) -> str |
         str | None: standardized phone number
     """
     clean_number = re.sub(r"\D", "", number)
-    if country_code == "es":
-        return _standardize_es_phone_number(clean_number)
-    elif country_code == "pt":
-        return _standardize_pt_phone_number(clean_number)
+    if country_code in {"es", "pt"}:
+        # Get the validation regex from params
+        pattern = COUNTRY_PARSING_RULES[country_code]["phone_validate_pattern"]
+
+        # Validate and extract in one step
+        if len(clean_number) >= 9: # Check if the cleaned number has at least 9 digits
+            match = pattern.match(clean_number)
+
+            # Return the captured group (the 9-digit number)
+            return match.group(0)[-9:] if match else None
+        else:
+            return None # Or handle the case where the number is too short
     else:
         raise ValueError(f"Country code ({country_code}) is not currently supported")

{datamarket-0.7.98.dist-info → datamarket-0.7.99.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datamarket
-Version: 0.7.98
+Version: 0.7.99
 Summary: Utilities that integrate advanced scraping knowledge into just one library.
 License: GPL-3.0-or-later
 Author: DataMarket

{datamarket-0.7.98.dist-info → datamarket-0.7.99.dist-info}/RECORD

@@ -12,7 +12,7 @@ datamarket/interfaces/peerdb.py,sha256=sO451wEGNb_0DDwchZ6eBVYKltqHM5XKau-WsfspX
 datamarket/interfaces/proxy.py,sha256=Uu-dHvpQOLNBZPGHAanLXnKT1789ArcHfOw8exECt34,5398
 datamarket/interfaces/tinybird.py,sha256=AYrcRGNOCoCt7ojilkWa27POROee9sTCwZ61GGHEPeM,2698
 datamarket/params/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datamarket/params/nominatim.py,sha256=Xl0mBls_Yz7y8nU6-boNTMDYsxvJRIFpZyMT2gLOqvs,11968
+datamarket/params/nominatim.py,sha256=RnmYXGoJQCijOsuCavCYcxw98WvOd_vOMK4KaraI0RU,11967
 datamarket/utils/__init__.py,sha256=FHLh-Qp9XpM4LkAocppCf_llW2CWVVghGorkqxqt1wk,34
 datamarket/utils/airflow.py,sha256=al0vc0YUikNu3Oy51VSn52I7pMU40akFBOl_UlHa2E4,795
 datamarket/utils/alchemy.py,sha256=SRq6kgh1aANXVShBPgAuglmNhZssPWwWEY503gKSia8,635
@@ -26,10 +26,10 @@ datamarket/utils/soda.py,sha256=eZTXFbI1P3WoMd1MM-YjoVTpdjTcDSWuvBb7ViBMhSQ,941
 datamarket/utils/strings/__init__.py,sha256=b6TYOT9v7y9ID-lDyZk4E8BH2uIPbsF2ZSLGjCQ1MCQ,43
 datamarket/utils/strings/normalization.py,sha256=UBluU6ABY6aCpnd02F7L7HcivVSisRJ9IUXdj9D1MyE,9050
 datamarket/utils/strings/obfuscation.py,sha256=Jo-x3f2Cb75983smmpcdPqUlBrLCTyrnmH3FPlgUUjM,5246
-datamarket/utils/strings/standardization.py,sha256=xl4I6F3brDFdRWKy7jKnOIIEo2YsqcBcPa2p5TJGRC0,2236
+datamarket/utils/strings/standardization.py,sha256=c8CAG6HI3AfK0hB3A3IGwsbnQebZ6R3PrA5PELHRXM0,1492
 datamarket/utils/typer.py,sha256=FDF3l6gh3UlAFPsHCtesnekvct2rKz0oFn3uKARBQvE,814
 datamarket/utils/types.py,sha256=vxdQZdwdXrfPR4Es52gBgol-tMRIOD6oK9cBo3rB0JQ,74
-datamarket-0.7.98.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-datamarket-0.7.98.dist-info/METADATA,sha256=f8YsBdGrtjmUOroA-qvv1bEpnt1LSfrCxqt8z6kF_tk,7381
-datamarket-0.7.98.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-datamarket-0.7.98.dist-info/RECORD,,
+datamarket-0.7.99.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+datamarket-0.7.99.dist-info/METADATA,sha256=RdJIjdRmB4RK9WsZpXkuXL8Je2ZtexQlVj9Qiq2jJt8,7381
+datamarket-0.7.99.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+datamarket-0.7.99.dist-info/RECORD,,