Replace pendulum with whenever

Author: dgarros

backend/infrahub/core/diff/model/path.py

@@ -20,7 +20,7 @@
     from neo4j.graph import Node as Neo4jNode
     from neo4j.graph import Path as Neo4jPath
     from neo4j.graph import Relationship as Neo4jRelationship
-    from pendulum import Interval
+    from whenever import TimeDelta
 
     from infrahub.graphql.initialization import GraphqlContext
 
@@ -417,7 +417,7 @@ def __hash__(self) -> int:
         return hash(self.uuid)
 
     @property
-    def time_range(self) -> Interval:
+    def time_range(self) -> TimeDelta:
         return self.to_time.obj - self.from_time.obj
 
     def update_metadata(
@@ -447,7 +447,7 @@ def __hash__(self) -> int:
         return hash(self.uuid)
 
     @property
-    def time_range(self) -> Interval:
+    def time_range(self) -> TimeDelta:
         return self.to_time.obj - self.from_time.obj
 
     def get_nodes_without_parents(self) -> set[EnrichedDiffNode]:

backend/infrahub/core/timestamp.py

@@ -5,11 +5,11 @@
 from infrahub_sdk.timestamp import Timestamp as BaseTimestamp
 
 if TYPE_CHECKING:
-    from pendulum.datetime import DateTime
+    from whenever import ZonedDateTime
 
 
 class Timestamp(BaseTimestamp):
-    async def to_graphql(self, *args: Any, **kwargs: Any) -> DateTime:  # noqa: ARG002
+    async def to_graphql(self, *args: Any, **kwargs: Any) -> ZonedDateTime:  # noqa: ARG002
         return self.obj
 
     def get_query_filter_path(self, rel_name: str = "r") -> tuple[str, dict]:

backend/tests/integration/user_workflows/test_user_worflow.py

@@ -1,6 +1,6 @@
-import pendulum
 import pytest
 from deepdiff import DeepDiff
+from whenever import Instant
 
 from infrahub.database import InfrahubDatabase
 from infrahub.graphql.manager import GraphQLSchemaManager
@@ -251,7 +251,7 @@ async def test_query_all_devices(self, test_client, integration_helper):
             if device["node"]["name"]["value"] == "spine1":
                 state.data["spine1_id"] = device["node"]["id"]
         # Initialize the start time
-        state.data["time_start"] = pendulum.now(tz="UTC")
+        state.data["time_start"] = Instant.now()
 
     async def test_query_spine1_loobpack0(self, test_client, integration_helper):
         """
@@ -374,7 +374,7 @@ async def test_update_intf_description_branch1(
 
         assert intfs[0]["node"]["description"]["value"] == new_description
 
-        state.data["time_after_intf_update_branch1"] = pendulum.now("UTC").to_iso8601_string()
+        state.data["time_after_intf_update_branch1"] = Instant.now().format_common_iso()
 
     async def test_update_intf_description_main(self, test_client, integration_helper):
         """
@@ -781,7 +781,7 @@ async def test_query_spine1_lo0_at_start_time(self, test_client, integration_hel
                     "intf_name": intf_name,
                 },
             },
-            params={"at": state.data["time_start"].to_iso8601_string()},
+            params={"at": state.data["time_start"].format_common_iso()},
             headers=headers,
         )
         assert response.status_code == 200

backend/tests/unit/api/conftest.py

@@ -1,4 +1,3 @@
-import pendulum
 import pytest
 from fastapi.testclient import TestClient
 
@@ -7,6 +6,7 @@
 from infrahub.core.initialization import create_branch
 from infrahub.core.manager import NodeManager
 from infrahub.core.node import Node
+from infrahub.core.timestamp import Timestamp
 from infrahub.database import InfrahubDatabase
 from infrahub.services.adapters.workflow.local import WorkflowLocalExecution
 from infrahub.workflows.initialization import setup_task_manager
@@ -140,7 +140,7 @@ async def car_person_data_diff(db: InfrahubDatabase, default_branch, car_person_
     branch2 = await create_branch(branch_name="branch2", db=db)
 
     # Time post Branch Creation
-    time0 = pendulum.now(tz="UTC")
+    time0 = Timestamp()
 
     persons_list = await NodeManager.query(db=db, schema="Person", branch=branch2)
     persons = {item.name.value: item for item in persons_list}
@@ -166,7 +166,7 @@ async def car_person_data_diff(db: InfrahubDatabase, default_branch, car_person_
     await p1.save(db=db)
 
     # Time in-between the 2 batch of changes
-    time1 = pendulum.now(tz="UTC")
+    time1 = Timestamp()
 
     # Update Repo 01 in Branch2
     repo01 = repos["repo01"]
@@ -181,7 +181,7 @@ async def car_person_data_diff(db: InfrahubDatabase, default_branch, car_person_
     await cars_main["bolt"].save(db=db)
 
     # Time After the changes
-    time2 = pendulum.now(tz="UTC")
+    time2 = Timestamp()
 
     params = {
         "branch": branch2,
@@ -198,7 +198,7 @@ async def car_person_data_generic_diff(db: InfrahubDatabase, default_branch, car
     branch2 = await create_branch(branch_name="branch2", db=db)
 
     # Time After Creation of branch2
-    time0 = pendulum.now(tz="UTC")
+    time0 = Timestamp()
 
     persons_list = await NodeManager.query(db=db, schema="TestPerson", branch=branch2)
     persons = {item.name.value: item for item in persons_list}
@@ -213,34 +213,34 @@ async def car_person_data_generic_diff(db: InfrahubDatabase, default_branch, car
     gcars = {item.name.value: item for item in gcars_list}
 
     # Add a new Person P3 in Branch2 and assign him as the owner of C1
-    time10 = pendulum.now(tz="UTC")
+    time10 = Timestamp()
     p3 = await Node.init(db=db, schema="TestPerson", branch=branch2)
     await p3.new(db=db, name="Bill", height=160)
     await p3.save(db=db, at=time10)
     persons["Bill"] = p3
 
-    time11 = pendulum.now(tz="UTC")
+    time11 = Timestamp()
     await ecars["volt"].owner.update(data=p3, db=db)
     await ecars["volt"].save(db=db, at=time11)
 
     # Update Repo 01 in Branch2 a first time
-    time12 = pendulum.now(tz="UTC")
+    time12 = Timestamp()
     repo01 = repos["repo01"]
     repo01.commit.value = "bbbbbbbbbbbbbbb"
     repo01.description.value = "First change in branch"
     await repo01.save(db=db, at=time12)
 
     # Update P1 height in main
-    time13 = pendulum.now(tz="UTC")
+    time13 = Timestamp()
     p1 = await NodeManager.get_one(id=persons["John"].id, db=db)
     p1.height.value = 120
     await p1.save(db=db, at=time13)
 
     # Time in-between the 2 batch of changes
-    time20 = pendulum.now(tz="UTC")
+    time20 = Timestamp()
 
     # Update Repo 01 in Branch2 a second time
-    time21 = pendulum.now(tz="UTC")
+    time21 = Timestamp()
     repo01 = repos["repo01"]
     repo01.commit.value = "dddddddddd"
     repo01.description.value = "Second change in branch"
@@ -257,7 +257,7 @@ async def car_person_data_generic_diff(db: InfrahubDatabase, default_branch, car
     await ecars_main["bolt"].save(db=db)
 
     # Time After the changes
-    time30 = pendulum.now(tz="UTC")
+    time30 = Timestamp()
 
     params = {
         "branch": branch2,
@@ -414,7 +414,7 @@ async def data_diff_attribute(db: InfrahubDatabase, default_branch, car_person_d
     branch2 = await create_branch(branch_name="branch2", db=db)
 
     # Time After Creation of branch2
-    time0 = pendulum.now(tz="UTC")
+    time0 = Timestamp()
 
     persons_list = await NodeManager.query(db=db, schema="TestPerson", branch=branch2)
     persons = {item.name.value: item for item in persons_list}
@@ -429,23 +429,23 @@ async def data_diff_attribute(db: InfrahubDatabase, default_branch, car_person_d
     gcars = {item.name.value: item for item in gcars_list}
 
     # Update Repo 01 in Branch2 a first time
-    time12 = pendulum.now(tz="UTC")
+    time12 = Timestamp()
     repo01 = repos["repo01"]
     repo01.commit.value = "bbbbbbbbbbbbbbb"
     repo01.description.value = "First update in Branch"
     await repo01.save(db=db, at=time12)
 
     # Update P1 height in main
-    time13 = pendulum.now(tz="UTC")
+    time13 = Timestamp()
     p1 = await NodeManager.get_one(id=persons["John"].id, db=db)
     p1.height.value = 120
     await p1.save(db=db, at=time13)
 
     # Time in-between the 2 batch of changes
-    time20 = pendulum.now(tz="UTC")
+    time20 = Timestamp()
 
     # Update Repo 01 in Branch2 a second time
-    time21 = pendulum.now(tz="UTC")
+    time21 = Timestamp()
     repo01 = repos["repo01"]
     repo01.commit.value = "dddddddddd"
     repo01.description.value = "Second update in Branch"
@@ -459,7 +459,7 @@ async def data_diff_attribute(db: InfrahubDatabase, default_branch, car_person_d
     await ecars_main["bolt"].save(db=db)
 
     # Time After the changes
-    time30 = pendulum.now(tz="UTC")
+    time30 = Timestamp()
 
     params = {
         "branch": branch2,
@@ -486,7 +486,7 @@ async def data_conflict_attribute(db: InfrahubDatabase, default_branch, car_pers
     branch2 = await create_branch(branch_name="branch2", db=db)
 
     # Time After Creation of branch2
-    time0 = pendulum.now(tz="UTC")
+    time0 = Timestamp()
 
     persons_list_branch = await NodeManager.query(db=db, schema="TestPerson", branch=branch2)
     persons_branch = {item.name.value: item for item in persons_list_branch}
@@ -501,13 +501,13 @@ async def data_conflict_attribute(db: InfrahubDatabase, default_branch, car_pers
     repos_main = {item.name.value: item for item in repos_list_main}
 
     # Update Repo 01 in Branch2 a first time
-    time12 = pendulum.now(tz="UTC")
+    time12 = Timestamp()
     repos_branch["repo01"].commit.value = "bbbbbbbbbbbbbbb"
     repos_branch["repo01"].description.value = "First update in Branch"
     await repos_branch["repo01"].save(db=db, at=time12)
 
     # Update P1 height in branch2
-    time13 = pendulum.now(tz="UTC")
+    time13 = Timestamp()
     persons_branch["John"].height.value = 666
     await persons_branch["John"].save(db=db, at=time13)
 
@@ -516,22 +516,22 @@ async def data_conflict_attribute(db: InfrahubDatabase, default_branch, car_pers
     await persons_main["John"].save(db=db, at=time13)
 
     # Time in-between the 2 batch of changes
-    time20 = pendulum.now(tz="UTC")
+    time20 = Timestamp()
 
     # Update Repo 01 in Branch2 a second time
-    time21 = pendulum.now(tz="UTC")
+    time21 = Timestamp()
     repos_branch["repo01"].commit.value = "dddddddddd"
     repos_branch["repo01"].description.value = "Second update in Branch"
     await repos_branch["repo01"].save(db=db, at=time21)
 
     # Update Repo 01 in main
-    time22 = pendulum.now(tz="UTC")
+    time22 = Timestamp()
     repos_main["repo01"].commit.value = "mmmmmmmmmmmmm"
     repos_main["repo01"].description.value = "update in main"
     await repos_main["repo01"].save(db=db, at=time12)
 
     # Time After the changes
-    time30 = pendulum.now(tz="UTC")
+    time30 = Timestamp()
 
     params = {
         "branch": branch2,
@@ -553,7 +553,7 @@ async def data_conflict_attribute(db: InfrahubDatabase, default_branch, car_pers
 @pytest.fixture
 async def data_diff_relationship_one(db: InfrahubDatabase, default_branch, car_person_data_generic, first_account):
     # Set some values in C1 in Main before creating the branch
-    time_minus1 = pendulum.now(tz="UTC")
+    time_minus1 = Timestamp()
 
     c1_main = await NodeManager.get_one_by_id_or_default_filter(
         db=db, id="volt", kind="TestElectricCar", branch=default_branch
@@ -569,7 +569,7 @@ async def data_diff_relationship_one(db: InfrahubDatabase, default_branch, car_p
     branch2 = await create_branch(branch_name="branch2", db=db)
 
     # Time After Creation of branch2
-    time0 = pendulum.now(tz="UTC")
+    time0 = Timestamp()
 
     persons_list = await NodeManager.query(db=db, schema="TestPerson", branch=branch2)
     persons = {item.name.value: item for item in persons_list}
@@ -578,19 +578,19 @@ async def data_diff_relationship_one(db: InfrahubDatabase, default_branch, car_p
     ecars = {item.name.value: item for item in ecars_list}
 
     # Change previous owner of C1 from P1 to P2 in branch
-    time11 = pendulum.now(tz="UTC")
+    time11 = Timestamp()
     await ecars["volt"].previous_owner.update(data=persons["John"], db=db)
     await ecars["volt"].save(db=db, at=time11)
 
     # Time in-between the 2 batch of changes
-    time20 = pendulum.now(tz="UTC")
+    time20 = Timestamp()
 
     # Set previous owner for C2 in branch
     await ecars["bolt"].previous_owner.update(data=persons["Jane"], db=db)
     await ecars["bolt"].save(db=db, at=time20)
 
     # Time After the changes
-    time30 = pendulum.now(tz="UTC")
+    time30 = Timestamp()
 
     params = {
         "branch": branch2,
@@ -610,7 +610,7 @@ async def data_diff_relationship_one(db: InfrahubDatabase, default_branch, car_p
 @pytest.fixture
 async def data_conflict_relationship_one(db: InfrahubDatabase, default_branch, car_person_data_generic, first_account):
     # Set some values in C1 in Main before creating the branch
-    time_minus1 = pendulum.now(tz="UTC")
+    time_minus1 = Timestamp()
 
     ecars_list_main = await NodeManager.query(db=db, schema="TestElectricCar", branch=default_branch)
     ecars_main = {item.name.value: item for item in ecars_list_main}
@@ -624,7 +624,7 @@ async def data_conflict_relationship_one(db: InfrahubDatabase, default_branch, c
     branch2 = await create_branch(branch_name="branch2", db=db)
 
     # Time After Creation of branch2
-    time0 = pendulum.now(tz="UTC")
+    time0 = Timestamp()
 
     persons_list_branch = await NodeManager.query(db=db, schema="TestPerson", branch=branch2)
     persons_branch = {item.name.value: item for item in persons_list_branch}
@@ -633,30 +633,30 @@ async def data_conflict_relationship_one(db: InfrahubDatabase, default_branch, c
     ecars_branch = {item.name.value: item for item in ecars_list_branch}
 
     # Change previous owner of C1 from P1 to P2 in branch
-    time11 = pendulum.now(tz="UTC")
+    time11 = Timestamp()
     await ecars_branch["volt"].previous_owner.update(data=persons_branch["John"], db=db)
     await ecars_branch["volt"].save(db=db, at=time11)
 
     # Change previous owner of C1 from P1 to Null in main
-    time12 = pendulum.now(tz="UTC")
+    time12 = Timestamp()
     await ecars_main["volt"].previous_owner.update(data=None, db=db)
     await ecars_main["volt"].save(db=db, at=time12)
 
     # Time in-between the 2 batch of changes
-    time20 = pendulum.now(tz="UTC")
+    time20 = Timestamp()
 
     # Set previous owner for C2 in branch
     await ecars_branch["bolt"].previous_owner.update(data=persons_branch["Jane"], db=db)
     await ecars_branch["bolt"].save(db=db, at=time20)
 
     # Set previous owner for C2 in main
-    time21 = pendulum.now(tz="UTC")
+    time21 = Timestamp()
 
     await ecars_main["bolt"].previous_owner.update(data=persons_branch["John"], db=db)
     await ecars_main["bolt"].save(db=db, at=time21)
 
     # Time After the changes
-    time30 = pendulum.now(tz="UTC")
+    time30 = Timestamp()
 
     params = {
         "branch": branch2,