akshare-one 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

akshare_one/modules/historical/eastmoney_direct.py

@@ -1,78 +1,78 @@
-import pandas as pd
-from .base import HistoricalDataProvider
-from ..cache import cache
-from akshare_one.eastmoney.client import EastMoneyClient
-from akshare_one.eastmoney.utils import parse_kline_data, resample_historical_data
-
-
-class EastMoneyDirectHistorical(HistoricalDataProvider):
-    """Direct implementation for EastMoney historical stock data API"""
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.client = EastMoneyClient()
-
-    @cache(
-        "hist_data_cache",
-        key=lambda self: f"eastmoney_direct_hist_{self.symbol}_{self.interval}_{self.interval_multiplier}_{self.adjust}",
-    )
-    def get_hist_data(self) -> pd.DataFrame:
-        """Fetches EastMoney historical market data directly from API"""
-        self.interval = self.interval.lower()
-        self._validate_interval_params()
-
-        try:
-            klt = self._get_kline_type()
-            fqt = self._get_adjust_type()
-            start_date = self.start_date.replace("-", "")
-            end_date = self.end_date.replace("-", "")
-
-            raw_data = self.client.fetch_historical_klines(
-                symbol=self.symbol,
-                klt=klt,
-                fqt=fqt,
-                start_date=start_date,
-                end_date=end_date,
-            )
-
-            if raw_data.get("rc") != 0:
-                raise ValueError(f"API returned error: {raw_data.get('msg')}")
-
-            df = parse_kline_data(raw_data)
-
-            df = resample_historical_data(df, self.interval, self.interval_multiplier)
-
-            return df
-
-        except Exception as e:
-            raise ValueError(f"Failed to fetch historical data for {self.symbol}: {e}")
-
-    def _get_kline_type(self) -> str:
-        """Get K-line type based on interval."""
-        kline_map = {
-            "minute": "1",
-            "hour": "60",
-            "day": "101",
-            "week": "102",
-            "month": "103",
-            "year": "103",
-        }
-
-        base_klt = kline_map.get(self.interval, "101")
-
-        if self.interval == "minute" and self.interval_multiplier in [5, 15, 30, 60]:
-            return str(self.interval_multiplier)
-
-        return base_klt
-
-    def _get_adjust_type(self) -> str:
-        """Get adjustment type."""
-        adjust_map = {"none": "0", "qfq": "1", "hfq": "2"}
-        return adjust_map.get(self.adjust, "0")
-
-    def _validate_interval_params(self) -> None:
-        """Validates the interval and multiplier."""
-        if self.interval not in self.get_supported_intervals():
-            raise ValueError(f"Unsupported interval: {self.interval}")
-        if self.interval in ["minute", "hour"] and self.interval_multiplier < 1:
-            raise ValueError("Interval multiplier must be >= 1 for minute/hour.")
+import pandas as pd
+from .base import HistoricalDataProvider
+from ..cache import cache
+from akshare_one.eastmoney.client import EastMoneyClient
+from akshare_one.eastmoney.utils import parse_kline_data, resample_historical_data
+
+
+class EastMoneyDirectHistorical(HistoricalDataProvider):
+    """Direct implementation for EastMoney historical stock data API"""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.client = EastMoneyClient()
+
+    @cache(
+        "hist_data_cache",
+        key=lambda self: f"eastmoney_direct_hist_{self.symbol}_{self.interval}_{self.interval_multiplier}_{self.adjust}",
+    )
+    def get_hist_data(self) -> pd.DataFrame:
+        """Fetches EastMoney historical market data directly from API"""
+        self.interval = self.interval.lower()
+        self._validate_interval_params()
+
+        try:
+            klt = self._get_kline_type()
+            fqt = self._get_adjust_type()
+            start_date = self.start_date.replace("-", "")
+            end_date = self.end_date.replace("-", "")
+
+            raw_data = self.client.fetch_historical_klines(
+                symbol=self.symbol,
+                klt=klt,
+                fqt=fqt,
+                start_date=start_date,
+                end_date=end_date,
+            )
+
+            if raw_data.get("rc") != 0:
+                raise ValueError(f"API returned error: {raw_data.get('msg')}")
+
+            df = parse_kline_data(raw_data)
+
+            df = resample_historical_data(df, self.interval, self.interval_multiplier)
+
+            return df
+
+        except Exception as e:
+            raise ValueError(f"Failed to fetch historical data for {self.symbol}: {e}")
+
+    def _get_kline_type(self) -> str:
+        """Get K-line type based on interval."""
+        kline_map = {
+            "minute": "1",
+            "hour": "60",
+            "day": "101",
+            "week": "102",
+            "month": "103",
+            "year": "103",
+        }
+
+        base_klt = kline_map.get(self.interval, "101")
+
+        if self.interval == "minute" and self.interval_multiplier in [5, 15, 30, 60]:
+            return str(self.interval_multiplier)
+
+        return base_klt
+
+    def _get_adjust_type(self) -> str:
+        """Get adjustment type."""
+        adjust_map = {"none": "0", "qfq": "1", "hfq": "2"}
+        return adjust_map.get(self.adjust, "0")
+
+    def _validate_interval_params(self) -> None:
+        """Validates the interval and multiplier."""
+        if self.interval not in self.get_supported_intervals():
+            raise ValueError(f"Unsupported interval: {self.interval}")
+        if self.interval in ["minute", "hour"] and self.interval_multiplier < 1:
+            raise ValueError("Interval multiplier must be >= 1 for minute/hour.")

akshare_one/modules/historical/factory.py

@@ -1,48 +1,48 @@
-from .base import HistoricalDataProvider
-from .eastmoney import EastMoneyHistorical
-from .eastmoney_direct import EastMoneyDirectHistorical
-from .sina import SinaHistorical
-
-
-class HistoricalDataFactory:
-    """
-    Factory class for creating historical data providers
-    """
-
-    _providers = {
-        "eastmoney": EastMoneyHistorical,
-        "eastmoney_direct": EastMoneyDirectHistorical,
-        "sina": SinaHistorical,
-    }
-
-    @classmethod
-    def get_provider(cls, provider_name: str, **kwargs) -> HistoricalDataProvider:
-        """
-        Get a historical data provider by name
-
-        Args:
-            provider_name: Name of the provider (e.g., 'eastmoney')
-            **kwargs: Additional arguments to pass to the provider's constructor
-
-        Returns:
-            HistoricalDataProvider: An instance of the requested provider
-
-        Raises:
-            ValueError: If the requested provider is not found
-        """
-        provider_class = cls._providers.get(provider_name.lower())
-        if not provider_class:
-            raise ValueError(f"Unknown historical data provider: {provider_name}")
-
-        return provider_class(**kwargs)
-
-    @classmethod
-    def register_provider(cls, name: str, provider_class: type):
-        """
-        Register a new historical data provider
-
-        Args:
-            name: Name to associate with this provider
-            provider_class: The provider class to register
-        """
-        cls._providers[name.lower()] = provider_class
+from .base import HistoricalDataProvider
+from .eastmoney import EastMoneyHistorical
+from .eastmoney_direct import EastMoneyDirectHistorical
+from .sina import SinaHistorical
+
+
+class HistoricalDataFactory:
+    """
+    Factory class for creating historical data providers
+    """
+
+    _providers = {
+        "eastmoney": EastMoneyHistorical,
+        "eastmoney_direct": EastMoneyDirectHistorical,
+        "sina": SinaHistorical,
+    }
+
+    @classmethod
+    def get_provider(cls, provider_name: str, **kwargs) -> HistoricalDataProvider:
+        """
+        Get a historical data provider by name
+
+        Args:
+            provider_name: Name of the provider (e.g., 'eastmoney')
+            **kwargs: Additional arguments to pass to the provider's constructor
+
+        Returns:
+            HistoricalDataProvider: An instance of the requested provider
+
+        Raises:
+            ValueError: If the requested provider is not found
+        """
+        provider_class = cls._providers.get(provider_name.lower())
+        if not provider_class:
+            raise ValueError(f"Unknown historical data provider: {provider_name}")
+
+        return provider_class(**kwargs)
+
+    @classmethod
+    def register_provider(cls, name: str, provider_class: type):
+        """
+        Register a new historical data provider
+
+        Args:
+            name: Name to associate with this provider
+            provider_class: The provider class to register
+        """
+        cls._providers[name.lower()] = provider_class