pyopensky 2.4__tar.gz → 2.5__tar.gz

{pyopensky-2.4 → pyopensky-2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyopensky
-Version: 2.4
+Version: 2.5
 Summary: A Python interface for OpenSky database
 License: MIT
 Author: Xavier Olive
@@ -55,13 +55,16 @@ See details in the [documentation](https://open-aviation.github.io/pyopensky/cre
 
 ## Usage
 
+> [!IMPORTANT]
+> The Impala shell is now deprecated. Please upgrade to Trino.
+
 - from the [REST API](https://open-aviation.github.io/pyopensky/rest.html):
 
   ```python
   from pyopensky.rest import REST
-  
+
   rest = REST()
-  
+
   rest.states()
   rest.tracks(icao24)
   rest.routes(callsign)
@@ -69,25 +72,16 @@ See details in the [documentation](https://open-aviation.github.io/pyopensky/cre
   rest.arrival(airport, begin, end)
   rest.departure(airport, begin, end)
   ```
-- from the [Impala](https://open-aviation.github.io/pyopensky/impala.html) shell (requires authentication):
 
-  ```python
-  from pyopensky.impala import Impala
-  
-  impala = Impala()
-  # full description of the whole set of parameters in the documentation
-  impala.flightlist(start, stop, *, airport, callsign, icao24)
-  impala.history(start, stop, *, callsign, icao24, bounds)
-  impala.rawdata(start, stop, *, callsign, icao24, bounds)
-  ```
 - from the [Trino](https://open-aviation.github.io/pyopensky/trino.html) database (requires authentication):
 
   ```python
   from pyopensky.trino import Trino
-  
+
   trino = Trino()
   # full description of the whole set of parameters in the documentation
   trino.flightlist(start, stop, *, airport, callsign, icao24)
   trino.history(start, stop, *, callsign, icao24, bounds)
   trino.rawdata(start, stop, *, callsign, icao24, bounds)
   ```
+

{pyopensky-2.4 → pyopensky-2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyopensky"
-version = "2.4"
+version = "2.5"
 description = "A Python interface for OpenSky database"
 authors = ["Xavier Olive <git@xoolive.org>", "Junzi Sun <j.sun-1@tudelft.nl>"]
 license = "MIT"

{pyopensky-2.4 → pyopensky-2.5}/readme.md

@@ -30,13 +30,16 @@ See details in the [documentation](https://open-aviation.github.io/pyopensky/cre
 
 ## Usage
 
+> [!IMPORTANT]
+> The Impala shell is now deprecated. Please upgrade to Trino.
+
 - from the [REST API](https://open-aviation.github.io/pyopensky/rest.html):
 
   ```python
   from pyopensky.rest import REST
-  
+
   rest = REST()
-  
+
   rest.states()
   rest.tracks(icao24)
   rest.routes(callsign)
@@ -44,25 +47,15 @@ See details in the [documentation](https://open-aviation.github.io/pyopensky/cre
   rest.arrival(airport, begin, end)
   rest.departure(airport, begin, end)
   ```
-- from the [Impala](https://open-aviation.github.io/pyopensky/impala.html) shell (requires authentication):
 
-  ```python
-  from pyopensky.impala import Impala
-  
-  impala = Impala()
-  # full description of the whole set of parameters in the documentation
-  impala.flightlist(start, stop, *, airport, callsign, icao24)
-  impala.history(start, stop, *, callsign, icao24, bounds)
-  impala.rawdata(start, stop, *, callsign, icao24, bounds)
-  ```
 - from the [Trino](https://open-aviation.github.io/pyopensky/trino.html) database (requires authentication):
 
   ```python
   from pyopensky.trino import Trino
-  
+
   trino = Trino()
   # full description of the whole set of parameters in the documentation
   trino.flightlist(start, stop, *, airport, callsign, icao24)
   trino.history(start, stop, *, callsign, icao24, bounds)
   trino.rawdata(start, stop, *, callsign, icao24, bounds)
-  ```
+  ```

{pyopensky-2.4 → pyopensky-2.5}/src/pyopensky/trino.py

@@ -119,6 +119,8 @@ class Trino(OpenSkyDBAPI):
                 if token is not None
                 else OAuth2Authentication(),
                 http_scheme="https",
+                # https://github.com/trinodb/trino-python-client/discussions/456
+                legacy_prepared_statements=True,
             ),
         )
         return engine
@@ -384,6 +386,7 @@ class Trino(OpenSkyDBAPI):
         cached: bool = True,
         compress: bool = False,
         limit: None | int = None,
+        selected_columns: tuple[InstrumentedAttribute[Any] | str, ...] = (),
         **kwargs: Any,
     ) -> None | pd.DataFrame:
         """Get Traffic from the OpenSky Trino database.
@@ -413,6 +416,10 @@ class Trino(OpenSkyDBAPI):
         :param bounds: sets a geographical footprint. Either an **airspace or
             shapely shape** (requires the bounds attribute); or a **tuple of
             float** (west, south, east, north);
+        :param selected_columns: specify the columns you want to retrieve. When
+            empty, use all columns of the StateVectorsData4 table. You may
+            escape column names as str. **Always** escape names from the
+            FlightsData4 table.
 
         **Airports**
 
@@ -475,7 +482,7 @@ class Trino(OpenSkyDBAPI):
                 )
                 .where(
                     FlightsData4.day >= start_ts.floor("1d"),
-                    FlightsData4.day <= start_ts.ceil("1d"),
+                    FlightsData4.day <= stop_ts.ceil("1d"),
                 )
             )
 
@@ -568,10 +575,31 @@ class Trino(OpenSkyDBAPI):
         stmt = stmt.where(
             StateVectorsData4.time >= start_ts,
             StateVectorsData4.time <= stop_ts,
-            StateVectorsData4.hour >= start_ts.floor("1H"),
-            StateVectorsData4.hour < stop_ts.ceil("1H"),
+            StateVectorsData4.hour >= start_ts.floor("1h"),
+            StateVectorsData4.hour < stop_ts.ceil("1h"),
         )
 
+        def transform_column(col: str) -> InstrumentedAttribute[Any]:
+            if "." in col:
+                table, column = col.split(".")
+                MATCH = {
+                    "StateVectorsData4": StateVectorsData4,
+                    "FlightsData4": fd4,
+                }
+                return getattr(MATCH[table], column)  # type: ignore
+            if candidate := getattr(StateVectorsData4, col, None):
+                return candidate  # type: ignore
+            if candidate := getattr(fd4, col, None):
+                return candidate  # type: ignore
+            raise ValueError(f"Unknown column: {col}")
+
+        if len(selected_columns) > 0:
+            columns = (
+                transform_column(col) if isinstance(col, str) else col
+                for col in selected_columns
+            )
+            stmt = stmt.with_only_columns(*columns)
+
         if limit is not None:
             stmt = stmt.limit(limit)
 
@@ -712,7 +740,7 @@ class Trino(OpenSkyDBAPI):
                 )
                 .where(
                     FlightsData4.day >= start_ts.floor("1d"),
-                    FlightsData4.day <= start_ts.ceil("1d"),
+                    FlightsData4.day <= stop_ts.ceil("1d"),
                 )
             )
 
@@ -766,8 +794,8 @@ class Trino(OpenSkyDBAPI):
                 )
                 .group_by(StateVectorsData4.icao24)
                 .where(
-                    StateVectorsData4.hour >= start_ts.floor("1H"),
-                    StateVectorsData4.hour <= stop_ts.ceil("1H"),
+                    StateVectorsData4.hour >= start_ts.floor("1h"),
+                    StateVectorsData4.hour <= stop_ts.ceil("1h"),
                     StateVectorsData4.time >= start_ts,
                     StateVectorsData4.time <= stop_ts,
                 )
@@ -819,8 +847,8 @@ class Trino(OpenSkyDBAPI):
         stmt = stmt.where(
             Table.mintime >= start_ts,
             Table.mintime <= stop_ts,
-            Table.hour >= start_ts.floor("1H"),
-            Table.hour < stop_ts.ceil("1H"),
+            Table.hour >= start_ts.floor("1h"),
+            Table.hour < stop_ts.ceil("1h"),
         )
 
         if limit is not None: