DEL: Delete warning for size and stype deprecation

Author: nmacholl

databento/common/enums.py

@@ -1,8 +1,6 @@
-import warnings
-from enum import Enum, EnumMeta, Flag, IntFlag, unique
-from typing import Any, Callable, Iterable, Type, TypeVar, Union
+from enum import Enum, Flag, IntFlag, unique
+from typing import Callable, Type, TypeVar, Union
 
-from databento.live.dbn import DBNRecord
 from databento_dbn import (
     ImbalanceMsg,
     InstrumentDefMsg,
@@ -14,6 +12,7 @@
     TradeMsg,
 )
 
+from databento.live.dbn import DBNRecord
 
 M = TypeVar("M", bound=Enum)
 
@@ -90,46 +89,6 @@ def coerced_new(enum: Type[M], value: object) -> M:
     return enum_type
 
 
-class DeprecatedAccess(EnumMeta):
-    """
-    runs a user-specified function whenever member is accessed
-    """
-
-    def __getattribute__(cls, name: str) -> object:
-        obj = super().__getattribute__(name)
-        if isinstance(obj, Enum) and obj._on_access:  # type: ignore
-            obj._on_access()  # type: ignore
-        return obj
-
-    def __getitem__(cls, name: str, *_: Iterable[Any]) -> object:  # type: ignore
-        member: Any = super().__getitem__(name)
-        if member._on_access:
-            member._on_access()
-        return member
-
-    def __call__(  # type: ignore
-        cls,
-        value: str,
-        names=None,
-        *,
-        module=None,
-        qualname=None,
-        type=None,
-        start=1,
-    ) -> object:
-        obj = super().__call__(
-            value,
-            names,
-            module=module,
-            qualname=qualname,
-            type=type,
-            start=start,
-        )
-        if isinstance(obj, Enum) and obj._on_access:
-            obj._on_access()
-        return obj
-
-
 class StringyMixin:
     """
     Mixin class for overloading __str__ on Enum types.
@@ -273,46 +232,16 @@ class Delivery(StringyMixin, str, Enum):
     DISK = "disk"
 
 
-def deprecated_enum(old_value: str, new_value: str) -> str:
-    warnings.warn(
-        f"{old_value} is deprecated to {new_value}",
-        category=DeprecationWarning,
-        stacklevel=3,  # This makes the error happen in user code
-    )
-    return new_value
-
-
 @unique
 @coercible
-class SType(StringyMixin, str, Enum, metaclass=DeprecatedAccess):
+class SType(StringyMixin, str, Enum):
     """Represents a symbology type."""
 
-    PRODUCT_ID = "product_id", "instrument_id"  # Deprecated for `instrument_id`
-    NATIVE = "native", "raw_symbol"  # Deprecated for `raw_symbol`
-    SMART = "smart", "parent", "continuous"  # Deprecated for `parent` and `continuous`
     INSTRUMENT_ID = "instrument_id"
     RAW_SYMBOL = "raw_symbol"
     PARENT = "parent"
     CONTINUOUS = "continuous"
 
-    def __new__(cls, value: str, *args: Iterable[str]) -> "SType":
-        variant = super().__new__(cls, value)
-        variant._value_ = value
-        variant.__args = args  # type: ignore
-        variant._on_access = variant.__deprecated if args else None  # type: ignore
-        return variant
-
-    def __eq__(self, other: object) -> bool:
-        return str(self).lower() == str(other).lower()
-
-    def __deprecated(self) -> None:
-        other_values = " or ".join(self.__args)  # type: ignore
-        warnings.warn(
-            f"SType of {self.value} is deprecated; use {other_values}",
-            category=DeprecationWarning,
-            stacklevel=3,
-        )
-
 
 @unique
 @coercible

databento/common/parsing.py

@@ -142,8 +142,7 @@ def _(symbols: str, stype_in: SType) -> str:
         symbol_list = symbols.strip().strip(",").split(",")
         return ",".join(map(symbol_to_string, symbol_list))
 
-    # TODO(cs): Temporary mapping until past stype rename deprecation period
-    if stype_in in (SType.PARENT, SType.CONTINUOUS) or stype_in == "smart":
+    if stype_in in (SType.PARENT, SType.CONTINUOUS):
         return validate_smart_symbol(symbols)
     return symbols.strip().upper()
 

databento/historical/api/timeseries.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import warnings
 from datetime import date
 from io import BufferedIOBase
 from io import BytesIO
@@ -16,20 +15,15 @@
 from databento.common.enums import Encoding
 from databento.common.enums import Schema
 from databento.common.enums import SType
-from databento.common.error import BentoWarning
 from databento.common.parsing import datetime_to_string
 from databento.common.parsing import optional_datetime_to_string
 from databento.common.parsing import optional_symbols_list_to_string
 from databento.common.validation import validate_enum
 from databento.common.validation import validate_semantic_string
 from databento.historical.api import API_VERSION
-from databento.historical.api.metadata import MetadataHttpAPI
 from databento.historical.http import BentoHttpAPI
 
 
-WARN_REQUEST_SIZE: int = 5 * 10**9  # 5 GB
-
-
 class TimeSeriesHttpAPI(BentoHttpAPI):
     """
     Provides request methods for the time series HTTP API endpoints.
@@ -125,16 +119,6 @@ def get_range(
         if limit is not None:
             params.append(("limit", str(limit)))
 
-        self._pre_check_data_size(
-            dataset=dataset,
-            stype_in=stype_in_valid,
-            symbols=symbols_list,
-            schema=schema_valid,
-            start=start_valid,
-            end=end_valid,
-            limit=limit,
-        )
-
         if path is not None:
             writer: BufferedIOBase = open(path, "x+b")
         else:
@@ -268,16 +252,6 @@ async def get_range_async(
         if limit is not None:
             params.append(("limit", str(limit)))
 
-        self._pre_check_data_size(
-            dataset=dataset,
-            stype_in=stype_in_valid,
-            symbols=symbols_list,
-            schema=schema_valid,
-            start=start_valid,
-            end=end_valid,
-            limit=limit,
-        )
-
         if path is not None:
             writer: BufferedIOBase = open(path, "x+b")
         else:
@@ -295,101 +269,3 @@ async def get_range_async(
             return DBNStore.from_file(path)
         writer.seek(0)  # rewind for read
         return DBNStore.from_bytes(writer.read())
-
-    def _pre_check_data_size(
-        self,
-        dataset: str,
-        symbols: str,
-        schema: Schema,
-        start: str,
-        end: Optional[str],
-        stype_in: SType,
-        limit: Optional[int],
-    ) -> None:
-        if _is_size_limited(
-            schema=schema,
-            limit=limit,
-        ):
-            return
-
-        if _is_period_limited(
-            schema=schema,
-            symbols=symbols,
-            start=start,
-            end=end,
-        ):
-            return
-
-        metadata_api = MetadataHttpAPI(
-            key=self._key,
-            gateway=self._gateway,
-        )
-        request_size = metadata_api.get_billable_size(
-            dataset=dataset,
-            start=start,
-            end=end,
-            symbols=symbols,
-            schema=schema,
-            stype_in=stype_in,
-            limit=limit,
-        )
-
-        if request_size < WARN_REQUEST_SIZE:
-            return
-
-        warnings.warn(
-            message="""The size of this streaming request is greater than 5GB.
-            It is recommended to submit a batch download request for large volumes
-            of data, or break this request into smaller requests.
-            This warning can be suppressed:
-            https://docs.python.org/3/library/warnings.html""",
-            category=BentoWarning,
-            stacklevel=3,  # This makes the error happen in user code
-        )
-
-
-def _is_size_limited(
-    schema: Schema,
-    limit: Optional[int],
-    max_size: int = WARN_REQUEST_SIZE,
-) -> bool:
-    if limit is None:
-        return False
-
-    estimated_size = limit * schema.get_record_type().size_hint()
-    return estimated_size < max_size
-
-
-def _is_period_limited(
-    schema: Schema,
-    symbols: str,
-    start: str,
-    end: Optional[str],
-    max_size: int = WARN_REQUEST_SIZE,
-) -> bool:
-    if end is None:
-        return False
-
-    if schema not in (
-        Schema.OHLCV_1S,
-        Schema.OHLCV_1M,
-        Schema.OHLCV_1H,
-        Schema.OHLCV_1D,
-        Schema.DEFINITION,
-    ):
-        return False
-
-    dt_start = pd.to_datetime(start, utc=True)
-    dt_end = pd.to_datetime(end, utc=True)
-
-    # default scale to one day for ohlcv_1d and definition
-    scale = {
-        Schema.OHLCV_1S: 1,
-        Schema.OHLCV_1M: 60,
-        Schema.OHLCV_1H: 60 * 60,
-    }.get(schema, 60 * 60 * 24)
-
-    num_symbols = len(symbols.split(","))
-    num_records = num_symbols * (dt_end - dt_start).total_seconds() // scale
-    estimated_size = num_records * schema.get_record_type().size_hint()
-    return estimated_size < max_size

tests/test_common_enums.py

@@ -145,35 +145,3 @@ def test_int_flags_stringy_mixin(enum_type: Type[Flag]) -> None:
         assert str(record_flags) == ", ".join(
             f.name.lower() for f in enum_type if f in record_flags
         )
-
-
-def test_stype_deprecation() -> None:
-    """
-    Test that a deprecation warning is emitted when
-    accessing a deprecated SType member.
-    """
-    with pytest.deprecated_call():
-        SType.PRODUCT_ID
-
-    with pytest.deprecated_call():
-        SType.NATIVE
-
-    with pytest.deprecated_call():
-        SType.SMART
-
-
-@pytest.mark.parametrize(
-    "name",
-    [
-        "product_id",
-        "native",
-        "smart",
-    ],
-)
-def test_stype_deprecation_strings(name: str) -> None:
-    """
-    Test that a deprecation warning is emitted when
-    constructing an SType from strings.
-    """
-    with pytest.deprecated_call():
-        SType(name)