koleo-cli 0.2.137.22__py3-none-any.whl → 0.2.137.23__py3-none-any.whl

koleo/api/client.py

@@ -215,7 +215,31 @@ class KoleoAPI(BaseAPIClient):
         return res.json().get("price")
 
     async def get_current_session(self) -> CurrentSession:
-        return (await self.get(f"/sessions/current", use_auth=True)).json()
+        return (await self.get("/sessions/current", use_auth=True)).json()
 
     async def get_current_user(self) -> CurrentUser:
-        return (await self.get(f"/users/current", use_auth=True)).json()
+        return (await self.get("/users/current", use_auth=True)).json()
+
+    async def v3_connection_search(
+        self,
+        start_station_id: int,
+        end_station_id: int,
+        brand_ids: list[int],
+        date: datetime,
+        direct: bool = False,
+    ) -> list[V3ConnectionResult]:
+        data = {
+            "start_id": start_station_id,
+            "end_id": end_station_id,
+            "departure_after": date.isoformat(),
+            "only_direct": direct,
+        }
+        if brand_ids:
+            data["allowed_brands"] = brand_ids
+        return (await self.post("/api/v2/main/eol_connections/search", json=data)).json()
+
+    async def v3_get_price(self, id: str) -> V3Price:
+        return (await self.get(f"/api/v2/main/eol_connections/{id}/price")).json()
+
+    async def get_carrier_lines(self, carrier_slug: str) -> list[CarrierLine]:
+        return (await self.get(f"/api/v2/main/carrier_lines/{carrier_slug}")).json()["list"]

koleo/api/types.py

@@ -486,3 +486,87 @@ class TrainAttribute(t.TypedDict):
     short_name: str
     rank: int
     warning: bool
+
+
+class AttributeWithAnnotation(t.TypedDict):
+    attribute_definition_id: int
+    annotation: str
+
+
+class V3LegStop(t.TypedDict):
+    station_id: int
+    arrival: str
+    departure: str
+    commercial_brand_id: int
+    internal_brand_id: int
+    train_nr: int
+    platform: str
+    track: str
+    for_alighting: bool
+    for_boarding: bool
+    request_stop: bool
+
+
+V3LegType = t.Literal["train_leg"]
+
+
+class V3ConnectionLeg(t.TypedDict):
+    leg_type: V3LegType
+    train_id: int
+    train_nr: int
+    train_name: str
+    train_full_name: str
+    operating_day: str  # YYYY-MM-DD
+    commercial_brand_id: int
+    internal_brand_id: int
+    constrictions: list[AttributeWithAnnotation]
+    duration: int  # minutes
+    origin_station_id: int
+    destination_station_id: int
+    departure: str  # iso with tz
+    arrival: str
+    departure_platform: str  # roman
+    departure_track: str  # arabic
+    arrival_platform: str
+    arrival_track: str
+    stops_before_leg: list[V3LegStop]
+    stops_in_leg: list[V3LegStop]
+    stops_after_leg: list[V3LegStop]
+    attributes: list[AttributeWithAnnotation]
+
+
+class V3ConnectionResult(t.TypedDict):
+    uuid: str
+    eol_response_version: int
+    departure: str  # datetime iso
+    arrival: str  # datetime iso
+    origin_station_id: int
+    destination_station_id: int
+    duration: int  # minutes
+    changes: int
+    constrictions: list[AttributeWithAnnotation]
+    legs: list[V3ConnectionLeg]
+
+
+class V3PricePerPassenger(t.TypedDict):
+    value: str # zł.gr
+    passenger_id: int | None
+
+
+class V3Price(t.TypedDict):
+    price: str # zł.gr
+    uncertain: bool
+    price_label: str | None
+    is_child_birthday_required: bool
+    needs_document: bool
+    purchasable: bool
+    purchasable_errors: list[ErrorDict]
+    price_per_passengers: list[V3PricePerPassenger]
+    additional_info: str
+
+
+class CarrierLine(t.TypedDict):
+    start_station_name: str
+    start_station_slug: str
+    end_station_name: str
+    end_station_slug: str

koleo/args.py

@@ -1,6 +1,6 @@
 from argparse import ArgumentParser
-from datetime import datetime
 from asyncio import run
+from datetime import datetime
 from inspect import isawaitable
 
 from .api import KoleoAPI
@@ -245,7 +245,9 @@ def main():
         default=False,
     )
     train_connection_stats.add_argument("connection_id", help="The koleo ID", type=int)
-    train_connection_stats.set_defaults(func=cli.train_connection_stats_view, pass_=["connection_id", "type", "detailed"])
+    train_connection_stats.set_defaults(
+        func=cli.train_connection_stats_view, pass_=["connection_id", "type", "detailed"]
+    )
 
     aliases = subparsers.add_parser("aliases", help="Save quick aliases for station names!")
     aliases.set_defaults(func=cli.alias_list_view)

koleo/cli/__init__.py

@@ -1,9 +1,9 @@
 from .aliases import Aliases
-from .station_board import StationBoard
 from .connections import Connections
-from .train_info import TrainInfo
 from .seats import Seats
+from .station_board import StationBoard
 from .stations import Stations
+from .train_info import TrainInfo
 
 
 class CLI(Aliases, StationBoard, Connections, Seats, Stations): ...

koleo/cli/aliases.py

@@ -3,7 +3,7 @@ from .base import BaseCli
 
 class Aliases(BaseCli):
     def alias_list_view(self):
-        self.print(f"[bold][green]alias[/green] → [red]station[/red][/bold]:")
+        self.print("[bold][green]alias[/green] → [red]station[/red][/bold]:")
         for n, (k, v) in enumerate(self.storage.aliases.items()):
             self.print(f"{n}. [bold][green]{k}[/green] → [red]{v}[/red][/bold]")
 

koleo/cli/base.py

@@ -1,10 +1,11 @@
-from koleo.api import KoleoAPI
-from koleo.storage import Storage
-from koleo.api.types import ExtendedStationInfo, TrainOnStationInfo, TrainStop
-from koleo.utils import koleo_time_to_dt, name_to_slug, convert_platform_number
+import re
 
 from rich.console import Console
-import re
+
+from koleo.api import KoleoAPI
+from koleo.api.types import ExtendedStationInfo, TrainOnStationInfo, TrainStop
+from koleo.storage import Storage
+from koleo.utils import convert_platform_number, koleo_time_to_dt, name_to_slug
 
 
 class BaseCli:
@@ -109,7 +110,7 @@ class BaseCli:
         brands = await self.get_brands()
         s = s.upper()
         if name and "SŁONECZNY" in name and s == "KM":
-            return "SLONECZNY" # OH MY FUCKING GOD
+            return "SLONECZNY"  # OH MY FUCKING GOD
         if s == "AR":
             return "ARRIVARP"
         if s not in [i["name"] for i in brands]:

koleo/cli/connections.py

@@ -1,12 +1,12 @@
 from asyncio import gather
-
-from .base import BaseCli
-from .utils import format_price
-
 from datetime import datetime, timedelta
+
 from koleo.api.types import ConnectionDetail
 from koleo.utils import koleo_time_to_dt
 
+from .base import BaseCli
+from .utils import format_price
+
 
 class Connections(BaseCli):
     async def connections_view(
@@ -33,7 +33,7 @@ class Connections(BaseCli):
                 if i["name"].lower().strip() in brands or i["logo_text"].lower().strip() in brands
             }
             if not connection_brands:
-                await self.error_and_exit(f'No brands match: [underline]{', '.join(brands)}[/underline]')
+                await self.error_and_exit(f'No brands match: [underline]{", ".join(brands)}[/underline]')
         results: list[ConnectionDetail] = []
         fetch_date = date
         while len(results) < length:

koleo/cli/seats.py

@@ -1,10 +1,12 @@
-from .train_info import TrainInfo
+import typing as t
+from asyncio import gather
 from datetime import datetime
 from asyncio import gather
 
-from koleo.api import SeatsAvailabilityResponse, SeatState
-
+from koleo.api import SeatState, SeatsAvailabilityResponse
 from koleo.utils import BRAND_SEAT_TYPE_MAPPING, koleo_time_to_dt
+
+from .train_info import TrainInfo
 from .utils import CLASS_COLOR_MAP
 
 
@@ -49,16 +51,20 @@ class Seats(TrainInfo):
             direct=True,
             date=koleo_time_to_dt(train_stops_by_slug[first_station]["departure"], base_date=date),
         )
-        connection = next(iter(i for i in connections if i["trains"][0]["train_id"] == train_details["train"]["id"]), None)
+        connection = next(
+            iter(i for i in connections if i["trains"][0]["train_id"] == train_details["train"]["id"]), None
+        )
         if connection is None:
-            await self.error_and_exit("Train not found:<")
+            await self.error_and_exit("Train connection not found:<\nplease try clearing the cache")
         connection_train = connection["trains"][0]
         if connection_train["brand_id"] not in BRAND_SEAT_TYPE_MAPPING:
             await self.error_and_exit(f"Brand [underline]{connection_train["brand_id"]}[/underline] is not supported.")
         await self.show_train_header(
             train_details, train_stops_by_slug[first_station], train_stops_by_slug[last_station]
         )
-        await self.train_seat_info(connection["id"], type, connection_train["brand_id"], connection_train["train_nr"], detailed=detailed)
+        await self.train_seat_info(
+            connection["id"], type, connection_train["brand_id"], connection_train["train_nr"], detailed=detailed
+        )
 
     async def train_connection_stats_view(self, connection_id: int, type: str | None, detailed: bool = False):
         connection = await self.client.get_connection(connection_id)
@@ -72,13 +78,7 @@ class Seats(TrainInfo):
         await self.train_seat_info(connection_id, type, train["brand_id"], train["train_nr"], detailed=detailed)
 
     async def train_seat_info(
-        self,
-        connection_id: int,
-        type: str | None,
-        brand_id: int,
-        train_nr: int,
-        *,
-        detailed: bool = False
+        self, connection_id: int, type: str | None, brand_id: int, train_nr: int, *, detailed: bool = False
     ):
         seat_name_map = BRAND_SEAT_TYPE_MAPPING[brand_id]
         if type is not None:
@@ -98,26 +98,22 @@ class Seats(TrainInfo):
             for seat in result["seats"]:
                 counters[seat["state"]] += 1
             color = CLASS_COLOR_MAP.get(seat_name_map[seat_type], "")
-            self.print(f"[bold {color}]{seat_name_map[seat_type]}: [/bold {color}]")
             total = sum(i for i in counters.values())
-            self.print(
-                f"  Free: [{color}]{counters["FREE"]}/{total}, ~{counters["FREE"]/total*100:.1f}%[/{color}]"
-            )
-            self.print(
-                f"  Reserved: [{color}]{counters["RESERVED"]}[/{color}]"
-            )
-            self.print(
-                f"  Blocked: [underline {color}]{counters["BLOCKED"]}[/underline {color}]"
-            )
+            if not total:
+                continue
+            self.print(f"[bold {color}]{seat_name_map[seat_type]}: [/bold {color}]")
+            self.print(f"  Free: [{color}]{counters["FREE"]}/{total}, ~{counters["FREE"]/total*100:.1f}%[/{color}]")
+            self.print(f"  Reserved: [{color}]{counters["RESERVED"]}[/{color}]")
+            self.print(f"  Blocked: [underline {color}]{counters["BLOCKED"]}[/underline {color}]")
             taken = counters["BLOCKED"] + counters["RESERVED"]
-            self.print(
-                f"  Total: [underline {color}]{taken}/{total}, ~{taken/total*100:.1f}%[/underline {color}]"
-            )
+            self.print(f"  Total: [underline {color}]{taken}/{total}, ~{taken/total*100:.1f}%[/underline {color}]")
 
-        if detailed: # super temporary!!!!!!
+        if detailed:  # super temporary!!!!!!
             for seat_type, result in res.items():
                 type_color = CLASS_COLOR_MAP.get(seat_name_map[seat_type], "")
                 self.print(f"[bold {type_color}]{seat_name_map[seat_type]}: [/bold {type_color}]")
                 for seat in result["seats"]:
                     color = "green" if seat["state"] == "FREE" else "red"
-                    self.print(f" [{type_color}]{seat["carriage_nr"]}[/{type_color}] {seat['seat_nr']}: [{color}]{seat["state"]}[/{color}]")
+                    self.print(
+                        f" [{type_color}]{seat["carriage_nr"]}[/{type_color}] {seat['seat_nr']}: [{color}]{seat["state"]}[/{color}]"
+                    )

koleo/cli/train_info.py

@@ -1,10 +1,11 @@
-from .base import BaseCli
 from asyncio import gather
-
 from datetime import datetime, timedelta
+
 from koleo.api.types import TrainCalendar, TrainDetailResponse, TrainStop
 from koleo.utils import koleo_time_to_dt
 
+from .base import BaseCli
+
 
 class TrainInfo(BaseCli):
     async def get_train_calendars(self, brand: str, name: str) -> list[TrainCalendar]:
@@ -22,7 +23,7 @@ class TrainInfo(BaseCli):
         cache_id = f"tc-{brand}-{number}-{name}"
         try:
             train_calendars = self.storage.get_cache(cache_id) or self.storage.set_cache(
-                cache_id, await self.client.get_train_calendars(brand, number, train_name)
+                cache_id, await self.client.get_train_calendars(brand, number, train_name), ttl=3600
             )
         except self.client.errors.KoleoNotFound:
             await self.error_and_exit(f"Train not found: [underline]nr={number}, name={train_name}[/underline]")
@@ -95,9 +96,7 @@ class TrainInfo(BaseCli):
         brand = brand_obj.get("logo_text", "")
         url_brand = await self.get_brand_by_shortcut(brand, name=train_details["train"]["train_full_name"])
 
-        link = (
-            f"https://koleo.pl/pociag/{url_brand}/{train_details["train"]["train_full_name"].replace(" ", "-", 1).replace(" ", "%20")}"
-        )
+        link = f"https://koleo.pl/pociag/{url_brand}/{train_details["train"]["train_full_name"].replace(" ", "-", 1).replace(" ", "%20")}"
         if date:
             link += f"/{date}"
         self.print(

koleo/cli/utils.py

@@ -1,5 +1,6 @@
 from koleo.api.types import Price
 
+
 CLASS_COLOR_MAP = {
     "Klasa 2": "bright_green",
     "Economy": "bright_green",

koleo/storage.py

@@ -1,11 +1,12 @@
 import typing as t
 from dataclasses import asdict, dataclass, field
-from orjson import dumps, loads
 from os import makedirs
 from os import path as ospath
 from sys import platform
 from time import time
 
+from orjson import dumps, loads
+
 
 if t.TYPE_CHECKING:
     from yt_dlp.cookies import YoutubeDLCookieJar

koleo/utils.py

@@ -1,7 +1,7 @@
 from argparse import Action
 from datetime import datetime, time, timedelta
 
-from .api.types import TimeDict, SeatsAvailabilityResponse, TrainComposition, CarriageType
+from .api.types import CarriageType, SeatsAvailabilityResponse, TimeDict, TrainComposition
 
 
 def parse_datetime(s: str):

{koleo_cli-0.2.137.22.dist-info → koleo_cli-0.2.137.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: koleo-cli
-Version: 0.2.137.22
+Version: 0.2.137.23
 Summary: Koleo CLI
 Home-page: https://github.com/lzgirlcat/koleo-cli
 Author: Zoey !

koleo_cli-0.2.137.23.dist-info/RECORD

@@ -0,0 +1,26 @@
+koleo/__init__.py,sha256=dp6PfGcuWP50QBWhjnT-zS03l3KzzYnMJnUeYMKBayc,51
+koleo/__main__.py,sha256=zRwdn7wRjqzWyDIoQ8PDDd_K2GizFIto35uO-mGFwsQ,63
+koleo/args.py,sha256=cCOwKOb6s4Am6cypHdRb8Wnkv8Uv5vJuRgukQjGRvtU,11039
+koleo/storage.py,sha256=ebeIIuUBGe96-AizFc3UVaDaczKGuBPwbL318Ft9vrU,4588
+koleo/utils.py,sha256=s58W1zNWQm1KFvvCunRVibrb-Zd7Rd1xWSZkxqr5zYw,4631
+koleo/api/__init__.py,sha256=3TfO8eBJcDCDXvIFobgyvN3Sfa1kQ2U0lm7gxEAsaWQ,50
+koleo/api/base.py,sha256=8wAasDQ1DBDI1PsPESmS3iUE5csIgaGT4DOX_A-hPwI,2070
+koleo/api/client.py,sha256=h2pGGsE8dZe5bePDOKOonSokMnoqgWE9aIWUcZBjPfs,9346
+koleo/api/errors.py,sha256=J9g75K9_yvnZ-7Hi521h0yGcw9NUNnTprQsIZ_mclO0,1324
+koleo/api/logging.py,sha256=VhOFY6N_mofFfg9ZJ5ZnDVCzNuRilqLqrzZU9b-hpZY,1644
+koleo/api/types.py,sha256=EGApqn-YuD1_9LxwsAttNT6kjFdQ7Ll4YQzT18Q--Q0,12574
+koleo/cli/__init__.py,sha256=AFG1RddD3iHryKrlBLC7nAPYOXNAnbwd6ps1ZDUW1lQ,266
+koleo/cli/aliases.py,sha256=RroIzuMFntUQABdj6SAYab2lH5SRTnUT8FtemNp1wHg,580
+koleo/cli/base.py,sha256=dtrPjcLB8GLoQM0yg5zPO6Xjln96aibX39EsjFTCeA4,4956
+koleo/cli/connections.py,sha256=UAcG5L-UW50JiaBY4xShEeMRMy1nZDg-BCPBUZ05Y3c,6873
+koleo/cli/seats.py,sha256=cswhtDQtJn3Y3LObAyt7sRfjkAyD6-8clMfh2j_0eyY,6399
+koleo/cli/station_board.py,sha256=lRGIeEKEOvUcctM6cwmqVE7Yk9m9R12gfFZahlWLQFc,3669
+koleo/cli/stations.py,sha256=6L3PBWc6xssyR9eeLacuvGBJmaY7Ny3DalKy2Xq7zsA,1633
+koleo/cli/train_info.py,sha256=aG6Srbha-dWTHH6zN-LTxAHamcJU_zZn859Y6fNJ7J4,7151
+koleo/cli/utils.py,sha256=ISbsabi6fBdCO2tf7X2FjodeG3iRjngFPW93VqMeLq4,667
+koleo_cli-0.2.137.23.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+koleo_cli-0.2.137.23.dist-info/METADATA,sha256=0HWKrqeCvbJS4W9F2_cp73yIfQxuq8Z8HVa8VIvXhK4,4731
+koleo_cli-0.2.137.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+koleo_cli-0.2.137.23.dist-info/entry_points.txt,sha256=ouWbMR_XWpEwV7zfkFKeiFLe_IMP-47kTvVahgy4PRg,42
+koleo_cli-0.2.137.23.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
+koleo_cli-0.2.137.23.dist-info/RECORD,,

koleo_cli-0.2.137.22.dist-info/RECORD

@@ -1,26 +0,0 @@
-koleo/__init__.py,sha256=dp6PfGcuWP50QBWhjnT-zS03l3KzzYnMJnUeYMKBayc,51
-koleo/__main__.py,sha256=zRwdn7wRjqzWyDIoQ8PDDd_K2GizFIto35uO-mGFwsQ,63
-koleo/args.py,sha256=glXMFflV4TMHA1JYEFf54MCry2bSLEOa7ap8bPiJZA0,11025
-koleo/storage.py,sha256=_-vpcO6MwbTsnCNWhaHe9xRKm9jpO0Xl0OOyXSmZJzs,4587
-koleo/utils.py,sha256=OAjm90SN1BqpgNF8OTAaR9atyLNYIGy5owZ2pLP5OAM,4631
-koleo/api/__init__.py,sha256=3TfO8eBJcDCDXvIFobgyvN3Sfa1kQ2U0lm7gxEAsaWQ,50
-koleo/api/base.py,sha256=8wAasDQ1DBDI1PsPESmS3iUE5csIgaGT4DOX_A-hPwI,2070
-koleo/api/client.py,sha256=Ru5M5ntp2vpQQI4VUaD1TCLIjNtJB4tkNCB4y766DUU,8457
-koleo/api/errors.py,sha256=J9g75K9_yvnZ-7Hi521h0yGcw9NUNnTprQsIZ_mclO0,1324
-koleo/api/logging.py,sha256=VhOFY6N_mofFfg9ZJ5ZnDVCzNuRilqLqrzZU9b-hpZY,1644
-koleo/api/types.py,sha256=udCQeDjRvUqrUkuE_-Jidzsq_FOCjNyGd_bQWm3f9iA,10594
-koleo/cli/__init__.py,sha256=50B_lMtZS27_FVrkIa2TOWMX7SozG1CPPMxbY1W9tqk,266
-koleo/cli/aliases.py,sha256=is3NX5g0-ujJTmyjlFLoNnK_pwoYUVIojWNkgwXRBKk,581
-koleo/cli/base.py,sha256=4vnQ4HS5GD6WXReWiJs1E7Bt8cDU4anlZCDb8xXqXS0,4954
-koleo/cli/connections.py,sha256=LJzoq3ADVUmBeqF4-h_me3pZbBHYg1sG3MaDYprwuLU,6873
-koleo/cli/seats.py,sha256=h7pRWdeQ8frHD1ZuiGZO6UGQRboty9PtiVHg49lkw4Q,6337
-koleo/cli/station_board.py,sha256=lRGIeEKEOvUcctM6cwmqVE7Yk9m9R12gfFZahlWLQFc,3669
-koleo/cli/stations.py,sha256=6L3PBWc6xssyR9eeLacuvGBJmaY7Ny3DalKy2Xq7zsA,1633
-koleo/cli/train_info.py,sha256=wWsbbvpNmm54_0FBvr_TEhhplhD8byKKYs_VvfpvOcs,7164
-koleo/cli/utils.py,sha256=FzPGcJdwRwcz10mYiW63Y4zpjM9j6DzNH91UNR3MS8s,666
-koleo_cli-0.2.137.22.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-koleo_cli-0.2.137.22.dist-info/METADATA,sha256=QQehYoUOPqA7BiVk7szVD7ZtBZ7vKqoWF0ClMndHITU,4731
-koleo_cli-0.2.137.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-koleo_cli-0.2.137.22.dist-info/entry_points.txt,sha256=ouWbMR_XWpEwV7zfkFKeiFLe_IMP-47kTvVahgy4PRg,42
-koleo_cli-0.2.137.22.dist-info/top_level.txt,sha256=AlWdXotkRYzHpFfOBYi6xOXl1H0zq4-tqtZ2XivoWB4,6
-koleo_cli-0.2.137.22.dist-info/RECORD,,