datamarket 0.9.33__tar.gz → 0.9.34__tar.gz

{datamarket-0.9.33 → datamarket-0.9.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datamarket
-Version: 0.9.33
+Version: 0.9.34
 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 → datamarket-0.9.34}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datamarket"
-version = "0.9.33"
+version = "0.9.34"
 description = "Utilities that integrate advanced scraping knowledge into just one library."
 authors = ["DataMarket <techsupport@datamarket.es>"]
 license = "GPL-3.0-or-later"

{datamarket-0.9.33 → datamarket-0.9.34}/src/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-0.9.33 → datamarket-0.9.34}/src/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()