r5py 1.0.1__py3-none-any.whl → 1.0.3.dev0__py3-none-any.whl

r5py/__init__.py

@@ -2,7 +2,7 @@
 
 """Python wrapper for the R5 routing analysis engine."""
 
-__version__ = "1.0.1"
+__version__ = "1.0.3.dev0"
 
 
 from .r5 import (

r5py/r5/__init__.py

@@ -3,7 +3,6 @@
 """R5 classes."""
 
 from .access_leg import AccessLeg
-from .breakdown_stat import BreakdownStat
 from .detailed_itineraries import DetailedItineraries, DetailedItinerariesComputer
 from .direct_leg import DirectLeg
 from .egress_leg import EgressLeg
@@ -21,7 +20,6 @@ from .trip_planner import TripPlanner
 
 __all__ = [
     "AccessLeg",
-    "BreakdownStat",
     "DetailedItineraries",
     "DetailedItinerariesComputer",
     "DirectLeg",

r5py/r5/regional_task.py

@@ -45,7 +45,6 @@ class RegionalTask:
         speed_cycling=12.0,
         max_public_transport_rides=8,
         max_bicycle_traffic_stress=3,
-        breakdown=False,
     ):
         """
         Create a RegionalTask, a computing request for R5.
@@ -110,8 +109,6 @@ class RegionalTask:
         max_bicycle_traffic_stress : int
             Maximum stress level for cyclist routing, ranges from 1-4 see
             https://docs.conveyal.com/learn-more/traffic-stress Default: 3
-        breakdown : bool
-            Compute a more detailed breakdown of the routes. Default: False
         """
         self._regional_task = com.conveyal.r5.analyst.cluster.RegionalTask()
         self.scenario = Scenario()
@@ -149,8 +146,6 @@ class RegionalTask:
 
         # always record travel times
         self._regional_task.recordTimes = True
-        # also report paths, if `breakdown`
-        self.breakdown = breakdown
 
         # a few settings we don’t expose (yet?)
         self._regional_task.makeTauiSite = False
@@ -185,32 +180,6 @@ class RegionalTask:
             access_modes, com.conveyal.r5.api.util.LegMode
         )
 
-    @property
-    def breakdown(self):
-        """Compute a more detailed breakdown of the routes."""
-        return self._breakdown
-
-    @breakdown.setter
-    def breakdown(self, breakdown):
-        self._breakdown = breakdown
-        self._regional_task.includePathResults = breakdown
-
-        # R5 has a maximum number of destinations for which it returns detailed
-        # information, and it’s set to 5000 by default.
-        # The value is a static property of com.conveyal.r5.analyst.cluster.PathResult;
-        # static properites of Java classes can be modified in a singleton kind of way
-        try:
-            num_destinations = len(self.destinations)
-        except AttributeError:
-            num_destinations = 0
-        if (
-            num_destinations
-            > com.conveyal.r5.analyst.cluster.PathResult.MAX_PATH_DESTINATIONS
-        ):
-            com.conveyal.r5.analyst.cluster.PathResult.MAX_PATH_DESTINATIONS = (
-                num_destinations + 1
-            )
-
     @property
     def departure(self):
         """Find public transport connections leaving within ``departure_time_window`` after ``departure`` (datetime.datetime)."""
@@ -225,8 +194,10 @@ class RegionalTask:
         ):
             # fmt: on
             warnings.warn(
-                f"Departure time {departure} is outside of the time range "
-                "covered by currently loaded GTFS data sets.",
+                (
+                    "The currently loaded GTFS data sets do not define "
+                    f"any services on {departure.date()}."
+                ),
                 RuntimeWarning,
             )
 

r5py/r5/transit_layer.py

@@ -4,13 +4,12 @@
 """Wraps a com.conveyal.r5.transit.TransitLayer."""
 
 
-import datetime
 import functools
 
 import jpype
 import jpype.types
 
-from ..util import parse_int_date
+import java.time
 
 
 __all__ = ["TransitLayer"]
@@ -32,44 +31,24 @@ class TransitLayer:
         instance._transit_layer = transit_layer
         return instance
 
-    @functools.cached_property
-    def start_date(self):
-        """The earliest date the loaded GTFS data covers."""
-        try:
-            start_date = min(
-                [
-                    parse_int_date(service.calendar.start_date)
-                    for service in self._transit_layer.services
-                ]
-            )
-        except (AttributeError, ValueError) as exception:
-            raise ValueError("No GTFS data set loaded") from exception
-        return start_date
+    def covers(self, date):
+        """
+        Check whether `date` is covered by GTFS data sets.
 
-    @functools.cached_property
-    def end_date(self):
-        """The latest date the loaded GTFS data covers."""
-        try:
-            end_date = max(
-                [
-                    parse_int_date(service.calendar.end_date)
-                    for service in self._transit_layer.services
-                ]
-            )
-            end_date += datetime.timedelta(
-                hours=23, minutes=59, seconds=59
-            )  # *end* of day
-        except (AttributeError, ValueError) as exception:
-            raise ValueError("No GTFS data set loaded") from exception
-        return end_date
-
-    def covers(self, point_in_time):
-        """Check whether `point_in_time` is covered by GTFS data sets."""
-        try:
-            covers = self.start_date <= point_in_time <= self.end_date
-        except ValueError:  # no GTFS data loaded
-            covers = False
-        return covers
+        Arguments:
+        ----------
+        date : datetime.date
+            date for which to check whether a GTFS service exists.
+
+        Returns:
+        --------
+        bool
+            Whether or not any services exist on `date`.
+        """
+        date = java.time.LocalDate.of(date.year, date.month, date.day)
+        return True in set(
+            [service.activeOn(date) for service in self._transit_layer.services]
+        )
 
     def get_street_vertex_for_stop(self, stop):
         """

r5py/r5/transport_network.py

@@ -16,6 +16,7 @@ from .street_layer import StreetLayer
 from .transit_layer import TransitLayer
 from .transport_mode import TransportMode
 from ..util import Config, contains_gtfs_data, FileDigest, start_jvm, WorkingCopy
+from ..util.exceptions import GtfsFileError
 
 import com.conveyal.gtfs
 import com.conveyal.osmlib
@@ -35,7 +36,7 @@ start_jvm()
 class TransportNetwork:
     """Wrap a com.conveyal.r5.transit.TransportNetwork."""
 
-    def __init__(self, osm_pbf, gtfs=[]):
+    def __init__(self, osm_pbf, gtfs=[], allow_errors=False):
         """
         Load a transport network.
 
@@ -45,6 +46,9 @@ class TransportNetwork:
             file path of an OpenStreetMap extract in PBF format
         gtfs : str | pathlib.Path | list[str] | list[pathlib.Path]
             path(s) to public transport schedule information in GTFS format
+        allow_errors : bool
+            try to proceed with loading the transport network even if input data
+            contain errors
         """
         osm_pbf = WorkingCopy(osm_pbf)
         if isinstance(gtfs, (str, pathlib.Path)):
@@ -79,9 +83,31 @@ class TransportNetwork:
             transport_network.transitLayer = com.conveyal.r5.transit.TransitLayer()
             transport_network.transitLayer.parentNetwork = transport_network
             for gtfs_file in gtfs:
-                gtfs_feed = com.conveyal.gtfs.GTFSFeed.readOnlyTempFileFromGtfs(
+                gtfs_feed = com.conveyal.gtfs.GTFSFeed.writableTempFileFromGtfs(
                     f"{gtfs_file}"
                 )
+                if gtfs_feed.errors.size() > 0:
+                    errors = [
+                        f"{error.errorType}: {error.getMessageWithContext()}"
+                        for error in gtfs_feed.errors
+                    ]
+                    if allow_errors:
+                        warnings.warn(
+                            (
+                                "R5 reported the following issues with "
+                                f"GTFS file {gtfs_file.name}: \n"
+                                + ("\n- ".join(errors))
+                            ),
+                            RuntimeWarning,
+                        )
+                    else:
+                        raise GtfsFileError(
+                            (
+                                f"Could not load GTFS file {gtfs_file.name}. \n"
+                                + ("\n- ".join(errors))
+                            )
+                        )
+
                 transport_network.transitLayer.loadFromGtfs(gtfs_feed)
                 gtfs_feed.close()
 

r5py/util/exceptions.py

@@ -12,6 +12,10 @@ class R5pyError(Exception):
 
 
 # more specific exceptions
+class GtfsFileError(R5pyError):
+    """GTFS file contained errors."""
+
+
 class ChecksumFailed(requests.RequestException, R5pyError):
     """Requested resource did not pass checksum test."""
 

{r5py-1.0.1.dist-info → r5py-1.0.3.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: r5py
-Version: 1.0.1
+Version: 1.0.3.dev0
 Summary: Python wrapper for the R5 routing analysis engine
 Author: Christoph Fink, Willem Klumpenhouwer, Marcus Sairava, Rafael Pereira, Henrikki Tenkanen
 License: GPL-3.0-or-later or MIT
@@ -58,6 +58,7 @@ Requires-Dist: pytest-lazy-fixtures; extra == "tests"
 Requires-Dist: r5py.sampledata.helsinki>=0.1.1; extra == "tests"
 Requires-Dist: r5py.sampledata.sao_paulo>=0.1.1; extra == "tests"
 Requires-Dist: typing-extensions; extra == "tests"
+Dynamic: license-file
 
 <img class="r5py_logo" align="right" src="https://github.com/r5py/r5py/raw/main/docs/_static/images/r5py_blue.svg" alt="r5py logo" style="width:180px; max-width:30vW;">
 

{r5py-1.0.1.dist-info → r5py-1.0.3.dev0.dist-info}/RECORD

@@ -1,22 +1,21 @@
-r5py/__init__.py,sha256=G4_W_JrAJL28AYFzW0kImNgE-wAfjb15kpCwQulRuNc,546
+r5py/__init__.py,sha256=fmuPx-uivkG0M6kPpYFSiiAHJKYQ4iWAprWSkeq--xA,551
 r5py/__main__.py,sha256=Wvn0ChD7E-dCSZ8b8k_HhHG0KMOk0qMNFkijGuSH3-0,81
-r5py/r5/__init__.py,sha256=6IQpvStxKeNxflizfRWh05USpdM18KBSB3UZ8Z_cGY4,1124
+r5py/r5/__init__.py,sha256=BVEeEVc-uUHLPLYBq1LN4exiQIHDw4YyANxNrprb8jQ,1061
 r5py/r5/access_leg.py,sha256=W3GfPEpqmWD1c4xipd6UcVIaBC-yb6srGCZV30E2dPY,293
 r5py/r5/base_travel_time_matrix.py,sha256=Vl82Wkk2iANNy6L3r937yXNnQ9lmMOErGT_-fQnb1Ms,6978
-r5py/r5/breakdown_stat.py,sha256=ZQkWA0hXlcRH3KVgtxPSNHP0FUDri8MWqdFk8EUdDMU,533
 r5py/r5/detailed_itineraries.py,sha256=Oo8JnF5jM2FsYFR1ma9r4y3evOmU7itDYs5M4vbqrZo,11245
 r5py/r5/direct_leg.py,sha256=T7wX8puhOVIssCpflXthYs-G9OA8pasFbdz9p8k8teg,1054
 r5py/r5/egress_leg.py,sha256=9rsCIcwlZUzoZE6q4imNY3VWpjJepO1IJvheVrlPi90,297
 r5py/r5/isochrones.py,sha256=NNpV3Df4NeLdDksGERkb2Eos33ziMBGEeaWyCKPt5P8,12974
-r5py/r5/regional_task.py,sha256=wTNx2NT3-GCEvDyz0e-_YYkVWtpE66dg2IlXTA1gI-4,23234
+r5py/r5/regional_task.py,sha256=jpOoskx7Y-j-c4E-56uvJXiiuPYK3w28_FJsoGQLSbE,22062
 r5py/r5/scenario.py,sha256=nUNAlN3cO7E_b4sMpNqdL0FD7WQaQ49iIvh-k8l4YRM,763
 r5py/r5/street_layer.py,sha256=2AWhIE0-aTNGQenX6bF1xv5bmhR_LV0CgqM4BKgVYfk,2329
 r5py/r5/street_segment.py,sha256=0O0QV8Eyfss-xHJShKGSQV1IusZfTrrxzu_AWl3KACo,1109
 r5py/r5/transfer_leg.py,sha256=_IpzQJAyW4hDPO5V4k-ZjIPd3uyxhHPa4U6_b8UbKt4,311
-r5py/r5/transit_layer.py,sha256=vVo_o10yDCzpujOQ99xdzmznwVjAbANjdDflQy2QOpI,3223
+r5py/r5/transit_layer.py,sha256=vfbzCpTiIpCevSwCTz7EGeFWB4LDrfba1JAqXYo7WXo,2334
 r5py/r5/transit_leg.py,sha256=R0Qc9YLMEXYu51NIdo7Q0bdmpYIJf5irEDXWrW6pZWE,221
 r5py/r5/transport_mode.py,sha256=zHSqXb0R4oyjTp069CzO69IgoCKt0nmOAwsSy272rGo,3675
-r5py/r5/transport_network.py,sha256=wy7jsIqcladee6FdUiOu0kJgMhGYymtJpfyjX9RRnNU,7925
+r5py/r5/transport_network.py,sha256=eKq4c4L46k_rpPkO9MxPOWHAZ0ZyPzV27lVouNFHqSk,9055
 r5py/r5/travel_time_matrix.py,sha256=Z_ErylB8mMD_eO2BogV3K_OFdYFVCcmIPmcMe7GGRiU,8003
 r5py/r5/trip.py,sha256=AqhlhgYaGRL5jVzV08BhsqgWxe8f4wAb5HMP8HIGwc8,2944
 r5py/r5/trip_leg.py,sha256=9E4vZpBEJCXIVqAXWJvnPloC-upEASKhFnjiuen8i8A,6495
@@ -28,7 +27,7 @@ r5py/util/config.py,sha256=5jz42iUaftgBfJ2HNnktZw5oXIPE2ytl3Nxt2RjjDoM,5267
 r5py/util/contains_gtfs_data.py,sha256=ooX4hfVDKK0aqX1MI46jSFZ7dZ6riyXaORrgF6PUFrk,1211
 r5py/util/data_validation.py,sha256=H5Mcp2nS4vu5RKym20mPnGpl-8d0SDchzDRJBrrL6WE,1039
 r5py/util/environment.py,sha256=cbSM8TKTuhbXsTIIB06pMtydBOiqLkitF2Lj2asVTho,1082
-r5py/util/exceptions.py,sha256=r65XUg_AJ_bTw8ARNj7A2-GbFZlSTrOAjDynx1pSD2Y,1049
+r5py/util/exceptions.py,sha256=i1FyTuas43HnlLUIf3zip0Eie2S0j09EcgB9KnmQoKE,1121
 r5py/util/file_digest.py,sha256=95UbaxbTZLa54j1CupsKria028xZ8f6ueZsTupnjlYE,1061
 r5py/util/good_enough_equidistant_crs.py,sha256=7FX3Ly3qegSV_YRA4OFk49LC29xUyTte1Gc5qOEi_9E,2458
 r5py/util/jvm.py,sha256=NCwoYLDznXydcIRAZl2kzUQA6D6NCvzjVG74pm6ioR0,5027
@@ -40,8 +39,8 @@ r5py/util/spatially_clustered_geodataframe.py,sha256=FxG8V3SSeK-PuCep565p1b3TNcl
 r5py/util/validating_requests_session.py,sha256=sH5FgpS9eGax5DG2qA2GrGuiwgTJgh8tKsZ9OiXKmvk,1807
 r5py/util/warnings.py,sha256=CvxKWKlNO_p3riB4SkNqbU5AGPsaY_3-OzqaBObE3B8,139
 r5py/util/working_copy.py,sha256=sbLbRCi39LtC-0tXxvh2y7ZN2D15chbhleCZXzHAFSc,1432
-r5py-1.0.1.dist-info/LICENSE,sha256=VAnuGDX1TPylSN9G2xLa-urDpj_SQwn-qqs068dx4tk,51
-r5py-1.0.1.dist-info/METADATA,sha256=URprsHGGXPJ0Ve6vCwJHw7R4iEZ7d7y84fJvmNdTrV4,9954
-r5py-1.0.1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-r5py-1.0.1.dist-info/top_level.txt,sha256=fOH1R85dkNDOI7jkg-lIsl5CQIO4fE5X868K9dTqs9U,5
-r5py-1.0.1.dist-info/RECORD,,
+r5py-1.0.3.dev0.dist-info/licenses/LICENSE,sha256=VAnuGDX1TPylSN9G2xLa-urDpj_SQwn-qqs068dx4tk,51
+r5py-1.0.3.dev0.dist-info/METADATA,sha256=GnVvhl0wT1TNeqWnslpiwmvpw2fYJl62oUjkfptcsss,9981
+r5py-1.0.3.dev0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+r5py-1.0.3.dev0.dist-info/top_level.txt,sha256=fOH1R85dkNDOI7jkg-lIsl5CQIO4fE5X868K9dTqs9U,5
+r5py-1.0.3.dev0.dist-info/RECORD,,

{r5py-1.0.1.dist-info → r5py-1.0.3.dev0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

r5py/r5/breakdown_stat.py

@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-
-"""Wraps a com.conveyal.r5.analyst.cluster.PathResult.Stat enum set."""
-
-import enum
-
-from ..util import start_jvm
-
-import com.conveyal.r5
-
-
-__all__ = ["BreakdownStat"]
-
-
-start_jvm()
-
-
-class BreakdownStat(enum.Enum):
-    """
-    Statistical functions to apply to detailed routing results summary.
-
-    BreakdownStat.MEAN, BreakdownStat.MINIMUM
-    """
-
-    MEAN = com.conveyal.r5.analyst.cluster.PathResult.Stat.valueOf("MEAN")
-    MINIMUM = com.conveyal.r5.analyst.cluster.PathResult.Stat.valueOf("MINIMUM")