carconnectivity-plugin-database 0.4.2__tar.gz → 0.4.3__tar.gz

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3}/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 - No unreleased changes so far
 
+## [0.4.3] - 2026-02-07
+### Fixed
+- Fixes a problem where the start position would not be correctly recorded
+
 ## [0.4.2] - 2026-01-23
 ### Fixed
 - Improved reliability on recording trips and charging sessions
@@ -34,7 +38,8 @@ All notable changes to this project will be documented in this file.
 ## [0.1] - 2026-01-04
 Initial release, let's go and give this to the public to try out...
 
-[unreleased]: https://github.com/tillsteinbach/CarConnectivity-plugin-database/compare/v0.4.2...HEAD
+[unreleased]: https://github.com/tillsteinbach/CarConnectivity-plugin-database/compare/v0.4.3...HEAD
+[0.4.3]: https://github.com/tillsteinbach/CarConnectivity-plugin-database/releases/tag/v0.4.3
 [0.4.2]: https://github.com/tillsteinbach/CarConnectivity-plugin-database/releases/tag/v0.4.2
 [0.4.1]: https://github.com/tillsteinbach/CarConnectivity-plugin-database/releases/tag/v0.4.1
 [0.4]: https://github.com/tillsteinbach/CarConnectivity-plugin-database/releases/tag/v0.4

{carconnectivity_plugin_database-0.4.2/src/carconnectivity_plugin_database.egg-info → carconnectivity_plugin_database-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-plugin-database
-Version: 0.4.2
+Version: 0.4.3
 Summary: CarConnectivity plugin for storing data to Databases
 Author: Till Steinbach
 License-Expression: MIT

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3/src/carconnectivity_plugin_database.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-plugin-database
-Version: 0.4.2
+Version: 0.4.3
 Summary: CarConnectivity plugin for storing data to Databases
 Author: Till Steinbach
 License-Expression: MIT

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3}/src/carconnectivity_plugins/database/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.2'
-__version_tuple__ = version_tuple = (0, 4, 2)
+__version__ = version = '0.4.3'
+__version_tuple__ = version_tuple = (0, 4, 3)
 
-__commit_id__ = commit_id = 'g6a55f964d'
+__commit_id__ = commit_id = 'g0d9350942'

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3}/src/carconnectivity_plugins/database/agents/charging_agent.py

@@ -173,6 +173,18 @@ class ChargingAgent(BaseAgent):
                     self.__on_battery_temperature_change(electric_drive.battery.temperature, Observable.ObserverEvent.UPDATED)
         self.session_factory.remove()
 
+    def __del__(self) -> None:
+        self.carconnectivity_vehicle.charging.connector.connection_state.remove_observer(self.__on_connector_state_change)
+        self.carconnectivity_vehicle.charging.connector.lock_state.remove_observer(self.__on_connector_lock_state_change)
+        self.carconnectivity_vehicle.charging.state.remove_observer(self.__on_charging_state_change)
+        self.carconnectivity_vehicle.charging.rate.remove_observer(self.__on_charging_rate_change)
+        self.carconnectivity_vehicle.charging.power.remove_observer(self.__on_charging_power_change)
+        self.carconnectivity_vehicle.charging.type.remove_observer(self._on_charging_type_change)
+        electric_drive: Optional[ElectricDrive] = self.carconnectivity_vehicle.get_electric_drive()
+        if electric_drive is not None:
+            electric_drive.level.remove_observer(self._on_battery_level_change)
+            electric_drive.battery.temperature.remove_observer(self.__on_battery_temperature_change)
+
     # pylint: disable=too-many-branches, too-many-statements
     def __on_charging_state_change(self, element: EnumAttribute[Charging.ChargingState], flags: Observable.ObserverEvent) -> None:
         del flags
@@ -628,21 +640,21 @@ class ChargingAgent(BaseAgent):
                                 self.database_plugin.healthy._set_value(value=False)  # pylint: disable=protected-access
                         else:
                             LOG.info("Starting new charging session for vehicle %s due to connector locked state on startup", self.vehicle.vin)
-                        new_session: ChargingSession = ChargingSession(vin=self.vehicle.vin, plug_locked_date=element.last_changed)
-                        try:
-                            session.add(new_session)
-                            self._update_session_odometer(session, new_session)
-                            self._update_session_position(session, new_session)
-                            session.commit()
-                            LOG.debug('Added new charging session for vehicle %s to database', self.vehicle.vin)
-                            self.last_charging_session = new_session
-                        except IntegrityError as err:
-                            session.rollback()
-                            LOG.error('IntegrityError while adding charging session for vehicle %s to database: %s', self.vehicle.vin, err)
-                        except DatabaseError as err:
-                            session.rollback()
-                            LOG.error('DatabaseError while adding charging session for vehicle %s to database: %s', self.vehicle.vin, err)
-                            self.database_plugin.healthy._set_value(value=False)  # pylint: disable=protected-access
+                            new_session: ChargingSession = ChargingSession(vin=self.vehicle.vin, plug_locked_date=element.last_changed)
+                            try:
+                                session.add(new_session)
+                                self._update_session_odometer(session, new_session)
+                                self._update_session_position(session, new_session)
+                                session.commit()
+                                LOG.debug('Added new charging session for vehicle %s to database', self.vehicle.vin)
+                                self.last_charging_session = new_session
+                            except IntegrityError as err:
+                                session.rollback()
+                                LOG.error('IntegrityError while adding charging session for vehicle %s to database: %s', self.vehicle.vin, err)
+                            except DatabaseError as err:
+                                session.rollback()
+                                LOG.error('DatabaseError while adding charging session for vehicle %s to database: %s', self.vehicle.vin, err)
+                                self.database_plugin.healthy._set_value(value=False)  # pylint: disable=protected-access
                     elif self.last_charging_session is not None and not self.last_charging_session.was_locked():
                         try:
                             self.last_charging_session.plug_locked_date = element.last_changed

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3}/src/carconnectivity_plugins/database/agents/climatization_agent.py

@@ -76,6 +76,9 @@ class ClimatizationAgent(BaseAgent):
             self.__on_state_change(self.carconnectivity_vehicle.climatization.state, Observable.ObserverEvent.UPDATED)
         self.session_factory.remove()
 
+    def __del__(self) -> None:
+        self.carconnectivity_vehicle.climatization.state.remove_observer(self.__on_state_change)
+
     def __on_state_change(self, element: EnumAttribute[Climatization.ClimatizationState], flags: Observable.ObserverEvent) -> None:
         del flags
         if element.enabled:

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3}/src/carconnectivity_plugins/database/agents/drive_state_agent.py

@@ -155,6 +155,23 @@ class DriveStateAgent(BaseAgent):
                         self.__on_range_estimated_full_change(self.carconnectivity_drive.range_estimated_full, Observable.ObserverEvent.UPDATED)
             session_factory.remove()
 
+    def __del__(self) -> None:
+        self.carconnectivity_drive.type.remove_observer(self.__on_type_change)
+        self.carconnectivity_drive.range_wltp.remove_observer(self.__on_range_wltp_change)
+
+        if isinstance(self.carconnectivity_drive, ElectricDrive):
+            self.carconnectivity_drive.battery.total_capacity.remove_observer(self.__on_electric_total_capacity_change)
+            self.carconnectivity_drive.battery.available_capacity.remove_observer(self.__on_electric_available_capacity_change)
+            self.carconnectivity_drive.consumption.remove_observer(self.__on_electric_consumption_change)
+
+        elif isinstance(self.carconnectivity_drive, CombustionDrive):
+            self.carconnectivity_drive.fuel_tank.available_capacity.remove_observer(self.__on_fuel_available_capacity_change)
+            self.carconnectivity_drive.consumption.remove_observer(self.__on_fuel_consumption_change)
+
+        self.carconnectivity_drive.level.remove_observer(self.__on_level_change)
+        self.carconnectivity_drive.range.remove_observer(self.__on_range_change)
+        self.carconnectivity_drive.range_estimated_full.remove_observer(self.__on_range_estimated_full_change)
+
     def __on_level_change(self, element: LevelAttribute, flags: Observable.ObserverEvent) -> None:
         del flags
         if element.enabled:

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3}/src/carconnectivity_plugins/database/agents/refuel_agent.py

@@ -81,6 +81,10 @@ class RefuelAgent(BaseAgent):
 
         self.carconnectivity_vehicle.position.longitude.add_observer(self.__on_longitude_change, Observable.ObserverEvent.UPDATED)
 
+    def __del__(self) -> None:
+        self.carconnectivity_drive.level.remove_observer(self.__on_level_change)
+        self.carconnectivity_vehicle.position.longitude.remove_observer(self.__on_longitude_change)
+
     def __on_level_change(self, element: LevelAttribute, flags: Observable.ObserverEvent) -> None:
         del flags
         if element.enabled and element.value is not None:
@@ -141,22 +145,29 @@ class RefuelAgent(BaseAgent):
                     self.database_plugin.healthy._set_value(value=False)  # pylint: disable=protected-access
             if refuel_session.location is None and self.carconnectivity_vehicle.position.enabled \
                     and refuel_session.session_position_latitude is not None and refuel_session.session_position_longitude is not None:
-                location_service: Optional[BaseService] = self.database_plugin.car_connectivity.get_service_for(ServiceType.LOCATION_GAS_STATION)
-                if location_service is not None and isinstance(location_service, LocationService):
-                    location_result: Optional[CarConnectivityLocation] = location_service.gas_station_from_lat_lon(
-                        latitude=refuel_session.session_position_latitude,
-                        longitude=refuel_session.session_position_longitude,
-                        radius=150,
-                        location=None)
-                    if location_result is not None:
-                        LOG.debug('Resolved location from position (%s, %s)', refuel_session.session_position_latitude,
-                                  refuel_session.session_position_longitude)
-                        location: Location = Location.from_carconnectivity_location(location=location_result)
-                        try:
-                            location = session.merge(location)
-                            refuel_session.location = location
-                        except DatabaseError as err:
-                            session.rollback()
-                            LOG.error('DatabaseError while merging location for refuel session of vehicle %s in database: %s',
-                                      self.carconnectivity_vehicle.vin.value, err)
-                            self.database_plugin.healthy._set_value(value=False)  # pylint: disable=protected-access
+                location_services: Optional[list[BaseService]] = self.database_plugin.car_connectivity.get_services_for(ServiceType.LOCATION_GAS_STATION)
+                if location_services is None or len(location_services) == 0:
+                    LOG.debug('No LocationService available to resolve location from position for refuel session')
+                    return
+                location_result: Optional[CarConnectivityLocation] = None
+                for location_service in location_services:
+                    if location_service is not None and isinstance(location_service, LocationService):
+                        location_result = location_service.gas_station_from_lat_lon(
+                            latitude=refuel_session.session_position_latitude,
+                            longitude=refuel_session.session_position_longitude,
+                            radius=150,
+                            location=None)
+                        if location_result is not None:
+                            break
+                if location_result is not None:
+                    LOG.debug('Resolved location from position (%s, %s)', refuel_session.session_position_latitude,
+                              refuel_session.session_position_longitude)
+                    location: Location = Location.from_carconnectivity_location(location=location_result)
+                    try:
+                        location = session.merge(location)
+                        refuel_session.location = location
+                    except DatabaseError as err:
+                        session.rollback()
+                        LOG.error('DatabaseError while merging location for refuel session of vehicle %s in database: %s',
+                                  self.carconnectivity_vehicle.vin.value, err)
+                        self.database_plugin.healthy._set_value(value=False)  # pylint: disable=protected-access

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3}/src/carconnectivity_plugins/database/agents/state_agent.py

@@ -89,6 +89,17 @@ class StateAgent(BaseAgent):
                                                                     on_transaction_end=True)
         self.session_factory.remove()
 
+    def __del__(self) -> None:
+        self.carconnectivity_vehicle.state.remove_observer(self.__on_state_change)
+        self.carconnectivity_vehicle.connection_state.remove_observer(self.__on_connection_state_change)
+        self.carconnectivity_vehicle.outside_temperature.remove_observer(self.__on_outside_temperature_change)
+        self.carconnectivity_vehicle.name.remove_observer(self.__on_name_change)
+        self.carconnectivity_vehicle.manufacturer.remove_observer(self.__on_manufacturer_change)
+        self.carconnectivity_vehicle.model.remove_observer(self.__on_model_change)
+        self.carconnectivity_vehicle.model_year.remove_observer(self.__on_model_year_change)
+        self.carconnectivity_vehicle.type.remove_observer(self.__on_type_change)
+        self.carconnectivity_vehicle.license_plate.remove_observer(self.__on_license_plate_change)
+
     def __on_state_change(self, element: EnumAttribute[GenericVehicle.State], flags: Observable.ObserverEvent) -> None:
         del flags
         if element.enabled:

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3}/src/carconnectivity_plugins/database/agents/trip_agent.py

@@ -14,6 +14,7 @@ from sqlalchemy.orm.exc import ObjectDeletedError
 from carconnectivity.observable import Observable
 from carconnectivity.vehicle import GenericVehicle
 from carconnectivity.utils.timeout_lock import TimeoutLock
+from carconnectivity.location import Location as CarConnectivityLocation
 
 from carconnectivity_plugins.database.agents.base_agent import BaseAgent
 from carconnectivity_plugins.database.model.trip import Trip
@@ -95,6 +96,12 @@ class TripAgent(BaseAgent):
                                                                         on_transaction_end=True)
         self._on_position_location_change(self.carconnectivity_vehicle.position.location.uid, Observable.ObserverEvent.UPDATED)
 
+    def __del__(self) -> None:
+        self.carconnectivity_vehicle.state.remove_observer(self.__on_state_change)
+        self.carconnectivity_vehicle.position.latitude.remove_observer(self._on_position_latitude_change)
+        self.carconnectivity_vehicle.position.longitude.remove_observer(self._on_position_longitude_change)
+        self.carconnectivity_vehicle.position.location.uid.remove_observer(self._on_position_location_change)
+
     # pylint: disable-next=too-many-branches,too-many-statements
     def __on_state_change(self, element: EnumAttribute[GenericVehicle.State], flags: Observable.ObserverEvent) -> None:
         del flags
@@ -131,7 +138,7 @@ class TripAgent(BaseAgent):
                                         self.carconnectivity_vehicle.odometer.value is not None:
                                     new_trip.start_odometer = self.carconnectivity_vehicle.odometer.in_locale(locale=self.database_plugin.locale)[0]
                                 if not self._update_trip_position(session=session, trip=new_trip, start=True):
-                                    # if now no position is available try the last known position that is not older than 5min
+                                    # if now no position is available try the last known position
                                     if self.last_parked_position_latitude is not None and self.last_parked_position_longitude is not None:
                                         self._update_trip_position(session=session, trip=new_trip, start=True,
                                                                    latitude=self.last_parked_position_latitude,
@@ -188,11 +195,9 @@ class TripAgent(BaseAgent):
         del flags
         if element.enabled and element.value is not None:
             location_object: GenericObject = element.parent
-            if isinstance(location_object, Location):
+            if isinstance(location_object, CarConnectivityLocation):
                 self.last_parked_location = Location.from_carconnectivity_location(location=location_object)
-            self._on_location_change()
-        else:
-            self.last_parked_location = None
+                self._on_location_change()
 
     def _on_position_change(self) -> None:
         # Check if there is a finished trip that lacks destination position. We allow 5min after destination_date to set the position.
@@ -240,7 +245,7 @@ class TripAgent(BaseAgent):
                     if self.trip is not None and self.trip.destination_date is not None and self.trip.destination_location is None \
                             and self.last_parked_position_time is not None \
                             and self.last_parked_position_time < (self.trip.destination_date + timedelta(minutes=5)):
-                        location: Location = Location.from_carconnectivity_location(location=self.last_parked_location)
+                        location: Location = self.last_parked_location
                         try:
                             location = session.merge(location)
                             self.trip.destination_location = location
@@ -256,7 +261,7 @@ class TripAgent(BaseAgent):
                               latitude: Optional[float] = None, longitude: Optional[float] = None, location: Optional[Location] = None) -> bool:
         if self.carconnectivity_vehicle is None:
             raise ValueError("Vehicle's carconnectivity_vehicle attribute is None")
-        if latitude or longitude is None:
+        if latitude is None or longitude is None:
             if self.carconnectivity_vehicle.position.enabled and self.carconnectivity_vehicle.position.latitude.enabled \
                     and self.carconnectivity_vehicle.position.longitude.enabled \
                     and self.carconnectivity_vehicle.position.latitude.value is not None \
@@ -267,8 +272,8 @@ class TripAgent(BaseAgent):
             if start:
                 if trip.start_position_latitude is None and trip.start_position_longitude is None:
                     try:
-                        trip.start_position_latitude = self.carconnectivity_vehicle.position.latitude.value
-                        trip.start_position_longitude = self.carconnectivity_vehicle.position.longitude.value
+                        trip.start_position_latitude = latitude
+                        trip.start_position_longitude = longitude
                         session.commit()
                     except DatabaseError as err:
                         session.rollback()

{carconnectivity_plugin_database-0.4.2 → carconnectivity_plugin_database-0.4.3}/src/carconnectivity_plugins/database/plugin.py

@@ -148,6 +148,7 @@ class Plugin(BasePlugin):  # pylint: disable=too-many-instance-attributes
         self.scoped_session_factory.remove()
 
     def shutdown(self) -> None:
+        self.car_connectivity.garage.remove_observer(self.__on_add_vehicle)
         self._stop_event.set()
         if self._background_thread is not None:
             self._background_thread.join()