apyefa 1.0.1__tar.gz → 1.1.1__tar.gz

{apyefa-1.0.1 → apyefa-1.1.1}/.github/workflows/python-package.yml

@@ -37,9 +37,9 @@ jobs:
     - name: Install the code linting and formatting tool Ruff
       run: pipx install ruff
     - name: Lint code with Ruff
-      run: ruff check --output-format=github --target-version=py39
+      run: ruff check --output-format=github --target-version=py311
     - name: Check code formatting with Ruff
-      run: ruff format --diff --target-version=py39
+      run: ruff format --diff --target-version=py311
       continue-on-error: true
     - name: Test with pytest
       run: |

{apyefa-1.0.1 → apyefa-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: apyefa
-Version: 1.0.1
+Version: 1.1.1
 Summary: Python API for EFA(Elektronische Fahrplanauskunft) async requests
 Author-email: Alex Jung <jungdevelop@gmail.com>
 License: MIT License
@@ -42,6 +42,7 @@ Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-asyncio>=0.24.0; extra == "tests"
 Requires-Dist: pytest-benchmark[histogram]>=3.2.1; extra == "tests"
 Requires-Dist: requests>=2.32.3; extra == "tests"
+Dynamic: license-file
 
 # apyefa
 [![Python package](https://github.com/alex-jung/apyefa/actions/workflows/python-package.yml/badge.svg)](https://github.com/alex-jung/apyefa/actions/workflows/python-package.yml)
@@ -79,8 +80,8 @@ pip install .
 |Function Name                                                |Description|
 |----------------------------------------------------|-----------|
 |[info()](https://github.com/alex-jung/apyefa/wiki/info)|Provides EFA endpoint system information|
-|[locations_by_name()](https://github.com/alex-jung/apyefa/wiki/locations_by_name)|Search for locations by name with optional filters and limits|
-|[location_by_coord()](https://github.com/alex-jung/apyefa/wiki/location_by_coord)|Search for location by it's coordinates|
+|[locations_by_name()](https://github.com/alex-jung/apyefa/wiki/locations_by_name)|Search for locations by name with optional filters|
+|[locations_by_coord()](https://github.com/alex-jung/apyefa/wiki/locations_by_coord)|Search for locations by coordinates|
 |[list_lines()](https://github.com/alex-jung/apyefa/wiki/list_lines)|Retrieves a list of lines|
 |[list_stops()](https://github.com/alex-jung/apyefa/wiki/list_stops)|Retrieves a list of stops|
 |[trip()](https://github.com/alex-jung/apyefa/wiki/trip)|Calculates a trip between an origin and a destination locations|

{apyefa-1.0.1 → apyefa-1.1.1}/README.md

@@ -34,8 +34,8 @@ pip install .
 |Function Name                                                |Description|
 |----------------------------------------------------|-----------|
 |[info()](https://github.com/alex-jung/apyefa/wiki/info)|Provides EFA endpoint system information|
-|[locations_by_name()](https://github.com/alex-jung/apyefa/wiki/locations_by_name)|Search for locations by name with optional filters and limits|
-|[location_by_coord()](https://github.com/alex-jung/apyefa/wiki/location_by_coord)|Search for location by it's coordinates|
+|[locations_by_name()](https://github.com/alex-jung/apyefa/wiki/locations_by_name)|Search for locations by name with optional filters|
+|[locations_by_coord()](https://github.com/alex-jung/apyefa/wiki/locations_by_coord)|Search for locations by coordinates|
 |[list_lines()](https://github.com/alex-jung/apyefa/wiki/list_lines)|Retrieves a list of lines|
 |[list_stops()](https://github.com/alex-jung/apyefa/wiki/list_stops)|Retrieves a list of stops|
 |[trip()](https://github.com/alex-jung/apyefa/wiki/trip)|Calculates a trip between an origin and a destination locations|

{apyefa-1.0.1 → apyefa-1.1.1}/apyefa/client.py

@@ -130,17 +130,17 @@ class EfaClient:
 
         return command.parse(response)[:limit]
 
-    async def location_by_coord(
+    async def locations_by_coord(
         self,
         coord_x: float,
         coord_y: float,
         *,
         format: CoordFormat = CoordFormat.WGS84,
-        limit: int = 10,
         search_nearbly_stops: bool = False,
-    ) -> Location:
+        limit: int = 10,
+    ) -> list[Location]:
         """
-        Asynchronously fetches location information based on given coordinates.
+        Asynchronously fetches locations based on given coordinates.
 
         Args:
             coord_x (float): The X coordinate (longitude).
@@ -150,9 +150,9 @@ class EfaClient:
             search_nearbly_stops (bool, optional): Whether to search for nearby stops. Defaults to False.
 
         Returns:
-            Location: The location information based on the provided coordinates.
+            list[Location]: List of locations found based on the provided coordinates.
         """
-        _LOGGER.info("Request location search by coordinates")
+        _LOGGER.info("Request locations search by coordinates")
         _LOGGER.debug(f"coord_x: {coord_x}")
         _LOGGER.debug(f"coord_y: {coord_y}")
         _LOGGER.debug(f"format: {format}")

{apyefa-1.0.1 → apyefa-1.1.1}/apyefa/data_classes.py

@@ -122,7 +122,8 @@ _SCHEMA_PRODUCT = vol.Schema(
         vol.Optional("id"): int,
         vol.Optional("name"): str,
         vol.Optional("iconId"): int,
-    }
+    },
+    extra=vol.ALLOW_EXTRA,
 )
 
 _SCHEMA_PARENT = vol.Schema(
@@ -136,7 +137,8 @@ _SCHEMA_PARENT = vol.Schema(
         vol.Optional("disassembledName"): str,
         vol.Optional("parent"): vol.Self,
         vol.Optional("properties"): _SCHEMA_PROPERTIES,
-    }
+    },
+    extra=vol.ALLOW_EXTRA,
 )
 
 _SCHEMA_OPERATOR = vol.Schema(
@@ -144,7 +146,8 @@ _SCHEMA_OPERATOR = vol.Schema(
         vol.Required("id"): str,
         vol.Required("name"): str,
         vol.Optional("code"): str,
-    }
+    },
+    extra=vol.ALLOW_EXTRA,
 )
 
 _SCHEMA_LOCATION: Final = vol.Schema(
@@ -201,7 +204,8 @@ _SCHEMA_SYSTEM_INFO: Final = vol.Schema(
                 vol.Required("to"): vol.Date("%Y-%m-%d"),
             }
         ),
-    }
+    },
+    extra=vol.ALLOW_EXTRA,
 )
 
 _SCHEMA_DEPARTURE: Final = vol.Schema(
@@ -240,7 +244,8 @@ _SCHEMA_LEG: Final = vol.Schema(
         vol.Optional("isRealtimeControlled"): vol.Boolean,
         vol.Optional("realtimeStatus"): list,
         vol.Optional("footPathInfo"): list,
-    }
+    },
+    extra=vol.ALLOW_EXTRA,
 )
 
 
@@ -345,6 +350,7 @@ class Location(_Base):
 @dataclass(frozen=True)
 class Departure(_Base):
     location: Location = field(repr=False)
+    line_id: str
     line_name: str
     route: str
     origin: Location
@@ -375,6 +381,7 @@ class Departure(_Base):
         hints = data.get("hints")
 
         line = Line.from_dict(data.get("transportation"))
+        line_id = line.id
         line_name = line.name
         transport = line.product
         origin = line.origin
@@ -384,6 +391,7 @@ class Departure(_Base):
         return Departure(
             data,
             location,
+            line_id,
             line_name,
             route,
             origin,

{apyefa-1.0.1 → apyefa-1.1.1}/apyefa.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: apyefa
-Version: 1.0.1
+Version: 1.1.1
 Summary: Python API for EFA(Elektronische Fahrplanauskunft) async requests
 Author-email: Alex Jung <jungdevelop@gmail.com>
 License: MIT License
@@ -42,6 +42,7 @@ Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-asyncio>=0.24.0; extra == "tests"
 Requires-Dist: pytest-benchmark[histogram]>=3.2.1; extra == "tests"
 Requires-Dist: requests>=2.32.3; extra == "tests"
+Dynamic: license-file
 
 # apyefa
 [![Python package](https://github.com/alex-jung/apyefa/actions/workflows/python-package.yml/badge.svg)](https://github.com/alex-jung/apyefa/actions/workflows/python-package.yml)
@@ -79,8 +80,8 @@ pip install .
 |Function Name                                                |Description|
 |----------------------------------------------------|-----------|
 |[info()](https://github.com/alex-jung/apyefa/wiki/info)|Provides EFA endpoint system information|
-|[locations_by_name()](https://github.com/alex-jung/apyefa/wiki/locations_by_name)|Search for locations by name with optional filters and limits|
-|[location_by_coord()](https://github.com/alex-jung/apyefa/wiki/location_by_coord)|Search for location by it's coordinates|
+|[locations_by_name()](https://github.com/alex-jung/apyefa/wiki/locations_by_name)|Search for locations by name with optional filters|
+|[locations_by_coord()](https://github.com/alex-jung/apyefa/wiki/locations_by_coord)|Search for locations by coordinates|
 |[list_lines()](https://github.com/alex-jung/apyefa/wiki/list_lines)|Retrieves a list of lines|
 |[list_stops()](https://github.com/alex-jung/apyefa/wiki/list_stops)|Retrieves a list of stops|
 |[trip()](https://github.com/alex-jung/apyefa/wiki/trip)|Calculates a trip between an origin and a destination locations|

{apyefa-1.0.1 → apyefa-1.1.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apyefa"
-version = "1.0.1"
+version = "1.1.1"
 requires-python = ">= 3.11"
 description = "Python API for EFA(Elektronische Fahrplanauskunft) async requests"
 authors = [

{apyefa-1.0.1 → apyefa-1.1.1}/tests/unit/test_client.py

@@ -138,7 +138,7 @@ class TestFunctionLocationsByCoord:
                 return_value=True,
             ):
 
-                await test_async_client.location_by_coord(x, y)
+                await test_async_client.locations_by_coord(x, y)
 
         mock_add_param.assert_any_call("outputFormat", "rapidJSON")
         mock_add_param.assert_any_call("locationServerActive", 1)
@@ -154,7 +154,7 @@ class TestFunctionLocationsByCoord:
         ) as mock_parse:
             mock_parse.return_value = [x for x in range(limit * 2)]
 
-            result = await test_async_client.location_by_coord(0, 0, limit=limit)
+            result = await test_async_client.locations_by_coord(0, 0, limit=limit)
 
             assert len(result) == limit
 
@@ -172,7 +172,7 @@ class TestFunctionLocationsByCoord:
                 return_value=True,
             ):
 
-                await test_async_client.location_by_coord(0, 0, format=format)
+                await test_async_client.locations_by_coord(0, 0, format=format)
 
             mock_add_param.assert_any_call("name_sf", f"0:0:{format}")
 
@@ -189,7 +189,7 @@ class TestFunctionLocationsByCoord:
                 return_value=True,
             ):
 
-                await test_async_client.location_by_coord(
+                await test_async_client.locations_by_coord(
                     0, 0, search_nearbly_stops=search_nearbly_stops
                 )