carconnectivity-plugin-database 0.1__py3-none-any.whl → 0.1a21__py3-none-any.whl

{carconnectivity_plugin_database-0.1.dist-info → carconnectivity_plugin_database-0.1a21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: carconnectivity-plugin-database
-Version: 0.1
+Version: 0.1a21
 Summary: CarConnectivity plugin for storing data to Databases
 Author: Till Steinbach
 License-Expression: MIT
@@ -19,7 +19,7 @@ Classifier: Topic :: Home Automation
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: carconnectivity>=0.11
+Requires-Dist: carconnectivity>=0.10
 Requires-Dist: sqlalchemy~=2.0.45
 Requires-Dist: psycopg2-binary~=2.9.11
 Requires-Dist: alembic~=1.17.2

{carconnectivity_plugin_database-0.1.dist-info → carconnectivity_plugin_database-0.1a21.dist-info}/RECORD

@@ -1,11 +1,11 @@
 carconnectivity_database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_database/carconnectivity_database_base.py,sha256=tsCWJJlBody2IDSw55WPkl-q4sAGNWHgid1iK7nQ5Jk,842
-carconnectivity_plugin_database-0.1.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
+carconnectivity_plugin_database-0.1a21.dist-info/licenses/LICENSE,sha256=PIwI1alwDyOfvEQHdGCm2u9uf_mGE8030xZDfun0xTo,1071
 carconnectivity_plugins/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-carconnectivity_plugins/database/_version.py,sha256=zCgmOZqbKglNFIB9lB_sgjMOR6jrNzUWcCp-9rpWq18,699
-carconnectivity_plugins/database/plugin.py,sha256=c4RZlg3fjliLdcTKMtEK9OeJ-fqaGWK3blH0elW-WLw,8886
+carconnectivity_plugins/database/_version.py,sha256=9orOgcTKEcEMRSixfuXt_SWhzAuUd1_G8wVltD5md1o,709
+carconnectivity_plugins/database/plugin.py,sha256=8crlMdyntb8Tpx8eZOAWYHj0EPi5W4PXD_oQmZpZih0,8816
 carconnectivity_plugins/database/agents/base_agent.py,sha256=WsEoB-dIZ6le3vuObwPDOBQ5WJUyfzqrE8SQIJD5X4I,28
-carconnectivity_plugins/database/agents/charging_agent.py,sha256=Jg4OYjtgFV0JAWZ2PwnLmHMtfd46kmlZIrEWhgNLDgw,48769
+carconnectivity_plugins/database/agents/charging_agent.py,sha256=Zzt1wMHDunGOY15oq2MWGv3whBqrjagVY7ADhulJqI0,47341
 carconnectivity_plugins/database/agents/climatization_agent.py,sha256=bY_iX_EPjSECFPbkfjJlvVgvB2wMdWG3fXPsc5QiMUI,4765
 carconnectivity_plugins/database/agents/drive_state_agent.py,sha256=QwVoD6ZVLUbCGlwcWMUOmRM5FRhdwZSJatZdBbUSyBw,26975
 carconnectivity_plugins/database/agents/state_agent.py,sha256=zubufago7cP3k_b_CQYfz7xGbnBqBhlndh6kQBwaWDo,11602
@@ -41,8 +41,8 @@ carconnectivity_plugins/database/model/carconnectivity_schema/script.py.mako,sha
 carconnectivity_plugins/database/model/carconnectivity_schema/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 carconnectivity_plugins/database/ui/plugin_ui.py,sha256=LQOuXIeBOLH4Gg0Qqjmzu9BOHI0Rir9KLq3gZF5Rlr4,1815
 carconnectivity_plugins/database/ui/templates/database/status.html,sha256=OypmDrRib6tBM1fC7ijyTmF9HI53XlpF4tq_diXiLKc,162
-carconnectivity_plugin_database-0.1.dist-info/METADATA,sha256=E08_AJ5KzvkFU8xc1iZIppqks6LBWdEaJ-NyzuLED5E,3622
-carconnectivity_plugin_database-0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-carconnectivity_plugin_database-0.1.dist-info/entry_points.txt,sha256=YB5RERxEA_pxYQesyAyzV8hmPM2o3_F9FZbnSQaSuLQ,105
-carconnectivity_plugin_database-0.1.dist-info/top_level.txt,sha256=836FhYp_OWsQq5Vyjb95dilEMQPHUYCTZa2GBgNFEVE,49
-carconnectivity_plugin_database-0.1.dist-info/RECORD,,
+carconnectivity_plugin_database-0.1a21.dist-info/METADATA,sha256=csxOl7g8TRK7U8_3R_gw9y8-5GUKkjgfblCjyTqIOrc,3625
+carconnectivity_plugin_database-0.1a21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+carconnectivity_plugin_database-0.1a21.dist-info/entry_points.txt,sha256=YB5RERxEA_pxYQesyAyzV8hmPM2o3_F9FZbnSQaSuLQ,105
+carconnectivity_plugin_database-0.1a21.dist-info/top_level.txt,sha256=836FhYp_OWsQq5Vyjb95dilEMQPHUYCTZa2GBgNFEVE,49
+carconnectivity_plugin_database-0.1a21.dist-info/RECORD,,

carconnectivity_plugins/database/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1'
-__version_tuple__ = version_tuple = (0, 1)
+__version__ = version = '0.1a21'
+__version_tuple__ = version_tuple = (0, 1, 'a21')
 
 __commit_id__ = commit_id = None

carconnectivity_plugins/database/agents/charging_agent.py

@@ -410,7 +410,6 @@ class ChargingAgent(BaseAgent):
                     session.refresh(self.last_charging_session)
 
                 if element.value == ChargingConnector.ChargingConnectorLockState.LOCKED \
-                        and self.carconnectivity_last_connector_lock_state is not None \
                         and self.carconnectivity_last_connector_lock_state != ChargingConnector.ChargingConnectorLockState.LOCKED:
                     if self.last_charging_session is None or self.last_charging_session.is_closed():
                         # In case this was an interrupted charging session (interrupt no longer than 24hours), continue by erasing end time
@@ -466,21 +465,7 @@ class ChargingAgent(BaseAgent):
                 elif element.value == ChargingConnector.ChargingConnectorLockState.LOCKED \
                         and self.carconnectivity_last_connector_lock_state == ChargingConnector.ChargingConnectorLockState.LOCKED:
                     if self.last_charging_session is None or self.last_charging_session.is_closed():
-                        # In case this was an interrupted charging session (interrupt no longer than 24hours), continue by erasing end time
-                        if self.last_charging_session is not None and not self.last_charging_session.was_disconnected() \
-                            and (self.last_charging_session.plug_unlocked_date is None
-                                 or self.last_charging_session.plug_unlocked_date > ((element.last_changed or datetime.now(timezone.utc))
-                                                                                     - timedelta(hours=24))):
-                            LOG.debug("found a closed charging session that was not disconneced. This could be an interrupted session we want to continue")
-                            try:
-                                self.last_charging_session.plug_unlocked_date = None
-                                session.commit()
-                            except DatabaseError as err:
-                                session.rollback()
-                                LOG.error('DatabaseError while changing charging session for vehicle %s to database: %s', self.vehicle.vin, err)
-                                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)
+                        LOG.info("Starting new charging session for vehicle %s due to connector locked state", self.vehicle.vin)
                         new_session: ChargingSession = ChargingSession(vin=self.vehicle.vin, plug_locked_date=element.last_changed)
                         try:
                             session.add(new_session)

carconnectivity_plugins/database/plugin.py

@@ -38,8 +38,8 @@ class Plugin(BasePlugin):  # pylint: disable=too-many-instance-attributes
         car_connectivity (CarConnectivity): An instance of CarConnectivity.
         config (Dict): Configuration dictionary containing connection details.
     """
-    def __init__(self, plugin_id: str, car_connectivity: CarConnectivity, config: Dict, initialization: Optional[Dict] = None) -> None:
-        BasePlugin.__init__(self, plugin_id=plugin_id, car_connectivity=car_connectivity, config=config, log=LOG, initialization=initialization)
+    def __init__(self, plugin_id: str, car_connectivity: CarConnectivity, config: Dict) -> None:
+        BasePlugin.__init__(self, plugin_id=plugin_id, car_connectivity=car_connectivity, config=config, log=LOG)
 
         self._background_thread: Optional[threading.Thread] = None
         self._stop_event = threading.Event()