apyefa 0.0.3__tar.gz → 0.0.4__tar.gz

{apyefa-0.0.3 → apyefa-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apyefa
-Version: 0.0.3
+Version: 0.0.4
 Summary: Python API for EFA(Elektronische Fahrplanauskunft) async requests
 Author-email: Alex Jung <jungdevelop@gmail.com>
 License: MIT License
@@ -28,7 +28,7 @@ Project-URL: Homepage, https://github.com/alex-jung/apyefa
 Project-URL: Documentation, https://github.com/alex-jung/apyefa
 Project-URL: Repository, https://github.com/alex-jung/apyefa
 Project-URL: Issues, https://github.com/alex-jung/apyefa/issues
-Keywords: efa,vgn,gtfs,public transport,traffic
+Keywords: efa,public transport,traffic
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE

{apyefa-0.0.3 → apyefa-0.0.4}/apyefa/client.py

@@ -4,6 +4,7 @@ import aiohttp
 
 from apyefa.commands import (
     Command,
+    CommandAdditionalInfo,
     CommandDepartures,
     CommandServingLines,
     CommandStopFinder,
@@ -163,7 +164,7 @@ class EfaClient:
         return command.parse(response)
 
     async def lines_by_location(self, location: str | Location) -> list[Line]:
-        """Search for lines that pass `location`. Location can be location ID like `de:08111:6221` or a Location object
+        """Search for lines that pass `location`. Location can be location ID like `de:08111:6221` or a `Location` object
 
         Args:
             location (str | Location): Location
@@ -193,6 +194,15 @@ class EfaClient:
     async def locations_by_line(self, line: str | Line) -> list[Location]:
         raise NotImplementedError
 
+    async def additional_info(self):
+        _LOGGER.info("Request additional info")
+
+        command = CommandAdditionalInfo()
+
+        response = await self._run_query(self._build_url(command))
+
+        return command.parse(response)
+
     async def _run_query(self, query: str) -> str:
         _LOGGER.info(f"Run query {query}")
 

{apyefa-0.0.3 → apyefa-0.0.4}/apyefa/commands/__init__.py

@@ -1,4 +1,5 @@
 from .command import Command
+from .command_add_info import CommandAdditionalInfo
 from .command_departures import CommandDepartures
 from .command_serving_lines import CommandServingLines
 from .command_stop_finder import CommandStopFinder
@@ -8,6 +9,7 @@ from .command_trip import CommandTrip
 __all__ = [
     "Command",
     "CommandDepartures",
+    "CommandAdditionalInfo",
     "CommandStopFinder",
     "CommandSystemInfo",
     "CommandTrip",

apyefa-0.0.4/apyefa/commands/command_add_info.py

@@ -0,0 +1,51 @@
+import logging
+
+from voluptuous import Any, Optional, Required, Schema
+
+from apyefa.commands.command import Command
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class CommandAdditionalInfo(Command):
+    def __init__(self) -> None:
+        super().__init__("XML_ADDINFO_REQUEST", "addinfo")
+
+    def parse(self, data: dict):
+        data = self._get_parser().parse(data)
+
+        result = []
+
+        return result
+
+    def _get_params_schema(self) -> Schema:
+        return Schema(
+            {
+                Required("outputFormat", default="rapidJSON"): Any("rapidJSON"),
+                Required("coordOutputFormat", default="WGS84"): Any("WGS84"),
+                Optional("filterDateValid"): str,
+                Optional("filterDateValidDay"): str,
+                Optional("filterDateValidMonth"): str,
+                Optional("filterDateValidYear"): str,
+                Optional("filterDateValidComponentsActive"): Any("0", "1", 0, 1),
+                Optional("filterPublicationStatus"): Any("current", "history"),
+                Optional("filterValidIntervalStart"): str,
+                Optional("filterValidIntervalEnd"): str,
+                Optional("filterOMC"): str,
+                Optional("filterOMC_PlaceID"): str,
+                Optional("filterLineNumberIntervalStart"): str,
+                Optional("filterLineNumberIntervalEnd"): str,
+                Optional("filterMOTType"): str,
+                Optional("filterPNLineDir"): str,
+                Optional("filterPNLineSub"): str,
+                Optional("itdLPxx_selLine"): str,
+                Optional("itdLPxx_selOperator"): str,
+                Optional("itdLPxx_selStop"): str,
+                Optional("line"): str,
+                Optional("filterInfoID"): str,
+                Optional("filterInfoType"): str,
+                Optional("filterPriority"): str,
+                Optional("filterProviderCode"): str,
+                Optional("filterSourceSystemName"): str,
+            }
+        )

{apyefa-0.0.3 → apyefa-0.0.4}/apyefa/commands/command_serving_lines.py

@@ -48,7 +48,7 @@ class CommandServingLines(Command):
                 Optional("name_sl"): str,
                 # mode 'line'
                 Optional("lineName"): str,
-                Optional("lineReqType"): int,
+                Optional("lineReqType"): list[0, 2, 4, 8, 16],
                 Optional("mergeDir"): Any("0", "1", 0, 1),
                 Optional("lsShowTrainsExplicit"): Any("0", "1", 0, 1),
                 Optional("line"): str,

{apyefa-0.0.3 → apyefa-0.0.4}/apyefa/commands/command_stop_finder.py

@@ -41,6 +41,10 @@ class CommandStopFinder(Command):
                 Optional("anyResSort_sf"): str,
                 Optional("anyObjFilter_sf"): int,
                 Optional("doNotSearchForStops_sf"): Any("0", "1", 0, 1),
+                Optional("locationInfoActive_sf"): Any("0", "1", 0, 1),
+                Optional("useHouseNumberList_sf"): Any("0", "1", 0, 1),
+                Optional("useLocalityMainStop"): Any("0", "1", 0, 1),
+                Optional("prMinQu"): int,
                 Optional("anyObjFilter_origin"): Range(
                     min=0, max=sum([x.value for x in LocationFilter])
                 ),

{apyefa-0.0.3 → apyefa-0.0.4}/apyefa/data_classes.py

@@ -21,18 +21,48 @@ class LocationType(StrEnum):
     UNKNOWN = "unknown"
 
 
+class InfoType(StrEnum):
+    AREA_INFO = "areaInfo"
+    STOP_INFO = "stopInfo"
+    STOP_BLOCKING = "stopBlocking"
+    LINE_INFO = "lineInfo"
+    LINE_BLOCKING = "lineBlocking"
+    ROUTE_INFO = "routeInfo"
+    ROUTE_BLOCKING = "routeBlocking"
+    GENERAL_INFO = "generalInfo"
+    BANNER_INFO = "bannerInfo"
+    TRAFFIC_INFO = "trafficInformation"
+
+
+class InfoPriority(StrEnum):
+    VERY_LOW = "veryLow"
+    LOW = "low"
+    NORMAL = "normal"
+    HIGH = "high"
+    VERY_HIGH = "veryHigh"
+
+
 class TransportType(IntEnum):
-    RAIL = 0  # RB
+    TRAIN = 0  # Zug
     SUBURBAN = 1  # S-Bahn
     SUBWAY = 2  # U-Bahn
     CITY_RAIL = 3  # Stadtbahn
     TRAM = 4  # Straßenbahn
-    BUS = 5  # Bus
-    RBUS = 6  # Regional Bus
+    CITY_BUS = 5  # Stadtbus
+    REGIONAL_BUS = 6  # Regionalbus
     EXPRESS_BUS = 7  # Schnellbus
-    CABLE_TRAM = 8  # Seilbahn
+    CABLE_RAIL = 8  # Seilbahn
     FERRY = 9  # Schief
     AST = 10  # Anruf-Sammel-Taxi
+    SUSPENSION_RAIL = 11  # Schwebebahn
+    AIRPLANE = 12  # Flugzeug
+    REGIONAL_TRAIN = 13  # Reginalzug (z.B. IRE, RE und RB)
+    NATIONAL_TRAIN = 14  # Nationaler Zug (z.B. IR und D)
+    INTERNATINAL_TRAIN = 15  # Internationaler Zug (z.B. IC und EC)
+    HIGH_SPEED_TRAIN = 16  # Hochgeschwindigkeitzüge (z.B. ICE)
+    RAIL_REPLACEMENT_TRANSPORT = 17  # Schienenersatzverkehr
+    SHUTTLE_TRAIN = 18  # Schuttlezug
+    CITIZEN_BUS = 19  # Bürgerbus
 
 
 class LocationFilter(IntEnum):
@@ -63,7 +93,8 @@ SCHEMA_PROPERTIES = vol.Schema(
         vol.Optional("area"): str,
         vol.Optional("platform"): str,
         vol.Optional("platformName"): str,
-    }
+    },
+    extra=vol.ALLOW_EXTRA,
 )
 
 SCHEMA_LINE_PROPERTIES: Final = vol.Schema(
@@ -143,14 +174,14 @@ SCHEMA_TRANSPORTATION: Final = vol.Schema(
     {
         vol.Required("id"): str,
         vol.Required("name"): str,
-        vol.Required("disassembledName"): str,
         vol.Required("number"): str,
-        vol.Required("description"): str,
         vol.Required("product"): SCHEMA_PRODUCT,
+        vol.Optional("description"): str,
         vol.Optional("operator"): SCHEMA_OPERATOR,
         vol.Optional("destination"): SCHEMA_LOCATION,
         vol.Optional("origin"): SCHEMA_LOCATION,
         vol.Optional("properties"): dict,
+        vol.Optional("disassembledName"): str,
     }
 )
 
@@ -181,7 +212,8 @@ SCHEMA_DEPARTURE: Final = vol.Schema(
         vol.Required("transportation"): SCHEMA_TRANSPORTATION,
         vol.Optional("infos"): list,
         vol.Optional("hints"): list,
-    }
+    },
+    extra=vol.ALLOW_EXTRA,
 )
 
 
@@ -367,7 +399,8 @@ class Line(_Base):
         # number = data.get("number")
         description = data.get("description")
         product = TransportType(data.get("product").get("class"))
-        operator = data.get("operator").get("name")
+        # operator = data.get("operator", None).get("name", None)
+        operator = "None"
         destination = Location.from_dict(data.get("destination"))
         origin = Location.from_dict(data.get("origin"))
         properties = data.get("properties", {})

{apyefa-0.0.3 → apyefa-0.0.4}/apyefa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apyefa
-Version: 0.0.3
+Version: 0.0.4
 Summary: Python API for EFA(Elektronische Fahrplanauskunft) async requests
 Author-email: Alex Jung <jungdevelop@gmail.com>
 License: MIT License
@@ -28,7 +28,7 @@ Project-URL: Homepage, https://github.com/alex-jung/apyefa
 Project-URL: Documentation, https://github.com/alex-jung/apyefa
 Project-URL: Repository, https://github.com/alex-jung/apyefa
 Project-URL: Issues, https://github.com/alex-jung/apyefa/issues
-Keywords: efa,vgn,gtfs,public transport,traffic
+Keywords: efa,public transport,traffic
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE

{apyefa-0.0.3 → apyefa-0.0.4}/apyefa.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ apyefa.egg-info/requires.txt
 apyefa.egg-info/top_level.txt
 apyefa/commands/__init__.py
 apyefa/commands/command.py
+apyefa/commands/command_add_info.py
 apyefa/commands/command_departures.py
 apyefa/commands/command_serving_lines.py
 apyefa/commands/command_stop_finder.py

{apyefa-0.0.3 → apyefa-0.0.4}/examples.py

@@ -1,15 +1,18 @@
 import asyncio
-from apyefa import EfaClient, StopFilter
 from pprint import pprint
 
+from apyefa import EfaClient, LocationFilter
+
 
 async def main():
     async with EfaClient("https://efa.vgn.de/vgnExt_oeffi/") as client:
         result = await asyncio.gather(
             client.info(),
-            client.stops("Nürnberg Plärrer"),
-            client.stops("Nordostbahnhof", filters=[StopFilter.STOPS]),
-            client.departures("de:09564:704", limit=10, date="20241126 16:30"),
+            client.locations_by_name("Nürnberg Plärrer"),
+            client.locations_by_name("Nordostbahnhof", filters=[LocationFilter.STOPS]),
+            client.departures_by_location(
+                "de:09564:704", limit=10, date="20241126 16:30"
+            ),
         )
 
     print("System Info".center(60, "-"))

{apyefa-0.0.3 → apyefa-0.0.4}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apyefa"
-version = "0.0.3"
+version = "0.0.4"
 requires-python = ">= 3.11"
 description = "Python API for EFA(Elektronische Fahrplanauskunft) async requests"
 authors = [
@@ -15,7 +15,7 @@ authors = [
 ]
 readme = "README.md"
 license = {file = "LICENSE"}
-keywords = ["efa", "vgn", "gtfs", "public transport", "traffic"]
+keywords = ["efa", "public transport", "traffic"]
 
 dependencies = [
     "aiohttp>=3.11.7",