hkjc 0.3.18__py3-none-any.whl → 0.3.19__py3-none-any.whl

hkjc/__init__.py

@@ -4,10 +4,10 @@ This module re-exports commonly used symbols from the submodules.
 """
 from importlib.metadata import version as _version
 
-__all__ = ["live", "qpbanker",
+__all__ = ["live", "features",
            "generate_all_qp_trades", "generate_all_pla_trades", "pareto_filter",
-                        "speedpro_energy", "speedmap", "harveille_model",
-                        "generate_historical_data"]
+           "speedpro_energy", "speedmap", "harveille_model",
+           "generate_historical_data"]
 
 try:
     __version__ = _version(__name__)
@@ -17,4 +17,4 @@ except Exception:  # pragma: no cover - best-effort version resolution
 from .processing import generate_all_qp_trades, generate_all_pla_trades, generate_historical_data
 from .utils import pareto_filter
 from .speedpro import speedmap, speedpro_energy
-from . import harville_model, live
+from . import harville_model, live, features

hkjc/features.py

@@ -0,0 +1,6 @@
+""" Polars expressions to commonly-used analysis features, subject to frequent changes.
+"""
+import polars as pl
+
+rating_diff = (pl.col('Rtg').max().over('RaceId')-pl.col('Rtg')).alias('RtgDiff')
+frontrunner_pct = (pl.col('FavoriteRunningStyle')=='FrontRunner').mean().over('RaceId').alias('FRPct')

hkjc/historical.py

@@ -52,11 +52,13 @@ def _classify_running_style(df: pl.DataFrame, running_pos_col="RunningPosition")
         .alias("split_data").cast(pl.Int64, strict=False)
     ).unnest("split_data")
 
-    df = df.with_columns(pl.col('FinishPosition').fill_null(pl.col('Position3')))
+    df = df.with_columns(
+        pl.col('FinishPosition').fill_null(pl.col('Position3')))
 
     df = df.with_columns([
         (pl.col("StartPosition")-pl.col("FinishPosition")).alias("PositionChange"),
-        pl.mean_horizontal("StartPosition", "Position2").alias("AvgStartPosition"),
+        pl.mean_horizontal("StartPosition", "Position2").alias(
+            "AvgStartPosition"),
     ]).with_columns(pl.when(pl.col("StartPosition").is_null()).then(pl.lit("--"))
                     .when((pl.col("AvgStartPosition") <= 3) & (pl.col("StartPosition") <= 3)).then(pl.lit("FrontRunner"))
                     .when((pl.col("PositionChange") >= 1) & (pl.col("StartPosition") >= 6)).then(pl.lit("Closer"))
@@ -77,35 +79,7 @@ def _extract_horse_data(horse_no: str) -> pl.DataFrame:
         pl.col('Date') != '')  # Remove empty rows
     horse_data = _classify_running_style(horse_data)
 
-    # Extract horse profile info
-    table = soup.find_all('table', class_='table_eng_text')
-    profile_data = _parse_html_table(table[0], skip_header=True)
-    profile_data = _parse_html_table(table[1], skip_header=True)
-
-    try:
-        current_rating = int(profile_data.filter(
-            pl.col("column_0").str.starts_with("Current Rating"))['column_2'].item(0))
-        season_start_rating = int(profile_data.filter(pl.col(
-            "column_0").str.starts_with("Start of Season Rating"))['column_2'].item(0))
-    except:
-        current_rating, season_start_rating = 0, 0
-
-    try:
-        last_rating = int(profile_data.filter(
-            pl.col("column_0").str.starts_with("Last Rating"))['column_2'].item(0))
-    except:
-        last_rating = 0
-
-    horse_info = {
-        'HorseID': horse_no,
-        'CurrentRating': current_rating,
-        'SeasonStartRating': season_start_rating,
-        'LastRating': last_rating if current_rating == 0 else current_rating
-    }
-    horse_data = (horse_data.with_columns([
-        pl.lit(value).alias(key) for key, value in horse_info.items()
-    ])
-    )
+    horse_data = horse_data.with_columns(pl.lit(horse_no).alias('HorseNo'))
 
     return horse_data
 
@@ -124,16 +98,16 @@ def _clean_horse_data(df: pl.DataFrame) -> pl.DataFrame:
         pl.col('Dr').cast(pl.Int64, strict=False),
         pl.col('Rtg').cast(pl.Int64, strict=False),
         pl.col('Dist').cast(pl.Int64, strict=False),
-        pl.col('WinOdds').cast(pl.Float64, strict=False),
-        pl.col('RaceIndex').cast(pl.Int64, strict=False)
+        pl.col('WinOdds').cast(pl.Float64, strict=False)
     ])
 
-    df = df.with_columns(
+    df = (df.filter(~pl.col('FinishTime').str.starts_with('--'))
+          .with_columns(
         (
-            pl.col("FinishTime").str.split_exact(".", 1).struct.field("field_0").cast(pl.Int64) * 60 +
-            pl.col("FinishTime").str.split_exact(".", 1).struct.field("field_1").cast(pl.Int64)
-        ).cast(pl.Float64).alias("FinishTime")
-    )
+            pl.col("FinishTime").str.splitn(".", 2).struct.field("field_0").cast(pl.Int64) * 60 +
+            pl.col("FinishTime").str.splitn(".", 2).struct.field("field_1").cast(pl.Float64)
+        ).cast(pl.Float64).round(2).alias("FinishTime")
+    ))
 
     df = df.with_columns(
         pl.col('RCTrackCourse').str.split_exact(' / ', 2)
@@ -141,12 +115,22 @@ def _clean_horse_data(df: pl.DataFrame) -> pl.DataFrame:
         .alias('RCTrackCourse')
     ).unnest('RCTrackCourse')
 
+    df = df.with_columns(
+        pl.when(pl.col('Date').str.len_chars() <= 8)
+        .then(pl.col('Date').str.strptime(pl.Date, '%d/%m/%y', strict=False))
+        .otherwise(pl.col('Date').str.strptime(pl.Date, '%d/%m/%Y'))
+    ).with_columns(
+        pl.concat_str(pl.col('Date').dt.strftime('%Y%m%d'), pl.col(
+            'Venue'), pl.col('RaceIndex')).alias('RaceId')
+    ).drop("VideoReplay")
     return df
 
+
 def get_horse_data(horse_no: str) -> pl.DataFrame:
     df = _extract_horse_data(horse_no)
     return _clean_horse_data(df)
 
+
 def _clean_race_data(df: pl.DataFrame) -> pl.DataFrame:
     """ Clean and convert horse data to suitable data types
     """
@@ -165,13 +149,14 @@ def _clean_race_data(df: pl.DataFrame) -> pl.DataFrame:
 
     df = df.with_columns(
         (
-            pl.col("FinishTime").str.split_exact(":", 1).struct.field("field_0").cast(pl.Int64) * 60 +
-            pl.col("FinishTime").str.split_exact(":", 1).struct.field("field_1").cast(pl.Int64)
-        ).cast(pl.Float64).alias("FinishTime")
+            pl.col("FinishTime").str.splitn(":", 2).struct.field("field_0").cast(pl.Int64) * 60 +
+            pl.col("FinishTime").str.splitn(":", 2).struct.field("field_1").cast(pl.Float64)
+        ).cast(pl.Float64).round(2).alias("FinishTime")
     )
 
     return df
 
+
 def _extract_race_data(date: str, venue_code: str, race_number: int) -> pl.DataFrame:
     soup = _soupify_race_page(date, venue_code, race_number)
     table = soup.find('div', class_='race_tab').find('table')
@@ -211,5 +196,5 @@ def _extract_race_data(date: str, venue_code: str, race_number: int) -> pl.DataF
 
 
 def get_race_data(date: str, venue_code: str, race_number: int) -> pl.DataFrame:
-    df = _extract_race_data(date,venue_code,race_number)
-    return _clean_race_data(df)
+    df = _extract_race_data(date, venue_code, race_number)
+    return _clean_race_data(df)

hkjc/live.py

@@ -7,8 +7,6 @@ import requests
 from cachetools.func import ttl_cache
 import numpy as np
 
-from .utils import _validate_date, _validate_venue_code
-
 HKJC_LIVEODDS_ENDPOINT = "https://info.cld.hkjc.com/graphql/base/"
 
 RACEMTG_PAYLOAD = {
@@ -245,7 +243,7 @@ query racing($date: String, $venueCode: String, $oddsTypes: [OddsType], $raceNo:
 
 
 @ttl_cache(maxsize=12, ttl=1000)
-def _fetch_live_races(date: str, venue_code: str) -> dict:
+def _fetch_live_races(date: str=None, venue_code: str=None) -> dict:
     """Fetch live race data from HKJC GraphQL endpoint."""
     payload = RACEMTG_PAYLOAD.copy()
     payload["variables"] = payload["variables"].copy()
@@ -265,9 +263,10 @@ def _fetch_live_races(date: str, venue_code: str) -> dict:
     if r.status_code != 200:
         raise RuntimeError(f"Request failed: {r.status_code} - {r.text}")
 
-    races = r.json()['data']['raceMeetings'][0]['races']
+    data = r.json()['data']['raceMeetings'][0]
+    races = data['races']
 
-    race_info = {}
+    race_info = {'Date': data['date'], 'Venue': data['venueCode'], 'Races': {}}
     for race in races:
         race_num = race['no']
         race_name = race['raceName_en']
@@ -277,12 +276,15 @@ def _fetch_live_races(date: str, venue_code: str) -> dict:
         race_class = race['raceClass_en']
         race_course = race['raceCourse']['displayCode']
 
-        runners = [{'Dr': runner['barrierDrawNumber'],
-                    'Rtg' : int(runner['currentRating']),
-                    'Wt' : int(runner['currentWeight']),
+        runners = [{'No': runner['no'],
+                    'Name': runner['name_en'],
+                    'Dr': runner['barrierDrawNumber'],
+                    'Rtg': int(runner['currentRating']),
+                    'Wt': int(runner['currentWeight']),
+                    'Handicap': int(runner['handicapWeight']),
                     'HorseNo': runner['horse']['code']
-                    } for runner in race['runners']]
-        race_info[race_num]={
+                    } for runner in race['runners'] if runner['status'] != "Standby"]
+        race_info['Races'][race_num] = {
             'No': race_num,
             'Name': race_name,
             'Class': race_class,
@@ -290,13 +292,13 @@ def _fetch_live_races(date: str, venue_code: str) -> dict:
             'Dist': race_dist,
             'Going': race_going,
             'Track': race_track,
-            'Runners': runners            
+            'Runners': runners
         }
     return race_info
 
 
 @ttl_cache(maxsize=12, ttl=30)
-def _fetch_live_odds(date: str, venue_code: str, race_number: int, odds_type: Tuple[str] = ('PLA', 'QPL')) -> List[dict]:
+def _fetch_live_odds(date: str, venue_code: str, race_number: int, odds_type: Tuple[str] = ('PLA', )) -> List[dict]:
     """Fetch live odds data from HKJC GraphQL endpoint."""
     payload = LIVEODDS_PAYLOAD.copy()
     payload["variables"] = payload["variables"].copy()
@@ -329,14 +331,14 @@ def _fetch_live_odds(date: str, venue_code: str, race_number: int, odds_type: Tu
     ]
 
 
-def live_odds(date: str, venue_code: str, race_number: int, odds_type: List[str] = ['PLA', 'QPL']) -> dict:
+def live_odds(date: str, venue_code: str, race_number: int, odds_type: List[str] = ['WIN', 'PLA', 'QPL', 'QIN']) -> dict:
     """Fetch live odds as numpy arrays.
 
     Args:
         date (str): Date in 'YYYY-MM-DD' format.
         venue_code (str): Venue code, e.g., 'ST' for Shatin, 'HV' for Happy Valley.
         race_number (int): Race number.
-        odds_type (List[str]): Types of odds to fetch. Default is ['PLA', 'QPL']. Currently the following types are supported:
+        odds_type (List[str]): Types of odds to fetch. Default is ['WIN', 'PLA', 'QPL', 'QIN']. Currently the following types are supported:
             - 'WIN': Win odds
             - 'PLA': Place odds
             - 'QIN': Quinella odds
@@ -348,11 +350,13 @@ def live_odds(date: str, venue_code: str, race_number: int, odds_type: List[str]
             If odds_type is 'WIN','PLA', returns a 1D array of place odds.
             If odds_type is 'QIN','QPL', returns a 2D array of quinella place odds. 
     """
-    _validate_date(date)
-    _validate_venue_code(venue_code)
-
     race_info = _fetch_live_races(date, venue_code)
-    N = len(race_info[race_number]['Runners'])
+    N = len(race_info['Races'][race_number]['Runners'])
+
+    if (race_info['Date'] != date) or (race_info['Venue'] != venue_code):
+        print(f"[WARNING] Requested {date} {venue_code} but server returned {race_info['Date']} {race_info['Venue']}.")
+        date = race_info['Date']
+        venue_code = race_info['Venue']
 
     data = _fetch_live_odds(date, venue_code, race_number,
                             odds_type=tuple(odds_type))

hkjc/processing.py

@@ -63,7 +63,12 @@ def generate_historical_data(start_date: str, end_date: str) -> pl.DataFrame:
     # Use horse track records
     dfs = [_extract_horse_data(horse_id) for horse_id in tqdm(horse_ids, desc='Processing horses ...', leave=False)]
     df = pl.concat(dfs)
-    return _clean_horse_data(df)
+
+    try:
+        return _clean_horse_data(df).filter(pl.col('Date').is_between(start_dt, end_dt))
+    except:
+        print('Failed to clean data. Returning raw data for debug.')
+    return df
 
 
 # ==========================

{hkjc-0.3.18.dist-info → hkjc-0.3.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hkjc
-Version: 0.3.18
+Version: 0.3.19
 Summary: Library for scrapping HKJC data and perform basic analysis
 Requires-Python: >=3.11
 Requires-Dist: beautifulsoup4>=4.14.2

hkjc-0.3.19.dist-info/RECORD

@@ -0,0 +1,14 @@
+hkjc/__init__.py,sha256=XSm9N6YbZ2SzyxjO9aR26ctB4Z1-VeBImuroSgncUfk,737
+hkjc/features.py,sha256=1mcF9Pq2LsnQ8yIv2F8Uyg1HXz7LdNcPf9RDzFN3sbA,297
+hkjc/harville_model.py,sha256=MZjPLS-1nbEhp1d4Syuq13DtraKnd7TlNqBmOOCwxgc,15976
+hkjc/historical.py,sha256=Yujb4Q2cTkvVvvZxVaSoawbwwxfzq03lprG_s_4H7Dk,7682
+hkjc/live.py,sha256=CfMeHRQfhKSmhQaexM99sdP0KRbIEqg2DIvNPc1gohk,10696
+hkjc/processing.py,sha256=uNjM5eeH9Mj8Dg9-9K7z-7xeufaXJT42F49zUHzj0h0,6968
+hkjc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hkjc/speedpro.py,sha256=Y2Z3GYGeePc4sM-ZnCHXCI1N7L-_j9nrMqS3CC5BBSo,2031
+hkjc/utils.py,sha256=4CA_FPf_U3GvzoLkqBX0qDPZgrSvKJKvbP7VWqd5FiA,6323
+hkjc/strategy/place_only.py,sha256=lHPjTSj8PzghxncNBg8FI4T4HJigekB9a3bV7l7VtPA,2079
+hkjc/strategy/qpbanker.py,sha256=MQxjwsfhllKZroKS8w8Q3bi3HMjGc1DAyBIjNZAp3yQ,4805
+hkjc-0.3.19.dist-info/METADATA,sha256=npklDb_gSAZHliXMNDZYOlRIuV_Klkzgw4ELdW9zzjc,480
+hkjc-0.3.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hkjc-0.3.19.dist-info/RECORD,,

hkjc/analysis.py

@@ -1,3 +0,0 @@
-# TODO:
-
-# Generate filtered live odds, fav run style, dr, current rating, season start rating, track record

hkjc-0.3.18.dist-info/RECORD

@@ -1,14 +0,0 @@
-hkjc/__init__.py,sha256=5A9MzcITYJDcA2UbIBpkimZBYSqS4pgRuQJhTagOfpE,753
-hkjc/analysis.py,sha256=0042_NMIkQCl0J6B0P4TFfrBDCnm2B6jsCZKOEO30yI,108
-hkjc/harville_model.py,sha256=MZjPLS-1nbEhp1d4Syuq13DtraKnd7TlNqBmOOCwxgc,15976
-hkjc/historical.py,sha256=v9k_R47Na5en5ftrocjIHofkNAUthE_lp4CyLaCTsQE,8280
-hkjc/live.py,sha256=GqctH-BVdIL6Vi1g8XHe3p8fZBopCQf5KACLAR0meP0,10249
-hkjc/processing.py,sha256=H0chtW_FBMMhK3IzcjYjrryd3fAPYimanc2fWuGiB0M,6807
-hkjc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hkjc/speedpro.py,sha256=Y2Z3GYGeePc4sM-ZnCHXCI1N7L-_j9nrMqS3CC5BBSo,2031
-hkjc/utils.py,sha256=4CA_FPf_U3GvzoLkqBX0qDPZgrSvKJKvbP7VWqd5FiA,6323
-hkjc/strategy/place_only.py,sha256=lHPjTSj8PzghxncNBg8FI4T4HJigekB9a3bV7l7VtPA,2079
-hkjc/strategy/qpbanker.py,sha256=MQxjwsfhllKZroKS8w8Q3bi3HMjGc1DAyBIjNZAp3yQ,4805
-hkjc-0.3.18.dist-info/METADATA,sha256=aoXp6Fvn3EkuXyv6p5LClSbZa5XS_bfcUxMKBJXcNvw,480
-hkjc-0.3.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hkjc-0.3.18.dist-info/RECORD,,